From 3c722a66dfd55c317c82938acd80d4c39baee2b0 Mon Sep 17 00:00:00 2001
From: MaddoScientisto <maddo.science@gmail.com>
Date: Thu, 12 Mar 2026 18:48:13 +0100
Subject: [PATCH] feat: Add AI extraction service and related view models

- Introduced `IAiExtractionService` and its implementation `AiExtractionService` for processing images and extracting text.
- Created `AiResultItem` model to hold results from AI extraction.
- Added `ImageProcessingCoordinator` to manage image processing tasks and provide progress updates.
- Implemented view models for AI settings, path settings, processing state, race upload settings, and visual settings to support UI binding.
- Updated `Program.cs` to register new services and dependencies.
- Modified project file to skip MinVer execution during local builds.
---
 .../DataModelCharacterizationTests.cs         | 174 ++++
 MaddoShared.Tests/MaddoShared.Tests.csproj    |   1 +
 imagecatalog/AvaloniaViews/AiTabView.axaml    |  78 +-
 imagecatalog/DataModel.cs                     | 854 ++++++------------
 imagecatalog/ImageCatalog 2.csproj            |   2 +
 imagecatalog/Models/AiResultItem.cs           |   7 +
 imagecatalog/Program.cs                       |   6 +-
 imagecatalog/Services/AiExtractionService.cs  | 132 +++
 imagecatalog/Services/IAiExtractionService.cs |  22 +
 .../Services/IImageProcessingCoordinator.cs   |  28 +
 .../Services/ImageProcessingCoordinator.cs    | 127 +++
 .../ViewModels/AiSettingsViewModel.cs         |  75 ++
 .../ViewModels/PathSettingsViewModel.cs       |  49 +
 .../ViewModels/ProcessingStateViewModel.cs    |  82 ++
 .../ViewModels/RaceUploadSettingsViewModel.cs | 149 +++
 .../ViewModels/VisualSettingsViewModel.cs     | 312 +++++++
 16 files changed, 1466 insertions(+), 632 deletions(-)
 create mode 100644 MaddoShared.Tests/DataModelCharacterizationTests.cs
 create mode 100644 imagecatalog/Models/AiResultItem.cs
 create mode 100644 imagecatalog/Services/AiExtractionService.cs
 create mode 100644 imagecatalog/Services/IAiExtractionService.cs
 create mode 100644 imagecatalog/Services/IImageProcessingCoordinator.cs
 create mode 100644 imagecatalog/Services/ImageProcessingCoordinator.cs
 create mode 100644 imagecatalog/ViewModels/AiSettingsViewModel.cs
 create mode 100644 imagecatalog/ViewModels/PathSettingsViewModel.cs
 create mode 100644 imagecatalog/ViewModels/ProcessingStateViewModel.cs
 create mode 100644 imagecatalog/ViewModels/RaceUploadSettingsViewModel.cs
 create mode 100644 imagecatalog/ViewModels/VisualSettingsViewModel.cs

diff --git a/MaddoShared.Tests/DataModelCharacterizationTests.cs b/MaddoShared.Tests/DataModelCharacterizationTests.cs
new file mode 100644
index 0000000..468e389
--- /dev/null
+++ b/MaddoShared.Tests/DataModelCharacterizationTests.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Threading.Tasks;
+using FluentAssertions;
+using ImageCatalog_2;
+using ImageCatalog_2.Services;
+using MaddoShared;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MaddoShared.Tests;
+
+[TestClass]
+public class DataModelCharacterizationTests
+{
+    [TestMethod]
+    public void SelectSourceFolderCommand_RaisesEvent()
+    {
+        var model = CreateModel();
+        var raised = false;
+        model.SelectSourceFolderRequested += (_, _) => raised = true;
+
+        model.SelectSourceFolderCommand.Execute(null);
+
+        raised.Should().BeTrue();
+    }
+
+    [TestMethod]
+    public async Task SaveSettingsToFileAsync_DelegatesToSettingsService()
+    {
+        var settingsService = new Mock<ISettingsService>();
+        settingsService
+            .Setup(s => s.SaveSettingsAsync(It.IsAny<string>(), It.IsAny<object>()))
+            .Returns(Task.CompletedTask);
+
+        var model = CreateModel(settingsService: settingsService.Object);
+
+        await model.SaveSettingsToFileAsync("settings.xml");
+
+        settingsService.Verify(
+            s => s.SaveSettingsAsync("settings.xml", model),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public async Task LoadSettingsFromFileAsync_DelegatesToSettingsService()
+    {
+        var settingsService = new Mock<ISettingsService>();
+        settingsService
+            .Setup(s => s.LoadSettingsAsync(It.IsAny<string>(), It.IsAny<object>()))
+            .Returns(Task.CompletedTask);
+
+        var model = CreateModel(settingsService: settingsService.Object);
+
+        await model.LoadSettingsFromFileAsync("settings.xml");
+
+        settingsService.Verify(
+            s => s.LoadSettingsAsync("settings.xml", model),
+            Times.Once);
+    }
+
+    [TestMethod]
+    public void ThumbnailOptionIndex_UpdatesAuthoritativeThumbnailState()
+    {
+        var model = CreateModel();
+
+        model.ThumbnailOptionIndex = (int)DataModel.ThumbnailOptionEnum.RaceTime;
+
+        model.ThumbnailOption.Should().Be(DataModel.ThumbnailOptionEnum.RaceTime);
+        model.AddRaceTimeToThumbnails.Should().BeTrue();
+        model.ThumbnailMode.Should().Be("RaceTime");
+    }
+
+    [TestMethod]
+    public void ProcessingChildChange_RaisesDataModelPropertyChanged()
+    {
+        var model = CreateModel();
+        string? changed = null;
+        model.PropertyChanged += (_, args) => changed = args.PropertyName;
+
+        model.Processing.SpeedCounter = "12.00 f/s";
+
+        changed.Should().Be(nameof(DataModel.SpeedCounter));
+        model.SpeedCounter.Should().Be("12.00 f/s");
+    }
+
+    [TestMethod]
+    public void PathsNormalize_UpdatesFlattenedSourceAndDestination()
+    {
+        var model = CreateModel();
+        model.SourcePath = "\"C:/input\"";
+        model.DestinationPath = "C:/output";
+
+        model.Paths.NormalizePaths();
+
+        model.SourcePath.Should().Be($"C:{System.IO.Path.DirectorySeparatorChar}input{System.IO.Path.DirectorySeparatorChar}");
+        model.DestinationPath.Should().Be($"C:{System.IO.Path.DirectorySeparatorChar}output{System.IO.Path.DirectorySeparatorChar}");
+    }
+
+    [TestMethod]
+    public void AiChildChange_RaisesDataModelPropertyChanged()
+    {
+        var model = CreateModel();
+        string? changed = null;
+        model.PropertyChanged += (_, args) => changed = args.PropertyName;
+
+        model.Ai.ModelsFolderPath = "K:/models";
+
+        changed.Should().Be(nameof(DataModel.ModelsFolderPath));
+        model.ModelsFolderPath.Should().Be("K:/models");
+    }
+
+    [TestMethod]
+    public void RaceUploadChildChange_RaisesDataModelPropertyChanged()
+    {
+        var model = CreateModel();
+        string? changed = null;
+        model.PropertyChanged += (_, args) => changed = args.PropertyName;
+
+        model.RaceUpload.ApiLogin = "admin";
+
+        changed.Should().Be(nameof(DataModel.ApiLogin));
+        model.ApiLogin.Should().Be("admin");
+    }
+
+    [TestMethod]
+    public void VisualChildChange_RaisesDataModelPropertyChanged()
+    {
+        var model = CreateModel();
+        string? changed = null;
+        model.PropertyChanged += (_, args) => changed = args.PropertyName;
+
+        model.Visual.FontSize = 42;
+
+        changed.Should().Be(nameof(DataModel.FontSize));
+        model.FontSize.Should().Be(42);
+    }
+
+    private static DataModel CreateModel(
+        ISettingsService? settingsService = null,
+        ITestService? testService = null)
+    {
+        var mapper = new Mock<AutoMapper.IMapper>().Object;
+        var picSettings = new PicSettings();
+
+        var imageCreator = new Mock<IImageCreator>();
+        imageCreator
+            .Setup(x => x.CreateImageAsync(It.IsAny<ImageState>(), It.IsAny<byte[]?>()))
+            .Returns(Task.CompletedTask);
+
+        var imageCreationService = new ImageCreationService(
+            new Mock<ILogger<ImageCreationService>>().Object,
+            picSettings,
+            imageCreator.Object);
+
+        var imageProcessingCoordinator = new ImageProcessingCoordinator(
+            imageCreationService,
+            new Mock<ILogger<ImageProcessingCoordinator>>().Object);
+
+        var aiExtractionService = new AiExtractionService(
+            new Mock<ILogger<AiExtractionService>>().Object);
+
+        return new DataModel(
+            testService ?? new Mock<ITestService>().Object,
+            settingsService ?? new Mock<ISettingsService>().Object,
+            imageCreationService,
+            aiExtractionService,
+            imageProcessingCoordinator,
+            picSettings,
+            mapper,
+            new Mock<ILogger<DataModel>>().Object,
+            versionProvider: null);
+    }
+}
diff --git a/MaddoShared.Tests/MaddoShared.Tests.csproj b/MaddoShared.Tests/MaddoShared.Tests.csproj
index b2f98b7..911c340 100644
--- a/MaddoShared.Tests/MaddoShared.Tests.csproj
+++ b/MaddoShared.Tests/MaddoShared.Tests.csproj
@@ -22,6 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\imagecatalog\ImageCatalog 2.csproj" />
     <ProjectReference Include="..\MaddoShared\MaddoShared.csproj" />
   </ItemGroup>
 
diff --git a/imagecatalog/AvaloniaViews/AiTabView.axaml b/imagecatalog/AvaloniaViews/AiTabView.axaml
index a5f6971..8b125d3 100644
--- a/imagecatalog/AvaloniaViews/AiTabView.axaml
+++ b/imagecatalog/AvaloniaViews/AiTabView.axaml
@@ -2,39 +2,53 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:avaloniaDataGrid="clr-namespace:Avalonia.Controls;assembly=Avalonia.Controls.DataGrid"
              x:Class="ImageCatalog_2.AvaloniaViews.AiTabView">
-    <ScrollViewer>
-        <StackPanel Margin="4">
-            <TextBlock Text="AI / OCR" FontWeight="Bold" />
-            <CheckBox Content="Estrai numeri dalle immagini" IsChecked="{Binding ExtractNumbers}" Margin="0,6,0,0" />
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
 
-            <TextBlock Text="Modelli" FontWeight="Bold" Margin="0,8,0,0" />
-            <Grid Margin="0,4,0,0" ColumnDefinitions="Auto,*,Auto,Auto">
-                <TextBlock Text="Cartella modelli:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
-                <TextBox Text="{Binding ModelsFolderPath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
-                <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectModelsFolderCommand}"
-                        Grid.Column="2" Content="Scegli..." />
-                <Button Width="56" Margin="6,0,0,0" Grid.Column="3"
-                        Click="OpenModelsFolder_Click" Content="Apri" />
-            </Grid>
+        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto">
+            <StackPanel Margin="4">
+                <TextBlock Text="AI / OCR" FontWeight="Bold" />
+                <CheckBox Content="Estrai numeri dalle immagini" IsChecked="{Binding ExtractNumbers}" Margin="0,6,0,0" />
 
-            <TextBlock Text="Output CSV" FontWeight="Bold" Margin="0,8,0,0" />
-            <Grid Margin="0,4,0,0" ColumnDefinitions="Auto,*,Auto,Auto">
-                <TextBlock Text="Percorso CSV:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
-                <TextBox Text="{Binding CsvOutputPath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
-                <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectCsvOutputCommand}"
-                        Grid.Column="2" Content="Scegli..." />
-                <Button Width="56" Margin="6,0,0,0" Grid.Column="3"
-                        Click="OpenCsvOutputFolder_Click" Content="Apri" />
-            </Grid>
+                <TextBlock Text="Modelli" FontWeight="Bold" Margin="0,8,0,0" />
+                <Grid Margin="0,4,0,0" ColumnDefinitions="Auto,*,Auto,Auto">
+                    <TextBlock Text="Cartella modelli:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
+                    <TextBox Text="{Binding ModelsFolderPath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
+                    <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectModelsFolderCommand}"
+                            Grid.Column="2" Content="Scegli..." />
+                    <Button Width="56" Margin="6,0,0,0" Grid.Column="3"
+                            Click="OpenModelsFolder_Click" Content="Apri" />
+                </Grid>
 
-            <TextBlock Text="Anteprima risultati" FontWeight="Bold" Margin="0,8,0,0" />
-            <avaloniaDataGrid:DataGrid ItemsSource="{Binding PreviewResults}" IsReadOnly="True"
-                                       AutoGenerateColumns="False" Height="200" Margin="0,4,0,0">
-                <avaloniaDataGrid:DataGrid.Columns>
-                    <avaloniaDataGrid:DataGridTextColumn Header="Path" Binding="{Binding Path}" Width="*" />
-                    <avaloniaDataGrid:DataGridTextColumn Header="Text" Binding="{Binding Text}" Width="2*" />
-                </avaloniaDataGrid:DataGrid.Columns>
-            </avaloniaDataGrid:DataGrid>
-        </StackPanel>
-    </ScrollViewer>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,8,0,0" Spacing="8">
+                    <Button Content="Avvia AI" Command="{Binding StartAiCommand}" Width="120" />
+                    <Button Content="Annulla" Command="{Binding AsyncCancelOperationCommand}" Width="120" />
+                </StackPanel>
+
+                <TextBlock Text="Output CSV" FontWeight="Bold" Margin="0,8,0,0" />
+                <Grid Margin="0,4,0,0" ColumnDefinitions="Auto,*,Auto,Auto">
+                    <TextBlock Text="Percorso CSV:" VerticalAlignment="Center" Margin="0,0,8,0" Grid.Column="0" />
+                    <TextBox Text="{Binding CsvOutputPath, Mode=TwoWay}" Grid.Column="1" VerticalAlignment="Center" />
+                    <Button Width="88" Margin="6,0,0,0" Command="{Binding SelectCsvOutputCommand}"
+                            Grid.Column="2" Content="Scegli..." />
+                    <Button Width="56" Margin="6,0,0,0" Grid.Column="3"
+                            Click="OpenCsvOutputFolder_Click" Content="Apri" />
+                </Grid>
+
+                <TextBlock Text="Anteprima risultati" FontWeight="Bold" Margin="0,8,0,0" />
+                <ProgressBar Minimum="0" Maximum="100" Value="{Binding AiProgress}" Height="16" Margin="0,4,0,4" />
+            </StackPanel>
+        </ScrollViewer>
+
+        <avaloniaDataGrid:DataGrid Grid.Row="1" ItemsSource="{Binding PreviewResults}" IsReadOnly="True"
+                                   AutoGenerateColumns="False" Margin="4,4,4,4" CanUserResizeColumns="True" VerticalAlignment="Stretch">
+            <avaloniaDataGrid:DataGrid.Columns>
+                <avaloniaDataGrid:DataGridTextColumn Header="Path" Binding="{Binding Path}" Width="*" />
+                <avaloniaDataGrid:DataGridTextColumn Header="Text" Binding="{Binding Text}" Width="2*" />
+            </avaloniaDataGrid:DataGrid.Columns>
+        </avaloniaDataGrid:DataGrid>
+    </Grid>
 </UserControl>
diff --git a/imagecatalog/DataModel.cs b/imagecatalog/DataModel.cs
index 66fbb3f..206c602 100644
--- a/imagecatalog/DataModel.cs
+++ b/imagecatalog/DataModel.cs
@@ -1,7 +1,8 @@
 using ImageCatalog_2.Commands;
+using ImageCatalog_2.Models;
 using ImageCatalog_2.Services;
+using ImageCatalog_2.ViewModels;
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -38,11 +39,19 @@ namespace ImageCatalog_2
         public ICommand SelectTransparentColorCommand { get; }
         public ICommand SelectModelsFolderCommand { get; }
         public ICommand SelectCsvOutputCommand { get; }
+        public ICommand StartAiCommand { get; }
 
         private readonly ITestService _service;
         private readonly ILogger<DataModel> _logger;
         private readonly ISettingsService _settingsService;
         private readonly ImageCreationService _imageCreationService;
+        private readonly IAiExtractionService _aiExtractionService;
+        private readonly IImageProcessingCoordinator _imageProcessingCoordinator;
+        private readonly ProcessingStateViewModel _processing;
+        private readonly PathSettingsViewModel _paths;
+        private readonly AiSettingsViewModel _ai;
+        private readonly RaceUploadSettingsViewModel _raceUpload;
+        private readonly VisualSettingsViewModel _visual;
         private readonly PicSettings _picSettings;
         private readonly IMapper _mapper;
 
@@ -51,14 +60,27 @@ namespace ImageCatalog_2
         public List<string> VerticalPositions { get; } = new() { "Alto", "Centro", "Basso" };
         public List<string> HorizontalAlignments { get; } = new() { "Sinistra", "Centro", "Destra" };
 
+        [CLSCompliant(false)]
         public DataModel(ITestService testService, ISettingsService settingsService,
-            ImageCreationService imageCreationService, PicSettings picSettings,
+            ImageCreationService imageCreationService, IAiExtractionService aiExtractionService, IImageProcessingCoordinator imageProcessingCoordinator, PicSettings picSettings,
             IMapper mapper, ILogger<DataModel> logger, MaddoShared.IVersionProvider? versionProvider = null)
         {
             _service = testService;
             _logger = logger;
             _settingsService = settingsService;
             _imageCreationService = imageCreationService;
+            _aiExtractionService = aiExtractionService;
+            _imageProcessingCoordinator = imageProcessingCoordinator;
+            _processing = new ProcessingStateViewModel();
+            _processing.PropertyChanged += OnProcessingPropertyChanged;
+            _paths = new PathSettingsViewModel();
+            _paths.PropertyChanged += OnPathsPropertyChanged;
+            _ai = new AiSettingsViewModel();
+            _ai.PropertyChanged += OnAiPropertyChanged;
+            _raceUpload = new RaceUploadSettingsViewModel();
+            _raceUpload.PropertyChanged += OnRaceUploadPropertyChanged;
+            _visual = new VisualSettingsViewModel();
+            _visual.PropertyChanged += OnVisualPropertyChanged;
             _picSettings = picSettings;
             _mapper = mapper;
             // Populate AppVersion from version provider when available
@@ -70,6 +92,7 @@ namespace ImageCatalog_2
             ProcessImagesCommand = new AsyncCommand(ProcessImages);
             SelectModelsFolderCommand = new RelayCommand(SelectModelsFolder);
             SelectCsvOutputCommand = new RelayCommand(SelectCsvOutput);
+            StartAiCommand = new AsyncCommand(StartAiAsync);
 
             SelectSourceFolderCommand = new RelayCommand(SelectSourceFolder);
             SelectDestinationFolderCommand = new RelayCommand(SelectDestinationFolder);
@@ -83,133 +106,48 @@ namespace ImageCatalog_2
             AvailableFonts = LoadAvailableFonts();
         }
 
-        private async Task RunAiExtractionAsync(CancellationToken token)
+        private async Task StartAiAsync()
         {
-            // Simple stub: scan source folder for supported images and either call AIFotoONLUS.Core
-            // or simulate results. Write CSV output and populate PreviewResults.
-            if (string.IsNullOrWhiteSpace(SourcePath) || !System.IO.Directory.Exists(SourcePath))
-            {
-                _logger.LogWarning("Source path invalid for AI extraction: {SourcePath}", SourcePath);
-                return;
-            }
-
-            var imageFiles = System.IO.Directory.EnumerateFiles(SourcePath, "*.*", System.IO.SearchOption.TopDirectoryOnly)
-                .Where(f => f.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase)
-                         || f.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase)
-                         || f.EndsWith(".png", StringComparison.OrdinalIgnoreCase)
-                         || f.EndsWith(".bmp", StringComparison.OrdinalIgnoreCase)
-                         || f.EndsWith(".gif", StringComparison.OrdinalIgnoreCase))
-                .ToList();
-
-            if (imageFiles.Count == 0)
-            {
-                _logger.LogInformation("No image files found for AI extraction in {SourcePath}", SourcePath);
-                return;
-            }
-
-            // Clear preview
-            await InvokeOnUiThreadAsync(() => { PreviewResults.Clear(); });
-
-            // Try to locate AIFotoONLUS.Core types via reflection to avoid hard reference at compile time
-            Type? aiProcessorType = null;
-            object? aiProcessor = null;
-
+            MainToken = new CancellationTokenSource();
             try
             {
-                var assembly = AppDomain.CurrentDomain.GetAssemblies()
-                    .FirstOrDefault(a => a.GetName().Name?.Equals("AIFotoONLUS.Core", StringComparison.OrdinalIgnoreCase) == true);
-                if (assembly != null)
-                {
-                    aiProcessorType = assembly.GetType("AIFotoONLUS.Core.AiProcessor");
-                    if (aiProcessorType != null)
-                    {
-                        // Create instance assuming parameterless ctor
-                        aiProcessor = Activator.CreateInstance(aiProcessorType);
-                    }
-                }
+                await RunAiExtractionCoreAsync(MainToken.Token, useDestination: true, recursive: true).ConfigureAwait(false);
             }
-            catch (Exception ex)
+            catch (OperationCanceledException)
             {
-                _logger.LogDebug(ex, "AIFotoONLUS.Core not available or failed to load via reflection");
+                // user cancelled
             }
-
-            var results = new List<AiResult>();
-
-            foreach (var file in imageFiles)
+            finally
             {
-                token.ThrowIfCancellationRequested();
-
-                string extracted = string.Empty;
-
-                if (aiProcessorType is not null && aiProcessor is not null)
-                {
-                    try
-                    {
-                        // Preferred method name: ExtractNumbersFromImage(string imagePath)
-                        var method = aiProcessorType.GetMethod("ExtractNumbersFromImage") ?? aiProcessorType.GetMethod("ExtractTextFromImage");
-                        if (method is not null)
-                        {
-                            var value = method.Invoke(aiProcessor, new object[] { file });
-                            if (value != null)
-                                extracted = value.ToString() ?? string.Empty;
-                        }
-                        else
-                        {
-                            // No expected method found, fallback to simulated result
-                            extracted = SimulateExtraction(file);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogWarning(ex, "Error invoking AI processor for {File}", file);
-                        extracted = SimulateExtraction(file);
-                    }
-                }
-                else
-                {
-                    // Simulate extraction when library not available
-                    extracted = SimulateExtraction(file);
-                }
-
-                var res = new AiResult { Path = file, Text = extracted };
-                results.Add(res);
-
-                await InvokeOnUiThreadAsync(() => PreviewResults.Add(res));
-            }
-
-            // Write CSV if requested
-            if (!string.IsNullOrWhiteSpace(CsvOutputPath))
-            {
-                try
-                {
-                    var dir = System.IO.Path.GetDirectoryName(CsvOutputPath) ?? string.Empty;
-                    if (!string.IsNullOrWhiteSpace(dir) && !System.IO.Directory.Exists(dir))
-                    {
-                        System.IO.Directory.CreateDirectory(dir);
-                    }
-
-                    using var sw = new System.IO.StreamWriter(CsvOutputPath, false, System.Text.Encoding.UTF8);
-                    sw.WriteLine("Path,Text");
-                    foreach (var r in results)
-                    {
-                        var safeText = (r.Text ?? string.Empty).Replace("\"", "\"\"");
-                        sw.WriteLine($"\"{r.Path}\",\"{safeText}\"");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Failed to write CSV to {CsvOutputPath}", CsvOutputPath);
-                }
+                MainToken = null;
             }
         }
 
-        private string SimulateExtraction(string file)
+        private async Task RunAiExtractionCoreAsync(CancellationToken token, bool useDestination = false, bool recursive = false)
         {
-            // Cheap heuristic: return filename digits
-            var name = System.IO.Path.GetFileNameWithoutExtension(file);
-            var digits = new string(name.Where(char.IsDigit).ToArray());
-            if (string.IsNullOrEmpty(digits)) return "";
-            return digits;
+            var searchRoot = useDestination ? DestinationPath : SourcePath;
+            if (string.IsNullOrWhiteSpace(searchRoot) || !System.IO.Directory.Exists(searchRoot))
+            {
+                _logger.LogWarning("AI extraction path invalid: {Path}", searchRoot);
+                return;
+            }
+
+            await InvokeOnUiThreadAsync(() =>
+            {
+                PreviewResults.Clear();
+                AiProgress = 0;
+            }).ConfigureAwait(false);
+
+            await _aiExtractionService.RunAsync(
+                new AiExtractionRequest
+                {
+                    SearchRoot = searchRoot,
+                    Recursive = recursive,
+                    CsvOutputPath = CsvOutputPath
+                },
+                token,
+                result => InvokeOnUiThreadAsync(() => PreviewResults.Add(result)),
+                progress => InvokeOnUiThreadAsync(() => AiProgress = progress)).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -229,142 +167,126 @@ namespace ImageCatalog_2
             });
         }
 
+        public AiSettingsViewModel Ai => _ai;
+        public RaceUploadSettingsViewModel RaceUpload => _raceUpload;
+
         // AI properties
-        private bool _extractNumbers;
         public bool ExtractNumbers
         {
-            get => _extractNumbers;
-            set { _extractNumbers = value; NotifyPropertyChanged(); }
+            get => _ai.ExtractNumbers;
+            set => _ai.ExtractNumbers = value;
         }
 
-        private string _modelsFolderPath = string.Empty;
         public string ModelsFolderPath
         {
-            get => _modelsFolderPath;
-            set { _modelsFolderPath = value; NotifyPropertyChanged(); }
+            get => _ai.ModelsFolderPath;
+            set => _ai.ModelsFolderPath = value;
         }
 
-        private string _csvOutputPath = string.Empty;
         public string CsvOutputPath
         {
-            get => _csvOutputPath;
-            set { _csvOutputPath = value; NotifyPropertyChanged(); }
+            get => _ai.CsvOutputPath;
+            set => _ai.CsvOutputPath = value;
         }
 
-        private string _faceExecutablePath = string.Empty;
         public string FaceExecutablePath
         {
-            get => _faceExecutablePath;
-            set { _faceExecutablePath = value; NotifyPropertyChanged(); }
+            get => _ai.FaceExecutablePath;
+            set => _ai.FaceExecutablePath = value;
         }
 
-        private string _faceOutputFolderPath = string.Empty;
         public string FaceOutputFolderPath
         {
-            get => _faceOutputFolderPath;
-            set { _faceOutputFolderPath = value; NotifyPropertyChanged(); }
+            get => _ai.FaceOutputFolderPath;
+            set => _ai.FaceOutputFolderPath = value;
         }
 
         // Race upload settings
-        private string _apiLogin = string.Empty;
         public string ApiLogin
         {
-            get => _apiLogin;
-            set { _apiLogin = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiLogin;
+            set => _raceUpload.ApiLogin = value;
         }
 
-        private string _apiPassword = string.Empty;
         public string ApiPassword
         {
-            get => _apiPassword;
-            set { _apiPassword = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiPassword;
+            set => _raceUpload.ApiPassword = value;
         }
 
-        private string _apiRaceDescription = string.Empty;
         public string ApiRaceDescription
         {
-            get => _apiRaceDescription;
-            set { _apiRaceDescription = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiRaceDescription;
+            set => _raceUpload.ApiRaceDescription = value;
         }
 
-        private string _apiRaceTypeId = "1";
         public string ApiRaceTypeId
         {
-            get => _apiRaceTypeId;
-            set { _apiRaceTypeId = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiRaceTypeId;
+            set => _raceUpload.ApiRaceTypeId = value;
         }
 
-        private DateTime _apiRaceStartDate = DateTime.Today;
         public DateTime ApiRaceStartDate
         {
-            get => _apiRaceStartDate;
-            set { _apiRaceStartDate = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiRaceStartDate;
+            set => _raceUpload.ApiRaceStartDate = value;
         }
 
-        private DateTime _apiRaceEndDate = DateTime.Today;
         public DateTime ApiRaceEndDate
         {
-            get => _apiRaceEndDate;
-            set { _apiRaceEndDate = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiRaceEndDate;
+            set => _raceUpload.ApiRaceEndDate = value;
         }
 
-        private string _apiPathBase = string.Empty;
         public string ApiPathBase
         {
-            get => _apiPathBase;
-            set { _apiPathBase = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiPathBase;
+            set => _raceUpload.ApiPathBase = value;
         }
 
-        private string _apiLocalita = string.Empty;
         public string ApiLocalita
         {
-            get => _apiLocalita;
-            set { _apiLocalita = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiLocalita;
+            set => _raceUpload.ApiLocalita = value;
         }
 
-        private int _apiEventoInLineaIndex = 0;
         public int ApiEventoInLineaIndex
         {
-            get => _apiEventoInLineaIndex;
-            set { _apiEventoInLineaIndex = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiEventoInLineaIndex;
+            set => _raceUpload.ApiEventoInLineaIndex = value;
         }
 
-        private int _apiTipoIndexValue = 1;
         public int ApiTipoIndexValue
         {
-            get => _apiTipoIndexValue;
-            set { _apiTipoIndexValue = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiTipoIndexValue;
+            set => _raceUpload.ApiTipoIndexValue = value;
         }
 
-        private int _apiFreeEventIndex = 0;
         public int ApiFreeEventIndex
         {
-            get => _apiFreeEventIndex;
-            set { _apiFreeEventIndex = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiFreeEventIndex;
+            set => _raceUpload.ApiFreeEventIndex = value;
         }
 
-        private string _apiRaceId = string.Empty;
         public string ApiRaceId
         {
-            get => _apiRaceId;
-            set { _apiRaceId = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiRaceId;
+            set => _raceUpload.ApiRaceId = value;
         }
 
-        private string _apiRemoteProcessedBasePath = string.Empty;
         public string ApiRemoteProcessedBasePath
         {
-            get => _apiRemoteProcessedBasePath;
-            set { _apiRemoteProcessedBasePath = value; NotifyPropertyChanged(); }
+            get => _raceUpload.ApiRemoteProcessedBasePath;
+            set => _raceUpload.ApiRemoteProcessedBasePath = value;
         }
 
         // Preview results for DataGrid
-        private System.Collections.ObjectModel.ObservableCollection<AiResult> _previewResults = new();
-        public System.Collections.ObjectModel.ObservableCollection<AiResult> PreviewResults => _previewResults;
+        public System.Collections.ObjectModel.ObservableCollection<AiResultItem> PreviewResults => _ai.PreviewResults;
 
-        public class AiResult
+        public double AiProgress
         {
-            public string Path { get; set; } = string.Empty;
-            public string Text { get; set; } = string.Empty;
+            get => _ai.AiProgress;
+            set => _ai.AiProgress = value;
         }
 
         private List<string> LoadAvailableFonts()
@@ -393,64 +315,34 @@ namespace ImageCatalog_2
             }
         }
 
-        private string _sourcePath;
-
         public string SourcePath
         {
-            get => _sourcePath;
-            set
-            {
-                _sourcePath = value;
-                NotifyPropertyChanged();
-            }
+            get => _paths.SourcePath;
+            set => _paths.SourcePath = value;
         }
 
-        private string _destinationPath;
-
         public string DestinationPath
         {
-            get => _destinationPath;
-            set
-            {
-                _destinationPath = value;
-                NotifyPropertyChanged();
-            }
+            get => _paths.DestinationPath;
+            set => _paths.DestinationPath = value;
         }
 
-        private string _horizontalText;
-
         public string HorizontalText
         {
-            get => _horizontalText;
-            set
-            {
-                _horizontalText = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.HorizontalText;
+            set => _visual.HorizontalText = value;
         }
 
-        private string _verticalText;
-
         public string VerticalText
         {
-            get => _verticalText;
-            set
-            {
-                _verticalText = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.VerticalText;
+            set => _visual.VerticalText = value;
         }
 
-        private bool _overwriteImages;
-
         public bool OverwriteImages
         {
-            get => _overwriteImages;
-            set
-            {
-                _overwriteImages = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.OverwriteImages;
+            set => _visual.OverwriteImages = value;
         }
 
         private bool _uiEnabled = true;
@@ -468,16 +360,65 @@ namespace ImageCatalog_2
 
         public bool UiDisabled => !_uiEnabled;
 
-        private string _speedCounter = "-";
+        public ProcessingStateViewModel Processing => _processing;
+        public PathSettingsViewModel Paths => _paths;
+        public VisualSettingsViewModel Visual => _visual;
+
+        private void OnProcessingPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(e.PropertyName))
+            {
+                return;
+            }
+
+            // Keep existing DataModel bindings working while state lives in child viewmodel.
+            NotifyPropertyChanged(e.PropertyName);
+        }
+
+        private void OnPathsPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(e.PropertyName))
+            {
+                return;
+            }
+
+            NotifyPropertyChanged(e.PropertyName);
+        }
+
+        private void OnAiPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(e.PropertyName))
+            {
+                return;
+            }
+
+            NotifyPropertyChanged(e.PropertyName);
+        }
+
+        private void OnRaceUploadPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(e.PropertyName))
+            {
+                return;
+            }
+
+            NotifyPropertyChanged(e.PropertyName);
+        }
+
+        private void OnVisualPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(e.PropertyName))
+            {
+                return;
+            }
+
+            NotifyPropertyChanged(e.PropertyName);
+        }
 
         public string SpeedCounter
         {
-            get => _speedCounter;
-            set
-            {
-                _speedCounter = value;
-                NotifyPropertyChanged();
-            }
+            get => _processing.SpeedCounter;
+            set => _processing.SpeedCounter = value;
         }
 
         private int _chunkSize;
@@ -505,217 +446,122 @@ namespace ImageCatalog_2
         }
 
         // Thumbnail settings
-        private string _thumbnailPrefix = "tn_";
         public string ThumbnailPrefix
         {
-            get => _thumbnailPrefix;
-            set
-            {
-                _thumbnailPrefix = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.ThumbnailPrefix;
+            set => _visual.ThumbnailPrefix = value;
         }
 
-        private int _thumbnailHeight = 350;
         public int ThumbnailHeight
         {
-            get => _thumbnailHeight;
-            set
-            {
-                _thumbnailHeight = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.ThumbnailHeight;
+            set => _visual.ThumbnailHeight = value;
         }
 
-        private int _thumbnailWidth = 350;
         public int ThumbnailWidth
         {
-            get => _thumbnailWidth;
-            set
-            {
-                _thumbnailWidth = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.ThumbnailWidth;
+            set => _visual.ThumbnailWidth = value;
         }
 
         // Big photo settings
-        private int _photoBigHeight = 2240;
         public int PhotoBigHeight
         {
-            get => _photoBigHeight;
-            set
-            {
-                _photoBigHeight = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.PhotoBigHeight;
+            set => _visual.PhotoBigHeight = value;
         }
 
-        private int _photoBigWidth = 2240;
         public int PhotoBigWidth
         {
-            get => _photoBigWidth;
-            set
-            {
-                _photoBigWidth = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.PhotoBigWidth;
+            set => _visual.PhotoBigWidth = value;
         }
 
         // Font settings
-        private int _fontSize = 20;
         public int FontSize
         {
-            get => _fontSize;
-            set
-            {
-                _fontSize = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.FontSize;
+            set => _visual.FontSize = value;
         }
 
-        private int _fontSizeThumbnail = 50;
         public int FontSizeThumbnail
         {
-            get => _fontSizeThumbnail;
-            set
-            {
-                _fontSizeThumbnail = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.FontSizeThumbnail;
+            set => _visual.FontSizeThumbnail = value;
         }
 
-        private string _fontName = "Arial";
         public string FontName
         {
-            get => _fontName;
-            set
-            {
-                _fontName = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.FontName;
+            set => _visual.FontName = value;
         }
 
-        private bool _fontBold = false;
         public bool FontBold
         {
-            get => _fontBold;
-            set
-            {
-                _fontBold = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.FontBold;
+            set => _visual.FontBold = value;
         }
 
         // Text settings
-        private int _textTransparency = 0;
         public int TextTransparency
         {
-            get => _textTransparency;
-            set
-            {
-                _textTransparency = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.TextTransparency;
+            set => _visual.TextTransparency = value;
         }
 
-        private int _textMargin = 8;
         public int TextMargin
         {
-            get => _textMargin;
-            set
-            {
-                _textMargin = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.TextMargin;
+            set => _visual.TextMargin = value;
         }
 
-        private string _textColorRGB = "Yellow";
         public string TextColorRGB
         {
-            get => _textColorRGB;
-            set
-            {
-                _textColorRGB = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.TextColorRGB;
+            set => _visual.TextColorRGB = value;
         }
 
-        private string _transparentColor = "#FFFFFF";
         public string TransparentColor
         {
-            get => _transparentColor;
-            set
-            {
-                _transparentColor = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.TransparentColor;
+            set => _visual.TransparentColor = value;
         }
 
-        private bool _useTransparentColor;
         public bool UseTransparentColor
         {
-            get => _useTransparentColor;
-            set
-            {
-                _useTransparentColor = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.UseTransparentColor;
+            set => _visual.UseTransparentColor = value;
         }
 
         // Logo/Watermark settings
-        private string _logoFile = "";
         public string LogoFile
         {
-            get => _logoFile;
-            set
-            {
-                _logoFile = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.LogoFile;
+            set => _visual.LogoFile = value;
         }
 
-        private int _logoHeight = 430;
         public int LogoHeight
         {
-            get => _logoHeight;
-            set
-            {
-                _logoHeight = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.LogoHeight;
+            set => _visual.LogoHeight = value;
         }
 
-        private int _logoWidth = 430;
         public int LogoWidth
         {
-            get => _logoWidth;
-            set
-            {
-                _logoWidth = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.LogoWidth;
+            set => _visual.LogoWidth = value;
         }
 
-        private int _logoMargin = 290;
         public int LogoMargin
         {
-            get => _logoMargin;
-            set
-            {
-                _logoMargin = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.LogoMargin;
+            set => _visual.LogoMargin = value;
         }
 
-        private int _logoTransparency = 100;
         public int LogoTransparency
         {
-            get => _logoTransparency;
-            set
-            {
-                _logoTransparency = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.LogoTransparency;
+            set => _visual.LogoTransparency = value;
         }
 
         // Image library selection (UI radio buttons bind to the boolean helpers)
@@ -803,49 +649,29 @@ namespace ImageCatalog_2
         }
 
         // Vertical text settings
-        private int _verticalTextSize = 20;
         public int VerticalTextSize
         {
-            get => _verticalTextSize;
-            set
-            {
-                _verticalTextSize = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.VerticalTextSize;
+            set => _visual.VerticalTextSize = value;
         }
 
-        private int _verticalTextMargin = 6;
         public int VerticalTextMargin
         {
-            get => _verticalTextMargin;
-            set
-            {
-                _verticalTextMargin = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.VerticalTextMargin;
+            set => _visual.VerticalTextMargin = value;
         }
 
         // JPEG compression settings
-        private int _jpegQuality = 85;
         public int JpegQuality
         {
-            get => _jpegQuality;
-            set
-            {
-                _jpegQuality = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.JpegQuality;
+            set => _visual.JpegQuality = value;
         }
 
-        private int _jpegQualityThumbnail = 30;
         public int JpegQualityThumbnail
         {
-            get => _jpegQualityThumbnail;
-            set
-            {
-                _jpegQualityThumbnail = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.JpegQualityThumbnail;
+            set => _visual.JpegQualityThumbnail = value;
         }
 
         // CheckBox settings
@@ -926,26 +752,16 @@ namespace ImageCatalog_2
             }
         }
 
-        private bool _addLogo;
         public bool AddLogo
         {
-            get => _addLogo;
-            set
-            {
-                _addLogo = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.AddLogo;
+            set => _visual.AddLogo = value;
         }
 
-        private bool _keepOriginalDimensions;
         public bool KeepOriginalDimensions
         {
-            get => _keepOriginalDimensions;
-            set
-            {
-                _keepOriginalDimensions = value;
-                NotifyPropertyChanged();
-            }
+            get => _visual.KeepOriginalDimensions;
+            set => _visual.KeepOriginalDimensions = value;
         }
 
         private bool _showDate;
@@ -1283,73 +1099,36 @@ namespace ImageCatalog_2
         }
 
         // Image processing progress and status
-        private string _processingStatus = "";
         public string ProcessingStatus
         {
-            get => _processingStatus;
-            set
-            {
-                _processingStatus = value;
-                NotifyPropertyChanged();
-            }
+            get => _processing.ProcessingStatus;
+            set => _processing.ProcessingStatus = value;
         }
 
-        private int _processedImagesCount = 0;
         public int ProcessedImagesCount
         {
-            get => _processedImagesCount;
-            set
-            {
-                _processedImagesCount = value;
-                NotifyPropertyChanged();
-            }
+            get => _processing.ProcessedImagesCount;
+            set => _processing.ProcessedImagesCount = value;
         }
 
-        private int _totalImagesCount = 0;
         public int TotalImagesCount
         {
-            get => _totalImagesCount;
-            set
-            {
-                _totalImagesCount = value;
-                NotifyPropertyChanged();
-            }
+            get => _processing.TotalImagesCount;
+            set => _processing.TotalImagesCount = value;
         }
 
-        private int _progressBarValue = 0;
         public int ProgressBarValue
         {
-            get => _progressBarValue;
-            set
-            {
-                _progressBarValue = value;
-                NotifyPropertyChanged();
-            }
+            get => _processing.ProgressBarValue;
+            set => _processing.ProgressBarValue = value;
         }
 
-        private int _progressBarMaximum = 100;
         public int ProgressBarMaximum
         {
-            get => _progressBarMaximum;
-            set
-            {
-                _progressBarMaximum = value;
-                NotifyPropertyChanged();
-            }
+            get => _processing.ProgressBarMaximum;
+            set => _processing.ProgressBarMaximum = value;
         }
 
-        private ConcurrentBag<string> _results = new();
-        private int _currentAmount = 0;
-        private int _previousAmount = 0;
-        // Atomic counter for processed images — avoids expensive ConcurrentBag.Count enumerations
-        private int _processedAtomic = 0;
-        private System.Threading.Timer? _speedTimer;
-        // Stopwatch used to compute run-wide averages
-        private Stopwatch? _speedWatch;
-        // Recent diffs queue to smooth short-term fluctuations
-        private readonly Queue<int> _recentDiffs = new();
-        private int _recentWindowSize = 5; // average over last 5 samples (~5s)
-
         private void Test(object parameter)
         {
             Debug.WriteLine("Yep");
@@ -1370,16 +1149,11 @@ namespace ImageCatalog_2
             MainToken = new CancellationTokenSource();
             var token = MainToken.Token;
 
-            // Fix paths
-            FixPaths();
+            // Normalize paths
+            _paths.NormalizePaths();
 
             // Reset counters
-            ProcessingStatus = "Elaborazione in corso...";
-            TotalImagesCount = 0;
-            ProcessedImagesCount = 0;
-            SpeedCounter = "-f/s";
-            ProgressBarValue = 0;
-            ProgressBarMaximum = 100;
+            _processing.ResetForRun();
 
             // Update PicSettings from DataModel using AutoMapper
             _mapper.Map(this, _picSettings);
@@ -1419,28 +1193,25 @@ namespace ImageCatalog_2
 
             try
             {
-                _results = new ConcurrentBag<string>();
-                _currentAmount = 0;
-                _previousAmount = 0;
-                _processedAtomic = 0;
-
-                // Start speed timer (sample every second using lightweight atomic reads)
-                _speedWatch = Stopwatch.StartNew();
-                _recentDiffs.Clear();
-                _speedTimer = new System.Threading.Timer(UpdateSpeedCounter, null, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
-
-                var time = await _imageCreationService.CreaCatalogoParallel(
-                    imageCreationOptions,
-                    _results,
-                    OnImageProcessed,
-                    token);
+                var runResult = await _imageProcessingCoordinator.RunAsync(
+                    new ImageProcessingRunRequest { Options = imageCreationOptions },
+                    token,
+                    update =>
+                    {
+                        ProcessedImagesCount = update.Processed;
+                        TotalImagesCount = update.Total;
+                        ProgressBarMaximum = update.Total;
+                        ProgressBarValue = update.Processed;
+                        ProcessingStatus = update.Status;
+                    },
+                    speed => { SpeedCounter = speed; }).ConfigureAwait(false);
 
                 // AI integration stub: if ExtractNumbers is enabled, simulate or invoke OCR processing
                 if (ExtractNumbers)
                 {
                     try
                     {
-                        await RunAiExtractionAsync(token);
+                        await RunAiExtractionCoreAsync(token);
                     }
                     catch (OperationCanceledException)
                     {
@@ -1452,28 +1223,7 @@ namespace ImageCatalog_2
                     }
                 }
 
-                // Compute final averages and show only averages (do not show raw seconds)
-                var finalProcessed = System.Threading.Volatile.Read(ref _processedAtomic);
-                double overallAvg = 0.0;
-                double overallPerMin = 0.0;
-                if (_speedWatch is not null && _speedWatch.Elapsed.TotalSeconds > 0.0)
-                {
-                    overallAvg = finalProcessed / _speedWatch.Elapsed.TotalSeconds;
-                    overallPerMin = overallAvg * 60.0;
-                }
-
-                // Compute elapsed time as h m s and show final averages (no raw seconds parentheses)
-                var finalElapsed = _speedWatch?.Elapsed ?? TimeSpan.Zero;
-                int fh = (int)finalElapsed.TotalHours;
-                int fm = finalElapsed.Minutes;
-                int fs = finalElapsed.Seconds;
-
-                SpeedCounter = $"{fh}h {fm}m {fs}s{Environment.NewLine}media: {overallAvg:0.00} f/s{Environment.NewLine}media: {overallPerMin:0.00} f/m";
-
-                _speedTimer?.Dispose();
-                _speedTimer = null;
-                _speedWatch?.Stop();
-                _speedWatch = null;
+                SpeedCounter = runResult.FinalSpeedCounter;
             }
             catch (OperationCanceledException)
             {
@@ -1488,106 +1238,12 @@ namespace ImageCatalog_2
             {
                 MainToken?.Dispose();
                 MainToken = null;
-                _speedTimer?.Dispose();
-                _speedTimer = null;
             }
 
             ProcessingStatus = "Finito";
             UiEnabled = true;
         }
 
-        private void UpdateSpeedCounter(object? state)
-        {
-            try
-            {
-                _previousAmount = _currentAmount;
-                // Read the atomic counter without enumerating the ConcurrentBag
-                _currentAmount = System.Threading.Volatile.Read(ref _processedAtomic);
-                int diff = _currentAmount - _previousAmount;
-
-                // Protect against negative or spurious diffs
-                if (diff < 0) diff = 0;
-
-                // Maintain a small sliding window of recent diffs to smooth the display
-                lock (_recentDiffs)
-                {
-                    _recentDiffs.Enqueue(diff);
-                    if (_recentDiffs.Count > _recentWindowSize)
-                        _recentDiffs.Dequeue();
-                }
-
-                double avgRecent;
-                lock (_recentDiffs)
-                {
-                    avgRecent = _recentDiffs.Count == 0 ? 0.0 : _recentDiffs.Average();
-                }
-
-                // Compute overall average (since start) if we have a stopwatch
-                double overall = 0.0;
-                if (_speedWatch is not null && _speedWatch.Elapsed.TotalSeconds >= 1)
-                {
-                    var elapsedSeconds = _speedWatch.Elapsed.TotalSeconds;
-                    var total = System.Threading.Volatile.Read(ref _processedAtomic);
-                    overall = elapsedSeconds > 0 ? total / elapsedSeconds : 0.0;
-                }
-
-                // Recent per-minute estimate
-                var recentPerMin = avgRecent * 60.0;
-                var overallPerMin = overall * 60.0;
-
-                // Build a two-line display plus elapsed time: first line shows f/s with overall media and elapsed time,
-                // second line shows recent photos per minute (media)
-                var elapsed = _speedWatch?.Elapsed ?? TimeSpan.Zero;
-                int hours = (int)elapsed.TotalHours;
-                int minutes = elapsed.Minutes;
-                int seconds = elapsed.Seconds;
-                var elapsedStr = $"{hours}h {minutes}m {seconds}s";
-
-                SpeedCounter = $"{avgRecent:0.00} f/s (media: {overall:0.00} f/s) - {elapsedStr}{Environment.NewLine}media: {recentPerMin:0.00} f/m";
-            }
-            catch
-            {
-                // Swallow unlikely errors from timing/queue operations but keep UI responsive
-            }
-        }
-
-        private void OnImageProcessed(object? sender, Tuple<string, int> args)
-        {
-            // Increment atomic processed counter once and use its value for all UI updates
-            var processed = System.Threading.Interlocked.Increment(ref _processedAtomic);
-            ProcessedImagesCount = processed;
-            TotalImagesCount = args.Item2;
-            ProgressBarMaximum = args.Item2;
-            ProgressBarValue = processed;
-            ProcessingStatus = args.Item1;
-        }
-
-        private void FixPaths()
-        {
-            SourcePath = FixPath(SourcePath);
-            DestinationPath = FixPath(DestinationPath);
-        }
-
-        private string FixPath(string path)
-        {
-            if (string.IsNullOrWhiteSpace(path))
-            {
-                return string.Empty;
-            }
-
-            // Trim leading/trailing quotes
-            path = path.Trim().Trim('"');
-
-            // Normalize directory separators
-            path = path.Replace('/', System.IO.Path.DirectorySeparatorChar)
-                .Replace('\\', System.IO.Path.DirectorySeparatorChar);
-
-            // Remove trailing separators then add one back
-            path = path.TrimEnd(System.IO.Path.DirectorySeparatorChar) + System.IO.Path.DirectorySeparatorChar;
-
-            return path;
-        }
-
         private async Task CancelOperation()
         {
             try
@@ -1618,21 +1274,21 @@ namespace ImageCatalog_2
 
         // Note: These commands will trigger events that the View will handle to show dialogs
         // since dialogs require UI context
-        public event EventHandler SelectSourceFolderRequested;
-        public event EventHandler SelectDestinationFolderRequested;
-        public event EventHandler SelectLogoFileRequested;
-        public event EventHandler SelectModelsFolderRequested;
-        public event EventHandler SelectCsvOutputRequested;
-        public event EventHandler<string> SaveSettingsRequested;
-        public event EventHandler<string> LoadSettingsRequested;
-        public event EventHandler SelectColorRequested;
+        public event EventHandler? SelectSourceFolderRequested;
+        public event EventHandler? SelectDestinationFolderRequested;
+        public event EventHandler? SelectLogoFileRequested;
+        public event EventHandler? SelectModelsFolderRequested;
+        public event EventHandler? SelectCsvOutputRequested;
+        public event EventHandler<string?>? SaveSettingsRequested;
+        public event EventHandler<string?>? LoadSettingsRequested;
+        public event EventHandler? SelectColorRequested;
         // Request that the View shows a message to the user (message, caption, icon)
 #if WINDOWS
-        public event EventHandler<Tuple<string, string, MessageBoxIcon>> ShowMessageRequested;
+        public event EventHandler<Tuple<string, string, MessageBoxIcon>>? ShowMessageRequested;
 #else
-        public event EventHandler<Tuple<string, string, int>> ShowMessageRequested;
+        public event EventHandler<Tuple<string, string, int>>? ShowMessageRequested;
 #endif
-        public event EventHandler SelectTransparentColorRequested;
+        public event EventHandler? SelectTransparentColorRequested;
 
         private void SelectSourceFolder(object parameter)
         {
@@ -1661,12 +1317,12 @@ namespace ImageCatalog_2
 
         private void SaveSettings(object parameter)
         {
-            SaveSettingsRequested?.Invoke(this, null);
+            SaveSettingsRequested?.Invoke(this, string.Empty);
         }
 
         private void LoadSettings(object parameter)
         {
-            LoadSettingsRequested?.Invoke(this, null);
+            LoadSettingsRequested?.Invoke(this, string.Empty);
         }
 
         private void SelectColor(object parameter)
diff --git a/imagecatalog/ImageCatalog 2.csproj b/imagecatalog/ImageCatalog 2.csproj
index be6394f..8bd4894 100644
--- a/imagecatalog/ImageCatalog 2.csproj	
+++ b/imagecatalog/ImageCatalog 2.csproj	
@@ -25,6 +25,8 @@
          This prevents MinVer from injecting a computed version into generated BAML/pack URIs which can cause
          WPF to try loading a mismatched assembly identity at runtime. Do a full clean rebuild after this change. -->
     <UpdateVersionProperties>true</UpdateVersionProperties>
+    <!-- Skip MinVer execution during local builds to avoid environment/runtime-specific failures. -->
+    <MinVerSkip>true</MinVerSkip>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>embedded</DebugType>
diff --git a/imagecatalog/Models/AiResultItem.cs b/imagecatalog/Models/AiResultItem.cs
new file mode 100644
index 0000000..8595dec
--- /dev/null
+++ b/imagecatalog/Models/AiResultItem.cs
@@ -0,0 +1,7 @@
+namespace ImageCatalog_2.Models;
+
+public class AiResultItem
+{
+    public string Path { get; set; } = string.Empty;
+    public string Text { get; set; } = string.Empty;
+}
diff --git a/imagecatalog/Program.cs b/imagecatalog/Program.cs
index 18b8354..99fb2da 100644
--- a/imagecatalog/Program.cs
+++ b/imagecatalog/Program.cs
@@ -151,14 +151,18 @@ static class Program
             var testService = sp.GetRequiredService<ITestService>();
             var settingsService = sp.GetRequiredService<ISettingsService>();
             var imageCreation = sp.GetRequiredService<ImageCreationService>();
+            var aiExtractionService = sp.GetRequiredService<IAiExtractionService>();
+            var imageProcessingCoordinator = sp.GetRequiredService<IImageProcessingCoordinator>();
             var picSettings = sp.GetRequiredService<PicSettings>();
             var mapper = sp.GetRequiredService<IMapper>();
             var logger = sp.GetRequiredService<ILogger<DataModel>>();
             var versionProvider = sp.GetService<MaddoShared.IVersionProvider>();
 
-            return new DataModel(testService, settingsService, imageCreation, picSettings, mapper, logger, versionProvider);
+            return new DataModel(testService, settingsService, imageCreation, aiExtractionService, imageProcessingCoordinator, picSettings, mapper, logger, versionProvider);
         });
 
+        services.AddTransient<IAiExtractionService, AiExtractionService>();
+        services.AddTransient<IImageProcessingCoordinator, ImageProcessingCoordinator>();
         services.AddTransient<ImageCreationService>();
 #if WINDOWS
         services.AddTransient<ImageCreatorGDI>();
diff --git a/imagecatalog/Services/AiExtractionService.cs b/imagecatalog/Services/AiExtractionService.cs
new file mode 100644
index 0000000..2051581
--- /dev/null
+++ b/imagecatalog/Services/AiExtractionService.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using ImageCatalog_2.Models;
+using Microsoft.Extensions.Logging;
+
+namespace ImageCatalog_2.Services;
+
+public class AiExtractionService : IAiExtractionService
+{
+    private readonly ILogger<AiExtractionService> _logger;
+
+    public AiExtractionService(ILogger<AiExtractionService> logger)
+    {
+        _logger = logger;
+    }
+
+    public async Task RunAsync(
+        AiExtractionRequest request,
+        CancellationToken token,
+        Func<AiResultItem, Task> onResult,
+        Func<double, Task> onProgress)
+    {
+        var searchOption = request.Recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
+
+        var imageFiles = Directory.EnumerateFiles(request.SearchRoot, "*.*", searchOption)
+            .Where(f => f.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase)
+                     || f.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase)
+                     || f.EndsWith(".png", StringComparison.OrdinalIgnoreCase)
+                     || f.EndsWith(".bmp", StringComparison.OrdinalIgnoreCase)
+                     || f.EndsWith(".gif", StringComparison.OrdinalIgnoreCase))
+            .ToList();
+
+        if (imageFiles.Count == 0)
+        {
+            return;
+        }
+
+        var extractedResults = new List<AiResultItem>();
+
+        Type? aiProcessorType = null;
+        object? aiProcessor = null;
+
+        try
+        {
+            var assembly = AppDomain.CurrentDomain.GetAssemblies()
+                .FirstOrDefault(a => a.GetName().Name?.Equals("AIFotoONLUS.Core", StringComparison.OrdinalIgnoreCase) == true);
+            if (assembly != null)
+            {
+                aiProcessorType = assembly.GetType("AIFotoONLUS.Core.AiProcessor");
+                if (aiProcessorType != null)
+                {
+                    aiProcessor = Activator.CreateInstance(aiProcessorType);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "AIFotoONLUS.Core not available or failed to load via reflection");
+        }
+
+        var processed = 0;
+        var total = imageFiles.Count;
+
+        foreach (var file in imageFiles)
+        {
+            token.ThrowIfCancellationRequested();
+
+            var extracted = string.Empty;
+
+            if (aiProcessorType is not null && aiProcessor is not null)
+            {
+                try
+                {
+                    var method = aiProcessorType.GetMethod("ExtractNumbersFromImage")
+                                 ?? aiProcessorType.GetMethod("ExtractTextFromImage");
+                    if (method is not null)
+                    {
+                        var value = method.Invoke(aiProcessor, new object[] { file });
+                        if (value != null)
+                        {
+                            extracted = value.ToString() ?? string.Empty;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogWarning(ex, "Error invoking AI processor for {File}", file);
+                }
+            }
+
+            if (!string.IsNullOrWhiteSpace(extracted))
+            {
+                var result = new AiResultItem { Path = file, Text = extracted };
+                extractedResults.Add(result);
+                await onResult(result).ConfigureAwait(false);
+            }
+
+            processed++;
+            var percent = total > 0 ? (processed * 100.0 / total) : 100.0;
+            await onProgress(percent).ConfigureAwait(false);
+        }
+
+        if (!string.IsNullOrWhiteSpace(request.CsvOutputPath))
+        {
+            try
+            {
+                var dir = Path.GetDirectoryName(request.CsvOutputPath) ?? string.Empty;
+                if (!string.IsNullOrWhiteSpace(dir) && !Directory.Exists(dir))
+                {
+                    Directory.CreateDirectory(dir);
+                }
+
+                using var sw = new StreamWriter(request.CsvOutputPath, false, Encoding.UTF8);
+                sw.WriteLine("Path,Text");
+                foreach (var r in extractedResults)
+                {
+                    var safeText = (r.Text ?? string.Empty).Replace("\"", "\"\"");
+                    sw.WriteLine($"\"{r.Path}\",\"{safeText}\"");
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to write CSV to {CsvOutputPath}", request.CsvOutputPath);
+            }
+        }
+    }
+}
diff --git a/imagecatalog/Services/IAiExtractionService.cs b/imagecatalog/Services/IAiExtractionService.cs
new file mode 100644
index 0000000..3028946
--- /dev/null
+++ b/imagecatalog/Services/IAiExtractionService.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using ImageCatalog_2.Models;
+
+namespace ImageCatalog_2.Services;
+
+public sealed class AiExtractionRequest
+{
+    public required string SearchRoot { get; init; }
+    public required bool Recursive { get; init; }
+    public string CsvOutputPath { get; init; } = string.Empty;
+}
+
+public interface IAiExtractionService
+{
+    Task RunAsync(
+        AiExtractionRequest request,
+        CancellationToken token,
+        Func<AiResultItem, Task> onResult,
+        Func<double, Task> onProgress);
+}
diff --git a/imagecatalog/Services/IImageProcessingCoordinator.cs b/imagecatalog/Services/IImageProcessingCoordinator.cs
new file mode 100644
index 0000000..1488db6
--- /dev/null
+++ b/imagecatalog/Services/IImageProcessingCoordinator.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using MaddoShared;
+
+namespace ImageCatalog_2.Services
+{
+    public readonly record struct ImageProcessedUpdate(string Status, int Total, int Processed);
+
+    public sealed class ImageProcessingRunRequest
+    {
+        public required ImageCreationService.Options Options { get; init; }
+    }
+
+    public sealed class ImageProcessingRunResult
+    {
+        public required string FinalSpeedCounter { get; init; }
+    }
+
+    public interface IImageProcessingCoordinator
+    {
+        Task<ImageProcessingRunResult> RunAsync(
+            ImageProcessingRunRequest request,
+            CancellationToken token,
+            Action<ImageProcessedUpdate> onImageProcessed,
+            Action<string> onSpeedUpdated);
+    }
+}
diff --git a/imagecatalog/Services/ImageProcessingCoordinator.cs b/imagecatalog/Services/ImageProcessingCoordinator.cs
new file mode 100644
index 0000000..6d0ab39
--- /dev/null
+++ b/imagecatalog/Services/ImageProcessingCoordinator.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MaddoShared;
+using Microsoft.Extensions.Logging;
+
+namespace ImageCatalog_2.Services
+{
+    public class ImageProcessingCoordinator : IImageProcessingCoordinator
+    {
+        private readonly ImageCreationService _imageCreationService;
+        private readonly ILogger<ImageProcessingCoordinator> _logger;
+
+        [CLSCompliant(false)]
+        public ImageProcessingCoordinator(
+            ImageCreationService imageCreationService,
+            ILogger<ImageProcessingCoordinator> logger)
+        {
+            _imageCreationService = imageCreationService;
+            _logger = logger;
+        }
+
+        public async Task<ImageProcessingRunResult> RunAsync(
+            ImageProcessingRunRequest request,
+            CancellationToken token,
+            Action<ImageProcessedUpdate> onImageProcessed,
+            Action<string> onSpeedUpdated)
+        {
+            var results = new ConcurrentBag<string>();
+            var recentDiffs = new Queue<int>();
+            const int recentWindowSize = 5;
+
+            int currentAmount = 0;
+            int previousAmount = 0;
+            int processedAtomic = 0;
+
+            var speedWatch = Stopwatch.StartNew();
+            using var speedTimer = new System.Threading.Timer(_ =>
+            {
+                try
+                {
+                    previousAmount = currentAmount;
+                    currentAmount = Volatile.Read(ref processedAtomic);
+                    int diff = currentAmount - previousAmount;
+                    if (diff < 0)
+                    {
+                        diff = 0;
+                    }
+
+                    lock (recentDiffs)
+                    {
+                        recentDiffs.Enqueue(diff);
+                        if (recentDiffs.Count > recentWindowSize)
+                        {
+                            recentDiffs.Dequeue();
+                        }
+                    }
+
+                    double avgRecent;
+                    lock (recentDiffs)
+                    {
+                        avgRecent = recentDiffs.Count == 0 ? 0.0 : recentDiffs.Average();
+                    }
+
+                    double overall = 0.0;
+                    if (speedWatch.Elapsed.TotalSeconds >= 1)
+                    {
+                        var elapsedSeconds = speedWatch.Elapsed.TotalSeconds;
+                        var total = Volatile.Read(ref processedAtomic);
+                        overall = elapsedSeconds > 0 ? total / elapsedSeconds : 0.0;
+                    }
+
+                    var recentPerMin = avgRecent * 60.0;
+                    var elapsed = speedWatch.Elapsed;
+                    int hours = (int)elapsed.TotalHours;
+                    int minutes = elapsed.Minutes;
+                    int seconds = elapsed.Seconds;
+                    var elapsedStr = $"{hours}h {minutes}m {seconds}s";
+
+                    var speedText = $"{avgRecent:0.00} f/s (media: {overall:0.00} f/s) - {elapsedStr}{Environment.NewLine}media: {recentPerMin:0.00} f/m";
+                    onSpeedUpdated(speedText);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogDebug(ex, "Failed to update speed counter");
+                }
+            }, null, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
+
+            EventHandler<Tuple<string, int>> onImageProcessedInternal = (_, args) =>
+            {
+                var processed = Interlocked.Increment(ref processedAtomic);
+                onImageProcessed(new ImageProcessedUpdate(args.Item1, args.Item2, processed));
+            };
+
+            await _imageCreationService.CreaCatalogoParallel(
+                request.Options,
+                results,
+                onImageProcessedInternal,
+                token).ConfigureAwait(false);
+
+            speedWatch.Stop();
+
+            var finalProcessed = Volatile.Read(ref processedAtomic);
+            double overallAvg = 0.0;
+            double overallPerMin = 0.0;
+            if (speedWatch.Elapsed.TotalSeconds > 0.0)
+            {
+                overallAvg = finalProcessed / speedWatch.Elapsed.TotalSeconds;
+                overallPerMin = overallAvg * 60.0;
+            }
+
+            var finalElapsed = speedWatch.Elapsed;
+            int finalHours = (int)finalElapsed.TotalHours;
+            int finalMinutes = finalElapsed.Minutes;
+            int finalSeconds = finalElapsed.Seconds;
+
+            return new ImageProcessingRunResult
+            {
+                FinalSpeedCounter = $"{finalHours}h {finalMinutes}m {finalSeconds}s{Environment.NewLine}media: {overallAvg:0.00} f/s{Environment.NewLine}media: {overallPerMin:0.00} f/m"
+            };
+        }
+    }
+}
diff --git a/imagecatalog/ViewModels/AiSettingsViewModel.cs b/imagecatalog/ViewModels/AiSettingsViewModel.cs
new file mode 100644
index 0000000..18878dd
--- /dev/null
+++ b/imagecatalog/ViewModels/AiSettingsViewModel.cs
@@ -0,0 +1,75 @@
+using System.Collections.ObjectModel;
+using ImageCatalog_2.Models;
+
+namespace ImageCatalog_2.ViewModels;
+
+public class AiSettingsViewModel : ViewModelBase
+{
+    private bool _extractNumbers;
+    public bool ExtractNumbers
+    {
+        get => _extractNumbers;
+        set
+        {
+            _extractNumbers = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _modelsFolderPath = string.Empty;
+    public string ModelsFolderPath
+    {
+        get => _modelsFolderPath;
+        set
+        {
+            _modelsFolderPath = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _csvOutputPath = string.Empty;
+    public string CsvOutputPath
+    {
+        get => _csvOutputPath;
+        set
+        {
+            _csvOutputPath = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _faceExecutablePath = string.Empty;
+    public string FaceExecutablePath
+    {
+        get => _faceExecutablePath;
+        set
+        {
+            _faceExecutablePath = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _faceOutputFolderPath = string.Empty;
+    public string FaceOutputFolderPath
+    {
+        get => _faceOutputFolderPath;
+        set
+        {
+            _faceOutputFolderPath = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private double _aiProgress;
+    public double AiProgress
+    {
+        get => _aiProgress;
+        set
+        {
+            _aiProgress = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    public ObservableCollection<AiResultItem> PreviewResults { get; } = new();
+}
diff --git a/imagecatalog/ViewModels/PathSettingsViewModel.cs b/imagecatalog/ViewModels/PathSettingsViewModel.cs
new file mode 100644
index 0000000..321640a
--- /dev/null
+++ b/imagecatalog/ViewModels/PathSettingsViewModel.cs
@@ -0,0 +1,49 @@
+using System;
+using System.IO;
+
+namespace ImageCatalog_2.ViewModels;
+
+public class PathSettingsViewModel : ViewModelBase
+{
+    private string _sourcePath = string.Empty;
+    public string SourcePath
+    {
+        get => _sourcePath;
+        set
+        {
+            _sourcePath = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _destinationPath = string.Empty;
+    public string DestinationPath
+    {
+        get => _destinationPath;
+        set
+        {
+            _destinationPath = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    public void NormalizePaths()
+    {
+        SourcePath = NormalizePath(SourcePath);
+        DestinationPath = NormalizePath(DestinationPath);
+    }
+
+    public static string NormalizePath(string path)
+    {
+        if (string.IsNullOrWhiteSpace(path))
+        {
+            return string.Empty;
+        }
+
+        path = path.Trim().Trim('"');
+        path = path.Replace('/', Path.DirectorySeparatorChar)
+            .Replace('\\', Path.DirectorySeparatorChar);
+
+        return path.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
+    }
+}
diff --git a/imagecatalog/ViewModels/ProcessingStateViewModel.cs b/imagecatalog/ViewModels/ProcessingStateViewModel.cs
new file mode 100644
index 0000000..a230bcf
--- /dev/null
+++ b/imagecatalog/ViewModels/ProcessingStateViewModel.cs
@@ -0,0 +1,82 @@
+using System;
+
+namespace ImageCatalog_2.ViewModels;
+
+public class ProcessingStateViewModel : ViewModelBase
+{
+    private string _processingStatus = string.Empty;
+    public string ProcessingStatus
+    {
+        get => _processingStatus;
+        set
+        {
+            _processingStatus = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _processedImagesCount;
+    public int ProcessedImagesCount
+    {
+        get => _processedImagesCount;
+        set
+        {
+            _processedImagesCount = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _totalImagesCount;
+    public int TotalImagesCount
+    {
+        get => _totalImagesCount;
+        set
+        {
+            _totalImagesCount = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _progressBarValue;
+    public int ProgressBarValue
+    {
+        get => _progressBarValue;
+        set
+        {
+            _progressBarValue = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _progressBarMaximum = 100;
+    public int ProgressBarMaximum
+    {
+        get => _progressBarMaximum;
+        set
+        {
+            _progressBarMaximum = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _speedCounter = "-";
+    public string SpeedCounter
+    {
+        get => _speedCounter;
+        set
+        {
+            _speedCounter = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    public void ResetForRun()
+    {
+        ProcessingStatus = "Elaborazione in corso...";
+        TotalImagesCount = 0;
+        ProcessedImagesCount = 0;
+        SpeedCounter = "-f/s";
+        ProgressBarValue = 0;
+        ProgressBarMaximum = 100;
+    }
+}
diff --git a/imagecatalog/ViewModels/RaceUploadSettingsViewModel.cs b/imagecatalog/ViewModels/RaceUploadSettingsViewModel.cs
new file mode 100644
index 0000000..1a4cca8
--- /dev/null
+++ b/imagecatalog/ViewModels/RaceUploadSettingsViewModel.cs
@@ -0,0 +1,149 @@
+using System;
+
+namespace ImageCatalog_2.ViewModels;
+
+public class RaceUploadSettingsViewModel : ViewModelBase
+{
+    private string _apiLogin = string.Empty;
+    public string ApiLogin
+    {
+        get => _apiLogin;
+        set
+        {
+            _apiLogin = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _apiPassword = string.Empty;
+    public string ApiPassword
+    {
+        get => _apiPassword;
+        set
+        {
+            _apiPassword = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _apiRaceDescription = string.Empty;
+    public string ApiRaceDescription
+    {
+        get => _apiRaceDescription;
+        set
+        {
+            _apiRaceDescription = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _apiRaceTypeId = "1";
+    public string ApiRaceTypeId
+    {
+        get => _apiRaceTypeId;
+        set
+        {
+            _apiRaceTypeId = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private DateTime _apiRaceStartDate = DateTime.Today;
+    public DateTime ApiRaceStartDate
+    {
+        get => _apiRaceStartDate;
+        set
+        {
+            _apiRaceStartDate = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private DateTime _apiRaceEndDate = DateTime.Today;
+    public DateTime ApiRaceEndDate
+    {
+        get => _apiRaceEndDate;
+        set
+        {
+            _apiRaceEndDate = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _apiPathBase = string.Empty;
+    public string ApiPathBase
+    {
+        get => _apiPathBase;
+        set
+        {
+            _apiPathBase = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _apiLocalita = string.Empty;
+    public string ApiLocalita
+    {
+        get => _apiLocalita;
+        set
+        {
+            _apiLocalita = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _apiEventoInLineaIndex;
+    public int ApiEventoInLineaIndex
+    {
+        get => _apiEventoInLineaIndex;
+        set
+        {
+            _apiEventoInLineaIndex = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _apiTipoIndexValue = 1;
+    public int ApiTipoIndexValue
+    {
+        get => _apiTipoIndexValue;
+        set
+        {
+            _apiTipoIndexValue = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _apiFreeEventIndex;
+    public int ApiFreeEventIndex
+    {
+        get => _apiFreeEventIndex;
+        set
+        {
+            _apiFreeEventIndex = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _apiRaceId = string.Empty;
+    public string ApiRaceId
+    {
+        get => _apiRaceId;
+        set
+        {
+            _apiRaceId = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _apiRemoteProcessedBasePath = string.Empty;
+    public string ApiRemoteProcessedBasePath
+    {
+        get => _apiRemoteProcessedBasePath;
+        set
+        {
+            _apiRemoteProcessedBasePath = value;
+            NotifyPropertyChanged();
+        }
+    }
+}
diff --git a/imagecatalog/ViewModels/VisualSettingsViewModel.cs b/imagecatalog/ViewModels/VisualSettingsViewModel.cs
new file mode 100644
index 0000000..d5a2f2f
--- /dev/null
+++ b/imagecatalog/ViewModels/VisualSettingsViewModel.cs
@@ -0,0 +1,312 @@
+namespace ImageCatalog_2.ViewModels;
+
+public class VisualSettingsViewModel : ViewModelBase
+{
+    private string _horizontalText = string.Empty;
+    public string HorizontalText
+    {
+        get => _horizontalText;
+        set
+        {
+            _horizontalText = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _verticalText = string.Empty;
+    public string VerticalText
+    {
+        get => _verticalText;
+        set
+        {
+            _verticalText = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private bool _overwriteImages;
+    public bool OverwriteImages
+    {
+        get => _overwriteImages;
+        set
+        {
+            _overwriteImages = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _thumbnailPrefix = "tn_";
+    public string ThumbnailPrefix
+    {
+        get => _thumbnailPrefix;
+        set
+        {
+            _thumbnailPrefix = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _thumbnailHeight = 350;
+    public int ThumbnailHeight
+    {
+        get => _thumbnailHeight;
+        set
+        {
+            _thumbnailHeight = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _thumbnailWidth = 350;
+    public int ThumbnailWidth
+    {
+        get => _thumbnailWidth;
+        set
+        {
+            _thumbnailWidth = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _photoBigHeight = 2240;
+    public int PhotoBigHeight
+    {
+        get => _photoBigHeight;
+        set
+        {
+            _photoBigHeight = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _photoBigWidth = 2240;
+    public int PhotoBigWidth
+    {
+        get => _photoBigWidth;
+        set
+        {
+            _photoBigWidth = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _fontSize = 20;
+    public int FontSize
+    {
+        get => _fontSize;
+        set
+        {
+            _fontSize = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _fontSizeThumbnail = 50;
+    public int FontSizeThumbnail
+    {
+        get => _fontSizeThumbnail;
+        set
+        {
+            _fontSizeThumbnail = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _fontName = "Arial";
+    public string FontName
+    {
+        get => _fontName;
+        set
+        {
+            _fontName = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private bool _fontBold;
+    public bool FontBold
+    {
+        get => _fontBold;
+        set
+        {
+            _fontBold = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _textTransparency;
+    public int TextTransparency
+    {
+        get => _textTransparency;
+        set
+        {
+            _textTransparency = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _textMargin = 8;
+    public int TextMargin
+    {
+        get => _textMargin;
+        set
+        {
+            _textMargin = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _textColorRgb = "Yellow";
+    public string TextColorRGB
+    {
+        get => _textColorRgb;
+        set
+        {
+            _textColorRgb = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _transparentColor = "#FFFFFF";
+    public string TransparentColor
+    {
+        get => _transparentColor;
+        set
+        {
+            _transparentColor = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private bool _useTransparentColor;
+    public bool UseTransparentColor
+    {
+        get => _useTransparentColor;
+        set
+        {
+            _useTransparentColor = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private string _logoFile = string.Empty;
+    public string LogoFile
+    {
+        get => _logoFile;
+        set
+        {
+            _logoFile = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _logoHeight = 430;
+    public int LogoHeight
+    {
+        get => _logoHeight;
+        set
+        {
+            _logoHeight = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _logoWidth = 430;
+    public int LogoWidth
+    {
+        get => _logoWidth;
+        set
+        {
+            _logoWidth = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _logoMargin = 290;
+    public int LogoMargin
+    {
+        get => _logoMargin;
+        set
+        {
+            _logoMargin = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _logoTransparency = 100;
+    public int LogoTransparency
+    {
+        get => _logoTransparency;
+        set
+        {
+            _logoTransparency = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _verticalTextSize = 20;
+    public int VerticalTextSize
+    {
+        get => _verticalTextSize;
+        set
+        {
+            _verticalTextSize = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _verticalTextMargin = 6;
+    public int VerticalTextMargin
+    {
+        get => _verticalTextMargin;
+        set
+        {
+            _verticalTextMargin = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _jpegQuality = 85;
+    public int JpegQuality
+    {
+        get => _jpegQuality;
+        set
+        {
+            _jpegQuality = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private int _jpegQualityThumbnail = 30;
+    public int JpegQualityThumbnail
+    {
+        get => _jpegQualityThumbnail;
+        set
+        {
+            _jpegQualityThumbnail = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private bool _addLogo;
+    public bool AddLogo
+    {
+        get => _addLogo;
+        set
+        {
+            _addLogo = value;
+            NotifyPropertyChanged();
+        }
+    }
+
+    private bool _keepOriginalDimensions;
+    public bool KeepOriginalDimensions
+    {
+        get => _keepOriginalDimensions;
+        set
+        {
+            _keepOriginalDimensions = value;
+            NotifyPropertyChanged();
+        }
+    }
+}