diff --git a/.github/workflows/azure-static-web-apps-yellow-sea-04668c503.yml b/.github/workflows/azure-static-web-apps-yellow-sea-04668c503.yml
index 56556db..5b22a3e 100644
--- a/.github/workflows/azure-static-web-apps-yellow-sea-04668c503.yml
+++ b/.github/workflows/azure-static-web-apps-yellow-sea-04668c503.yml
@@ -30,6 +30,6 @@ jobs:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_YELLOW_SEA_04668C503 }}
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           action: "upload"
-          app_location: "./MakerPrompt.Blazor"
+          app_location: "./src/MakerPrompt.UI.Blazor"
           api_location: ""
           output_location: "wwwroot"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2afa8b3..6463320 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,13 +28,13 @@ jobs:
         dotnet workload install maui-windows
         
     - name: Restore dependencies (Blazor)
-      run: dotnet restore MakerPrompt.Blazor/MakerPrompt.Blazor.csproj
+      run: dotnet restore src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj
 
     - name: Build (Windows)
-      run: dotnet build MakerPrompt.MAUI/MakerPrompt.MAUI.csproj -c Release -f net10.0-windows10.0.19041.0 -p:RuntimeIdentifierOverride=win-x64
+      run: dotnet build src/MakerPrompt.UI.MAUI/MakerPrompt.UI.MAUI.csproj -c Release -f net10.0-windows10.0.19041.0 -p:RuntimeIdentifierOverride=win-x64
 
     - name: Build (Blazor WebAssembly)
-      run: dotnet build MakerPrompt.Blazor/MakerPrompt.Blazor.csproj -c Release --no-restore
+      run: dotnet build src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj -c Release --no-restore
 
     - name: Test (Unit)
-      run: dotnet test MakerPrompt.Tests/MakerPrompt.Tests.csproj -c Release
+      run: dotnet test tests/MakerPrompt.Tests.Unit/MakerPrompt.Tests.Unit.csproj -c Release
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27299ed..8a93f67 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,14 +21,14 @@ jobs:
           dotnet-version: '10.0.x'
 
       - name: Restore
-        run: dotnet restore MakerPrompt.Tests/MakerPrompt.Tests.csproj
+        run: dotnet restore tests/MakerPrompt.Tests.Unit/MakerPrompt.Tests.Unit.csproj
 
       - name: Build
-        run: dotnet build MakerPrompt.Tests/MakerPrompt.Tests.csproj --no-restore -c Release
+        run: dotnet build tests/MakerPrompt.Tests.Unit/MakerPrompt.Tests.Unit.csproj --no-restore -c Release
 
       - name: Test with coverage
         run: |
-          dotnet test MakerPrompt.Tests/MakerPrompt.Tests.csproj \
+          dotnet test tests/MakerPrompt.Tests.Unit/MakerPrompt.Tests.Unit.csproj \
             --no-build \
             --configuration Release \
             --collect:"XPlat Code Coverage" \
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index bdfc3b8..c8dafb7 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -25,19 +25,19 @@ jobs:
         run: dotnet workload install wasm-tools
 
       - name: Restore
-        run: dotnet restore MakerPrompt.E2E.Wasm/MakerPrompt.E2E.Wasm.csproj
+        run: dotnet restore tests/MakerPrompt.Tests.E2E.Wasm/MakerPrompt.Tests.E2E.Wasm.csproj
 
       - name: Build E2E project
-        run: dotnet build MakerPrompt.E2E.Wasm/MakerPrompt.E2E.Wasm.csproj --no-restore -c Release
+        run: dotnet build tests/MakerPrompt.Tests.E2E.Wasm/MakerPrompt.Tests.E2E.Wasm.csproj --no-restore -c Release
 
       - name: Install Playwright browsers
-        run: pwsh MakerPrompt.E2E.Wasm/bin/Release/net10.0/playwright.ps1 install --with-deps chromium
+        run: pwsh tests/MakerPrompt.Tests.E2E.Wasm/bin/Release/net10.0/playwright.ps1 install --with-deps chromium
 
       - name: Run Playwright E2E tests
         env:
           E2E_HEADLESS: "true"
         run: |
-          dotnet test MakerPrompt.E2E.Wasm/MakerPrompt.E2E.Wasm.csproj \
+          dotnet test tests/MakerPrompt.Tests.E2E.Wasm/MakerPrompt.Tests.E2E.Wasm.csproj \
             --no-build \
             --configuration Release \
             --logger "trx;LogFileName=wasm-e2e-results.trx" \
@@ -74,25 +74,25 @@ jobs:
 
       - name: Build MAUI app (Debug — enables CDP debugging port)
         run: >
-          dotnet build MakerPrompt.MAUI/MakerPrompt.MAUI.csproj
+          dotnet build src/MakerPrompt.UI.MAUI/MakerPrompt.UI.MAUI.csproj
           -c Debug
           -f net10.0-windows10.0.19041.0
           -p:RuntimeIdentifierOverride=win-x64
 
       - name: Restore E2E.Maui
-        run: dotnet restore MakerPrompt.E2E.Maui/MakerPrompt.E2E.Maui.csproj
+        run: dotnet restore tests/MakerPrompt.Tests.E2E.Maui/MakerPrompt.Tests.E2E.Maui.csproj
 
       - name: Build E2E.Maui project
-        run: dotnet build MakerPrompt.E2E.Maui/MakerPrompt.E2E.Maui.csproj --no-restore -c Release
+        run: dotnet build tests/MakerPrompt.Tests.E2E.Maui/MakerPrompt.Tests.E2E.Maui.csproj --no-restore -c Release
 
       - name: Install Playwright browsers
-        run: pwsh MakerPrompt.E2E.Maui/bin/Release/net10.0/playwright.ps1 install --with-deps chromium
+        run: pwsh tests/MakerPrompt.Tests.E2E.Maui/bin/Release/net10.0/playwright.ps1 install --with-deps chromium
 
       - name: Run MAUI E2E tests
         env:
-          MAUI_APP_PATH: ${{ github.workspace }}\MakerPrompt.MAUI\bin\Debug\net10.0-windows10.0.19041.0\win-x64\MakerPrompt.MAUI.exe
+          MAUI_APP_PATH: ${{ github.workspace }}\src\MakerPrompt.UI.MAUI\bin\Debug\net10.0-windows10.0.19041.0\win-x64\MakerPrompt.UI.MAUI.exe
         run: |
-          dotnet test MakerPrompt.E2E.Maui/MakerPrompt.E2E.Maui.csproj `
+          dotnet test tests/MakerPrompt.Tests.E2E.Maui/MakerPrompt.Tests.E2E.Maui.csproj `
             --no-build `
             --configuration Release `
             --logger "trx;LogFileName=maui-e2e-results.trx" `
diff --git a/.github/workflows/publish-github-pages.yml b/.github/workflows/publish-github-pages.yml
index 8d2a62e..a381858 100644
--- a/.github/workflows/publish-github-pages.yml
+++ b/.github/workflows/publish-github-pages.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 env:
-  WASM_PROJECT: 'MakerPrompt.Blazor/MakerPrompt.Blazor.csproj'
+  WASM_PROJECT: 'src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj'
   OUTPUT_DIR: 'publish_wasm'
 
 concurrency:
diff --git a/.github/workflows/publish-maui.yml b/.github/workflows/publish-maui.yml
index a849b16..47058a6 100644
--- a/.github/workflows/publish-maui.yml
+++ b/.github/workflows/publish-maui.yml
@@ -6,8 +6,8 @@ on:
     - 'v*'
 
 env:
-  MAUI_PROJECT_DIR: 'MakerPrompt.MAUI/'
-  MAUI_PROJECT: 'MakerPrompt.MAUI/MakerPrompt.MAUI.csproj'
+  MAUI_PROJECT_DIR: 'src/MakerPrompt.UI.MAUI/'
+  MAUI_PROJECT: 'src/MakerPrompt.UI.MAUI/MakerPrompt.UI.MAUI.csproj'
   OUTPUT_DIR: 'publish'
 
 jobs:
diff --git a/MakerPrompt.Blazor/.gitattributes b/MakerPrompt.Blazor/.gitattributes
deleted file mode 100644
index bc0a213..0000000
--- a/MakerPrompt.Blazor/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.js binary
diff --git a/MakerPrompt.Blazor/Program.cs b/MakerPrompt.Blazor/Program.cs
deleted file mode 100644
index 26c1fa6..0000000
--- a/MakerPrompt.Blazor/Program.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Globalization;
-using MakerPrompt.Blazor;
-using MakerPrompt.Blazor.Services;
-using MakerPrompt.Blazor.Storage;
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Services;
-using MakerPrompt.Shared.Utils;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.JSInterop;
-
-var builder = WebAssemblyHostBuilder.CreateDefault(args);
-builder.RootComponents.Add<App>("#app");
-builder.RootComponents.Add<HeadOutlet>("head::after");
-
-builder.Services.RegisterMakerPromptSharedServices<AppConfigurationService, WebSerialService>();
-builder.Services.AddScoped<MakerPrompt.Shared.Infrastructure.IAppLocalStorageProvider, BlazorAppLocalStorageProvider>();
-// WASM: AES-GCM not supported in browser — use Base64 encoding fallback
-builder.Services.AddSingleton<IConnectionEncryptionService, Base64ConnectionEncryptionService>();
-
-var host = builder.Build();
-const string defaultCulture = "en-US";
-
-// Initialize configuration from localStorage before the app renders so that
-// Index.razor and other components see the persisted FarmModeEnabled / FarmName
-// values on the very first render rather than always defaulting.
-var configService = host.Services.GetRequiredService<IAppConfigurationService>();
-await configService.InitializeAsync();
-
-var js = host.Services.GetRequiredService<IJSRuntime>();
-var result = await js.InvokeAsync<string>("blazorCulture.get");
-var culture = CultureInfo.GetCultureInfo(result ?? defaultCulture);
-
-if (result == null)
-{
-    await js.InvokeVoidAsync("blazorCulture.set", defaultCulture);
-}
-
-CultureInfo.DefaultThreadCurrentCulture = culture;
-CultureInfo.DefaultThreadCurrentUICulture = culture;
-
-await host.RunAsync();
\ No newline at end of file
diff --git a/MakerPrompt.Blazor/Services/AppConfigurationService.cs b/MakerPrompt.Blazor/Services/AppConfigurationService.cs
deleted file mode 100644
index aa2471d..0000000
--- a/MakerPrompt.Blazor/Services/AppConfigurationService.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Utils;
-using Microsoft.JSInterop;
-using System.Text.Json;
-
-namespace MakerPrompt.Blazor.Services
-{
-    public class AppConfigurationService : IAppConfigurationService, IAsyncDisposable
-    {
-        private const string StorageKey = "AppConfig";
-        private readonly IJSRuntime _jsRuntime;
-        private AppConfiguration _config = new();
-
-        public AppConfiguration Configuration => _config;
-
-        public AppConfigurationService(IJSRuntime jsRuntime)
-        {
-            _jsRuntime = jsRuntime;
-        }
-
-        public async Task InitializeAsync()
-        {
-            var json = await _jsRuntime.InvokeAsync<string>("localStorage.getItem", StorageKey);
-            _config = json != null
-                ? JsonSerializer.Deserialize<AppConfiguration>(json) ?? new AppConfiguration()
-                : new AppConfiguration();
-        }
-
-        public async Task SaveConfigurationAsync()
-        {
-            await _jsRuntime.InvokeVoidAsync("localStorage.setItem", StorageKey,
-                JsonSerializer.Serialize(_config));
-        }
-
-        public async Task ResetToDefaultsAsync()
-        {
-            _config = new AppConfiguration();
-            await SaveConfigurationAsync();
-        }
-
-        public async ValueTask DisposeAsync() => await SaveConfigurationAsync();
-    }
-}
diff --git a/MakerPrompt.E2E.Maui/Tests/FleetWorkflowTests.cs b/MakerPrompt.E2E.Maui/Tests/FleetWorkflowTests.cs
deleted file mode 100644
index c5ea228..0000000
--- a/MakerPrompt.E2E.Maui/Tests/FleetWorkflowTests.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using Microsoft.Playwright;
-using MakerPrompt.E2E.Maui.Fixtures;
-
-namespace MakerPrompt.E2E.Maui.Tests;
-
-/// <summary>
-/// Fleet workflow tests for the MAUI app via Playwright + CDP.
-/// Covers: add printer → connect demo → telemetry → disconnect.
-/// Mirrors the WASM FleetWorkflowTests but runs inside the MAUI WebView2.
-///
-/// Each test run uses a unique name suffix so printers from previous runs
-/// don't cause strict-mode violations. MAUI stores printer data on the
-/// filesystem (not browser localStorage), and the PrinterConnectionManager
-/// singleton keeps state in memory — JS cleanup can't clear either. Unique
-/// names sidestep this entirely.
-/// </summary>
-[Collection("Appium")]
-[Trait("Category", "E2E-Maui")]
-[TestCaseOrderer("MakerPrompt.E2E.Maui.Fixtures.AlphabeticalOrderer", "MakerPrompt.E2E.Maui")]
-public class FleetWorkflowTests
-{
-    private static IPage Page => AppiumSetup.Page;
-
-    // Unique suffix per test run so locators never match old printers
-    private static readonly string S = DateTime.UtcNow.Ticks.ToString()[^6..];
-
-    [Fact]
-    public async Task Fleet_AddPrinter_Demo_Mode()
-    {
-        await NavigateToFleetAsync();
-
-        var name = $"Add {S}";
-        await Page.Locator("[data-testid='fleet-add-btn']").ClickAsync();
-
-        var nameInput = Page.Locator("#printerName");
-        await nameInput.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
-        await nameInput.FillAsync(name);
-
-        // Demo is the default connection type — click Save
-        await Page.Locator("[data-testid='fleet-save-printer-btn']").ClickAsync();
-
-        var card = Page.Locator($".card strong:has-text('{name}')").First;
-        await card.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
-        Assert.True(await card.IsVisibleAsync());
-    }
-
-    [Fact]
-    public async Task Fleet_ConnectDemoPrinter()
-    {
-        await NavigateToFleetAsync();
-        var name = $"Conn {S}";
-        await AddDemoPrinterAsync(name);
-        await SelectAndConnectAsync(name);
-
-        var badge = Page.Locator(".badge.bg-success");
-        await badge.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
-        Assert.True(await badge.IsVisibleAsync());
-    }
-
-    [Fact]
-    public async Task Fleet_TelemetryUpdates()
-    {
-        await NavigateToFleetAsync();
-        var name = $"Tele {S}";
-        await AddDemoPrinterAsync(name);
-        await SelectAndConnectAsync(name);
-
-        var heatingCard = Page.Locator(".card-header", new PageLocatorOptions
-        {
-            HasTextRegex = new System.Text.RegularExpressions.Regex(
-                "Heating|Temperature",
-                System.Text.RegularExpressions.RegexOptions.IgnoreCase)
-        });
-        await heatingCard.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
-        Assert.True(await heatingCard.IsVisibleAsync());
-
-        var tempValue = Page.Locator(".input-group-text:has-text('C:')");
-        await tempValue.First.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
-        Assert.True(await tempValue.First.IsVisibleAsync());
-    }
-
-    [Fact]
-    public async Task Fleet_DisconnectPrinter()
-    {
-        await NavigateToFleetAsync();
-        var name = $"Disc {S}";
-        await AddDemoPrinterAsync(name);
-        await SelectAndConnectAsync(name);
-
-        var disconnectBtn = Page.Locator("button.btn-outline-danger:has(.bi-x-circle)");
-        await disconnectBtn.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
-        await disconnectBtn.ClickAsync();
-
-        var disconnectedIcon = Page.Locator($".card:has-text('{name}') .bi-plug.text-muted").First;
-        await disconnectedIcon.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
-        Assert.True(await disconnectedIcon.IsVisibleAsync());
-    }
-
-    // ── Helpers ──
-
-    /// <summary>
-    /// Navigates to the Fleet page with _selectedPrinter reset.
-    /// Goes to /settings first to unmount Fleet, then back to / to remount fresh.
-    /// This ensures the card grid (not ControlPanel) is shown even if a previous
-    /// test left a printer connected.
-    /// </summary>
-    private static async Task NavigateToFleetAsync()
-    {
-        await AppiumSetup.NavigateAsync("/settings");
-        await Page.WaitForTimeoutAsync(300);
-        await AppiumSetup.NavigateAsync("/fleet");
-        await Page.Locator("[data-testid='fleet-add-btn']").WaitForAsync(
-            new LocatorWaitForOptions { Timeout = 30_000 });
-    }
-
-    private static async Task AddDemoPrinterAsync(string name)
-    {
-        await Page.Locator("[data-testid='fleet-add-btn']").ClickAsync();
-        var nameInput = Page.Locator("#printerName");
-        await nameInput.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
-        await nameInput.FillAsync(name);
-        await Page.Locator("[data-testid='fleet-save-printer-btn']").ClickAsync();
-        await Page.Locator($".card strong:has-text('{name}')").First.WaitForAsync(
-            new LocatorWaitForOptions { Timeout = 5_000 });
-    }
-
-    private static async Task SelectAndConnectAsync(string name)
-    {
-        await Page.Locator($".card:has-text('{name}')").First.ClickAsync();
-
-        var connectBtn = Page.Locator($".card:has-text('{name}') button.btn-outline-success").First;
-        await connectBtn.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
-        await connectBtn.ClickAsync();
-
-        await Page.Locator(".badge.bg-success").WaitForAsync(
-            new LocatorWaitForOptions { Timeout = 10_000 });
-    }
-}
diff --git a/MakerPrompt.MAUI/App.xaml.cs b/MakerPrompt.MAUI/App.xaml.cs
deleted file mode 100644
index 5757c97..0000000
--- a/MakerPrompt.MAUI/App.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace MakerPrompt.MAUI
-{
-    public partial class App : Application
-    {
-        public App()
-        {
-            InitializeComponent();
-        }
-
-        protected override Window CreateWindow(IActivationState? activationState)
-        {
-            return new Window(new MainPage()) { Title = "MakerPrompt.MAUI" };
-        }
-    }
-}
diff --git a/MakerPrompt.MAUI/Components/Routes.razor b/MakerPrompt.MAUI/Components/Routes.razor
deleted file mode 100644
index e9503ef..0000000
--- a/MakerPrompt.MAUI/Components/Routes.razor
+++ /dev/null
@@ -1,12 +0,0 @@
-<ProcessError>
-    <GlobalErrorBoundary>
-        <AppInitializer>
-            <Router AppAssembly="@typeof(MauiProgram).Assembly" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
-                <Found Context="routeData">
-                    <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-                    <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-                </Found>
-            </Router>
-        </AppInitializer>
-    </GlobalErrorBoundary>
-</ProcessError>
\ No newline at end of file
diff --git a/MakerPrompt.MAUI/MainPage.xaml.cs b/MakerPrompt.MAUI/MainPage.xaml.cs
deleted file mode 100644
index 2d1f5f2..0000000
--- a/MakerPrompt.MAUI/MainPage.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace MakerPrompt.MAUI
-{
-    public partial class MainPage : ContentPage
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/MakerPrompt.MAUI/MakerPrompt.MAUI.csproj b/MakerPrompt.MAUI/MakerPrompt.MAUI.csproj
deleted file mode 100644
index d64c25b..0000000
--- a/MakerPrompt.MAUI/MakerPrompt.MAUI.csproj
+++ /dev/null
@@ -1,83 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-        <PropertyGroup>
-        <TargetFrameworks>net10.0-android;net10.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0;net10.0-windows10.0.22000.0</TargetFrameworks>
-        <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">android-arm64;android-x64</RuntimeIdentifiers>
-        <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
-
-        <OutputType>Exe</OutputType>
-        <RootNamespace>MakerPrompt.MAUI</RootNamespace>
-        <UseMaui>true</UseMaui>
-        <SingleProject>true</SingleProject>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <EnableDefaultCssItems>false</EnableDefaultCssItems>
-        <Nullable>enable</Nullable>
-        <ApplicationTitle>MakerPrompt</ApplicationTitle>
-        <ApplicationId>com.makerprompt.maui</ApplicationId>
-		<ApplicationDisplayVersion>$(Version)</ApplicationDisplayVersion>
-		<ApplicationVersion>$(Version)</ApplicationVersion>
-		<Version>0.4.0</Version>
-
-			<!-- To develop, package, and publish an app to the Microsoft Store, see: https://aka.ms/MauiTemplateUnpackaged -->
-        <WindowsPackageType>None</WindowsPackageType>
-
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-        <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-        <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
-    </PropertyGroup>
-
-    <!-- Android -->
-    <ItemGroup Condition="$(TargetFramework.Contains('-android')) != true">
-        <Compile Remove="**\*.Android.cs" />
-        <None Include="**\*.Android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    </ItemGroup>
-
-    <!-- IOS for future -->
-    <ItemGroup Condition="$(TargetFramework.Contains('-ios')) != true">
-        <Compile Remove="**\*.iOS.cs" />
-        <None Include="**\*.iOS.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    </ItemGroup>
-
-    <!-- Mac Catalyst -->
-    <ItemGroup Condition="$(TargetFramework.Contains('-maccatalyst')) != true">
-        <Compile Remove="**\*.MacOS.cs" />
-        <None Include="**\*.MacOS.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    </ItemGroup>
-
-    <!-- Windows -->
-    <ItemGroup Condition="$(TargetFramework.Contains('-windows')) != true">
-        <Compile Remove="**\*.Windows.cs" />
-        <None Include="**\*.Windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <!-- App Icon -->
-        <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#151E3F" />
-
-        <!-- Splash Screen -->
-        <MauiSplashScreen Include="Resources\AppIcon\appicon.svg" Color="#151E3F" BaseSize="128,128" />
-
-        <!-- Custom Fonts -->
-        <MauiFont Include="Resources\Fonts\*" />
-
-        <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Maui.Controls" Version="10.0.30" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.30" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.2" />
-		<PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.3.9" />
-		<PackageReference Include="System.IO.Ports" Version="10.0.2" />
-        <PackageReference Include="UsbSerialForAndroid.Net" Version="1.0.4" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'" />
-        <PackageReference Include="UsbSerialForMacOS" Version="0.9.5" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'" />
-	</ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\MakerPrompt.Shared\MakerPrompt.Shared.csproj" />
-    </ItemGroup>
-
-</Project>
diff --git a/MakerPrompt.MAUI/MauiProgram.cs b/MakerPrompt.MAUI/MauiProgram.cs
deleted file mode 100644
index 99e2689..0000000
--- a/MakerPrompt.MAUI/MauiProgram.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Globalization;
-using System.Text.Json;
-using Microsoft.Extensions.Logging;
-using MakerPrompt.Shared.Utils;
-using MakerPrompt.Shared.Services;
-using MakerPrompt.MAUI.Services;
-using Microsoft.AspNetCore.Builder;
-using MakerPrompt.MAUI.Storage;
-using MakerPrompt.Shared.Infrastructure;
-
-namespace MakerPrompt.MAUI
-{
-    public static class MauiProgram
-    {
-        public static MauiApp CreateMauiApp()
-        {
-            var builder = MauiApp.CreateBuilder();
-            builder
-                .UseMauiApp<App>()
-                .ConfigureFonts(fonts =>
-                {
-                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-                });
-
-            builder.Services.AddMauiBlazorWebView();
-            // Enable WebGL in the embedded WebView2 on Windows.
-            // WebView2 silently disables WebGL for GPUs on its blocklist — bypassing that
-            // is required for the GCode visual viewer (Three.js / WebGL canvas) to work.
-            var webViewArgs = "--ignore-gpu-blocklist --enable-gpu-rasterization";
-#if DEBUG
-            // Append remote-debugging port so E2E tests can connect via CDP / Playwright.
-            webViewArgs += " --remote-debugging-port=9222";
-            builder.Services.AddBlazorWebViewDeveloperTools();
-            builder.Logging.AddDebug();
-#endif
-            Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", webViewArgs);
-
-            builder.Services.AddLocalization(options =>
-            {
-                options.ResourcesPath = "Resources";
-            });
-
-            var supportedCultures = new AppConfiguration().SupportedCultures;
-            var localizationOptions = new RequestLocalizationOptions()
-                .SetDefaultCulture(supportedCultures[0])
-                .AddSupportedCultures(supportedCultures)
-                .AddSupportedUICultures(supportedCultures);
-
-            // Restore the user's saved language from MAUI Preferences.
-            // The Blazor WASM host reads this from JS localStorage in Program.cs,
-            // but MAUI can't invoke JS before Blazor starts. Read from the native
-            // Preferences store (same data that AppConfigurationService persists).
-            RestoreSavedCulture(supportedCultures);
-
-            builder.Services.RegisterMakerPromptSharedServices<AppConfigurationService, SerialService>();
-            // Override the passthrough camera proxy with MAUI native HttpClient fetcher
-            builder.Services.AddSingleton<ICameraProxyService, MauiCameraProxyService>();
-            builder.Services.AddScoped<IAppLocalStorageProvider, MauiAppLocalStorageProvider>();
-            // MAUI: Use AES-256-GCM encryption for stored credentials
-            var deviceId = DeviceInfo.Current.Idiom.ToString();
-            var deviceName = DeviceInfo.Current.Name ?? "default";
-            builder.Services.AddSingleton<IConnectionEncryptionService>(
-                new AesConnectionEncryptionService($"MakerPrompt-{deviceId}-{deviceName}"));
-            return builder.Build();
-        }
-
-        /// <summary>
-        /// Reads the saved language from MAUI Preferences and applies it to
-        /// the current thread before Blazor starts, so the first render uses
-        /// the correct culture. Without this, a force-reload after a language
-        /// change in CultureSelector would revert to the default culture.
-        /// </summary>
-        private static void RestoreSavedCulture(string[] supportedCultures)
-        {
-            try
-            {
-                var json = Preferences.Get("Mak3rPromptAppConfig", (string?)null);
-                if (json == null) return;
-
-                using var doc = JsonDocument.Parse(json);
-                if (!doc.RootElement.TryGetProperty("Language", out var langProp)) return;
-
-                var lang = langProp.GetString();
-                if (string.IsNullOrEmpty(lang)) return;
-                if (!supportedCultures.Contains(lang, StringComparer.OrdinalIgnoreCase)) return;
-
-                var culture = new CultureInfo(lang);
-                CultureInfo.DefaultThreadCurrentCulture = culture;
-                CultureInfo.DefaultThreadCurrentUICulture = culture;
-            }
-            catch
-            {
-                // Config not saved yet or corrupt — use default culture
-            }
-        }
-    }
-}
diff --git a/MakerPrompt.MAUI/Properties/launchSettings.json b/MakerPrompt.MAUI/Properties/launchSettings.json
deleted file mode 100644
index f4c6c8d..0000000
--- a/MakerPrompt.MAUI/Properties/launchSettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "Windows Machine": {
-      "commandName": "Project",
-      "nativeDebugging": false
-    }
-  }
-}
\ No newline at end of file
diff --git a/MakerPrompt.MAUI/Resources/AppIcon/appicon.svg b/MakerPrompt.MAUI/Resources/AppIcon/appicon.svg
deleted file mode 100644
index 83624a6..0000000
--- a/MakerPrompt.MAUI/Resources/AppIcon/appicon.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <rect x="0" y="0" width="456" height="456" fill="#151E3F" />
-</svg>
\ No newline at end of file
diff --git a/MakerPrompt.MAUI/Resources/AppIcon/appiconfg.svg b/MakerPrompt.MAUI/Resources/AppIcon/appiconfg.svg
deleted file mode 100644
index bb65df3..0000000
--- a/MakerPrompt.MAUI/Resources/AppIcon/appiconfg.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="456"
-   height="456"
-   viewBox="0 0 456 456"
-   version="1.1"
-   id="svg641"
-   sodipodi:docname="maker-prompt-logo.svg"
-   inkscape:version="1.2.1 (9c6d41e4, 2022-07-14)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview836"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="0.08005836"
-     inkscape:cx="-380.97208"
-     inkscape:cy="730.71694"
-     inkscape:window-width="2560"
-     inkscape:window-height="1387"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg641">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1563"
-       originx="30.000001"
-       originy="30.000001" />
-  </sodipodi:namedview>
-  <defs
-     id="defs638" />
-  <path
-     style="fill:#85D4FF;fill-opacity:1;stroke-width:0"
-     d="M 30,60 H 90 L 190,180 90,300 H 30 L 130,180 Z"
-     id="path621"
-     sodipodi:nodetypes="ccccccc" />
-  <path
-     id="path623"
-     style="fill:#85D4FF;fill-opacity:1;stroke-width:0"
-     d="M 219.99997,30.000001 220,190.00024 c -2e-5,13.80711 11.19289,25 25.00003,24.99998 13.80693,0 25,-11.19256 25,-24.99946 v -5.2e-4 L 270,30.000515 Z" />
-  <path
-     style="fill:#85D4FF;fill-opacity:1;stroke-width:0"
-     d="M 280,30.000515 V 330 h 50 V 30.000515 Z"
-     id="path625" />
-</svg>
diff --git a/MakerPrompt.MAUI/Resources/Fonts/OpenSans-Regular.ttf b/MakerPrompt.MAUI/Resources/Fonts/OpenSans-Regular.ttf
deleted file mode 100644
index 5b46960..0000000
Binary files a/MakerPrompt.MAUI/Resources/Fonts/OpenSans-Regular.ttf and /dev/null differ
diff --git a/MakerPrompt.MAUI/Resources/Splash/splash.svg b/MakerPrompt.MAUI/Resources/Splash/splash.svg
deleted file mode 100644
index 62d66d7..0000000
--- a/MakerPrompt.MAUI/Resources/Splash/splash.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-    <path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
-</svg>
\ No newline at end of file
diff --git a/MakerPrompt.MAUI/Services/SerialService.Android.cs b/MakerPrompt.MAUI/Services/SerialService.Android.cs
deleted file mode 100644
index a383e10..0000000
--- a/MakerPrompt.MAUI/Services/SerialService.Android.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using UsbSerialForAndroid.Net;
-using UsbSerialForAndroid.Net.Drivers;
-using UsbSerialForAndroid.Net.Helper;
-using System.Text;
-
-namespace MakerPrompt.MAUI.Services
-{
-    public class SerialService : BaseSerialService, ISerialService
-    {
-        private UsbDriverBase? _usbDriver;
-        public bool IsSupported => true;
-
-        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
-        {
-            if (connectionSettings.ConnectionType != ConnectionType || connectionSettings.Serial == null)
-                throw new ArgumentException("Invalid connection settings");
-
-            try
-            {
-                var deviceName = connectionSettings.Serial.PortName; // fix to id
-                var baudRate = connectionSettings.Serial.BaudRate == 0
-                    ? 250000
-                    : connectionSettings.Serial.BaudRate;
-                var dataBits = (byte)8;
-                var stopBits = UsbSerialForAndroid.Net.Enums.StopBits.One;
-                var parity = UsbSerialForAndroid.Net.Enums.Parity.None;
-
-                // Get the USB device
-                var usbDevice = UsbManagerHelper.GetAllUsbDevices().FirstOrDefault(d => d.DeviceName == deviceName);
-                if (usbDevice == null)
-                    throw new InvalidOperationException("USB device not found");
-
-                // Request permission if needed
-                if (!UsbManagerHelper.HasPermission(usbDevice))
-                    UsbManagerHelper.RequestPermission(usbDevice);
-
-                // Create and open the USB driver
-                _usbDriver = UsbDriverFactory.CreateUsbDriver(usbDevice.DeviceId);
-                _usbDriver.Open(baudRate, dataBits, stopBits, parity);
-
-                IsConnected = true;
-                RaiseConnectionChanged();
-            }
-            catch (Exception ex)
-            {
-                IsConnected = false;
-                Console.WriteLine($"Error connecting to device: {ex.Message}");
-            }
-
-            return IsConnected;
-        }
-
-        public async Task DisconnectAsync()
-        {
-            if (IsConnected && _usbDriver != null)
-            {
-                _usbDriver.Close();
-                _usbDriver = null;
-                IsConnected = false;
-                RaiseConnectionChanged();
-            }
-        }
-
-        public override async Task WriteDataAsync(string data)
-        {
-            if (!IsConnected || _usbDriver == null)
-                throw new InvalidOperationException("Device is not connected");
-
-            var buffer = Encoding.ASCII.GetBytes(data);
-            _usbDriver.Write(buffer);
-        }
-
-        public Task StartPrint(GCodeDoc gcodeDoc)
-        {
-            if (!IsConnected || string.IsNullOrEmpty(gcodeDoc.Content))
-            {
-                return Task.CompletedTask;
-            }
-
-            // Android path does not currently expose a CancellationToken; use a simple IsConnected check.
-            return Task.Run(async () =>
-            {
-                await foreach (var command in gcodeDoc.EnumerateCommandsAsync())
-                {
-                    if (!IsConnected)
-                    {
-                        break;
-                    }
-
-                    await WriteDataAsync(command);
-                }
-            });
-        }
-
-        public override async ValueTask DisposeAsync()
-        {
-            await DisconnectAsync();
-        }
-
-        public async Task<IEnumerable<string>> GetAvailablePortsAsync()
-        {
-            var devices = UsbManagerHelper.GetAllUsbDevices();
-            return devices.Select(d => d.DeviceId.ToString()).ToList();
-        }
-
-        public async Task<bool> CheckSupportedAsync()
-        {
-            // Assuming USB support is always available on Android
-            return true;
-        }
-
-        public Task RequestPortAsync() => Task.CompletedTask;
-    }
-}
\ No newline at end of file
diff --git a/MakerPrompt.MAUI/Services/SerialService.MacOS.cs b/MakerPrompt.MAUI/Services/SerialService.MacOS.cs
deleted file mode 100644
index d66d298..0000000
--- a/MakerPrompt.MAUI/Services/SerialService.MacOS.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using MakerPrompt.Shared.Utils;
-using System.Text;
-using System.Threading.Tasks.Dataflow;
-using UsbSerialForMacOS;
-namespace MakerPrompt.MAUI.Services
-{
-    public class SerialService : BaseSerialService, ISerialService
-    {
-        private UsbSerialManager? _manager = new();
-        private readonly BufferBlock<string> _commandQueue = new();
-        private CancellationTokenSource? _cts;
-        private Task? _sendTask;
-        private Task? _receiveTask;
-        private bool _disposed = false;
-        public bool IsSupported => true;
-
-        public SerialService() { }
-
-        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
-        {
-            if (IsConnected) return IsConnected;
-            if (connectionSettings.ConnectionType != ConnectionType || connectionSettings.Serial == null)
-                throw new ArgumentException("Invalid connection settings");
-
-            var portName = connectionSettings.Serial.PortName;
-            var baudRate = connectionSettings.Serial.BaudRate == 0
-                ? 250000
-                : connectionSettings.Serial.BaudRate;
-
-            try
-            {
-                _manager ??= new UsbSerialManager();
-                _cts?.Dispose();
-                _cts = new CancellationTokenSource();
-
-                IsConnected = _manager.Open(portName, baudRate);
-                ConnectionName = portName;
-
-                _sendTask = Task.Run(() => SendLoopAsync(_cts.Token));
-                _receiveTask = Task.Run(() => ReceiveLoopAsync(_cts.Token));
-                RaiseConnectionChanged();
-            }
-            catch (Exception ex)
-            {
-                IsConnected = false;
-                throw new SerialException("Connection failed", ex);
-            }
-
-            return IsConnected;
-        }
-
-        public async Task DisconnectAsync()
-        {
-            if (!IsConnected) return;
-            _cts?.Cancel();
-
-            try
-            {
-                if (_sendTask != null)
-                    await _sendTask.ConfigureAwait(false);
-                if (_receiveTask != null)
-                    await _receiveTask.ConfigureAwait(false);
-            }
-            finally
-            {
-                try
-                {
-                    _manager?.Close();
-                }
-                catch
-                {
-                    // swallow close exceptions on shutdown
-                }
-
-                _manager = null;
-                IsConnected = false;
-                RaiseConnectionChanged();
-            }
-        }
-
-        public override async Task WriteDataAsync(string data)
-        {
-            if (!IsConnected) return;
-            await _commandQueue.SendAsync(data);
-        }
-
-        public async Task<IEnumerable<string>> GetAvailablePortsAsync()
-        {
-            return _manager?.AvailablePorts().OrderBy(p => p).ToList() ?? [];
-        }
-
-        private async Task SendLoopAsync(CancellationToken ct)
-        {
-            try
-            {
-                while (IsConnected && !ct.IsCancellationRequested)
-                {
-                    var command = await _commandQueue.ReceiveAsync(ct);
-                    var manager = _manager;
-                    if (manager == null || ct.IsCancellationRequested)
-                    {
-                        break;
-                    }
-                    manager.Write(command);
-                    await Task.Delay(10, ct);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-                // Normal shutdown
-            }
-        }
-
-        private async Task ReceiveLoopAsync(CancellationToken ct)
-        {
-            while (!ct.IsCancellationRequested && IsConnected)
-            {
-                try
-                {
-                    var manager = _manager;
-                    if (manager == null || ct.IsCancellationRequested)
-                    {
-                        break;
-                    }
-                    var bytesRead = manager.Read(4096);
-                    if (bytesRead.Length > 0)
-                    {
-                        var received = Encoding.UTF8.GetString(bytesRead.ToArray());
-                        ProcessReceivedData(received);
-                    }
-                    await Task.Delay(10, ct);
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Receive error: {ex.Message}");
-                    IsConnected = false;
-                    await DisposeAsync();
-                }
-            }
-        }
-
-        public override async ValueTask DisposeAsync()
-        {
-            if (_disposed) return;
-            _disposed = true;
-
-            try
-            {
-                await DisconnectAsync();
-                _cts?.Dispose();
-            }
-            catch (ObjectDisposedException)
-            {
-                // Ignore if already disposed to ensure idempotent disposal
-            }
-        }
-
-        public Task<bool> CheckSupportedAsync() => Task.FromResult(true);
-
-        public Task RequestPortAsync() => Task.CompletedTask;
-
-        public Task StartPrint(GCodeDoc gcodeDoc)
-        {
-            if (!IsConnected || string.IsNullOrEmpty(gcodeDoc.Content))
-            {
-                return Task.CompletedTask;
-            }
-
-            return Task.Run(async () =>
-            {
-                await foreach (var command in gcodeDoc.EnumerateCommandsAsync(_cts?.Token ?? CancellationToken.None))
-                {
-                    if (!IsConnected)
-                    {
-                        break;
-                    }
-
-                    await WriteDataAsync(command);
-                }
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/MakerPrompt.MAUI/Services/SerialService.Windows.cs b/MakerPrompt.MAUI/Services/SerialService.Windows.cs
deleted file mode 100644
index 2bb2bc8..0000000
--- a/MakerPrompt.MAUI/Services/SerialService.Windows.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System.Text;
-using System.IO.Ports;
-using System.Threading.Tasks.Dataflow;
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Utils;
-using MakerPrompt.Shared.Services;
-
-namespace MakerPrompt.MAUI.Services
-{
-    public class SerialService : BaseSerialService, ISerialService
-    {
-        private readonly SerialPort _serialPort;
-        private readonly BufferBlock<string> _commandQueue = new();
-        private readonly CancellationTokenSource _cts = new();
-        private Task? _sendTask;
-        private Task? _receiveTask;
-        public bool IsSupported => true;
-
-        public SerialService()
-        {
-            _serialPort = new SerialPort
-            {
-                DataBits = 8,
-                Parity = Parity.None,
-                StopBits = StopBits.One,
-                Handshake = Handshake.None,   // was RequestToSend
-                DtrEnable = true,             // assert DTR for many CDC devices
-                RtsEnable = true,             // assert RTS manually (optional)
-                ReadTimeout = 2000,
-                WriteTimeout = 5000,
-                NewLine = "\n",
-                Encoding = Encoding.ASCII
-            };
-        }
-
-        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
-        {
-            if (IsConnected) return IsConnected;
-
-            if (connectionSettings.ConnectionType != ConnectionType || string.IsNullOrWhiteSpace(connectionSettings.Serial.PortName)) return false;
-
-            _serialPort.PortName = connectionSettings.Serial.PortName;
-            _serialPort.BaudRate = connectionSettings.Serial.BaudRate == 0
-                ? 250000
-                : connectionSettings.Serial.BaudRate;
-
-            try
-            {
-                await Task.Run(() => _serialPort.Open());
-                IsConnected = true;
-                ConnectionName = connectionSettings.Serial.PortName;
-                _sendTask = Task.Run(() => SendLoopAsync(_cts.Token));
-                _receiveTask = Task.Run(() => ReceiveLoopAsync(_cts.Token));
-                updateTimer.Elapsed += async (s, e) => await GetPrinterTelemetryAsync();
-                updateTimer.Start();
-                RaiseConnectionChanged();
-            }
-            catch (Exception ex)
-            {
-                IsConnected = false;
-                throw new SerialException("Connection failed", ex);
-            }
-
-            return IsConnected;
-        }
-
-        public async Task DisconnectAsync()
-        {
-            updateTimer.Stop();
-            _serialPort.Close();
-            IsConnected = false;
-            RaiseConnectionChanged();
-        }
-
-        public override async Task WriteDataAsync(string data)
-        {
-            if (!IsConnected) return;
-            await _commandQueue.SendAsync(data);
-        }
-
-        public async Task<IEnumerable<string>> GetAvailablePortsAsync()
-        {
-            return await Task.Run(() => SerialPort.GetPortNames()
-                .OrderBy(p => p)
-                .ToList());
-        }
-
-        private async Task SendLoopAsync(CancellationToken ct)
-        {
-            try
-            {
-                while (IsConnected && !ct.IsCancellationRequested)
-                {
-                    var command = await _commandQueue.ReceiveAsync(ct);
-                    if (!_serialPort.IsOpen) break;
-
-                    var payload = Encoding.ASCII.GetBytes(command + _serialPort.NewLine);
-                    await _serialPort.BaseStream.WriteAsync(payload, 0, payload.Length, ct);
-                    await _serialPort.BaseStream.FlushAsync(ct);
-                    await Task.Delay(10, ct);
-                }
-            }
-            catch (OperationCanceledException) { }
-        }
-
-        private async Task ReceiveLoopAsync(CancellationToken ct)
-        {
-            var buffer = new byte[4096];
-
-            while (!ct.IsCancellationRequested && IsConnected)
-            {
-                try
-                {
-                    var bytesRead = await _serialPort.BaseStream
-                        .ReadAsync(buffer, 0, buffer.Length, ct);
-
-                    if (bytesRead > 0)
-                    {
-                        var received = Encoding.ASCII.GetString(buffer, 0, bytesRead);
-                        ProcessReceivedData(received);
-                    }
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Receive error: {ex.Message}");
-                    await DisposeAsync();
-                }
-            }
-        }
-
-        public override async ValueTask DisposeAsync()
-        {
-            if (!IsConnected) return;
-
-            IsConnected = false;
-
-            try
-            {
-                // First cancel operations
-                _cts.Cancel();
-
-                // Then await tasks completion
-                if (_sendTask != null)
-                    await _sendTask.ContinueWith(_ => { }); // Suppress exceptions
-                if (_receiveTask != null)
-                    await _receiveTask.ContinueWith(_ => { });
-            }
-            finally
-            {
-                // Then close the port
-                if (_serialPort.IsOpen)
-                {
-                    await Task.Run(() =>
-                    {
-                        try
-                        {
-                            _serialPort.DiscardInBuffer();
-                            _serialPort.DiscardOutBuffer();
-                            _serialPort.Close();
-                        }
-                        catch { /* Ignore close errors */ }
-                    });
-                }
-
-                // Dispose resources in reverse order
-                _serialPort.Dispose();
-                _cts.Dispose();
-                updateTimer.Dispose();
-                RaiseConnectionChanged();
-            }
-        }
-
-        public Task<bool> CheckSupportedAsync() => Task.FromResult(true);
-
-        public Task RequestPortAsync() => Task.CompletedTask;
-
-        public Task StartPrint(GCodeDoc gcodeDoc)
-        {
-            // Stream G-code through the existing send queue without blocking.
-            if (!IsConnected || string.IsNullOrEmpty(gcodeDoc.Content))
-            {
-                return Task.CompletedTask;
-            }
-
-            return Task.Run(async () =>
-            {
-                await foreach (var command in gcodeDoc.EnumerateCommandsAsync(_cts.Token))
-                {
-                    if (!IsConnected)
-                    {
-                        break;
-                    }
-
-                    await WriteDataAsync(command);
-                }
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/MakerPrompt.MAUI/Services/SerialService.iOS.cs b/MakerPrompt.MAUI/Services/SerialService.iOS.cs
deleted file mode 100644
index 58974f2..0000000
--- a/MakerPrompt.MAUI/Services/SerialService.iOS.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.IO.Ports;
-using System.Threading.Tasks.Dataflow;
-using MakerPrompt.Shared.Infrastructure;
-using System.Text;
-using MakerPrompt.Shared.Models;
-
-namespace MakerPrompt.MAUI.Services
-{
-    public class SerialService : BaseSerialService, ISerialService
-    {
-        public bool IsSupported => false;
-
-        public SerialService()
-        {
-
-        }
-
-        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings) => throw new NotSupportedException();
-        public async Task DisconnectAsync() => throw new NotSupportedException();
-        public override async Task WriteDataAsync(string data) => throw new NotSupportedException();
-        public async Task<IEnumerable<string>> GetAvailablePortsAsync() => throw new NotSupportedException();
-
-        public override async ValueTask DisposeAsync()
-        {
-        }
-
-        public Task<bool> CheckSupportedAsync() => Task.FromResult(false);
-
-        public Task RequestPortAsync()  => throw new NotSupportedException();
-    }
-}
\ No newline at end of file
diff --git a/MakerPrompt.Shared/Components/PrusaConnectImportModal.razor b/MakerPrompt.Shared/Components/PrusaConnectImportModal.razor
deleted file mode 100644
index 2276d14..0000000
--- a/MakerPrompt.Shared/Components/PrusaConnectImportModal.razor
+++ /dev/null
@@ -1,266 +0,0 @@
-@* ─────────────────────────────────────────────────────────────────────
-   PrusaConnectImportModal — Two-step fleet import from PrusaConnect.
-
-   Step 1: User enters a Bearer token and clicks "Discover Printers".
-   Step 2: A list of discovered printers is shown with checkboxes.
-           Clicking "Import Selected" saves each as a PrusaConnect printer.
-
-   Call ShowAsync() to open.
-   ───────────────────────────────────────────────────────────────────── *@
-@using MakerPrompt.Shared.Infrastructure
-@using static MakerPrompt.Shared.Utils.Enums
-@inject PrusaConnectProvider Provider
-@inject PrinterConnectionManager ConnectionManager
-@inject ToastService ToastService
-@inject ILogger<PrusaConnectImportModal> Logger
-
-<Modal @ref="_modal" Title="Import from PrusaConnect" Size="ModalSize.Large">
-    <BodyTemplate>
-        @if (_step == Step.Token)
-        {
-            <p class="text-muted small mb-3">
-                Enter your PrusaConnect Bearer token. You can obtain it from
-                <a href="https://connect.prusa3d.com" target="_blank" rel="noopener noreferrer">connect.prusa3d.com</a>
-                account settings (API keys) or by capturing the Authorization header from a PrusaConnect session.
-            </p>
-
-            <div class="mb-3">
-                <label class="form-label">Bearer Token</label>
-                <input type="password" class="form-control" @bind="_bearerToken"
-                       placeholder="Paste your Bearer token here" />
-            </div>
-
-            @if (!string.IsNullOrEmpty(_error))
-            {
-                <div class="alert alert-danger d-flex align-items-start gap-2 mb-0" role="alert">
-                    <i class="bi bi-exclamation-triangle-fill flex-shrink-0 mt-1"></i>
-                    <div>@_error</div>
-                </div>
-            }
-        }
-        else
-        {
-            @if (_discoveredPrinters.Count == 0)
-            {
-                <div class="alert alert-warning">
-                    <i class="bi bi-printer me-2"></i>
-                    No printers found on this PrusaConnect account.
-                </div>
-            }
-            else
-            {
-                <p class="text-muted small mb-3">
-                    @_discoveredPrinters.Count printer(s) found. Select the ones you want to import.
-                </p>
-
-                <div class="list-group">
-                    @foreach (var printer in _discoveredPrinters)
-                    {
-                        var isChecked = _selected.Contains(printer.Id);
-                        var alreadyAdded = _alreadyImported.Contains(printer.Id);
-                        <label class="list-group-item list-group-item-action @(alreadyAdded ? "text-muted" : "")"
-                               style="cursor: @(alreadyAdded ? "default" : "pointer")">
-                            <div class="d-flex align-items-center gap-3">
-                                <input type="checkbox" class="form-check-input flex-shrink-0"
-                                       checked="@isChecked"
-                                       disabled="@alreadyAdded"
-                                       @onchange="e => ToggleSelection(printer.Id, (bool)(e.Value ?? false))" />
-                                <div>
-                                    <div class="fw-semibold">
-                                        @(string.IsNullOrEmpty(printer.Name) ? printer.Model : printer.Name)
-                                        @if (alreadyAdded)
-                                        {
-                                            <span class="badge bg-secondary ms-2">Already added</span>
-                                        }
-                                    </div>
-                                    <div class="text-muted small">
-                                        @if (!string.IsNullOrEmpty(printer.Model))
-                                        {
-                                            <span class="me-2">@printer.Model</span>
-                                        }
-                                        @if (!string.IsNullOrEmpty(printer.Status))
-                                        {
-                                            <span class="badge bg-light text-dark border">@printer.Status</span>
-                                        }
-                                        <span class="ms-1 font-monospace" style="font-size:0.75em">@printer.Id</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </label>
-                    }
-                </div>
-            }
-
-            @if (!string.IsNullOrEmpty(_error))
-            {
-                <div class="alert alert-danger d-flex align-items-start gap-2 mt-3 mb-0" role="alert">
-                    <i class="bi bi-exclamation-triangle-fill flex-shrink-0 mt-1"></i>
-                    <div>@_error</div>
-                </div>
-            }
-        }
-    </BodyTemplate>
-
-    <FooterTemplate>
-        <button class="btn btn-outline-secondary" @onclick="CloseAsync" disabled="@_isBusy">Cancel</button>
-
-        @if (_step == Step.Token)
-        {
-            <button class="btn btn-outline-primary" @onclick="DiscoverAsync" disabled="@(_isBusy || string.IsNullOrWhiteSpace(_bearerToken))">
-                @if (_isBusy)
-                {
-                    <span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>
-                    <span>Discovering...</span>
-                }
-                else
-                {
-                    <i class="bi bi-search me-1"></i>
-                    <span>Discover Printers</span>
-                }
-            </button>
-        }
-        else
-        {
-            <button class="btn btn-outline-secondary" @onclick="GoBackAsync" disabled="@_isBusy">
-                <i class="bi bi-arrow-left me-1"></i>Back
-            </button>
-            <button class="btn btn-primary" @onclick="ImportAsync"
-                    disabled="@(_isBusy || _selected.Count == 0)">
-                @if (_isBusy)
-                {
-                    <span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>
-                    <span>Importing...</span>
-                }
-                else
-                {
-                    <i class="bi bi-cloud-download me-1"></i>
-                    <span>Import Selected (@_selected.Count)</span>
-                }
-            </button>
-        }
-    </FooterTemplate>
-</Modal>
-
-@code {
-    private enum Step { Token, Printers }
-
-    private Modal _modal = default!;
-    private Step _step = Step.Token;
-    private string _bearerToken = string.Empty;
-    private bool _isBusy;
-    private string? _error;
-
-    private List<RemotePrinterInfo> _discoveredPrinters = [];
-    private HashSet<string> _selected = [];
-    private HashSet<string> _alreadyImported = [];
-
-    public async Task ShowAsync()
-    {
-        _step = Step.Token;
-        _bearerToken = string.Empty;
-        _error = null;
-        _isBusy = false;
-        _discoveredPrinters = [];
-        _selected = [];
-        _alreadyImported = BuildAlreadyImportedSet();
-        await _modal.ShowAsync();
-    }
-
-    private async Task DiscoverAsync()
-    {
-        if (string.IsNullOrWhiteSpace(_bearerToken)) return;
-
-        _isBusy = true;
-        _error = null;
-        try
-        {
-            Provider.Configure(_bearerToken.Trim());
-            _discoveredPrinters = (await Provider.GetPrintersAsync()).ToList();
-
-            // Pre-select printers not yet imported.
-            _selected = _discoveredPrinters
-                .Where(p => !_alreadyImported.Contains(p.Id))
-                .Select(p => p.Id)
-                .ToHashSet();
-
-            _step = Step.Printers;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex, "PrusaConnect discovery failed");
-            _error = "Could not reach PrusaConnect. Check your Bearer token and network connection.";
-        }
-        finally
-        {
-            _isBusy = false;
-        }
-    }
-
-    private async Task ImportAsync()
-    {
-        if (_selected.Count == 0) return;
-
-        _isBusy = true;
-        _error = null;
-        var imported = 0;
-        try
-        {
-            foreach (var printer in _discoveredPrinters.Where(p => _selected.Contains(p.Id)))
-            {
-                var displayName = string.IsNullOrEmpty(printer.Name) ? printer.Model : printer.Name;
-                if (string.IsNullOrEmpty(displayName)) displayName = $"PrusaConnect {printer.Id[..8]}";
-
-                var definition = new PrinterConnectionDefinition
-                {
-                    Name = displayName,
-                    ConnectionType = PrinterConnectionType.PrusaConnect,
-                    Settings = new PrinterConnectionSettings(
-                        new ApiConnectionSettings(string.Empty, printer.Id, _bearerToken.Trim()),
-                        PrinterConnectionType.PrusaConnect)
-                };
-
-                await ConnectionManager.AddPrinterAsync(definition);
-                imported++;
-            }
-
-            var noun = imported == 1 ? "printer" : "printers";
-            ToastService.Notify(new ToastMessage(ToastType.Success, $"{imported} {noun} imported from PrusaConnect"));
-            await _modal.HideAsync();
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex, "PrusaConnect import failed");
-            _error = $"Import failed: {ex.Message}";
-        }
-        finally
-        {
-            _isBusy = false;
-        }
-    }
-
-    private async Task GoBackAsync()
-    {
-        _step = Step.Token;
-        _error = null;
-        await Task.CompletedTask;
-    }
-
-    private async Task CloseAsync()
-    {
-        _error = null;
-        await _modal.HideAsync();
-    }
-
-    private void ToggleSelection(string id, bool isChecked)
-    {
-        if (isChecked) _selected.Add(id);
-        else _selected.Remove(id);
-    }
-
-    private HashSet<string> BuildAlreadyImportedSet() =>
-        ConnectionManager.Printers
-            .Where(p => p.Definition.ConnectionType == PrinterConnectionType.PrusaConnect
-                        && p.Definition.Settings.Api is not null)
-            .Select(p => p.Definition.Settings.Api!.UserName)
-            .ToHashSet();
-}
diff --git a/MakerPrompt.Shared/Infrastructure/IPrinterCommunicationService.cs b/MakerPrompt.Shared/Infrastructure/IPrinterCommunicationService.cs
deleted file mode 100644
index a8cbaf3..0000000
--- a/MakerPrompt.Shared/Infrastructure/IPrinterCommunicationService.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-namespace MakerPrompt.Shared.Infrastructure
-{
-    public interface IPrinterCommunicationService : IAsyncDisposable
-    {
-        event EventHandler<bool> ConnectionStateChanged;
-        event EventHandler<PrinterTelemetry> TelemetryUpdated;
-
-        PrinterConnectionType ConnectionType { get; }
-        PrinterTelemetry LastTelemetry { get; }
-        string ConnectionName { get; }
-        bool IsConnected { get; }
-        bool IsPrinting { get; }
-
-        /// <summary>
-        /// True when the backend supports direct printer control commands
-        /// (temperature set, motion, extrusion, fan, etc.).
-        /// Monitoring-only backends (PrusaLink, PrusaConnect) return false.
-        /// </summary>
-        bool SupportsDirectControl => true;
-
-        /// <summary>
-        /// True when the backend exposes a queryable printer-side print queue.
-        /// Currently only Moonraker supports this.
-        /// </summary>
-        bool SupportsPrinterQueue => false;
-
-        /// <summary>
-        /// True when the backend supports sending raw G-code commands via <see cref="WriteDataAsync"/>.
-        /// Backends that use a proprietary protocol with no command terminal should return false.
-        /// </summary>
-        bool SupportsCommandPrompt => true;
-
-        Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings);
-        Task DisconnectAsync();
-        Task WriteDataAsync(string command);
-        Task<PrinterTelemetry> GetPrinterTelemetryAsync();
-        Task<List<FileEntry>> GetFilesAsync();
-        /// <summary>
-        /// Returns the printer-side print queue entries. Returns an empty list
-        /// for backends that do not support a print queue (<see cref="SupportsPrinterQueue"/> is false).
-        /// </summary>
-        Task<List<PrintQueueEntry>> GetPrinterQueueAsync() => Task.FromResult(new List<PrintQueueEntry>());
-        Task SetHotendTemp(int targetTemp = 0);
-        Task SetBedTemp(int targetTemp = 0);
-        Task Home(bool x = true, bool y = true, bool z = true);
-        Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f);
-        Task SetFanSpeed(int fanSpeedPercentage = 0);
-        Task SetPrintSpeed(int speed);
-        Task SetPrintFlow(int flow);
-        Task SetAxisPerUnit(float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f);
-        Task RunPidTuning(int cycles, int targetTemp, int extruderIndex);
-        Task RunThermalModelCalibration(int cycles, int targetTemp);
-        Task StartPrint(FileEntry file);
-        Task StartPrint(GCodeDoc document);
-        Task SaveEEPROM();
-    }
-}
diff --git a/MakerPrompt.Shared/Infrastructure/IPrinterProvider.cs b/MakerPrompt.Shared/Infrastructure/IPrinterProvider.cs
deleted file mode 100644
index 06cd5ed..0000000
--- a/MakerPrompt.Shared/Infrastructure/IPrinterProvider.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace MakerPrompt.Shared.Infrastructure;
-
-/// <summary>
-/// Abstracts services that manage a fleet of printers under a single account.
-/// Call Configure(token) before GetPrintersAsync().
-/// </summary>
-public interface IPrinterProvider
-{
-    void Configure(string bearerToken);
-    Task<IReadOnlyList<RemotePrinterInfo>> GetPrintersAsync();
-}
diff --git a/MakerPrompt.Shared/Models/FarmConfiguration.cs b/MakerPrompt.Shared/Models/FarmConfiguration.cs
deleted file mode 100644
index 569bd13..0000000
--- a/MakerPrompt.Shared/Models/FarmConfiguration.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace MakerPrompt.Shared.Models
-{
-    /// <summary>
-    /// Represents a saved farm profile. Each farm bundles a set of printer connections
-    /// and a display name so users can switch between different physical setups.
-    /// </summary>
-    public class FarmConfiguration
-    {
-        public Guid Id { get; set; } = Guid.NewGuid();
-        public string Name { get; set; } = string.Empty;
-        public List<PrinterConnectionDefinition> Printers { get; set; } = [];
-        public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
-    }
-}
diff --git a/MakerPrompt.Shared/Models/FilamentSpool.cs b/MakerPrompt.Shared/Models/FilamentSpool.cs
deleted file mode 100644
index afe8570..0000000
--- a/MakerPrompt.Shared/Models/FilamentSpool.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace MakerPrompt.Shared.Models
-{
-    public class FilamentSpool
-    {
-        public Guid Id { get; set; } = Guid.NewGuid();
-        public string Name { get; set; } = string.Empty;
-        public string Material { get; set; } = string.Empty;
-        public string Brand { get; set; } = string.Empty;
-        public string Color { get; set; } = string.Empty;
-        public double Diameter { get; set; } = 1.75;
-        public double TotalWeightGrams { get; set; } = 1000;
-        public double RemainingWeightGrams { get; set; } = 1000;
-        public decimal Cost { get; set; }
-        public DateTime PurchaseDate { get; set; } = DateTime.UtcNow;
-        public bool IsArchived { get; set; }
-    }
-}
diff --git a/MakerPrompt.Shared/Models/NotificationRecord.cs b/MakerPrompt.Shared/Models/NotificationRecord.cs
deleted file mode 100644
index 19a283d..0000000
--- a/MakerPrompt.Shared/Models/NotificationRecord.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace MakerPrompt.Shared.Models
-{
-    public enum NotificationLevel
-    {
-        Info,
-        Warning,
-        Error,
-        Critical
-    }
-
-    public class NotificationRecord
-    {
-        public Guid Id { get; set; } = Guid.NewGuid();
-        public NotificationLevel Level { get; set; }
-        public string Title { get; set; } = string.Empty;
-        public string Message { get; set; } = string.Empty;
-        public DateTime Timestamp { get; set; } = DateTime.UtcNow;
-        public Guid? PrinterId { get; set; }
-        public Guid? FilamentSpoolId { get; set; }
-        public bool IsRead { get; set; }
-    }
-}
diff --git a/MakerPrompt.Shared/Models/PrintJobUsageRecord.cs b/MakerPrompt.Shared/Models/PrintJobUsageRecord.cs
deleted file mode 100644
index 1a8163c..0000000
--- a/MakerPrompt.Shared/Models/PrintJobUsageRecord.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace MakerPrompt.Shared.Models
-{
-    public class PrintJobUsageRecord
-    {
-        public Guid Id { get; set; } = Guid.NewGuid();
-        public Guid PrinterId { get; set; }
-        public Guid FilamentSpoolId { get; set; }
-        public string JobName { get; set; } = string.Empty;
-        public TimeSpan Duration { get; set; }
-        public double EstimatedFilamentUsedGrams { get; set; }
-        public double ActualFilamentUsedGrams { get; set; }
-        public DateTime Timestamp { get; set; } = DateTime.UtcNow;
-    }
-}
diff --git a/MakerPrompt.Shared/Models/PrintProject.cs b/MakerPrompt.Shared/Models/PrintProject.cs
deleted file mode 100644
index 0fd9f09..0000000
--- a/MakerPrompt.Shared/Models/PrintProject.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-namespace MakerPrompt.Shared.Models
-{
-    /// <summary>
-    /// A print project groups multiple G-code files under a folder/name.
-    /// Files are uploaded locally to app storage and can be dispatched to any connected printer.
-    /// </summary>
-    public class PrintProject
-    {
-        public Guid Id { get; set; } = Guid.NewGuid();
-
-        /// <summary>
-        /// Human-readable project name (also acts as the folder name).
-        /// </summary>
-        public string Name { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Optional description or notes.
-        /// </summary>
-        public string? Notes { get; set; }
-
-        /// <summary>
-        /// When the project was created.
-        /// </summary>
-        public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
-
-        /// <summary>
-        /// The individual print jobs in this project.
-        /// </summary>
-        public List<PrintJob> Jobs { get; set; } = [];
-    }
-
-    /// <summary>
-    /// A single print job within a project — one G-code file plus tracking state.
-    /// </summary>
-    public class PrintJob
-    {
-        public Guid Id { get; set; } = Guid.NewGuid();
-
-        /// <summary>
-        /// Original uploaded filename (e.g. "benchy.gcode").
-        /// </summary>
-        public string FileName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Storage path within IAppLocalStorageProvider (e.g. "PrintProjects/{projectId}/{filename}").
-        /// </summary>
-        public string StoragePath { get; set; } = string.Empty;
-
-        /// <summary>
-        /// File size in bytes.
-        /// </summary>
-        public long Size { get; set; }
-
-        /// <summary>
-        /// Current status of this job.
-        /// </summary>
-        public PrintJobStatus Status { get; set; } = PrintJobStatus.Queued;
-
-        /// <summary>
-        /// The printer this job was assigned/sent to (null = unassigned).
-        /// </summary>
-        public Guid? AssignedPrinterId { get; set; }
-
-        /// <summary>
-        /// Friendly name of the assigned printer (for display when printer is offline).
-        /// </summary>
-        public string? AssignedPrinterName { get; set; }
-    }
-
-    public enum PrintJobStatus
-    {
-        Queued,
-        Printing,
-        Completed,
-        Failed
-    }
-}
diff --git a/MakerPrompt.Shared/Models/PrinterConnectionDefinition.cs b/MakerPrompt.Shared/Models/PrinterConnectionDefinition.cs
deleted file mode 100644
index bbdc131..0000000
--- a/MakerPrompt.Shared/Models/PrinterConnectionDefinition.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-namespace MakerPrompt.Shared.Models
-{
-    /// <summary>
-    /// Persistent model for a saved printer connection. Stored via IAppLocalStorageProvider.
-    /// Inspired by PrintQue multi-printer management and OctoPrint connection profiles.
-    /// </summary>
-    public class PrinterConnectionDefinition
-    {
-        /// <summary>
-        /// Unique identifier for this printer connection.
-        /// </summary>
-        public Guid Id { get; set; } = Guid.NewGuid();
-
-        /// <summary>
-        /// User-friendly display name (e.g. "Workshop Prusa MK4", "BambuLab X1C #2").
-        /// </summary>
-        public string Name { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Backend type for this printer connection.
-        /// </summary>
-        public PrinterConnectionType ConnectionType { get; set; } = PrinterConnectionType.Demo;
-
-        /// <summary>
-        /// Connection details — API settings for HTTP/WS backends, serial settings for USB.
-        /// </summary>
-        public PrinterConnectionSettings Settings { get; set; } = new();
-
-        /// <summary>
-        /// Whether MakerPrompt should attempt to auto-connect this printer on startup.
-        /// </summary>
-        public bool AutoConnect { get; set; }
-
-        /// <summary>
-        /// Optional user-assigned color for the printer card in the Fleet dashboard.
-        /// </summary>
-        public string? Color { get; set; }
-
-        /// <summary>
-        /// Optional notes for this printer connection.
-        /// </summary>
-        public string? Notes { get; set; }
-
-        /// <summary>
-        /// Timestamp of when this definition was created.
-        /// </summary>
-        public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
-
-        /// <summary>
-        /// Timestamp of the last successful connection.
-        /// </summary>
-        public DateTime? LastConnectedAt { get; set; }
-
-        /// <summary>
-        /// The ID of the currently assigned filament spool.
-        /// </summary>
-        public Guid? AssignedFilamentSpoolId { get; set; }
-    }
-}
diff --git a/MakerPrompt.Shared/Models/PrinterConnectionSettings.cs b/MakerPrompt.Shared/Models/PrinterConnectionSettings.cs
deleted file mode 100644
index ae5bcb9..0000000
--- a/MakerPrompt.Shared/Models/PrinterConnectionSettings.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-namespace MakerPrompt.Shared.Models
-{
-    public class PrinterConnectionSettings
-    {
-        public PrinterConnectionType ConnectionType { get; set; }
-
-        public SerialConnectionSettings? Serial { get; set; }
-
-        public ApiConnectionSettings? Api { get; set; }
-
-        public PrinterConnectionSettings()
-        {
-            ConnectionType = PrinterConnectionType.Demo;
-        }
-
-        public PrinterConnectionSettings(SerialConnectionSettings serialConnectionSettings)
-        {
-            ConnectionType = PrinterConnectionType.Serial;
-            Serial = serialConnectionSettings;
-        }
-
-        public PrinterConnectionSettings(ApiConnectionSettings apiConnectionSettings, PrinterConnectionType connectionType)
-        {
-            if (connectionType == PrinterConnectionType.Serial) throw new ArgumentOutOfRangeException(nameof(connectionType));
-            ConnectionType = connectionType;
-            Api = apiConnectionSettings;
-        }
-    }
-
-    public record SerialConnectionSettings
-    {
-        public string PortName { get; set; } = string.Empty;
-
-        public int BaudRate { get; set; } = 115200;
-    }
-
-    public class ApiConnectionSettings
-    {
-        public ApiConnectionSettings()
-        {
-        }
-        public ApiConnectionSettings(string url, string username, string password)
-        {
-            Url = url;
-            UserName = username;
-            Password = password;
-        }
-        public string Url { get; set; } = string.Empty;
-
-        public string UserName { get; set; } = string.Empty;
-
-        public string Password { get; set; } = string.Empty;
-    }
-}
diff --git a/MakerPrompt.Shared/Models/PrinterTelemetry.cs b/MakerPrompt.Shared/Models/PrinterTelemetry.cs
deleted file mode 100644
index 24ed015..0000000
--- a/MakerPrompt.Shared/Models/PrinterTelemetry.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System.ComponentModel;
-
-namespace MakerPrompt.Shared.Models
-{
-    public class PrinterTelemetry : INotifyPropertyChanged
-    {
-        private readonly object _lock = new();
-
-        private string _lastResponse = "";
-        public string LastResponse
-        {
-            get => _lastResponse;
-            set => SetField(ref _lastResponse, value, nameof(LastResponse));
-        }
-
-        private string _printerName = "My 3D Printer";
-        public string PrinterName
-        {
-            get => _printerName;
-            set => SetField(ref _printerName, value, nameof(PrinterName));
-        }
-
-        private DateTime? _connectionTime;
-        public DateTime? ConnectionTime
-        {
-            get => _connectionTime;
-            set => SetField(ref _connectionTime, value, nameof(ConnectionTime));
-        }
-
-        private double _hotendTemp;
-        public double HotendTemp
-        {
-            get => _hotendTemp;
-            set => SetField(ref _hotendTemp, value, nameof(HotendTemp));
-        }
-
-        private double _hotendTarget;
-        public double HotendTarget
-        {
-            get => _hotendTarget;
-            set => SetField(ref _hotendTarget, value, nameof(HotendTarget));
-        }
-
-        private double _bedTemp;
-        public double BedTemp
-        {
-            get => _bedTemp;
-            set => SetField(ref _bedTemp, value, nameof(BedTemp));
-        }
-
-        private double _bedTarget;
-        public double BedTarget
-        {
-            get => _bedTarget;
-            set => SetField(ref _bedTarget, value, nameof(BedTarget));
-        }
-
-        private double _chamberTemp;
-        public double ChamberTemp
-        {
-            get => _chamberTemp;
-            set => SetField(ref _chamberTemp, value, nameof(ChamberTemp));
-        }
-
-        private double _chamberTarget;
-        public double ChamberTarget
-        {
-            get => _chamberTarget;
-            set => SetField(ref _chamberTarget, value, nameof(ChamberTarget));
-        }
-
-        private Vector3 _position = new();
-        public Vector3 Position
-        {
-            get => _position;
-            set => SetField(ref _position, value, nameof(Position));
-        }
-
-        private PrinterStatus _status = PrinterStatus.Disconnected;
-        public PrinterStatus Status
-        {
-            get => _status;
-            set => SetField(ref _status, value, nameof(Status));
-        }
-
-        private int _feedRate;
-        public int FeedRate
-        {
-            get => _feedRate;
-            set => SetField(ref _feedRate, value, nameof(FeedRate));
-        }
-
-        private int _flowRate;
-        public int FlowRate
-        {
-            get => _flowRate;
-            set => SetField(ref _flowRate, value, nameof(FlowRate));
-        }
-
-        private int _fanSpeed;
-        public int FanSpeed
-        {
-            get => _fanSpeed;
-            set => SetField(ref _fanSpeed, value, nameof(FanSpeed));
-        }
-
-        private string _printJobName = "";
-        public string PrintJobName
-        {
-            get => _printJobName;
-            set => SetField(ref _printJobName, value, nameof(PrintJobName));
-        }
-
-        private TimeSpan _printDuration;
-        public TimeSpan PrintDuration
-        {
-            get => _printDuration;
-            set => SetField(ref _printDuration, value, nameof(PrintDuration));
-        }
-
-        private double _filamentUsed;
-        public double FilamentUsed
-        {
-            get => _filamentUsed;
-            set => SetField(ref _filamentUsed, value, nameof(FilamentUsed));
-        }
-
-        public SDCardStatus SDCard { get; } = new();
-
-
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        protected bool SetField<T>(ref T field, T value, string propertyName)
-        {
-            lock (_lock)
-            {
-                if (EqualityComparer<T>.Default.Equals(field, value)) return false;
-                field = value;
-                OnPropertyChanged(propertyName);
-                return true;
-            }
-        }
-    }
-
-    public class SDCardStatus
-    {
-        public bool Present { get; set; }
-        public bool Printing { get; set; }
-        public double Progress { get; set; } // 0-100%
-    }
-}
diff --git a/MakerPrompt.Shared/Models/RemotePrinterInfo.cs b/MakerPrompt.Shared/Models/RemotePrinterInfo.cs
deleted file mode 100644
index b638571..0000000
--- a/MakerPrompt.Shared/Models/RemotePrinterInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace MakerPrompt.Shared.Models;
-
-/// <summary>
-/// Printer discovered from a fleet provider (e.g. PrusaConnect account).
-/// </summary>
-public class RemotePrinterInfo
-{
-    public string Id { get; set; } = string.Empty;
-    public string Name { get; set; } = string.Empty;
-    public string Model { get; set; } = string.Empty;
-    public string Status { get; set; } = string.Empty;
-}
diff --git a/MakerPrompt.Shared/Pages/ProjectHub.razor b/MakerPrompt.Shared/Pages/ProjectHub.razor
deleted file mode 100644
index bcbe563..0000000
--- a/MakerPrompt.Shared/Pages/ProjectHub.razor
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="container-fluid">
-    <PrintQueue />
-</div>
diff --git a/MakerPrompt.Shared/Services/GCodeDocumentService.cs b/MakerPrompt.Shared/Services/GCodeDocumentService.cs
deleted file mode 100644
index ecc6ac9..0000000
--- a/MakerPrompt.Shared/Services/GCodeDocumentService.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System.Runtime.CompilerServices;
-
-namespace MakerPrompt.Shared.Services
-{
-    // Simple wrapper around the current G-code text; can be extended later to expose parsed structures
-    public class GCodeDocumentService
-    {
-        private string? _current;
-        public string? CurrentGCode => _current;
-        public event Action? Changed;
-
-        // Expose a lightweight document wrapper for higher-level APIs
-        public GCodeDoc Document => new(_current ?? string.Empty);
-
-        public void SetGCode(string? gcode)
-        {
-            _current = gcode ?? string.Empty;
-            Changed?.Invoke();
-        }
-
-        public void Clear()
-        {
-            _current = string.Empty;
-            Changed?.Invoke();
-        }
-    }
-
-    public readonly record struct GCodeDoc(string Content)
-    {
-        // Async, streaming enumeration of non-empty, non-comment commands.
-        public async IAsyncEnumerable<string> EnumerateCommandsAsync(
-            [EnumeratorCancellation] CancellationToken cancellationToken = default)
-        {
-            if (string.IsNullOrEmpty(Content)) yield break;
-
-            using var reader = new StringReader(Content);
-            string? line;
-
-            while (!cancellationToken.IsCancellationRequested &&
-                   (line = await reader.ReadLineAsync().ConfigureAwait(false)) != null)
-            {
-                line = line.Trim();
-                if (string.IsNullOrEmpty(line) || line.StartsWith(";", StringComparison.Ordinal))
-                    continue;
-
-                yield return line;
-            }
-        }
-    }
-}
diff --git a/MakerPrompt.Shared/Utils/AppConfiguration.cs b/MakerPrompt.Shared/Utils/AppConfiguration.cs
deleted file mode 100644
index 8c62d91..0000000
--- a/MakerPrompt.Shared/Utils/AppConfiguration.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace MakerPrompt.Shared.Utils
-{
-    public class AppConfiguration
-    {
-        public Theme Theme { get; set; } = Theme.Auto;
-		public string[] SupportedCultures { get; } = new string[] { "en-US", "de-DE", "tr-TR", "es-ES", "fr-FR", "it-IT", "pl-PL", "he-IL", "zh-CN" };
-        public string Language { get; set; } = "en-US";
-        public string FarmName { get; set; } = string.Empty;
-        public bool FarmModeEnabled { get; set; } = false;
-        public Guid? ActiveFarmId { get; set; }
-        public bool AnalyticsEnabled { get; set; } = true;
-        public bool EnableFilamentInventory { get; set; } = false;
-        public bool EnablePrintAnalytics { get; set; } = false;
-        public DateTime? LastUpdated { get; set; }
-    }
-}
diff --git a/MakerPrompt.Shared/_Imports.razor b/MakerPrompt.Shared/_Imports.razor
deleted file mode 100644
index b75125d..0000000
--- a/MakerPrompt.Shared/_Imports.razor
+++ /dev/null
@@ -1,16 +0,0 @@
-@using System.ComponentModel
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.Extensions.Localization
-@using Microsoft.Extensions.Logging
-@using MakerPrompt.Shared.Models
-@using MakerPrompt.Shared.Infrastructure
-@using MakerPrompt.Shared.Utils
-@using MakerPrompt.Shared.Components
-@using MakerPrompt.Shared.Components.Calculators
-@using MakerPrompt.Shared.Properties
-@using MakerPrompt.Shared.Services
-@using BlazorBootstrap
-@using EnumExtensions = MakerPrompt.Shared.Utils.EnumExtensions
\ No newline at end of file
diff --git a/MakerPrompt.Shared/usings.cs b/MakerPrompt.Shared/usings.cs
deleted file mode 100644
index 7a3a9d7..0000000
--- a/MakerPrompt.Shared/usings.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-global using static MakerPrompt.Shared.Utils.Enums;
-global using System.Text;
-global using System.Text.Json;
-global using System.Text.RegularExpressions;
-global using System.Text.Json.Serialization;
-global using System.Reflection;
-global using System.Numerics;
-global using System.Net;
-global using System.Net.Http.Headers;
-global using MakerPrompt.Shared.Infrastructure;
-global using MakerPrompt.Shared.Properties;
-global using MakerPrompt.Shared.Services;
-global using MakerPrompt.Shared.Models;
-global using MakerPrompt.Shared.Utils;
-global using Microsoft.JSInterop;
\ No newline at end of file
diff --git a/MakerPrompt.Tests/AnalyticsServiceTests.cs b/MakerPrompt.Tests/AnalyticsServiceTests.cs
deleted file mode 100644
index 95ef6cb..0000000
--- a/MakerPrompt.Tests/AnalyticsServiceTests.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using Microsoft.Extensions.Logging.Abstractions;
-
-namespace MakerPrompt.Tests;
-
-public class AnalyticsServiceTests
-{
-    private static AnalyticsService Create() =>
-        new(new InMemoryStorageProvider(), NullLogger<AnalyticsService>.Instance);
-
-    private static PrintJobUsageRecord BuildRecord(
-        Guid? printerId = null,
-        Guid? spoolId = null,
-        double estimated = 0,
-        double actual = 0,
-        TimeSpan? duration = null) =>
-        new()
-        {
-            PrinterId = printerId ?? Guid.NewGuid(),
-            FilamentSpoolId = spoolId ?? Guid.NewGuid(),
-            JobName = "test-job",
-            EstimatedFilamentUsedGrams = estimated,
-            ActualFilamentUsedGrams = actual,
-            Duration = duration ?? TimeSpan.FromMinutes(30)
-        };
-
-    // ── Record / Read ──
-
-    [Fact]
-    public async Task RecordUsageAsync_AddsToInMemoryList()
-    {
-        var svc = Create();
-        await svc.RecordUsageAsync(BuildRecord());
-        Assert.Single(svc.GetRecords());
-    }
-
-    [Fact]
-    public async Task RecordUsageAsync_MultipleRecords_AllAppear()
-    {
-        var svc = Create();
-        await svc.RecordUsageAsync(BuildRecord());
-        await svc.RecordUsageAsync(BuildRecord());
-        await svc.RecordUsageAsync(BuildRecord());
-        Assert.Equal(3, svc.GetRecords().Count);
-    }
-
-    [Fact]
-    public async Task RecordUsageAsync_FiresAnalyticsUpdatedEvent()
-    {
-        var svc = Create();
-        bool fired = false;
-        svc.AnalyticsUpdated += (_, _) => fired = true;
-        await svc.RecordUsageAsync(BuildRecord());
-        Assert.True(fired);
-    }
-
-    // ── Aggregates ──
-
-    [Fact]
-    public async Task GetTotalPrintHours_SumsAllDurations()
-    {
-        var svc = Create();
-        await svc.RecordUsageAsync(BuildRecord(duration: TimeSpan.FromHours(1)));
-        await svc.RecordUsageAsync(BuildRecord(duration: TimeSpan.FromHours(2)));
-        Assert.Equal(TimeSpan.FromHours(3), svc.GetTotalPrintHours());
-    }
-
-    [Fact]
-    public async Task GetTotalFilamentConsumed_PrefersActualOverEstimated()
-    {
-        var svc = Create();
-        // actual > 0 → use actual (20g), not estimated (50g)
-        await svc.RecordUsageAsync(BuildRecord(estimated: 50, actual: 20));
-        // actual == 0 → fall back to estimated (30g)
-        await svc.RecordUsageAsync(BuildRecord(estimated: 30, actual: 0));
-        Assert.Equal(50.0, svc.GetTotalFilamentConsumed(), 2);
-    }
-
-    [Fact]
-    public async Task GetFilamentConsumedByPrinter_FiltersCorrectly()
-    {
-        var svc = Create();
-        var printerId = Guid.NewGuid();
-        await svc.RecordUsageAsync(BuildRecord(printerId: printerId, actual: 15));
-        await svc.RecordUsageAsync(BuildRecord(actual: 25));  // different printer
-        Assert.Equal(15.0, svc.GetFilamentConsumedByPrinter(printerId), 2);
-    }
-
-    [Fact]
-    public async Task GetFilamentConsumedBySpool_FiltersCorrectly()
-    {
-        var svc = Create();
-        var spoolId = Guid.NewGuid();
-        await svc.RecordUsageAsync(BuildRecord(spoolId: spoolId, actual: 10));
-        await svc.RecordUsageAsync(BuildRecord(actual: 40));  // different spool
-        Assert.Equal(10.0, svc.GetFilamentConsumedBySpool(spoolId), 2);
-    }
-
-    [Fact]
-    public void GetRecords_EmptyService_ReturnsEmpty()
-    {
-        var svc = Create();
-        Assert.Empty(svc.GetRecords());
-    }
-
-    [Fact]
-    public void GetTotalPrintHours_EmptyService_ReturnsZero()
-    {
-        var svc = Create();
-        Assert.Equal(TimeSpan.Zero, svc.GetTotalPrintHours());
-    }
-}
diff --git a/MakerPrompt.Tests/FilamentInventoryServiceTests.cs b/MakerPrompt.Tests/FilamentInventoryServiceTests.cs
deleted file mode 100644
index 7206cc6..0000000
--- a/MakerPrompt.Tests/FilamentInventoryServiceTests.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using Microsoft.Extensions.Logging.Abstractions;
-
-namespace MakerPrompt.Tests;
-
-public class FilamentInventoryServiceTests
-{
-    private static FilamentInventoryService Create() =>
-        new(new InMemoryStorageProvider(), NullLogger<FilamentInventoryService>.Instance);
-
-    private static FilamentSpool BuildSpool(string name = "PLA White", double remaining = 800) =>
-        new() { Name = name, Material = "PLA", TotalWeightGrams = 1000, RemainingWeightGrams = remaining };
-
-    // ── Add / Get ──
-
-    [Fact]
-    public async Task AddSpoolAsync_AppearsInGetSpools()
-    {
-        var svc = Create();
-        var spool = BuildSpool();
-        await svc.AddSpoolAsync(spool);
-        Assert.Single(svc.GetSpools());
-        Assert.Equal("PLA White", svc.GetSpools()[0].Name);
-    }
-
-    [Fact]
-    public async Task AddSpoolAsync_MultipleSpools_AllVisible()
-    {
-        var svc = Create();
-        await svc.AddSpoolAsync(BuildSpool("PLA Red"));
-        await svc.AddSpoolAsync(BuildSpool("PETG Black"));
-        Assert.Equal(2, svc.GetSpools().Count);
-    }
-
-    [Fact]
-    public async Task GetSpool_ExistingId_ReturnsCorrectSpool()
-    {
-        var svc = Create();
-        var spool = BuildSpool("ABS Blue");
-        await svc.AddSpoolAsync(spool);
-        var retrieved = svc.GetSpool(spool.Id);
-        Assert.NotNull(retrieved);
-        Assert.Equal("ABS Blue", retrieved.Name);
-    }
-
-    [Fact]
-    public async Task GetSpool_UnknownId_ReturnsNull()
-    {
-        var svc = Create();
-        Assert.Null(svc.GetSpool(Guid.NewGuid()));
-    }
-
-    // ── Update ──
-
-    [Fact]
-    public async Task UpdateSpoolAsync_ChangesFieldsInPlace()
-    {
-        var svc = Create();
-        var spool = BuildSpool("Old Name");
-        await svc.AddSpoolAsync(spool);
-
-        spool.Name = "New Name";
-        spool.RemainingWeightGrams = 500;
-        await svc.UpdateSpoolAsync(spool);
-
-        var updated = svc.GetSpool(spool.Id);
-        Assert.NotNull(updated);
-        Assert.Equal("New Name", updated.Name);
-        Assert.Equal(500, updated.RemainingWeightGrams);
-    }
-
-    // ── Delete ──
-
-    [Fact]
-    public async Task DeleteSpoolAsync_RemovesFromList()
-    {
-        var svc = Create();
-        var spool = BuildSpool();
-        await svc.AddSpoolAsync(spool);
-        await svc.DeleteSpoolAsync(spool.Id);
-        Assert.Empty(svc.GetSpools());
-    }
-
-    [Fact]
-    public async Task DeleteSpoolAsync_UnknownId_DoesNotThrow()
-    {
-        var svc = Create();
-        // Should be a no-op
-        await svc.DeleteSpoolAsync(Guid.NewGuid());
-    }
-
-    // ── Deduct ──
-
-    [Fact]
-    public async Task DeductFilamentAsync_ReducesRemainingWeight()
-    {
-        var svc = Create();
-        var spool = BuildSpool(remaining: 500);
-        await svc.AddSpoolAsync(spool);
-
-        await svc.DeductFilamentAsync(spool.Id, 100);
-
-        var updated = svc.GetSpool(spool.Id);
-        Assert.NotNull(updated);
-        Assert.Equal(400, updated.RemainingWeightGrams);
-    }
-
-    [Fact]
-    public async Task DeductFilamentAsync_MoreThanRemaining_ClampsAtZero()
-    {
-        var svc = Create();
-        var spool = BuildSpool(remaining: 50);
-        await svc.AddSpoolAsync(spool);
-
-        await svc.DeductFilamentAsync(spool.Id, 200);
-
-        var updated = svc.GetSpool(spool.Id);
-        Assert.NotNull(updated);
-        Assert.Equal(0, updated.RemainingWeightGrams);
-    }
-
-    // ── Events ──
-
-    [Fact]
-    public async Task AddSpoolAsync_FiresInventoryChangedEvent()
-    {
-        var svc = Create();
-        bool fired = false;
-        svc.InventoryChanged += (_, _) => fired = true;
-        await svc.AddSpoolAsync(BuildSpool());
-        Assert.True(fired);
-    }
-
-    [Fact]
-    public async Task DeleteSpoolAsync_FiresInventoryChangedEvent()
-    {
-        var svc = Create();
-        var spool = BuildSpool();
-        await svc.AddSpoolAsync(spool);
-        bool fired = false;
-        svc.InventoryChanged += (_, _) => fired = true;
-        await svc.DeleteSpoolAsync(spool.Id);
-        Assert.True(fired);
-    }
-}
diff --git a/MakerPrompt.Tests/Helpers/InMemoryStorageProvider.cs b/MakerPrompt.Tests/Helpers/InMemoryStorageProvider.cs
deleted file mode 100644
index 67d9d8b..0000000
--- a/MakerPrompt.Tests/Helpers/InMemoryStorageProvider.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
-
-namespace MakerPrompt.Tests;
-
-/// <summary>
-/// In-memory implementation of IAppLocalStorageProvider used by unit tests.
-/// </summary>
-internal sealed class InMemoryStorageProvider : IAppLocalStorageProvider
-{
-    private readonly Dictionary<string, byte[]> _files = new(StringComparer.OrdinalIgnoreCase);
-
-    public string DisplayName => "Test";
-    public string Key => "test";
-    public string RootPath => "/test/";
-
-    public Task<List<FileEntry>> ListFilesAsync(CancellationToken cancellationToken = default)
-    {
-        var entries = _files.Select(kv => new FileEntry
-        {
-            FullPath = kv.Key,
-            Size = kv.Value.Length,
-            IsAvailable = true
-        }).ToList();
-        return Task.FromResult(entries);
-    }
-
-    public Task<Stream?> OpenReadAsync(string fullPath, CancellationToken cancellationToken = default)
-    {
-        if (_files.TryGetValue(fullPath, out var bytes))
-            return Task.FromResult<Stream?>(new MemoryStream(bytes));
-        return Task.FromResult<Stream?>(null);
-    }
-
-    public async Task SaveFileAsync(string fullPath, Stream content, CancellationToken cancellationToken = default)
-    {
-        using var ms = new MemoryStream();
-        await content.CopyToAsync(ms, cancellationToken);
-        _files[fullPath] = ms.ToArray();
-    }
-
-    public Task DeleteFileAsync(string fullPath, CancellationToken cancellationToken = default)
-    {
-        _files.Remove(fullPath);
-        return Task.CompletedTask;
-    }
-
-    public string GetString(string path)
-        => _files.TryGetValue(path, out var b) ? System.Text.Encoding.UTF8.GetString(b) : string.Empty;
-}
diff --git a/MakerPrompt.Tests/PrintProjectServiceTests.cs b/MakerPrompt.Tests/PrintProjectServiceTests.cs
deleted file mode 100644
index 79be0b4..0000000
--- a/MakerPrompt.Tests/PrintProjectServiceTests.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using Microsoft.Extensions.Logging.Abstractions;
-
-namespace MakerPrompt.Tests;
-
-public class PrintProjectServiceTests
-{
-    private static PrintProjectService Create() =>
-        new(new InMemoryStorageProvider(), NullLogger<PrintProjectService>.Instance);
-
-    private static Stream TextStream(string text) =>
-        new MemoryStream(System.Text.Encoding.UTF8.GetBytes(text));
-
-    // ── Project CRUD ──
-
-    [Fact]
-    public async Task AddProjectAsync_AppearsInProjects()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("My Project");
-        Assert.Single(svc.Projects);
-        Assert.Equal("My Project", svc.Projects[0].Name);
-    }
-
-    [Fact]
-    public async Task AddProjectAsync_TrimsName()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("  Trimmed  ");
-        Assert.Equal("Trimmed", svc.Projects[0].Name);
-    }
-
-    [Fact]
-    public async Task RenameProjectAsync_UpdatesName()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("Original");
-        var id = svc.Projects[0].Id;
-
-        await svc.RenameProjectAsync(id, "Renamed");
-        Assert.Equal("Renamed", svc.Projects[0].Name);
-    }
-
-    [Fact]
-    public async Task RenameProjectAsync_UnknownId_IsNoOp()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.RenameProjectAsync(Guid.NewGuid(), "Should not throw");
-        Assert.Empty(svc.Projects);
-    }
-
-    [Fact]
-    public async Task DeleteProjectAsync_RemovesFromList()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("To Delete");
-        var id = svc.Projects[0].Id;
-
-        await svc.DeleteProjectAsync(id);
-        Assert.Empty(svc.Projects);
-    }
-
-    [Fact]
-    public async Task ProjectsChanged_FiredOnAdd()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        bool fired = false;
-        svc.ProjectsChanged += (_, _) => fired = true;
-        await svc.AddProjectAsync("Test");
-        Assert.True(fired);
-    }
-
-    // ── Job management ──
-
-    [Fact]
-    public async Task AddJobAsync_AppearsInProjectJobs()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("Project");
-        var projectId = svc.Projects[0].Id;
-
-        await svc.AddJobAsync(projectId, "benchy.gcode", TextStream("G28\nM104 S200"));
-
-        Assert.Single(svc.Projects[0].Jobs);
-        Assert.Equal("benchy.gcode", svc.Projects[0].Jobs[0].FileName);
-    }
-
-    [Fact]
-    public async Task AddJobAsync_UnknownProject_ThrowsInvalidOperation()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await Assert.ThrowsAsync<InvalidOperationException>(
-            () => svc.AddJobAsync(Guid.NewGuid(), "test.gcode", TextStream("G28")));
-    }
-
-    [Fact]
-    public async Task RemoveJobAsync_RemovesJobFromProject()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("Project");
-        var projectId = svc.Projects[0].Id;
-        await svc.AddJobAsync(projectId, "test.gcode", TextStream("G28"));
-        var jobId = svc.Projects[0].Jobs[0].Id;
-
-        await svc.RemoveJobAsync(projectId, jobId);
-        Assert.Empty(svc.Projects[0].Jobs);
-    }
-
-    [Fact]
-    public async Task AssignJobAsync_SetsPrinterAndPrintingStatus()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("Project");
-        var projectId = svc.Projects[0].Id;
-        await svc.AddJobAsync(projectId, "test.gcode", TextStream("G28"));
-        var job = svc.Projects[0].Jobs[0];
-        var printerId = Guid.NewGuid();
-
-        await svc.AssignJobAsync(projectId, job.Id, printerId, "Prusa MK4");
-
-        var assigned = svc.Projects[0].Jobs[0];
-        Assert.Equal(printerId, assigned.AssignedPrinterId);
-        Assert.Equal("Prusa MK4", assigned.AssignedPrinterName);
-        Assert.Equal(PrintJobStatus.Printing, assigned.Status);
-    }
-
-    [Fact]
-    public async Task UpdateJobStatusAsync_ChangesStatus()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("Project");
-        var projectId = svc.Projects[0].Id;
-        await svc.AddJobAsync(projectId, "test.gcode", TextStream("G28"));
-        var jobId = svc.Projects[0].Jobs[0].Id;
-
-        await svc.UpdateJobStatusAsync(projectId, jobId, PrintJobStatus.Completed);
-        Assert.Equal(PrintJobStatus.Completed, svc.Projects[0].Jobs[0].Status);
-    }
-
-    [Fact]
-    public async Task OpenJobFileAsync_ReturnsStoredContent()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        await svc.AddProjectAsync("Project");
-        var projectId = svc.Projects[0].Id;
-        const string gcode = "G28\nM104 S200\nM109 S200";
-        await svc.AddJobAsync(projectId, "test.gcode", TextStream(gcode));
-        var jobId = svc.Projects[0].Jobs[0].Id;
-
-        await using var stream = await svc.OpenJobFileAsync(projectId, jobId);
-        Assert.NotNull(stream);
-        using var reader = new StreamReader(stream);
-        var content = await reader.ReadToEndAsync();
-        Assert.Equal(gcode, content);
-    }
-
-    [Fact]
-    public async Task OpenJobFileAsync_UnknownJob_ReturnsNull()
-    {
-        var svc = Create();
-        await svc.InitializeAsync();
-        var result = await svc.OpenJobFileAsync(Guid.NewGuid(), Guid.NewGuid());
-        Assert.Null(result);
-    }
-}
diff --git a/MakerPrompt.Tests/ThemeServiceTests.cs b/MakerPrompt.Tests/ThemeServiceTests.cs
deleted file mode 100644
index 9bc591f..0000000
--- a/MakerPrompt.Tests/ThemeServiceTests.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using Microsoft.JSInterop;
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using MakerPrompt.Shared.Utils;
-using static MakerPrompt.Shared.Utils.Enums;
-
-namespace MakerPrompt.Tests;
-
-public class ThemeServiceTests
-{
-    // ── Disposal ──────────────────────────────────────────────────────────────
-
-    [Fact]
-    public async Task DisposeAsync_DoesNotThrow_WhenJSModuleThrowsJSException()
-    {
-        // Reproduces: switching language triggers page reload which disposes
-        // ThemeService while the JS side is already gone.
-        var module = new FakeJSModule(throwsOnDispose: true);
-        var service = BuildService(module);
-        await service.InitializeAsync();
-
-        var ex = await Record.ExceptionAsync(() => service.DisposeAsync().AsTask());
-
-        Assert.Null(ex);
-    }
-
-    [Fact]
-    public async Task DisposeAsync_DoesNotThrow_WhenModuleNotYetInitialized()
-    {
-        var service = BuildService(new FakeJSModule());
-        // InitializeAsync NOT called — _moduleTask.IsValueCreated == false
-
-        var ex = await Record.ExceptionAsync(() => service.DisposeAsync().AsTask());
-
-        Assert.Null(ex);
-    }
-
-    [Fact]
-    public async Task DisposeAsync_DoesNotThrow_OnSecondCall()
-    {
-        var service = BuildService(new FakeJSModule());
-        await service.InitializeAsync();
-        await service.DisposeAsync();
-
-        var ex = await Record.ExceptionAsync(() => service.DisposeAsync().AsTask());
-
-        Assert.Null(ex);
-    }
-
-    // ── Theme state ───────────────────────────────────────────────────────────
-
-    [Fact]
-    public async Task InitializeAsync_SetsCurrentThemeFromConfig()
-    {
-        var config = new FakeConfigService { InitialTheme = Theme.Dark };
-        var service = new ThemeService(new FakeJSRuntime(new FakeJSModule()), config);
-
-        await service.InitializeAsync();
-
-        Assert.Equal(Theme.Dark, service.CurrentTheme);
-    }
-
-    [Fact]
-    public async Task SetThemeAsync_UpdatesCurrentTheme()
-    {
-        var service = BuildService(new FakeJSModule());
-        await service.InitializeAsync();
-
-        await service.SetThemeAsync(Theme.Dark);
-
-        Assert.Equal(Theme.Dark, service.CurrentTheme);
-    }
-
-    [Fact]
-    public async Task SetThemeAsync_RaisesOnThemeChanged()
-    {
-        var service = BuildService(new FakeJSModule());
-        await service.InitializeAsync();
-        var raised = false;
-        service.OnThemeChanged += () => raised = true;
-
-        await service.SetThemeAsync(Theme.Light);
-
-        Assert.True(raised);
-    }
-
-    // ── System theme change ───────────────────────────────────────────────────
-
-    [Fact]
-    public async Task HandleSystemThemeChange_RaisesOnThemeChanged_WhenModeIsAuto()
-    {
-        var service = BuildService(new FakeJSModule());
-        await service.InitializeAsync();
-        await service.SetThemeAsync(Theme.Auto);
-        var raised = false;
-        service.OnThemeChanged += () => raised = true;
-
-        await service.HandleSystemThemeChange(isDark: true);
-
-        Assert.True(raised);
-    }
-
-    [Fact]
-    public async Task HandleSystemThemeChange_DoesNotRaiseOnThemeChanged_WhenModeIsNotAuto()
-    {
-        var service = BuildService(new FakeJSModule());
-        await service.InitializeAsync();
-        await service.SetThemeAsync(Theme.Dark);
-        var raised = false;
-        service.OnThemeChanged += () => raised = true;
-
-        await service.HandleSystemThemeChange(isDark: true);
-
-        Assert.False(raised);
-    }
-
-    // ── Helpers ───────────────────────────────────────────────────────────────
-
-    private static ThemeService BuildService(FakeJSModule module)
-        => new(new FakeJSRuntime(module), new FakeConfigService());
-
-    private sealed class FakeJSModule : IJSObjectReference
-    {
-        private readonly bool _throwsOnDispose;
-
-        public FakeJSModule(bool throwsOnDispose = false) => _throwsOnDispose = throwsOnDispose;
-
-        public ValueTask<TValue> InvokeAsync<TValue>(string identifier, object?[]? args)
-        {
-            if (_throwsOnDispose && identifier == "dispose")
-                return ValueTask.FromException<TValue>(
-                    new JSException("JS object instance with ID 1 does not exist (has it been disposed?)."));
-
-            if (typeof(TValue) == typeof(bool))
-                return ValueTask.FromResult((TValue)(object)false);
-
-            return ValueTask.FromResult(default(TValue)!);
-        }
-
-        public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object?[]? args)
-            => InvokeAsync<TValue>(identifier, args);
-
-        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
-    }
-
-    private sealed class FakeJSRuntime : IJSRuntime
-    {
-        private readonly FakeJSModule _module;
-
-        public FakeJSRuntime(FakeJSModule module) => _module = module;
-
-        public ValueTask<TValue> InvokeAsync<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(
-            System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors |
-            System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicFields |
-            System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(
-            string identifier, object?[]? args)
-            => ValueTask.FromResult((TValue)(object)_module);
-
-        public ValueTask<TValue> InvokeAsync<[System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(
-            System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicConstructors |
-            System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicFields |
-            System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.PublicProperties)] TValue>(
-            string identifier, CancellationToken cancellationToken, object?[]? args)
-            => InvokeAsync<TValue>(identifier, args);
-    }
-
-    private sealed class FakeConfigService : IAppConfigurationService
-    {
-        public Theme InitialTheme { get; init; } = Theme.Auto;
-        public AppConfiguration Configuration => _config ??= new AppConfiguration { Theme = InitialTheme };
-        private AppConfiguration? _config;
-
-        public Task InitializeAsync() => Task.CompletedTask;
-        public Task SaveConfigurationAsync() => Task.CompletedTask;
-        public Task ResetToDefaultsAsync() => Task.CompletedTask;
-    }
-}
diff --git a/MakerPrompt.sln b/MakerPrompt.sln
index 210fac7..9b19c6d 100644
--- a/MakerPrompt.sln
+++ b/MakerPrompt.sln
@@ -1,14 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.13.35913.81
+# Visual Studio Version 18
+VisualStudioVersion = 18.6.11822.322
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Shared", "MakerPrompt.Shared\MakerPrompt.Shared.csproj", "{1659CECC-713A-4F76-B7F3-4D74C0603E97}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Blazor", "MakerPrompt.Blazor\MakerPrompt.Blazor.csproj", "{15F52CFF-63A3-427D-8795-95370626C764}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.MAUI", "MakerPrompt.MAUI\MakerPrompt.MAUI.csproj", "{67704D6B-0609-472D-A78A-473B780D4D1A}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\azure-static-web-apps-yellow-sea-04668c503.yml = .github\workflows\azure-static-web-apps-yellow-sea-04668c503.yml
@@ -25,11 +19,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gh-pages", "gh-pages", "{02
 		.github\workflows\gh-pages\index.html = .github\workflows\gh-pages\index.html
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Tests", "MakerPrompt.Tests\MakerPrompt.Tests.csproj", "{7BD83CCA-F9F2-4B00-B373-209946049150}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B4F2D4E1-0000-0000-0000-000000000001}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Infrastructure", "src\MakerPrompt.Infrastructure\MakerPrompt.Infrastructure.csproj", "{B4F2D4E1-0003-0000-0000-000000000001}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.UI.Components", "src\MakerPrompt.UI.Components\MakerPrompt.UI.Components.csproj", "{B4F2D4E1-0007-0000-0000-000000000001}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.UI.MAUI", "src\MakerPrompt.UI.MAUI\MakerPrompt.UI.MAUI.csproj", "{B4F2D4E1-0009-0000-0000-000000000001}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Core", "src\MakerPrompt.Core\MakerPrompt.Core.csproj", "{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A3D968B3-E563-4E96-9E66-9273E6D29024}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Tests.Unit", "tests\MakerPrompt.Tests.Unit\MakerPrompt.Tests.Unit.csproj", "{E8B1509E-7390-FDF0-EEA5-664EE640E08C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Tests.E2E.Wasm", "tests\MakerPrompt.Tests.E2E.Wasm\MakerPrompt.Tests.E2E.Wasm.csproj", "{42B6100C-D9D6-C74B-8220-3255CAF41D09}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Test.E2E.Maui", "tests\MakerPrompt.Tests.E2E.Maui\MakerPrompt.Test.E2E.Maui.csproj", "{50C312A0-A718-950E-425B-B6EACF134401}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Cloud", "src\MakerPrompt.Cloud\MakerPrompt.Cloud.csproj", "{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.EdgeAgent", "src\MakerPrompt.EdgeAgent\MakerPrompt.EdgeAgent.csproj", "{7E522ABD-C347-97F1-AD17-2B2177D780B8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.E2E.Wasm", "MakerPrompt.E2E.Wasm\MakerPrompt.E2E.Wasm.csproj", "{73B2A329-BE69-4E67-912B-0CB2E65088E2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.UI.Blazor", "src\MakerPrompt.UI.Blazor\MakerPrompt.UI.Blazor.csproj", "{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.E2E.Maui", "MakerPrompt.E2E.Maui\MakerPrompt.E2E.Maui.csproj", "{A03CF971-E571-4E00-849E-48675DAB24D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakerPrompt.Infrastructure.Sqlite", "src\MakerPrompt.Infrastructure.Sqlite\MakerPrompt.Infrastructure.Sqlite.csproj", "{18375969-1461-7C9D-5F1E-D078436D3114}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,85 +55,156 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Debug|x64.Build.0 = Debug|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Debug|x86.Build.0 = Debug|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Release|x64.ActiveCfg = Release|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Release|x64.Build.0 = Release|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Release|x86.ActiveCfg = Release|Any CPU
-		{1659CECC-713A-4F76-B7F3-4D74C0603E97}.Release|x86.Build.0 = Release|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Debug|x64.Build.0 = Debug|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Debug|x86.Build.0 = Debug|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Release|x64.ActiveCfg = Release|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Release|x64.Build.0 = Release|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Release|x86.ActiveCfg = Release|Any CPU
-		{15F52CFF-63A3-427D-8795-95370626C764}.Release|x86.Build.0 = Release|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Debug|x64.Build.0 = Debug|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Debug|x86.Build.0 = Debug|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Release|x64.ActiveCfg = Release|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Release|x64.Build.0 = Release|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Release|x86.ActiveCfg = Release|Any CPU
-		{67704D6B-0609-472D-A78A-473B780D4D1A}.Release|x86.Build.0 = Release|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Debug|x64.Build.0 = Debug|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Debug|x86.Build.0 = Debug|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Release|x64.ActiveCfg = Release|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Release|x64.Build.0 = Release|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Release|x86.ActiveCfg = Release|Any CPU
-		{7BD83CCA-F9F2-4B00-B373-209946049150}.Release|x86.Build.0 = Release|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Debug|x64.Build.0 = Debug|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Debug|x86.Build.0 = Debug|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Release|x64.ActiveCfg = Release|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Release|x64.Build.0 = Release|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{73B2A329-BE69-4E67-912B-0CB2E65088E2}.Release|x86.Build.0 = Release|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Debug|x64.Build.0 = Debug|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Debug|x86.Build.0 = Debug|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Release|x64.ActiveCfg = Release|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Release|x64.Build.0 = Release|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Release|x86.ActiveCfg = Release|Any CPU
-		{A03CF971-E571-4E00-849E-48675DAB24D7}.Release|x86.Build.0 = Release|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Release|x64.Build.0 = Release|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0003-0000-0000-000000000001}.Release|x86.Build.0 = Release|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Release|x64.Build.0 = Release|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0007-0000-0000-000000000001}.Release|x86.Build.0 = Release|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Release|x64.Build.0 = Release|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4F2D4E1-0009-0000-0000-000000000001}.Release|x86.Build.0 = Release|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Debug|x86.Build.0 = Debug|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Release|x64.Build.0 = Release|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6}.Release|x86.Build.0 = Release|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Debug|x64.Build.0 = Debug|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Debug|x86.Build.0 = Debug|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Release|x64.ActiveCfg = Release|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Release|x64.Build.0 = Release|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Release|x86.ActiveCfg = Release|Any CPU
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C}.Release|x86.Build.0 = Release|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Debug|x64.Build.0 = Debug|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Debug|x86.Build.0 = Debug|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Release|x64.ActiveCfg = Release|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Release|x64.Build.0 = Release|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Release|x86.ActiveCfg = Release|Any CPU
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09}.Release|x86.Build.0 = Release|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Debug|x64.Build.0 = Debug|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Debug|x86.Build.0 = Debug|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Release|x64.ActiveCfg = Release|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Release|x64.Build.0 = Release|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Release|x86.ActiveCfg = Release|Any CPU
+		{50C312A0-A718-950E-425B-B6EACF134401}.Release|x86.Build.0 = Release|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Debug|x64.Build.0 = Debug|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Debug|x86.Build.0 = Debug|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Release|x64.ActiveCfg = Release|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Release|x64.Build.0 = Release|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C}.Release|x86.Build.0 = Release|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Debug|x86.Build.0 = Debug|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Release|x64.Build.0 = Release|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8}.Release|x86.Build.0 = Release|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Debug|x64.Build.0 = Debug|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Debug|x86.Build.0 = Debug|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Release|x64.ActiveCfg = Release|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Release|x64.Build.0 = Release|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D}.Release|x86.Build.0 = Release|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Debug|x64.Build.0 = Debug|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Debug|x86.Build.0 = Debug|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Release|x64.ActiveCfg = Release|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Release|x64.Build.0 = Release|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Release|x86.ActiveCfg = Release|Any CPU
+		{18375969-1461-7C9D-5F1E-D078436D3114}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}
+		{B4F2D4E1-0003-0000-0000-000000000001} = {B4F2D4E1-0000-0000-0000-000000000001}
+		{B4F2D4E1-0007-0000-0000-000000000001} = {B4F2D4E1-0000-0000-0000-000000000001}
+		{B4F2D4E1-0009-0000-0000-000000000001} = {B4F2D4E1-0000-0000-0000-000000000001}
+		{F5AE4DDA-B749-DB0A-C32C-3982C67CCFA6} = {B4F2D4E1-0000-0000-0000-000000000001}
+		{E8B1509E-7390-FDF0-EEA5-664EE640E08C} = {A3D968B3-E563-4E96-9E66-9273E6D29024}
+		{42B6100C-D9D6-C74B-8220-3255CAF41D09} = {A3D968B3-E563-4E96-9E66-9273E6D29024}
+		{50C312A0-A718-950E-425B-B6EACF134401} = {A3D968B3-E563-4E96-9E66-9273E6D29024}
+		{EC3F1A30-FCDB-4C9A-3925-4CAF6819DE6C} = {B4F2D4E1-0000-0000-0000-000000000001}
+		{7E522ABD-C347-97F1-AD17-2B2177D780B8} = {B4F2D4E1-0000-0000-0000-000000000001}
+		{2BC29A9D-C78C-FAC4-90DF-482450FFD80D} = {B4F2D4E1-0000-0000-0000-000000000001}
+		{18375969-1461-7C9D-5F1E-D078436D3114} = {B4F2D4E1-0000-0000-0000-000000000001}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {545A45A2-4075-429A-AC75-ABFBE72CC15A}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..d70d66a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,68 @@
+version: "3.9"
+
+# MakerPrompt local development stack.
+#
+# Usage:
+#   docker compose up           # start everything
+#   docker compose up cloud     # start only the Cloud API + UI
+#   docker compose up edge      # start only the EdgeAgent
+#
+# To rebuild after code changes:
+#   docker compose build && docker compose up
+#
+# To configure a real printer edit the edge-agent section of this file
+# or supply an appsettings.Production.json volume mount.
+
+services:
+
+  # ── Cloud API + Blazor WASM UI ───────────────────────────────────────────────
+  cloud:
+    build:
+      context: .
+      dockerfile: src/MakerPrompt.Cloud/Dockerfile.dev
+    image: makerprompt/cloud:dev
+    container_name: makerprompt-cloud
+    restart: unless-stopped
+    ports:
+      - "8080:8080"
+    environment:
+      ASPNETCORE_ENVIRONMENT: Development
+      ASPNETCORE_URLS: "http://+:8080"
+      # Override in .env or compose.override.yml for production:
+      # MakerPrompt__Auth__Authority: https://your-oidc-provider/
+      # MakerPrompt__Auth__Audience:  https://api.makerprompt.io
+      # CloudApi__AgentApiKeyHash:    <sha256-hex of your pre-shared key>
+    networks:
+      - makerprompt
+
+  # ── EdgeAgent (local x64 dev mode) ──────────────────────────────────────────
+  # For ARM64 / Jetson Nano use:
+  #   dockerfile: src/MakerPrompt.EdgeAgent/Dockerfile
+  edge:
+    build:
+      context: .
+      dockerfile: src/MakerPrompt.EdgeAgent/Dockerfile.dev
+    image: makerprompt/edge-agent:dev
+    container_name: makerprompt-edge
+    restart: unless-stopped
+    depends_on:
+      - cloud
+    environment:
+      ASPNETCORE_ENVIRONMENT: Development
+      # Point to the cloud container by service name.
+      CloudApi__BaseUrl: "http://cloud:8080"
+      # Set CloudApi__ApiToken to the plain-text key whose SHA-256 hash is in
+      # CloudApi__AgentApiKeyHash on the cloud service.
+      CloudApi__ApiToken: ""
+      # Configure printers via environment overrides or a volume-mounted
+      # appsettings.Production.json (recommended for real deployments).
+      # Example single-printer override:
+      # EdgeAgent__Printers__0__PrinterId: "printer-1"
+      # EdgeAgent__Printers__0__Protocol:  "Moonraker"
+      # EdgeAgent__Printers__0__ApiUrl:    "http://192.168.1.100"
+    networks:
+      - makerprompt
+
+networks:
+  makerprompt:
+    driver: bridge
diff --git a/src/MakerPrompt.Cloud/Dockerfile b/src/MakerPrompt.Cloud/Dockerfile
new file mode 100644
index 0000000..c212e3a
--- /dev/null
+++ b/src/MakerPrompt.Cloud/Dockerfile
@@ -0,0 +1,36 @@
+# Cloud — Production (x64)
+# Build: docker build -f Dockerfile -t makerprompt/cloud:latest .
+# (Run from repo root)
+
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+WORKDIR /src
+
+# Restore layer — only copy project files first to cache packages.
+COPY MakerPrompt.sln .
+COPY src/MakerPrompt.Core/MakerPrompt.Core.csproj                           src/MakerPrompt.Core/
+COPY src/MakerPrompt.Infrastructure/MakerPrompt.Infrastructure.csproj       src/MakerPrompt.Infrastructure/
+COPY src/MakerPrompt.UI.Components/MakerPrompt.UI.Components.csproj         src/MakerPrompt.UI.Components/
+COPY src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj                 src/MakerPrompt.UI.Blazor/
+COPY src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj                         src/MakerPrompt.Cloud/
+RUN dotnet restore src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj
+
+# Publish (includes Blazor WASM bundle via project reference).
+COPY src/ src/
+RUN dotnet publish src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj \
+    -c Release \
+    -r linux-x64 \
+    --self-contained false \
+    -o /app/publish
+
+# ── Runtime image ─────────────────────────────────────────────────────────────
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS runtime
+WORKDIR /app
+
+RUN adduser --disabled-password --gecos "" appuser && chown appuser /app
+USER appuser
+
+COPY --from=build /app/publish .
+
+EXPOSE 8080
+ENV ASPNETCORE_URLS=http://+:8080
+ENTRYPOINT ["dotnet", "MakerPrompt.Cloud.dll"]
diff --git a/src/MakerPrompt.Cloud/Dockerfile.dev b/src/MakerPrompt.Cloud/Dockerfile.dev
new file mode 100644
index 0000000..4b07070
--- /dev/null
+++ b/src/MakerPrompt.Cloud/Dockerfile.dev
@@ -0,0 +1,30 @@
+# Cloud — Local dev (x64, hot-reload friendly)
+# Build: docker build -f Dockerfile.dev -t makerprompt/cloud:dev .
+# (Run from repo root)
+
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+WORKDIR /src
+
+COPY MakerPrompt.sln .
+COPY src/MakerPrompt.Core/MakerPrompt.Core.csproj                           src/MakerPrompt.Core/
+COPY src/MakerPrompt.Infrastructure/MakerPrompt.Infrastructure.csproj       src/MakerPrompt.Infrastructure/
+COPY src/MakerPrompt.UI.Components/MakerPrompt.UI.Components.csproj         src/MakerPrompt.UI.Components/
+COPY src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj                 src/MakerPrompt.UI.Blazor/
+COPY src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj                         src/MakerPrompt.Cloud/
+RUN dotnet restore src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj
+
+COPY src/ src/
+RUN dotnet publish src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj \
+    -c Debug \
+    -r linux-x64 \
+    --self-contained false \
+    -o /app/publish
+
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS runtime
+WORKDIR /app
+COPY --from=build /app/publish .
+
+EXPOSE 8080
+ENV ASPNETCORE_URLS=http://+:8080
+ENV ASPNETCORE_ENVIRONMENT=Development
+ENTRYPOINT ["dotnet", "MakerPrompt.Cloud.dll"]
diff --git a/src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj b/src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj
new file mode 100644
index 0000000..de88751
--- /dev/null
+++ b/src/MakerPrompt.Cloud/MakerPrompt.Cloud.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MakerPrompt.Core\MakerPrompt.Core.csproj" />
+    <ProjectReference Include="..\MakerPrompt.Infrastructure\MakerPrompt.Infrastructure.csproj" />
+    <!--
+      Include the Blazor WASM app as a static asset bundle without adding a code dependency.
+      The WASM output lands in wwwroot/  and is served as static files by the Cloud host.
+    -->
+    <ProjectReference Include="..\MakerPrompt.UI.Blazor\MakerPrompt.UI.Blazor.csproj" ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/MakerPrompt.Cloud/Program.cs b/src/MakerPrompt.Cloud/Program.cs
new file mode 100644
index 0000000..215bd45
--- /dev/null
+++ b/src/MakerPrompt.Cloud/Program.cs
@@ -0,0 +1,279 @@
+using System.Security.Cryptography;
+using System.Text;
+using MakerPrompt.Core.Abstractions;
+using MakerPrompt.Core.Models;
+using MakerPrompt.Infrastructure.InMemoryStores;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Microsoft.IdentityModel.Tokens;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// ── Constants ─────────────────────────────────────────────────────────────────
+
+const int JwtClockSkewMinutes = 5;
+
+// ── Authentication — JWT Bearer / OIDC ───────────────────────────────────────
+//
+// The Cloud API validates JWTs issued by any OIDC-compliant provider
+// (Azure AD, Auth0, Keycloak, etc.).  Configure the authority and audience
+// via environment variables or appsettings.json:
+//
+//   MakerPrompt:Auth:Authority   – OIDC issuer URL  (e.g. https://tenant.auth0.com/)
+//   MakerPrompt:Auth:Audience    – API identifier   (e.g. https://api.makerprompt.io)
+//   MakerPrompt:Auth:RequireHttpsMetadata – true in production, false in local dev
+//
+// Edge Agents send a machine-to-machine token; member clients send user tokens.
+
+var authSection = builder.Configuration.GetSection("MakerPrompt:Auth");
+var authority = authSection["Authority"];
+var audience = authSection["Audience"];
+var requireHttps = authSection.GetValue("RequireHttpsMetadata", true);
+
+builder.Services
+    .AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+    .AddJwtBearer(options =>
+    {
+        // If no Authority is configured, we run in open/dev mode.
+        if (!string.IsNullOrWhiteSpace(authority))
+        {
+            options.Authority = authority;
+            options.Audience = audience;
+            options.RequireHttpsMetadata = requireHttps;
+
+            options.TokenValidationParameters = new TokenValidationParameters
+            {
+                ValidateIssuer = true,
+                ValidateAudience = !string.IsNullOrWhiteSpace(audience),
+                ValidateLifetime = true,
+                ClockSkew = TimeSpan.FromMinutes(JwtClockSkewMinutes),
+            };
+        }
+        else
+        {
+            // Development fallback: accept any well-formed token but skip signature.
+            options.TokenValidationParameters = new TokenValidationParameters
+            {
+                ValidateIssuerSigningKey = false,
+                ValidateIssuer = false,
+                ValidateAudience = false,
+                ValidateLifetime = false,
+                SignatureValidator = (token, _) =>
+                {
+                    // Only allow the bypass in Development.
+                    if (!builder.Environment.IsDevelopment())
+                        throw new SecurityTokenValidationException(
+                            "Auth:Authority must be configured in non-Development environments.");
+
+                    return new System.IdentityModel.Tokens.Jwt.JwtSecurityToken(token);
+                }
+            };
+        }
+
+        // Swallow token validation exceptions — return 401 instead of 500.
+        options.Events = new JwtBearerEvents
+        {
+            OnAuthenticationFailed = ctx =>
+            {
+                ctx.Response.Headers.Append("WWW-Authenticate",
+                    $"Bearer error=\"invalid_token\", " +
+                    $"error_description=\"{Uri.EscapeDataString(ctx.Exception.Message)}\"");
+                return Task.CompletedTask;
+            }
+        };
+    });
+
+builder.Services.AddAuthorization(options =>
+{
+    // Default policy: require any authenticated user / machine.
+    options.DefaultPolicy = new AuthorizationPolicyBuilder()
+        .RequireAuthenticatedUser()
+        .Build();
+
+    // "EdgeAgent" policy: must have the edge-agent scope claim.
+    options.AddPolicy("EdgeAgent", policy =>
+        policy.RequireAuthenticatedUser()
+              .RequireClaim("scope", "makerprompt:ingest"));
+
+    // "Member" read policy: authenticated users may read telemetry.
+    options.AddPolicy("MemberRead", policy =>
+        policy.RequireAuthenticatedUser());
+});
+
+// ── Services ─────────────────────────────────────────────────────────────────
+
+// Local in-memory telemetry store (swap for SqliteTelemetryStore / InfluxDbTelemetryStore in production).
+builder.Services.AddSingleton<ITelemetryStore, InMemoryTelemetryStore>();
+
+// In-memory camera snapshot store (swap for SqliteCameraSnapshotStore in production).
+builder.Services.AddSingleton<ICameraSnapshotStore, InMemoryCameraSnapshotStore>();
+
+// Health checks — available at /health (no auth required).
+builder.Services.AddHealthChecks();
+
+// API Explorer for potential future Swagger integration.
+builder.Services.AddEndpointsApiExplorer();
+
+var app = builder.Build();
+
+// ── Middleware ────────────────────────────────────────────────────────────────
+
+app.UseHttpsRedirection();
+
+// ── Blazor WASM static files ──────────────────────────────────────────────────
+// Serve the Blazor WASM app from wwwroot/ (published by UI.Blazor project reference).
+app.UseBlazorFrameworkFiles();
+app.UseStaticFiles();
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+// ── Endpoints ─────────────────────────────────────────────────────────────────
+
+// Health check — public, no auth required.
+app.MapHealthChecks("/health", new HealthCheckOptions
+{
+    ResponseWriter = async (ctx, report) =>
+    {
+        ctx.Response.ContentType = "application/json";
+        await ctx.Response.WriteAsJsonAsync(new
+        {
+            status = report.Status.ToString().ToLowerInvariant(),
+            utc = DateTimeOffset.UtcNow,
+        });
+    }
+}).AllowAnonymous();
+
+// Ingest telemetry from an EdgeAgent.
+// Accepts either a JWT with the "makerprompt:ingest" scope OR a pre-shared
+// SHA-256 API key configured in CloudApi:AgentApiKeyHash.
+app.MapPost("/api/telemetry/{printerId}", async (
+    string printerId,
+    [FromBody] PrinterTelemetry telemetry,
+    HttpContext httpContext,
+    ITelemetryStore store,
+    IConfiguration config,
+    CancellationToken ct) =>
+{
+    // ── SHA-256 API key auth (alternative to JWT) ─────────────────────────
+    var keyHash = config["CloudApi:AgentApiKeyHash"];
+    if (!string.IsNullOrWhiteSpace(keyHash))
+    {
+        var authHeader = httpContext.Request.Headers.Authorization.FirstOrDefault();
+        var token = authHeader?.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase) is true
+            ? authHeader[7..]
+            : null;
+
+        if (token is null)
+            return Results.Unauthorized();
+
+        var actualHash = Convert.ToHexString(
+            SHA256.HashData(Encoding.UTF8.GetBytes(token))).ToLowerInvariant();
+
+        if (!actualHash.Equals(keyHash.ToLowerInvariant(), StringComparison.Ordinal))
+            return Results.Unauthorized();
+    }
+
+    // ── Staleness guard ────────────────────────────────────────────────────
+    // If the snapshot is older than 30 s, treat the printer as disconnected.
+    const int StaleThresholdSeconds = 30;
+    if ((DateTime.UtcNow - telemetry.CapturedAt).TotalSeconds > StaleThresholdSeconds)
+        telemetry.Status = PrinterStatus.Disconnected;
+
+    await store.SaveAsync(printerId, telemetry, ct);
+    return Results.Accepted();
+})
+.WithName("IngestTelemetry")
+.WithTags("Telemetry")
+.RequireAuthorization("EdgeAgent");
+
+// Retrieve the latest telemetry for a printer.
+// Requires any authenticated user (member read access).
+app.MapGet("/api/telemetry/{printerId}/latest", async (
+    string printerId,
+    ITelemetryStore store,
+    CancellationToken ct) =>
+{
+    var latest = await store.GetLatestAsync(printerId, ct);
+    return latest is null ? Results.NotFound() : Results.Ok(latest);
+})
+.WithName("GetLatestTelemetry")
+.WithTags("Telemetry")
+.RequireAuthorization("MemberRead");
+
+// Retrieve telemetry history for a printer.
+// Requires any authenticated user (member read access).
+app.MapGet("/api/telemetry/{printerId}/history", async (
+    string printerId,
+    ITelemetryStore store,
+    [FromQuery] int count = 100,
+    CancellationToken ct = default) =>
+{
+    var history = await store.GetHistoryAsync(printerId, count, ct);
+    return Results.Ok(history);
+})
+.WithName("GetTelemetryHistory")
+.WithTags("Telemetry")
+.RequireAuthorization("MemberRead");
+
+// ── Camera endpoints ──────────────────────────────────────────────────────────
+
+// Ingest a camera snapshot from an EdgeAgent.
+// Requires the "makerprompt:ingest" scope (same as telemetry ingest).
+app.MapPost("/api/camera/{cameraId}/snapshot", async (
+    string cameraId,
+    [FromBody] CameraSnapshot snapshot,
+    ICameraSnapshotStore cameraStore,
+    CancellationToken ct) =>
+{
+    snapshot.CameraId = cameraId;
+    await cameraStore.SaveAsync(snapshot, ct);
+    return Results.Accepted();
+})
+.WithName("IngestCameraSnapshot")
+.WithTags("Camera")
+.RequireAuthorization("EdgeAgent");
+
+// Retrieve the latest JPEG snapshot for a camera (returns raw JPEG bytes).
+app.MapGet("/api/camera/{cameraId}/latest", async (
+    string cameraId,
+    ICameraSnapshotStore cameraStore,
+    CancellationToken ct) =>
+{
+    var snapshot = await cameraStore.GetLatestAsync(cameraId, ct);
+    if (snapshot is null) return Results.NotFound();
+
+    return snapshot.JpegData.Length > 0
+        ? Results.File(snapshot.JpegData, "image/jpeg")
+        : Results.NotFound();
+})
+.WithName("GetLatestCameraSnapshot")
+.WithTags("Camera")
+.RequireAuthorization("MemberRead");
+
+// Retrieve snapshot metadata history for a camera (no image data).
+app.MapGet("/api/camera/{cameraId}/history", async (
+    string cameraId,
+    ICameraSnapshotStore cameraStore,
+    [FromQuery] int count = 20,
+    CancellationToken ct = default) =>
+{
+    var history = await cameraStore.GetHistoryAsync(cameraId, count, ct);
+    return Results.Ok(history);
+})
+.WithName("GetCameraSnapshotHistory")
+.WithTags("Camera")
+.RequireAuthorization("MemberRead");
+
+// ── Run ───────────────────────────────────────────────────────────────────────
+
+// Fallback — serve Blazor WASM for any non-API route (client-side routing).
+app.MapFallbackToFile("index.html");
+
+app.Run();
+
+// Make the Program class visible for integration tests
+public partial class Program { }
diff --git a/src/MakerPrompt.Cloud/Properties/launchSettings.json b/src/MakerPrompt.Cloud/Properties/launchSettings.json
new file mode 100644
index 0000000..8c5b2a9
--- /dev/null
+++ b/src/MakerPrompt.Cloud/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "MakerPrompt.Cloud": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:54778;http://localhost:54779"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/MakerPrompt.Cloud/appsettings.Development.json b/src/MakerPrompt.Cloud/appsettings.Development.json
new file mode 100644
index 0000000..5def1c3
--- /dev/null
+++ b/src/MakerPrompt.Cloud/appsettings.Development.json
@@ -0,0 +1,15 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "Microsoft.AspNetCore": "Information"
+    }
+  },
+  "MakerPrompt": {
+    "Auth": {
+      "Authority": "",
+      "Audience": "",
+      "RequireHttpsMetadata": false
+    }
+  }
+}
diff --git a/src/MakerPrompt.Cloud/appsettings.json b/src/MakerPrompt.Cloud/appsettings.json
new file mode 100644
index 0000000..98bd1a2
--- /dev/null
+++ b/src/MakerPrompt.Cloud/appsettings.json
@@ -0,0 +1,16 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "MakerPrompt": {
+    "Auth": {
+      "Authority": "",
+      "Audience": "",
+      "RequireHttpsMetadata": false
+    }
+  }
+}
diff --git a/src/MakerPrompt.Core/Abstractions/ICameraProvider.cs b/src/MakerPrompt.Core/Abstractions/ICameraProvider.cs
new file mode 100644
index 0000000..ac8552a
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/ICameraProvider.cs
@@ -0,0 +1,37 @@
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Abstraction for a camera feed associated with a printer or a hackerspace bay.
+///
+/// Implementations may read from:
+/// - an MJPEG HTTP stream (most webcams, OctoPrint, Mainsail)
+/// - an RTSP stream (IP cameras)
+/// - a local V4L2 device (Linux EdgeAgent)
+///
+/// The camera is identified by its <see cref="CameraId"/> which correlates snapshots
+/// with the printer they are mounted next to (same ID as the printer it monitors).
+/// </summary>
+public interface ICameraProvider : IAsyncDisposable
+{
+    /// <summary>Unique identifier for this camera, typically matching a printer ID.</summary>
+    string CameraId { get; }
+
+    /// <summary>Human-readable label (e.g. "Ender-3 Webcam").</summary>
+    string Label { get; }
+
+    /// <summary>Whether the camera stream is currently reachable.</summary>
+    bool IsAvailable { get; }
+
+    /// <summary>
+    /// Captures a single JPEG snapshot from the camera stream.
+    /// </summary>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>Raw JPEG bytes, or an empty array if the camera is unavailable.</returns>
+    Task<byte[]> CaptureSnapshotAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Verifies the camera is reachable and updates <see cref="IsAvailable"/>.
+    /// Called during EdgeAgent startup and periodically during health checks.
+    /// </summary>
+    Task<bool> CheckAvailabilityAsync(CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/ICameraSnapshotStore.cs b/src/MakerPrompt.Core/Abstractions/ICameraSnapshotStore.cs
new file mode 100644
index 0000000..e5943cc
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/ICameraSnapshotStore.cs
@@ -0,0 +1,29 @@
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Persists and retrieves camera snapshots.
+/// Implementations: in-memory (tests), SQLite (EdgeAgent), Cloud REST projection.
+/// </summary>
+public interface ICameraSnapshotStore
+{
+    /// <summary>
+    /// Persists a snapshot. The store associates it with the
+    /// <see cref="MakerPrompt.Core.Models.CameraSnapshot.CameraId"/> and the
+    /// capture timestamp already embedded in the model.
+    /// </summary>
+    Task SaveAsync(Core.Models.CameraSnapshot snapshot, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Returns the most recent snapshot for <paramref name="cameraId"/>,
+    /// or <c>null</c> if none has been stored.
+    /// </summary>
+    Task<Core.Models.CameraSnapshot?> GetLatestAsync(string cameraId, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Returns up to <paramref name="count"/> snapshots for <paramref name="cameraId"/>,
+    /// ordered from most-recent to oldest.  Only metadata is returned by default;
+    /// implementations may omit the <c>JpegData</c> blob to reduce memory pressure.
+    /// </summary>
+    Task<IReadOnlyList<Core.Models.CameraSnapshot>> GetHistoryAsync(
+        string cameraId, int count = 20, CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/IEdgeAgentClient.cs b/src/MakerPrompt.Core/Abstractions/IEdgeAgentClient.cs
new file mode 100644
index 0000000..52c9c77
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/IEdgeAgentClient.cs
@@ -0,0 +1,28 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Contract for the local EdgeAgent component that runs in the hackerspace / farm
+/// and bridges printers to the cloud backend.
+///
+/// The EdgeAgent is responsible for:
+///   • Connecting to configured printers via <see cref="IPrinterCommunicationService"/>.
+///   • Polling telemetry on a regular interval.
+///   • Forwarding telemetry snapshots to the cloud via <see cref="ICloudTelemetryClient"/>.
+///   • Optionally capturing webcam snapshots.
+/// </summary>
+public interface IEdgeAgentClient
+{
+    /// <summary>
+    /// Submits a telemetry snapshot to the cloud backend.
+    /// Implementations should retry on transient failures and swallow permanent errors silently.
+    /// </summary>
+    Task SendTelemetryAsync(string printerId, PrinterTelemetry telemetry,
+        CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Checks connectivity to the cloud backend.
+    /// </summary>
+    Task<bool> IsReachableAsync(CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/IFarmRepository.cs b/src/MakerPrompt.Core/Abstractions/IFarmRepository.cs
new file mode 100644
index 0000000..fad64bb
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/IFarmRepository.cs
@@ -0,0 +1,18 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Manages farm configurations — named groups of printer connections that
+/// can be saved, switched, imported, and exported.
+/// </summary>
+public interface IFarmRepository
+{
+    Task<IReadOnlyList<FarmConfiguration>> GetAllAsync(CancellationToken cancellationToken = default);
+
+    Task<FarmConfiguration?> GetByIdAsync(Guid farmId, CancellationToken cancellationToken = default);
+
+    Task SaveAsync(FarmConfiguration farm, CancellationToken cancellationToken = default);
+
+    Task DeleteAsync(Guid farmId, CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/IFilamentInventoryStore.cs b/src/MakerPrompt.Core/Abstractions/IFilamentInventoryStore.cs
new file mode 100644
index 0000000..3a6ebde
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/IFilamentInventoryStore.cs
@@ -0,0 +1,24 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Persists and retrieves filament spools for inventory tracking.
+/// Implementations may use local JSON storage, a database, or a cloud API.
+/// </summary>
+public interface IFilamentInventoryStore
+{
+    Task<IReadOnlyList<FilamentSpool>> GetAllAsync(CancellationToken cancellationToken = default);
+
+    Task<FilamentSpool?> GetByIdAsync(Guid id, CancellationToken cancellationToken = default);
+
+    Task SaveAsync(FilamentSpool spool, CancellationToken cancellationToken = default);
+
+    Task DeleteAsync(Guid id, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Deducts <paramref name="grams"/> from the spool's remaining weight.
+    /// Clamps to zero — never goes negative.
+    /// </summary>
+    Task DeductFilamentAsync(Guid spoolId, double grams, CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/IPrintJobAnalyticsStore.cs b/src/MakerPrompt.Core/Abstractions/IPrintJobAnalyticsStore.cs
new file mode 100644
index 0000000..28c82af
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/IPrintJobAnalyticsStore.cs
@@ -0,0 +1,21 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Stores and queries print-job analytics records.
+/// </summary>
+public interface IPrintJobAnalyticsStore
+{
+    Task<IReadOnlyList<PrintJobUsageRecord>> GetAllAsync(CancellationToken cancellationToken = default);
+
+    Task SaveAsync(PrintJobUsageRecord record, CancellationToken cancellationToken = default);
+
+    /// <summary>Returns records for a specific printer, ordered newest-first.</summary>
+    Task<IReadOnlyList<PrintJobUsageRecord>> GetByPrinterAsync(
+        Guid printerId, CancellationToken cancellationToken = default);
+
+    /// <summary>Returns records for a specific spool, ordered newest-first.</summary>
+    Task<IReadOnlyList<PrintJobUsageRecord>> GetBySpoolAsync(
+        Guid spoolId, CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/IPrintProjectRepository.cs b/src/MakerPrompt.Core/Abstractions/IPrintProjectRepository.cs
new file mode 100644
index 0000000..9e464a0
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/IPrintProjectRepository.cs
@@ -0,0 +1,34 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Manages print projects and their associated G-code jobs.
+/// Business logic lives in the Application layer; this interface
+/// describes the persistence contract for both storage and application use.
+/// </summary>
+public interface IPrintProjectRepository
+{
+    Task<IReadOnlyList<PrintProject>> GetAllAsync(CancellationToken cancellationToken = default);
+
+    Task<PrintProject?> GetByIdAsync(Guid projectId, CancellationToken cancellationToken = default);
+
+    Task SaveAsync(PrintProject project, CancellationToken cancellationToken = default);
+
+    Task DeleteAsync(Guid projectId, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Opens the binary content of a job's G-code file from storage.
+    /// Returns <c>null</c> if the file does not exist.
+    /// </summary>
+    Task<Stream?> OpenJobFileAsync(string storagePath, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Stores the binary content of a G-code file and returns the storage path assigned to it.
+    /// </summary>
+    Task<string> SaveJobFileAsync(Guid projectId, string fileName, Stream content,
+        CancellationToken cancellationToken = default);
+
+    /// <summary>Deletes the physical G-code file for a job.</summary>
+    Task DeleteJobFileAsync(string storagePath, CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/IPrinterCommunicationService.cs b/src/MakerPrompt.Core/Abstractions/IPrinterCommunicationService.cs
new file mode 100644
index 0000000..483b890
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/IPrinterCommunicationService.cs
@@ -0,0 +1,98 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Controls a single printer connection.
+///
+/// Architecture note
+/// -----------------
+/// This interface is intentionally scoped to ONE printer. Fleet / multi-printer
+/// scenarios are handled at the Application layer via <see cref="IPrinterProvider"/>
+/// and the fleet orchestration services that compose multiple
+/// <see cref="IPrinterCommunicationService"/> instances.
+/// </summary>
+public interface IPrinterCommunicationService : IAsyncDisposable
+{
+    // ── Events ──────────────────────────────────────────────────────────────
+
+    /// <summary>Raised when the connection state changes (true = connected, false = disconnected).</summary>
+    event EventHandler<bool> ConnectionStateChanged;
+
+    /// <summary>Raised whenever fresh telemetry is available from the printer.</summary>
+    event EventHandler<PrinterTelemetry> TelemetryUpdated;
+
+    // ── State ───────────────────────────────────────────────────────────────
+
+    /// <summary>Backend protocol in use.</summary>
+    PrinterConnectionType ConnectionType { get; }
+
+    /// <summary>Most recently received telemetry snapshot.</summary>
+    PrinterTelemetry LastTelemetry { get; }
+
+    /// <summary>Human-readable name for this connection (e.g. "Workshop Prusa MK4").</summary>
+    string ConnectionName { get; }
+
+    /// <summary><c>true</c> when a live connection is established.</summary>
+    bool IsConnected { get; }
+
+    /// <summary><c>true</c> when a print job is actively running on this printer.</summary>
+    bool IsPrinting { get; }
+
+    /// <summary>
+    /// <c>true</c> when this backend supports sending arbitrary G-code commands
+    /// via <see cref="WriteDataAsync"/> and displaying the response in the command prompt.
+    /// Backends that communicate over read-only APIs (e.g. PrusaLink) should return <c>false</c>.
+    /// </summary>
+    bool SupportsCommandPrompt => true;
+
+    // ── Lifecycle ───────────────────────────────────────────────────────────
+
+    /// <summary>Establishes the connection using the supplied settings.</summary>
+    /// <returns><c>true</c> on success, <c>false</c> on failure.</returns>
+    Task<bool> ConnectAsync(PrinterConnectionSettings settings, CancellationToken cancellationToken = default);
+
+    /// <summary>Gracefully closes the connection and releases backend resources.</summary>
+    Task DisconnectAsync(CancellationToken cancellationToken = default);
+
+    // ── Data transfer ───────────────────────────────────────────────────────
+
+    /// <summary>Sends a raw G-code command string to the printer.</summary>
+    Task WriteDataAsync(string command, CancellationToken cancellationToken = default);
+
+    /// <summary>Fetches an up-to-date telemetry snapshot from the printer.</summary>
+    Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Returns the list of files available on the printer's storage.</summary>
+    Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default);
+
+    // ── Print control ───────────────────────────────────────────────────────
+
+    /// <summary>Sets the hotend target temperature. Pass 0 to turn off.</summary>
+    Task SetHotendTempAsync(int targetCelsius, CancellationToken cancellationToken = default);
+
+    /// <summary>Sets the heated bed target temperature. Pass 0 to turn off.</summary>
+    Task SetBedTempAsync(int targetCelsius, CancellationToken cancellationToken = default);
+
+    /// <summary>Homes the specified axes.</summary>
+    Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default);
+
+    /// <summary>Performs a relative move on the given axes at <paramref name="feedRate"/> mm/min.</summary>
+    Task RelativeMoveAsync(int feedRate, float x = 0f, float y = 0f, float z = 0f, float e = 0f,
+        CancellationToken cancellationToken = default);
+
+    /// <summary>Sets the part-cooling fan speed (0–100 %).</summary>
+    Task SetFanSpeedAsync(int speedPercent, CancellationToken cancellationToken = default);
+
+    /// <summary>Sets the print feed-rate override (typically 10–200 %).</summary>
+    Task SetPrintSpeedAsync(int speedPercent, CancellationToken cancellationToken = default);
+
+    /// <summary>Sets the extrusion flow-rate override (typically 10–200 %).</summary>
+    Task SetPrintFlowAsync(int flowPercent, CancellationToken cancellationToken = default);
+
+    /// <summary>Starts printing the specified file from printer storage.</summary>
+    Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default);
+
+    /// <summary>Sends a G-code document to the printer for immediate streaming and printing.</summary>
+    Task StartPrintAsync(GCodeDoc gcode, CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/IPrinterProvider.cs b/src/MakerPrompt.Core/Abstractions/IPrinterProvider.cs
new file mode 100644
index 0000000..52ae3e2
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/IPrinterProvider.cs
@@ -0,0 +1,44 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Abstracts a service that can enumerate printers from a remote provider account
+/// (e.g. PrusaConnect, OctoPrint farm, future cloud providers).
+///
+/// Architecture note — provider vs. connection
+/// --------------------------------------------
+/// An <see cref="IPrinterProvider"/> answers the question:
+///   "Which printers does this account know about?"
+///
+/// An <see cref="IPrinterCommunicationService"/> answers the question:
+///   "How do I talk to this specific printer?"
+///
+/// These concerns are intentionally separate so that one provider can expose
+/// many printers, each controlled by its own communication service instance.
+///
+/// Usage pattern
+/// -------------
+///   1. Call <see cref="ConfigureAsync"/> with a bearer/API token.
+///   2. Call <see cref="GetPrintersAsync"/> to enumerate available printers.
+///   3. Pass a <see cref="PrinterInfo.Id"/> to the Application layer to create
+///      the matching <see cref="IPrinterCommunicationService"/> for that printer.
+/// </summary>
+public interface IPrinterProvider
+{
+    /// <summary>The provider type this implementation represents.</summary>
+    PrinterConnectionType ProviderType { get; }
+
+    /// <summary>
+    /// Configures the provider with the credentials needed to reach the upstream API.
+    /// Must be called before <see cref="GetPrintersAsync"/>.
+    /// </summary>
+    Task ConfigureAsync(string bearerToken, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Returns the list of printers available under the configured account.
+    /// Returns an empty list on authentication failure or transient network errors
+    /// (callers should not treat an empty result as fatal).
+    /// </summary>
+    Task<IReadOnlyList<PrinterInfo>> GetPrintersAsync(CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/Abstractions/ITelemetryStore.cs b/src/MakerPrompt.Core/Abstractions/ITelemetryStore.cs
new file mode 100644
index 0000000..98ce8df
--- /dev/null
+++ b/src/MakerPrompt.Core/Abstractions/ITelemetryStore.cs
@@ -0,0 +1,30 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.Core.Abstractions;
+
+/// <summary>
+/// Persists and retrieves telemetry snapshots for reporting, analytics, and the
+/// cloud backend. Implementations may write to a local SQLite database (EdgeAgent),
+/// an in-memory store (tests), or a remote REST API (Cloud-side projections).
+/// </summary>
+public interface ITelemetryStore
+{
+    /// <summary>
+    /// Persists a telemetry snapshot. The store is responsible for tagging the
+    /// record with <paramref name="printerId"/> and the current UTC timestamp.
+    /// </summary>
+    Task SaveAsync(string printerId, PrinterTelemetry telemetry, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Returns the most recent telemetry snapshot for the given printer,
+    /// or <c>null</c> if no snapshot has been stored yet.
+    /// </summary>
+    Task<PrinterTelemetry?> GetLatestAsync(string printerId, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Returns up to <paramref name="count"/> telemetry snapshots for the given printer,
+    /// ordered from most-recent to oldest.
+    /// </summary>
+    Task<IReadOnlyList<PrinterTelemetry>> GetHistoryAsync(
+        string printerId, int count = 100, CancellationToken cancellationToken = default);
+}
diff --git a/src/MakerPrompt.Core/MakerPrompt.Core.csproj b/src/MakerPrompt.Core/MakerPrompt.Core.csproj
new file mode 100644
index 0000000..93f5ab4
--- /dev/null
+++ b/src/MakerPrompt.Core/MakerPrompt.Core.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/MakerPrompt.Core/Models/CameraSnapshot.cs b/src/MakerPrompt.Core/Models/CameraSnapshot.cs
new file mode 100644
index 0000000..6469157
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/CameraSnapshot.cs
@@ -0,0 +1,29 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// A single camera frame snapshot — JPEG bytes plus metadata.
+/// Forwarded from an EdgeAgent to the Cloud API alongside telemetry.
+/// </summary>
+public sealed class CameraSnapshot
+{
+    /// <summary>
+    /// Unique identifier of the camera (typically matches a printer ID so snapshots
+    /// can be correlated with telemetry).
+    /// </summary>
+    public string CameraId { get; set; } = string.Empty;
+
+    /// <summary>Human-readable camera label.</summary>
+    public string Label { get; set; } = string.Empty;
+
+    /// <summary>Raw JPEG image data.</summary>
+    public byte[] JpegData { get; set; } = [];
+
+    /// <summary>UTC timestamp when the frame was captured.</summary>
+    public DateTimeOffset CapturedAt { get; set; } = DateTimeOffset.UtcNow;
+
+    /// <summary>Image width in pixels (0 if unknown).</summary>
+    public int Width { get; set; }
+
+    /// <summary>Image height in pixels (0 if unknown).</summary>
+    public int Height { get; set; }
+}
diff --git a/src/MakerPrompt.Core/Models/FarmConfiguration.cs b/src/MakerPrompt.Core/Models/FarmConfiguration.cs
new file mode 100644
index 0000000..a950690
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/FarmConfiguration.cs
@@ -0,0 +1,47 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// A saved farm profile that bundles a named group of printer connections.
+/// Users can switch between farms (e.g. "Workshop A" vs "Hackerspace B").
+/// </summary>
+public sealed class FarmConfiguration
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public string Name { get; set; } = string.Empty;
+    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+
+    /// <summary>
+    /// Snapshot of printer connection definitions belonging to this farm.
+    /// Populated when the farm is saved or exported.
+    /// </summary>
+    public List<PrinterConnectionDefinition> Printers { get; set; } = [];
+}
+
+/// <summary>
+/// Persistent connection profile for a single printer.
+/// </summary>
+public sealed class PrinterConnectionDefinition
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+
+    /// <summary>User-friendly display name (e.g. "Workshop Prusa MK4").</summary>
+    public string Name { get; set; } = string.Empty;
+
+    public PrinterConnectionType ConnectionType { get; set; } = PrinterConnectionType.Demo;
+
+    /// <summary>Connection settings (URL, credentials, or serial port).</summary>
+    public PrinterConnectionSettings Settings { get; set; } = new();
+
+    /// <summary>Auto-connect this printer on app startup.</summary>
+    public bool AutoConnect { get; set; }
+
+    /// <summary>Optional hex color for the Fleet card UI.</summary>
+    public string? Color { get; set; }
+
+    public string? Notes { get; set; }
+    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+    public DateTime? LastConnectedAt { get; set; }
+
+    /// <summary>The filament spool currently loaded in this printer.</summary>
+    public Guid? AssignedFilamentSpoolId { get; set; }
+}
diff --git a/src/MakerPrompt.Core/Models/FilamentSpool.cs b/src/MakerPrompt.Core/Models/FilamentSpool.cs
new file mode 100644
index 0000000..2178c59
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/FilamentSpool.cs
@@ -0,0 +1,30 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Represents a spool of filament tracked in the inventory.
+/// </summary>
+public sealed class FilamentSpool
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public string Name { get; set; } = string.Empty;
+    public string Material { get; set; } = string.Empty;
+    public string Brand { get; set; } = string.Empty;
+    public string Color { get; set; } = string.Empty;
+
+    /// <summary>Filament diameter in mm (typically 1.75 or 2.85).</summary>
+    public double Diameter { get; set; } = 1.75;
+
+    /// <summary>Total spool weight in grams as purchased.</summary>
+    public double TotalWeightGrams { get; set; } = 1000;
+
+    /// <summary>Estimated remaining weight in grams (decremented as jobs complete).</summary>
+    public double RemainingWeightGrams { get; set; } = 1000;
+
+    /// <summary>Cost paid for this spool.</summary>
+    public decimal Cost { get; set; }
+
+    public DateTime PurchaseDate { get; set; } = DateTime.UtcNow;
+
+    /// <summary>Archived spools are hidden from active selections but kept for history.</summary>
+    public bool IsArchived { get; set; }
+}
diff --git a/MakerPrompt.Shared/Models/FileEntry.cs b/src/MakerPrompt.Core/Models/FileEntry.cs
similarity index 87%
rename from MakerPrompt.Shared/Models/FileEntry.cs
rename to src/MakerPrompt.Core/Models/FileEntry.cs
index 72c3aa5..ef3f5ca 100644
--- a/MakerPrompt.Shared/Models/FileEntry.cs
+++ b/src/MakerPrompt.Core/Models/FileEntry.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Models
+namespace MakerPrompt.Core.Models
 {
     public class FileEntry
     {
diff --git a/src/MakerPrompt.Core/Models/GCodeDoc.cs b/src/MakerPrompt.Core/Models/GCodeDoc.cs
new file mode 100644
index 0000000..eb6a27e
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/GCodeDoc.cs
@@ -0,0 +1,27 @@
+using System.Runtime.CompilerServices;
+
+namespace MakerPrompt.Core.Models;
+
+/// <summary>Lightweight wrapper around G-code text content.</summary>
+public readonly record struct GCodeDoc(string Content)
+{
+    /// <summary>Async, streaming enumeration of non-empty, non-comment G-code commands.</summary>
+    public async IAsyncEnumerable<string> EnumerateCommandsAsync(
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(Content)) yield break;
+
+        using var reader = new StringReader(Content);
+        string? line;
+
+        while (!cancellationToken.IsCancellationRequested &&
+               (line = await reader.ReadLineAsync().ConfigureAwait(false)) != null)
+        {
+            line = line.Trim();
+            if (string.IsNullOrEmpty(line) || line.StartsWith(";", StringComparison.Ordinal))
+                continue;
+
+            yield return line;
+        }
+    }
+}
diff --git a/src/MakerPrompt.Core/Models/NotificationRecord.cs b/src/MakerPrompt.Core/Models/NotificationRecord.cs
new file mode 100644
index 0000000..da7b2f3
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/NotificationRecord.cs
@@ -0,0 +1,29 @@
+namespace MakerPrompt.Core.Models;
+
+public enum NotificationLevel
+{
+    Info,
+    Warning,
+    Error,
+    Critical,
+}
+
+/// <summary>
+/// A persisted notification event (print completion, error, low filament alert, etc.).
+/// </summary>
+public sealed class NotificationRecord
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public NotificationLevel Level { get; set; }
+    public string Title { get; set; } = string.Empty;
+    public string Message { get; set; } = string.Empty;
+    public DateTime Timestamp { get; set; } = DateTime.UtcNow;
+
+    /// <summary>Associated printer (if notification relates to a specific printer).</summary>
+    public Guid? PrinterId { get; set; }
+
+    /// <summary>Associated filament spool (e.g. low-filament warnings).</summary>
+    public Guid? FilamentSpoolId { get; set; }
+
+    public bool IsRead { get; set; }
+}
diff --git a/src/MakerPrompt.Core/Models/PrintJobUsageRecord.cs b/src/MakerPrompt.Core/Models/PrintJobUsageRecord.cs
new file mode 100644
index 0000000..cfe5989
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/PrintJobUsageRecord.cs
@@ -0,0 +1,35 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Audit record for a completed (or in-progress) print job.
+/// Used for analytics — print hours, filament consumption per printer/spool.
+/// </summary>
+public sealed class PrintJobUsageRecord
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+
+    /// <summary>ID of the printer that ran this job.</summary>
+    public Guid PrinterId { get; set; }
+
+    /// <summary>ID of the filament spool consumed by this job (empty = unknown).</summary>
+    public Guid FilamentSpoolId { get; set; }
+
+    public string JobName { get; set; } = string.Empty;
+
+    /// <summary>Total elapsed print time.</summary>
+    public TimeSpan Duration { get; set; }
+
+    /// <summary>Pre-slice estimated filament consumption in grams.</summary>
+    public double EstimatedFilamentUsedGrams { get; set; }
+
+    /// <summary>Actual filament consumed in grams (0 = not measured).</summary>
+    public double ActualFilamentUsedGrams { get; set; }
+
+    public DateTime Timestamp { get; set; } = DateTime.UtcNow;
+
+    /// <summary>
+    /// Returns the best available filament figure: actual if measured, otherwise estimated.
+    /// </summary>
+    public double EffectiveFilamentGrams =>
+        ActualFilamentUsedGrams > 0 ? ActualFilamentUsedGrams : EstimatedFilamentUsedGrams;
+}
diff --git a/src/MakerPrompt.Core/Models/PrintProject.cs b/src/MakerPrompt.Core/Models/PrintProject.cs
new file mode 100644
index 0000000..d0bc2fd
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/PrintProject.cs
@@ -0,0 +1,47 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Groups a set of G-code files under a single project name.
+/// Files are dispatched to printers; status is tracked per job.
+/// </summary>
+public sealed class PrintProject
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public string Name { get; set; } = string.Empty;
+    public string? Notes { get; set; }
+    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+    public List<PrintJob> Jobs { get; set; } = [];
+}
+
+/// <summary>
+/// A single G-code file within a <see cref="PrintProject"/>.
+/// </summary>
+public sealed class PrintJob
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+
+    /// <summary>Original filename (e.g. "benchy.gcode").</summary>
+    public string FileName { get; set; } = string.Empty;
+
+    /// <summary>Storage path within IStorageProvider (e.g. "PrintProjects/{projectId}/{filename}").</summary>
+    public string StoragePath { get; set; } = string.Empty;
+
+    /// <summary>File size in bytes (0 if not measurable at upload time).</summary>
+    public long Size { get; set; }
+
+    public PrintJobStatus Status { get; set; } = PrintJobStatus.Queued;
+
+    /// <summary>The printer this job is assigned to (null = unassigned).</summary>
+    public Guid? AssignedPrinterId { get; set; }
+
+    /// <summary>Friendly printer name kept for display when the printer is offline.</summary>
+    public string? AssignedPrinterName { get; set; }
+}
+
+public enum PrintJobStatus
+{
+    Queued,
+    Printing,
+    Completed,
+    Failed,
+}
diff --git a/MakerPrompt.Shared/Models/PrinterCamera.cs b/src/MakerPrompt.Core/Models/PrinterCamera.cs
similarity index 95%
rename from MakerPrompt.Shared/Models/PrinterCamera.cs
rename to src/MakerPrompt.Core/Models/PrinterCamera.cs
index 85314e1..5c78fa9 100644
--- a/MakerPrompt.Shared/Models/PrinterCamera.cs
+++ b/src/MakerPrompt.Core/Models/PrinterCamera.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Models
+namespace MakerPrompt.Core.Models
 {
     /// <summary>
     /// Neutral printer camera description consumed by UI components.
diff --git a/src/MakerPrompt.Core/Models/PrinterConnectionSettings.cs b/src/MakerPrompt.Core/Models/PrinterConnectionSettings.cs
new file mode 100644
index 0000000..8d1fc17
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/PrinterConnectionSettings.cs
@@ -0,0 +1,37 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Settings required to establish a connection to a single printer backend.
+/// </summary>
+public sealed class PrinterConnectionSettings
+{
+    /// <summary>Backend protocol to use.</summary>
+    public PrinterConnectionType ConnectionType { get; set; } = PrinterConnectionType.Demo;
+
+    // ── HTTP / WebSocket backends ───────────────────────────────────────────
+
+    /// <summary>Base URL of the printer's HTTP API (e.g. "http://192.168.1.10").</summary>
+    public string? ApiUrl { get; set; }
+
+    /// <summary>Username for API authentication (if required).</summary>
+    public string? UserName { get; set; }
+
+    /// <summary>Password or API key for authentication.</summary>
+    public string? Password { get; set; }
+
+    // ── Serial / USB backends ───────────────────────────────────────────────
+
+    /// <summary>Serial port name (e.g. "COM3" on Windows, "/dev/ttyUSB0" on Linux).</summary>
+    public string? PortName { get; set; }
+
+    /// <summary>Serial baud rate (default 115 200).</summary>
+    public int BaudRate { get; set; } = 115_200;
+
+    // ── Provider-backed backends ────────────────────────────────────────────
+
+    /// <summary>
+    /// Provider printer identifier returned by <see cref="Abstractions.IPrinterProvider"/>.
+    /// Required when connecting to a specific printer within a fleet provider.
+    /// </summary>
+    public string? ProviderId { get; set; }
+}
diff --git a/src/MakerPrompt.Core/Models/PrinterConnectionType.cs b/src/MakerPrompt.Core/Models/PrinterConnectionType.cs
new file mode 100644
index 0000000..dc229f4
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/PrinterConnectionType.cs
@@ -0,0 +1,37 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Identifies the backend protocol used to communicate with a printer.
+/// Single-printer backends connect directly to one machine; provider-backed
+/// types (e.g. PrusaConnect, OctoPrint) expose multiple printers through a
+/// single account and are resolved via <see cref="Abstractions.IPrinterProvider"/>.
+/// </summary>
+public enum PrinterConnectionType
+{
+    /// <summary>In-memory demo backend — no real hardware required.</summary>
+    Demo,
+
+    /// <summary>Direct USB/serial connection (Marlin, RepRap firmware, etc.).</summary>
+    Serial,
+
+    /// <summary>Moonraker HTTP + WebSocket backend (Klipper firmware).</summary>
+    Moonraker,
+
+    /// <summary>PrusaLink single-printer HTTP/JSON API (MK4, XL, etc.).</summary>
+    PrusaLink,
+
+    /// <summary>
+    /// PrusaConnect cloud account — a provider that may expose multiple printers.
+    /// Resolved via <see cref="Abstractions.IPrinterProvider"/>.
+    /// </summary>
+    PrusaConnect,
+
+    /// <summary>BambuLab proprietary MQTT + HTTP backend.</summary>
+    BambuLab,
+
+    /// <summary>
+    /// OctoPrint server — may act as a farm hub exposing multiple printers.
+    /// Resolved via <see cref="Abstractions.IPrinterProvider"/>.
+    /// </summary>
+    OctoPrint,
+}
diff --git a/src/MakerPrompt.Core/Models/PrinterInfo.cs b/src/MakerPrompt.Core/Models/PrinterInfo.cs
new file mode 100644
index 0000000..4930c86
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/PrinterInfo.cs
@@ -0,0 +1,28 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Describes a printer discovered from a provider account (e.g. PrusaConnect, OctoPrint farm).
+/// This model is intentionally minimal — the provider fills in whatever the upstream API exposes.
+/// </summary>
+public sealed class PrinterInfo
+{
+    /// <summary>
+    /// Unique identifier assigned by the provider (e.g. the PrusaConnect UUID, OctoPrint printer key).
+    /// </summary>
+    public string Id { get; set; } = string.Empty;
+
+    /// <summary>User-visible printer name as reported by the provider account.</summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>Hardware model string (e.g. "MK4", "XL", "X1C"). May be empty.</summary>
+    public string Model { get; set; } = string.Empty;
+
+    /// <summary>Raw status string returned by the provider. Use <see cref="Status"/> for typed access.</summary>
+    public string RawStatus { get; set; } = string.Empty;
+
+    /// <summary>Typed printer status derived from <see cref="RawStatus"/>.</summary>
+    public PrinterStatus Status { get; set; } = PrinterStatus.Disconnected;
+
+    /// <summary>The provider type that surfaced this printer.</summary>
+    public PrinterConnectionType ProviderType { get; set; }
+}
diff --git a/src/MakerPrompt.Core/Models/PrinterStatus.cs b/src/MakerPrompt.Core/Models/PrinterStatus.cs
new file mode 100644
index 0000000..1073fca
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/PrinterStatus.cs
@@ -0,0 +1,22 @@
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Operational status of a managed printer.
+/// </summary>
+public enum PrinterStatus
+{
+    /// <summary>No connection has been established.</summary>
+    Disconnected,
+
+    /// <summary>Connected and idle — ready to accept commands.</summary>
+    Connected,
+
+    /// <summary>A print job is actively running.</summary>
+    Printing,
+
+    /// <summary>Print job is paused (awaiting user action or filament change).</summary>
+    Paused,
+
+    /// <summary>The printer has reported a fault condition.</summary>
+    Error,
+}
diff --git a/src/MakerPrompt.Core/Models/PrinterTelemetry.cs b/src/MakerPrompt.Core/Models/PrinterTelemetry.cs
new file mode 100644
index 0000000..f75464b
--- /dev/null
+++ b/src/MakerPrompt.Core/Models/PrinterTelemetry.cs
@@ -0,0 +1,82 @@
+using System.Numerics;
+
+namespace MakerPrompt.Core.Models;
+
+/// <summary>
+/// Snapshot of live telemetry data received from a connected printer.
+/// </summary>
+public class PrinterTelemetry
+{
+    /// <summary>Last raw response line received from the printer (G-code terminal output).</summary>
+    public string LastResponse { get; set; } = string.Empty;
+
+    /// <summary>Timestamp when the connection to this printer was established.</summary>
+    public DateTime? ConnectionTime { get; set; }
+
+    /// <summary>Current print-head position reported by the printer.</summary>
+    public Vector3 Position { get; set; }
+
+    /// <summary>SD card status reported by the printer.</summary>
+    public SDCardStatus SDCard { get; } = new();
+
+    /// <summary>Display name of the printer (populated by the backend).</summary>
+    public string PrinterName { get; set; } = string.Empty;
+
+    /// <summary>Current hotend temperature in °C.</summary>
+    public double HotendTemp { get; set; }
+
+    /// <summary>Hotend target temperature in °C (0 = heater off).</summary>
+    public double HotendTarget { get; set; }
+
+    /// <summary>Current heated-bed temperature in °C.</summary>
+    public double BedTemp { get; set; }
+
+    /// <summary>Heated-bed target temperature in °C (0 = off).</summary>
+    public double BedTarget { get; set; }
+
+    /// <summary>Chamber temperature in °C (0 if not supported).</summary>
+    public double ChamberTemp { get; set; }
+
+    /// <summary>Chamber target temperature in °C (0 = off or not supported).</summary>
+    public double ChamberTarget { get; set; }
+
+    /// <summary>Current operational status.</summary>
+    public PrinterStatus Status { get; set; } = PrinterStatus.Disconnected;
+
+    /// <summary>Feed-rate override percentage (100 = nominal speed).</summary>
+    public int FeedRate { get; set; } = 100;
+
+    /// <summary>Flow-rate override percentage (100 = nominal extrusion).</summary>
+    public int FlowRate { get; set; } = 100;
+
+    /// <summary>Part cooling fan speed (0–100 %).</summary>
+    public int FanSpeed { get; set; }
+
+    /// <summary>Name of the currently active print job (empty when idle).</summary>
+    public string PrintJobName { get; set; } = string.Empty;
+
+    /// <summary>Elapsed time since the print job started.</summary>
+    public TimeSpan PrintDuration { get; set; }
+
+    /// <summary>Filament consumed in the current job (mm).</summary>
+    public double FilamentUsed { get; set; }
+
+    /// <summary>Print progress (0–100 %). 0 when not printing.</summary>
+    public double PrintProgress { get; set; }
+
+    /// <summary>UTC timestamp when this snapshot was captured.</summary>
+    public DateTimeOffset CapturedAt { get; set; } = DateTimeOffset.UtcNow;
+}
+
+/// <summary>SD card status reported by firmware.</summary>
+public class SDCardStatus
+{
+    /// <summary>Whether the SD card is present and mounted.</summary>
+    public bool Present { get; set; }
+
+    /// <summary>Whether a print from SD is currently active.</summary>
+    public bool Printing { get; set; }
+
+    /// <summary>SD print progress (0–100 %).</summary>
+    public double Progress { get; set; }
+}
diff --git a/src/MakerPrompt.EdgeAgent/Dockerfile b/src/MakerPrompt.EdgeAgent/Dockerfile
new file mode 100644
index 0000000..7c0990f
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/Dockerfile
@@ -0,0 +1,38 @@
+# EdgeAgent — Production (ARM64 / Jetson Nano / Raspberry Pi)
+# Build: docker build -f Dockerfile -t makerprompt/edge-agent:latest .
+# (Run from repo root so the full src/ tree is in context)
+
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+WORKDIR /src
+
+# Copy solution and restore in a separate layer to cache NuGet packages.
+COPY MakerPrompt.sln .
+COPY src/MakerPrompt.Core/MakerPrompt.Core.csproj                           src/MakerPrompt.Core/
+COPY src/MakerPrompt.Infrastructure/MakerPrompt.Infrastructure.csproj       src/MakerPrompt.Infrastructure/
+COPY src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj                 src/MakerPrompt.EdgeAgent/
+RUN dotnet restore src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj
+
+# Copy source and publish.
+COPY src/ src/
+RUN dotnet publish src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj \
+    -c Release \
+    -r linux-arm64 \
+    --self-contained true \
+    -p:PublishSingleFile=true \
+    -p:EnableCompressionInSingleFile=true \
+    -o /app/publish
+
+# ── Runtime image ─────────────────────────────────────────────────────────────
+FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble-arm64v8 AS runtime
+WORKDIR /app
+
+# Non-root user for security.
+RUN adduser --disabled-password --gecos "" appuser && chown appuser /app
+USER appuser
+
+COPY --from=build /app/publish .
+
+# Allow overriding config at runtime via environment variables or volume mounts.
+# Example: docker run -v /path/to/appsettings.Production.json:/app/appsettings.Production.json
+EXPOSE 8080
+ENTRYPOINT ["./MakerPrompt.EdgeAgent"]
diff --git a/src/MakerPrompt.EdgeAgent/Dockerfile.dev b/src/MakerPrompt.EdgeAgent/Dockerfile.dev
new file mode 100644
index 0000000..9c49d30
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/Dockerfile.dev
@@ -0,0 +1,26 @@
+# EdgeAgent — Local dev (Mac Intel x64 / Linux x64)
+# Build: docker build -f Dockerfile.dev -t makerprompt/edge-agent:dev .
+# (Run from repo root)
+
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+WORKDIR /src
+
+COPY MakerPrompt.sln .
+COPY src/MakerPrompt.Core/MakerPrompt.Core.csproj                           src/MakerPrompt.Core/
+COPY src/MakerPrompt.Infrastructure/MakerPrompt.Infrastructure.csproj       src/MakerPrompt.Infrastructure/
+COPY src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj                 src/MakerPrompt.EdgeAgent/
+RUN dotnet restore src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj
+
+COPY src/ src/
+RUN dotnet publish src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj \
+    -c Debug \
+    -r linux-x64 \
+    --self-contained true \
+    -p:PublishSingleFile=true \
+    -o /app/publish
+
+FROM mcr.microsoft.com/dotnet/runtime-deps:10.0-noble AS runtime
+WORKDIR /app
+COPY --from=build /app/publish .
+EXPOSE 8080
+ENTRYPOINT ["./MakerPrompt.EdgeAgent"]
diff --git a/src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj b/src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj
new file mode 100644
index 0000000..fe5efb4
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/MakerPrompt.EdgeAgent.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <RootNamespace>MakerPrompt.EdgeAgent</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MakerPrompt.Core\MakerPrompt.Core.csproj" />
+    <ProjectReference Include="..\MakerPrompt.Infrastructure\MakerPrompt.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/MakerPrompt.EdgeAgent/Models/PrinterConfig.cs b/src/MakerPrompt.EdgeAgent/Models/PrinterConfig.cs
new file mode 100644
index 0000000..2f20298
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/Models/PrinterConfig.cs
@@ -0,0 +1,23 @@
+namespace MakerPrompt.EdgeAgent.Models;
+
+/// <summary>
+/// Represents a single printer entry from <c>EdgeAgent:Printers</c> in appsettings.
+/// </summary>
+public sealed class PrinterConfig
+{
+    public string PrinterId { get; set; } = string.Empty;
+    public string Label { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Protocol name matching <see cref="MakerPrompt.Core.Models.PrinterConnectionType"/>:
+    /// Demo | Moonraker | PrusaLink | PrusaConnect | BambuLab | OctoPrint
+    /// </summary>
+    public string Protocol { get; set; } = "Demo";
+
+    public string ApiUrl { get; set; } = string.Empty;
+    public string UserName { get; set; } = string.Empty;
+    public string Password { get; set; } = string.Empty;
+
+    /// <summary>Optional MJPEG snapshot URL for this printer's camera.</summary>
+    public string CameraUrl { get; set; } = string.Empty;
+}
diff --git a/src/MakerPrompt.EdgeAgent/Program.cs b/src/MakerPrompt.EdgeAgent/Program.cs
new file mode 100644
index 0000000..f0788a0
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/Program.cs
@@ -0,0 +1,105 @@
+using MakerPrompt.Core.Abstractions;
+using MakerPrompt.Core.Models;
+using MakerPrompt.EdgeAgent.Models;
+using MakerPrompt.EdgeAgent.Workers;
+using MakerPrompt.Infrastructure.InMemoryStores;
+using MakerPrompt.Infrastructure.Services;
+using MakerPrompt.Infrastructure.Services.Printers;
+using MakerPrompt.Infrastructure.Utils;
+
+// Disambiguate: both Core.Abstractions and Infrastructure.Printers define IPrinterCommunicationService
+using IPrinterService = MakerPrompt.Core.Abstractions.IPrinterCommunicationService;
+
+var builder = Host.CreateApplicationBuilder(args);
+var configuration = builder.Configuration;
+
+// ── Telemetry store ───────────────────────────────────────────────────────────
+// Default: in-memory ring buffer.
+// Swap to SqliteTelemetryStore or InfluxDbTelemetryStore via DI registration below.
+builder.Services.AddSingleton<ITelemetryStore, InMemoryTelemetryStore>();
+
+// ── Camera snapshot store ─────────────────────────────────────────────────────
+builder.Services.AddSingleton<ICameraSnapshotStore, InMemoryCameraSnapshotStore>();
+
+// ── Cloud client (optional — only registered when CloudApi:BaseUrl is set) ────
+var cloudBaseUrl = configuration["CloudApi:BaseUrl"];
+var cloudApiToken = configuration["CloudApi:ApiToken"];
+if (!string.IsNullOrWhiteSpace(cloudBaseUrl))
+{
+    builder.Services.AddHttpClient<HttpEdgeAgentClient>(client =>
+    {
+        client.BaseAddress = new Uri(cloudBaseUrl.TrimEnd('/') + "/");
+        if (!string.IsNullOrWhiteSpace(cloudApiToken))
+            client.DefaultRequestHeaders.Authorization =
+                new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", cloudApiToken);
+    });
+    builder.Services.AddSingleton<IEdgeAgentClient>(sp =>
+        sp.GetRequiredService<HttpEdgeAgentClient>());
+}
+
+// ── Application-layer fleet manager ──────────────────────────────────────────
+builder.Services.AddSingleton<PrinterFleetService>();
+
+// ── Background workers ────────────────────────────────────────────────────────
+// Telemetry polling — polls each connected printer, saves to ITelemetryStore.
+builder.Services.AddHostedService<PrinterPollingWorker>();
+
+// Camera polling — captures MJPEG snapshots, saves to ICameraSnapshotStore.
+builder.Services.AddHostedService<CameraPollingWorker>();
+
+// ── Build ─────────────────────────────────────────────────────────────────────
+var host = builder.Build();
+
+// ── Bootstrap printers from EdgeAgent:Printers config ────────────────────────
+var fleet = host.Services.GetRequiredService<PrinterFleetService>();
+var startupLogger = host.Services.GetRequiredService<ILogger<Program>>();
+var printerConfigs = configuration.GetSection("EdgeAgent:Printers")
+    .Get<List<PrinterConfig>>() ?? [];
+
+foreach (var cfg in printerConfigs)
+{
+    if (string.IsNullOrWhiteSpace(cfg.PrinterId))
+    {
+        startupLogger.LogWarning("Printer entry missing PrinterId — skipping");
+        continue;
+    }
+
+    if (!Enum.TryParse<PrinterConnectionType>(cfg.Protocol, ignoreCase: true, out var connectionType))
+    {
+        startupLogger.LogWarning(
+            "Unknown protocol '{Protocol}' for printer {PrinterId} — skipping",
+            cfg.Protocol, cfg.PrinterId);
+        continue;
+    }
+
+    IPrinterService service = connectionType switch
+    {
+        PrinterConnectionType.Moonraker    => new MoonrakerApiService(),
+        PrinterConnectionType.PrusaLink    => new PrusaLinkApiService(),
+        PrinterConnectionType.PrusaConnect => new PrusaConnectPrinterService(),
+        PrinterConnectionType.BambuLab     => new BambuLabApiService(),
+        PrinterConnectionType.OctoPrint    => new OctoPrintApiService(),
+        _                                  => new DemoPrinterService(),
+    };
+
+    var settings = new PrinterConnectionSettings
+    {
+        ConnectionType = connectionType,
+        ApiUrl         = cfg.ApiUrl,
+        UserName       = cfg.UserName,
+        Password       = cfg.Password,
+    };
+
+    startupLogger.LogInformation(
+        "Connecting printer {PrinterId} ({Protocol}) at {Url}",
+        cfg.PrinterId, cfg.Protocol, cfg.ApiUrl);
+
+    var connected = await fleet.AddAndConnectAsync(cfg.PrinterId, service, settings);
+    if (!connected)
+        startupLogger.LogWarning(
+            "Initial connection failed for printer {PrinterId} — will retry on next poll",
+            cfg.PrinterId);
+}
+
+// ── Run ───────────────────────────────────────────────────────────────────────
+await host.RunAsync();
diff --git a/src/MakerPrompt.EdgeAgent/Workers/CameraPollingWorker.cs b/src/MakerPrompt.EdgeAgent/Workers/CameraPollingWorker.cs
new file mode 100644
index 0000000..dbb215f
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/Workers/CameraPollingWorker.cs
@@ -0,0 +1,138 @@
+using MakerPrompt.Core.Abstractions;
+using MakerPrompt.Core.Models;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Configuration;
+using MakerPrompt.Infrastructure.Utils;
+
+namespace MakerPrompt.EdgeAgent.Workers;
+
+/// <summary>
+/// Background worker that captures periodic snapshots from all configured camera
+/// feeds and persists them via <see cref="ICameraSnapshotStore"/>.
+///
+/// Cameras are configured in <c>appsettings.json</c> (or environment variables)
+/// under the <c>EdgeAgent:Cameras</c> array:
+///
+/// <code>
+/// "EdgeAgent": {
+///   "CameraIntervalSeconds": 10,
+///   "Cameras": [
+///     { "CameraId": "printer-1", "Label": "Ender-3 Cam", "MjpegUrl": "http://192.168.1.10:8080/?action=snapshot" },
+///     { "CameraId": "printer-2", "Label": "Voron Cam",   "MjpegUrl": "http://192.168.1.11/webcam/?action=snapshot" }
+///   ]
+/// }
+/// </code>
+///
+/// Each camera entry must supply a <c>CameraId</c> (matching the printer it monitors),
+/// a <c>Label</c>, and an MJPEG snapshot or stream <c>MjpegUrl</c>.
+/// </summary>
+public sealed class CameraPollingWorker : BackgroundService
+{
+    private readonly ICameraSnapshotStore _store;
+    private readonly ILogger<CameraPollingWorker> _logger;
+    private readonly ILoggerFactory _loggerFactory;
+    private readonly TimeSpan _captureInterval;
+    private readonly List<MjpegCameraProvider> _cameras = [];
+
+    public CameraPollingWorker(
+        ICameraSnapshotStore store,
+        ILoggerFactory loggerFactory,
+        IConfiguration configuration)
+    {
+        _store = store;
+        _loggerFactory = loggerFactory;
+        _logger = loggerFactory.CreateLogger<CameraPollingWorker>();
+
+        var intervalSeconds = configuration.GetValue("EdgeAgent:CameraIntervalSeconds", 10);
+        _captureInterval = TimeSpan.FromSeconds(Math.Max(1, intervalSeconds));
+
+        // Build providers from EdgeAgent:Printers entries that have a CameraUrl.
+        var printersSection = configuration.GetSection("EdgeAgent:Printers");
+        foreach (var printer in printersSection.GetChildren())
+        {
+            var cameraId = printer["PrinterId"] ?? string.Empty;
+            var label = printer["Label"] ?? cameraId;
+            var url = printer["CameraUrl"] ?? string.Empty;
+
+            if (string.IsNullOrWhiteSpace(cameraId) || string.IsNullOrWhiteSpace(url))
+                continue;
+
+            _cameras.Add(new MjpegCameraProvider(
+                cameraId, label, url,
+                loggerFactory.CreateLogger<MjpegCameraProvider>()));
+        }
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        if (_cameras.Count == 0)
+        {
+            _logger.LogInformation(
+                "CameraPollingWorker: no cameras configured — worker idle");
+            return;
+        }
+
+        _logger.LogInformation(
+            "CameraPollingWorker started — {Count} camera(s), interval {Interval}",
+            _cameras.Count, _captureInterval);
+
+        // Verify availability before first capture cycle.
+        foreach (var cam in _cameras)
+            await cam.CheckAvailabilityAsync(stoppingToken);
+
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            await CaptureAllAsync(stoppingToken);
+            await Task.Delay(_captureInterval, stoppingToken).ConfigureAwait(false);
+        }
+
+        _logger.LogInformation("CameraPollingWorker stopped");
+    }
+
+    private async Task CaptureAllAsync(CancellationToken ct)
+    {
+        foreach (var cam in _cameras)
+        {
+            try
+            {
+                var jpeg = await cam.CaptureSnapshotAsync(ct);
+                if (jpeg.Length == 0) continue;
+
+                var snapshot = new CameraSnapshot
+                {
+                    CameraId = cam.CameraId,
+                    Label = cam.Label,
+                    JpegData = jpeg,
+                    CapturedAt = DateTimeOffset.UtcNow
+                };
+
+                await _store.SaveAsync(snapshot, ct);
+            }
+            catch (OperationCanceledException)
+            {
+                return;
+            }
+            catch (Exception ex)
+            {
+                // Swallow per-camera errors — log at Debug to avoid spam.
+                _logger.LogDebug(ex,
+                    "Capture error for camera {CameraId}", cam.CameraId);
+            }
+        }
+    }
+
+    public override void Dispose()
+    {
+        // DisposeAsync() is not available as an override on BackgroundService in .NET 10.
+        // Use synchronous dispose here and rely on the host's graceful shutdown for cleanup.
+        foreach (var cam in _cameras)
+        {
+            var disposeTask = cam.DisposeAsync();
+            if (!disposeTask.IsCompleted)
+                disposeTask.AsTask().GetAwaiter().GetResult();
+        }
+
+        base.Dispose();
+    }
+}
diff --git a/src/MakerPrompt.EdgeAgent/Workers/PrinterPollingWorker.cs b/src/MakerPrompt.EdgeAgent/Workers/PrinterPollingWorker.cs
new file mode 100644
index 0000000..403ec2f
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/Workers/PrinterPollingWorker.cs
@@ -0,0 +1,148 @@
+using MakerPrompt.Core.Abstractions;
+using MakerPrompt.Core.Models;
+using MakerPrompt.Infrastructure.Services;
+
+namespace MakerPrompt.EdgeAgent.Workers;
+
+/// <summary>
+/// Background worker that polls registered printers on a fixed interval,
+/// collects telemetry snapshots, and forwards them to the configured
+/// <see cref="ITelemetryStore"/> (and optionally to the cloud backend via
+/// <see cref="IEdgeAgentClient"/>).
+///
+/// Polling errors are swallowed silently to avoid log spam — only unexpected
+/// exceptions that indicate a fatal misconfiguration are propagated.
+/// After <see cref="OfflineThreshold"/> consecutive failures the printer is
+/// marked offline in the store and the cloud is notified.
+/// </summary>
+public sealed class PrinterPollingWorker : BackgroundService
+{
+    private const int OfflineThreshold = 3;
+
+    private readonly PrinterFleetService _fleet;
+    private readonly ITelemetryStore _store;
+    private readonly IEdgeAgentClient? _cloudClient;
+    private readonly ILogger<PrinterPollingWorker> _logger;
+    private readonly TimeSpan _pollInterval;
+
+    // Tracks consecutive poll failures per printer.
+    private readonly Dictionary<string, int> _failureCounts = new();
+
+    public PrinterPollingWorker(
+        PrinterFleetService fleet,
+        ITelemetryStore store,
+        ILogger<PrinterPollingWorker> logger,
+        IConfiguration configuration,
+        IEdgeAgentClient? cloudClient = null)
+    {
+        _fleet = fleet;
+        _store = store;
+        _logger = logger;
+        _cloudClient = cloudClient;
+
+        var intervalSeconds = configuration.GetValue("EdgeAgent:PollIntervalSeconds", 5);
+        _pollInterval = TimeSpan.FromSeconds(Math.Max(1, intervalSeconds));
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        _logger.LogInformation(
+            "PrinterPollingWorker started — poll interval {Interval}", _pollInterval);
+
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            await PollAllPrintersAsync(stoppingToken);
+            await Task.Delay(_pollInterval, stoppingToken).ConfigureAwait(false);
+        }
+
+        _logger.LogInformation("PrinterPollingWorker stopped");
+    }
+
+    private async Task PollAllPrintersAsync(CancellationToken cancellationToken)
+    {
+        var printerIds = _fleet.PrinterIds;
+        if (printerIds.Count == 0) return;
+
+        foreach (var printerId in printerIds)
+        {
+            var service = _fleet.GetConnection(printerId);
+            if (service is null) continue;
+
+            // If the service reports disconnected, count that as a failure without polling.
+            if (!service.IsConnected)
+            {
+                await RecordFailureAsync(printerId, cancellationToken);
+                continue;
+            }
+
+            try
+            {
+                var telemetry = await service.GetTelemetryAsync(cancellationToken);
+                await _store.SaveAsync(printerId, telemetry, cancellationToken);
+
+                // Successful poll — reset failure counter and push to cloud.
+                _failureCounts[printerId] = 0;
+                await TrySendToCloudAsync(printerId, telemetry, cancellationToken);
+            }
+            catch (OperationCanceledException)
+            {
+                // Shutdown requested — exit cleanly.
+                return;
+            }
+            catch (Exception ex)
+            {
+                // Swallow per-printer polling errors — log at Debug to avoid spam.
+                _logger.LogDebug(ex, "Polling error for printer {PrinterId}", printerId);
+                await RecordFailureAsync(printerId, cancellationToken);
+            }
+        }
+    }
+
+    private async Task RecordFailureAsync(string printerId, CancellationToken cancellationToken)
+    {
+        _failureCounts.TryGetValue(printerId, out var count);
+        _failureCounts[printerId] = ++count;
+
+        if (count < OfflineThreshold) return;
+
+        // Hit the threshold — mark offline locally and notify cloud.
+        _logger.LogWarning(
+            "Printer {PrinterId} unreachable after {Count} consecutive failures — marking offline",
+            printerId, count);
+
+        var offlineTelemetry = new PrinterTelemetry
+        {
+            Status = PrinterStatus.Disconnected,
+            CapturedAt = DateTime.UtcNow,
+        };
+
+        try
+        {
+            await _store.SaveAsync(printerId, offlineTelemetry, cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "Failed to persist offline telemetry for {PrinterId}", printerId);
+        }
+
+        await TrySendToCloudAsync(printerId, offlineTelemetry, cancellationToken);
+    }
+
+    private async Task TrySendToCloudAsync(
+        string printerId,
+        PrinterTelemetry telemetry,
+        CancellationToken cancellationToken)
+    {
+        if (_cloudClient is null) return;
+
+        try
+        {
+            await _cloudClient.SendTelemetryAsync(printerId, telemetry, cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(ex, "Cloud push failed for printer {PrinterId}", printerId);
+        }
+    }
+}
+
diff --git a/src/MakerPrompt.EdgeAgent/appsettings.json b/src/MakerPrompt.EdgeAgent/appsettings.json
new file mode 100644
index 0000000..47cf70d
--- /dev/null
+++ b/src/MakerPrompt.EdgeAgent/appsettings.json
@@ -0,0 +1,28 @@
+{
+  "Logging": {
+    "Console": { "FormatterName": "json" },
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "EdgeAgent": {
+    "PollIntervalSeconds": 5,
+    "CameraIntervalSeconds": 10,
+    "Printers": [
+      {
+        "PrinterId": "printer-1",
+        "Label": "Moonraker Printer 1",
+        "Protocol": "Moonraker",
+        "ApiUrl": "http://192.168.1.100",
+        "UserName": "",
+        "Password": "",
+        "CameraUrl": ""
+      }
+    ]
+  },
+  "CloudApi": {
+    "BaseUrl": "http://localhost:8080",
+    "ApiToken": ""
+  }
+}
diff --git a/src/MakerPrompt.Infrastructure.Sqlite/MakerPrompt.Infrastructure.Sqlite.csproj b/src/MakerPrompt.Infrastructure.Sqlite/MakerPrompt.Infrastructure.Sqlite.csproj
new file mode 100644
index 0000000..2ecb19e
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure.Sqlite/MakerPrompt.Infrastructure.Sqlite.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <RootNamespace>MakerPrompt.Infrastructure.Sqlite</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Lightweight SQLite driver — no Entity Framework dependency -->
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MakerPrompt.Core\MakerPrompt.Core.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/MakerPrompt.Infrastructure.Sqlite/SqliteCameraSnapshotStore.cs b/src/MakerPrompt.Infrastructure.Sqlite/SqliteCameraSnapshotStore.cs
new file mode 100644
index 0000000..08652f9
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure.Sqlite/SqliteCameraSnapshotStore.cs
@@ -0,0 +1,178 @@
+using MakerPrompt.Core.Abstractions;
+using MakerPrompt.Core.Models;
+using Microsoft.Data.Sqlite;
+using Microsoft.Extensions.Logging;
+
+namespace MakerPrompt.Infrastructure.Sqlite;
+
+/// <summary>
+/// SQLite-backed implementation of <see cref="ICameraSnapshotStore"/>.
+///
+/// Schema
+/// ------
+/// <code>
+/// CREATE TABLE camera_snapshots (
+///     id          INTEGER PRIMARY KEY AUTOINCREMENT,
+///     camera_id   TEXT    NOT NULL,
+///     label       TEXT    NOT NULL,
+///     captured_at TEXT    NOT NULL,   -- ISO-8601 UTC
+///     width       INTEGER NOT NULL DEFAULT 0,
+///     height      INTEGER NOT NULL DEFAULT 0,
+///     jpeg_data   BLOB    NOT NULL
+/// );
+/// CREATE INDEX ix_camera_captured ON camera_snapshots (camera_id, captured_at DESC);
+/// </code>
+///
+/// Usage
+/// -----
+/// <code>
+/// builder.Services.AddSingleton&lt;ICameraSnapshotStore&gt;(sp =>
+///     new SqliteCameraSnapshotStore("Data Source=cameras.db", sp.GetRequiredService&lt;ILogger&lt;SqliteCameraSnapshotStore&gt;&gt;()));
+/// </code>
+/// </summary>
+public sealed class SqliteCameraSnapshotStore : ICameraSnapshotStore, IAsyncDisposable
+{
+    private readonly string _connectionString;
+    private readonly ILogger<SqliteCameraSnapshotStore> _logger;
+    private readonly SemaphoreSlim _writeLock = new(1, 1);
+
+    /// <param name="connectionString">SQLite connection string, e.g. "Data Source=cameras.db".</param>
+    /// <param name="logger">Logger.</param>
+    public SqliteCameraSnapshotStore(string connectionString, ILogger<SqliteCameraSnapshotStore> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+        InitialiseSchema();
+    }
+
+    // ── ICameraSnapshotStore ──────────────────────────────────────────────────
+
+    public async Task SaveAsync(CameraSnapshot snapshot, CancellationToken cancellationToken = default)
+    {
+        await _writeLock.WaitAsync(cancellationToken);
+        try
+        {
+            await using var conn = await OpenConnectionAsync(cancellationToken);
+            await using var cmd = conn.CreateCommand();
+            cmd.CommandText = """
+                INSERT INTO camera_snapshots (camera_id, label, captured_at, width, height, jpeg_data)
+                VALUES ($cameraId, $label, $capturedAt, $width, $height, $jpegData);
+                """;
+            cmd.Parameters.AddWithValue("$cameraId", snapshot.CameraId);
+            cmd.Parameters.AddWithValue("$label", snapshot.Label);
+            cmd.Parameters.AddWithValue("$capturedAt", snapshot.CapturedAt.ToString("O"));
+            cmd.Parameters.AddWithValue("$width", snapshot.Width);
+            cmd.Parameters.AddWithValue("$height", snapshot.Height);
+            cmd.Parameters.AddWithValue("$jpegData", snapshot.JpegData);
+            await cmd.ExecuteNonQueryAsync(cancellationToken);
+        }
+        finally
+        {
+            _writeLock.Release();
+        }
+    }
+
+    public async Task<CameraSnapshot?> GetLatestAsync(string cameraId,
+        CancellationToken cancellationToken = default)
+    {
+        await using var conn = await OpenConnectionAsync(cancellationToken);
+        await using var cmd = conn.CreateCommand();
+        cmd.CommandText = """
+            SELECT camera_id, label, captured_at, width, height, jpeg_data
+            FROM camera_snapshots
+            WHERE camera_id = $cameraId
+            ORDER BY captured_at DESC
+            LIMIT 1;
+            """;
+        cmd.Parameters.AddWithValue("$cameraId", cameraId);
+
+        await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+        if (!await reader.ReadAsync(cancellationToken)) return null;
+
+        return ReadSnapshot(reader, includeBlob: true);
+    }
+
+    public async Task<IReadOnlyList<CameraSnapshot>> GetHistoryAsync(
+        string cameraId, int count = 20, CancellationToken cancellationToken = default)
+    {
+        await using var conn = await OpenConnectionAsync(cancellationToken);
+        await using var cmd = conn.CreateCommand();
+        // History returns metadata only — JPEG blob is excluded to save memory.
+        cmd.CommandText = """
+            SELECT camera_id, label, captured_at, width, height, NULL as jpeg_data
+            FROM camera_snapshots
+            WHERE camera_id = $cameraId
+            ORDER BY captured_at DESC
+            LIMIT $count;
+            """;
+        cmd.Parameters.AddWithValue("$cameraId", cameraId);
+        cmd.Parameters.AddWithValue("$count", count);
+
+        var results = new List<CameraSnapshot>();
+        await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+        while (await reader.ReadAsync(cancellationToken))
+            results.Add(ReadSnapshot(reader, includeBlob: false));
+
+        return results.AsReadOnly();
+    }
+
+    // ── Schema initialisation ─────────────────────────────────────────────────
+
+    private void InitialiseSchema()
+    {
+        using var conn = OpenConnection();
+        using var cmd = conn.CreateCommand();
+        cmd.CommandText = """
+            CREATE TABLE IF NOT EXISTS camera_snapshots (
+                id          INTEGER PRIMARY KEY AUTOINCREMENT,
+                camera_id   TEXT    NOT NULL,
+                label       TEXT    NOT NULL,
+                captured_at TEXT    NOT NULL,
+                width       INTEGER NOT NULL DEFAULT 0,
+                height      INTEGER NOT NULL DEFAULT 0,
+                jpeg_data   BLOB    NOT NULL
+            );
+            CREATE INDEX IF NOT EXISTS ix_camera_captured
+                ON camera_snapshots (camera_id, captured_at DESC);
+            """;
+        cmd.ExecuteNonQuery();
+        _logger.LogDebug("[SqliteCameraSnapshotStore] Schema initialised ({Connection})", _connectionString);
+    }
+
+    // ── Helpers ───────────────────────────────────────────────────────────────
+
+    private async Task<SqliteConnection> OpenConnectionAsync(CancellationToken cancellationToken)
+    {
+        var conn = new SqliteConnection(_connectionString);
+        await conn.OpenAsync(cancellationToken);
+        return conn;
+    }
+
+    private SqliteConnection OpenConnection()
+    {
+        var conn = new SqliteConnection(_connectionString);
+        conn.Open();
+        return conn;
+    }
+
+    private static CameraSnapshot ReadSnapshot(SqliteDataReader reader, bool includeBlob)
+    {
+        return new CameraSnapshot
+        {
+            CameraId = reader.GetString(0),
+            Label = reader.GetString(1),
+            CapturedAt = DateTimeOffset.Parse(reader.GetString(2)),
+            Width = reader.GetInt32(3),
+            Height = reader.GetInt32(4),
+            JpegData = includeBlob && !reader.IsDBNull(5)
+                ? (byte[])reader.GetValue(5)
+                : []
+        };
+    }
+
+    public ValueTask DisposeAsync()
+    {
+        _writeLock.Dispose();
+        return ValueTask.CompletedTask;
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure.Sqlite/SqliteTelemetryStore.cs b/src/MakerPrompt.Infrastructure.Sqlite/SqliteTelemetryStore.cs
new file mode 100644
index 0000000..cbecbb6
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure.Sqlite/SqliteTelemetryStore.cs
@@ -0,0 +1,176 @@
+using System.Text.Json;
+using MakerPrompt.Core.Abstractions;
+using MakerPrompt.Core.Models;
+using Microsoft.Data.Sqlite;
+using Microsoft.Extensions.Logging;
+
+namespace MakerPrompt.Infrastructure.Sqlite;
+
+/// <summary>
+/// SQLite-backed implementation of <see cref="ITelemetryStore"/>.
+///
+/// Schema
+/// ------
+/// <code>
+/// CREATE TABLE telemetry_snapshots (
+///     id          INTEGER PRIMARY KEY AUTOINCREMENT,
+///     printer_id  TEXT    NOT NULL,
+///     captured_at TEXT    NOT NULL,   -- ISO-8601 UTC
+///     payload     TEXT    NOT NULL    -- JSON-serialised PrinterTelemetry
+/// );
+/// CREATE INDEX ix_telemetry_printer_captured ON telemetry_snapshots (printer_id, captured_at DESC);
+/// </code>
+///
+/// The full <see cref="PrinterTelemetry"/> model is stored as a JSON payload so the
+/// schema never needs to be migrated when new fields are added.
+///
+/// Usage
+/// -----
+/// Register via DI in the EdgeAgent or Cloud host:
+/// <code>
+/// builder.Services.AddSingleton&lt;ITelemetryStore&gt;(sp =>
+///     new SqliteTelemetryStore("Data Source=telemetry.db", sp.GetRequiredService&lt;ILogger&lt;SqliteTelemetryStore&gt;&gt;()));
+/// </code>
+/// </summary>
+public sealed class SqliteTelemetryStore : ITelemetryStore, IAsyncDisposable
+{
+    private static readonly JsonSerializerOptions JsonOpts =
+        new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
+
+    private readonly string _connectionString;
+    private readonly ILogger<SqliteTelemetryStore> _logger;
+    private readonly SemaphoreSlim _writeLock = new(1, 1);
+
+    /// <param name="connectionString">SQLite connection string, e.g. "Data Source=telemetry.db".</param>
+    /// <param name="logger">Logger.</param>
+    public SqliteTelemetryStore(string connectionString, ILogger<SqliteTelemetryStore> logger)
+    {
+        _connectionString = connectionString;
+        _logger = logger;
+        InitialiseSchema();
+    }
+
+    // ── ITelemetryStore ───────────────────────────────────────────────────────
+
+    public async Task SaveAsync(string printerId, PrinterTelemetry telemetry,
+        CancellationToken cancellationToken = default)
+    {
+        var json = JsonSerializer.Serialize(telemetry, JsonOpts);
+
+        await _writeLock.WaitAsync(cancellationToken);
+        try
+        {
+            await using var conn = await OpenConnectionAsync(cancellationToken);
+            await using var cmd = conn.CreateCommand();
+            cmd.CommandText = """
+                INSERT INTO telemetry_snapshots (printer_id, captured_at, payload)
+                VALUES ($printerId, $capturedAt, $payload);
+                """;
+            cmd.Parameters.AddWithValue("$printerId", printerId);
+            cmd.Parameters.AddWithValue("$capturedAt", telemetry.CapturedAt.ToString("O"));
+            cmd.Parameters.AddWithValue("$payload", json);
+            await cmd.ExecuteNonQueryAsync(cancellationToken);
+        }
+        finally
+        {
+            _writeLock.Release();
+        }
+    }
+
+    public async Task<PrinterTelemetry?> GetLatestAsync(string printerId,
+        CancellationToken cancellationToken = default)
+    {
+        await using var conn = await OpenConnectionAsync(cancellationToken);
+        await using var cmd = conn.CreateCommand();
+        cmd.CommandText = """
+            SELECT payload FROM telemetry_snapshots
+            WHERE printer_id = $printerId
+            ORDER BY captured_at DESC
+            LIMIT 1;
+            """;
+        cmd.Parameters.AddWithValue("$printerId", printerId);
+
+        var json = (string?)await cmd.ExecuteScalarAsync(cancellationToken);
+        return json is null ? null : Deserialise(json);
+    }
+
+    public async Task<IReadOnlyList<PrinterTelemetry>> GetHistoryAsync(
+        string printerId, int count = 100, CancellationToken cancellationToken = default)
+    {
+        await using var conn = await OpenConnectionAsync(cancellationToken);
+        await using var cmd = conn.CreateCommand();
+        cmd.CommandText = """
+            SELECT payload FROM telemetry_snapshots
+            WHERE printer_id = $printerId
+            ORDER BY captured_at DESC
+            LIMIT $count;
+            """;
+        cmd.Parameters.AddWithValue("$printerId", printerId);
+        cmd.Parameters.AddWithValue("$count", count);
+
+        var results = new List<PrinterTelemetry>();
+        await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+        while (await reader.ReadAsync(cancellationToken))
+        {
+            var item = Deserialise(reader.GetString(0));
+            if (item is not null) results.Add(item);
+        }
+
+        return results.AsReadOnly();
+    }
+
+    // ── Schema initialisation ─────────────────────────────────────────────────
+
+    private void InitialiseSchema()
+    {
+        using var conn = OpenConnection();
+        using var cmd = conn.CreateCommand();
+        cmd.CommandText = """
+            CREATE TABLE IF NOT EXISTS telemetry_snapshots (
+                id          INTEGER PRIMARY KEY AUTOINCREMENT,
+                printer_id  TEXT    NOT NULL,
+                captured_at TEXT    NOT NULL,
+                payload     TEXT    NOT NULL
+            );
+            CREATE INDEX IF NOT EXISTS ix_telemetry_printer_captured
+                ON telemetry_snapshots (printer_id, captured_at DESC);
+            """;
+        cmd.ExecuteNonQuery();
+        _logger.LogDebug("[SqliteTelemetryStore] Schema initialised ({Connection})", _connectionString);
+    }
+
+    // ── Helpers ───────────────────────────────────────────────────────────────
+
+    private async Task<SqliteConnection> OpenConnectionAsync(CancellationToken cancellationToken)
+    {
+        var conn = new SqliteConnection(_connectionString);
+        await conn.OpenAsync(cancellationToken);
+        return conn;
+    }
+
+    private SqliteConnection OpenConnection()
+    {
+        var conn = new SqliteConnection(_connectionString);
+        conn.Open();
+        return conn;
+    }
+
+    private PrinterTelemetry? Deserialise(string json)
+    {
+        try
+        {
+            return JsonSerializer.Deserialize<PrinterTelemetry>(json, JsonOpts);
+        }
+        catch (JsonException ex)
+        {
+            _logger.LogWarning(ex, "[SqliteTelemetryStore] Failed to deserialise telemetry row");
+            return null;
+        }
+    }
+
+    public ValueTask DisposeAsync()
+    {
+        _writeLock.Dispose();
+        return ValueTask.CompletedTask;
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryCameraSnapshotStore.cs b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryCameraSnapshotStore.cs
new file mode 100644
index 0000000..3b8649d
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryCameraSnapshotStore.cs
@@ -0,0 +1,76 @@
+namespace MakerPrompt.Infrastructure.InMemoryStores;
+
+/// <summary>
+/// In-memory implementation of <see cref="ICameraSnapshotStore"/>.
+/// Retains the last <c>N</c> snapshots per camera in a bounded ring buffer.
+/// Suitable for tests and EdgeAgent scenarios where the process is long-running.
+/// </summary>
+/// <param name="maxPerCamera">Maximum snapshots retained per camera (default 50).</param>
+public sealed class InMemoryCameraSnapshotStore(int maxPerCamera = 50) : ICameraSnapshotStore
+{
+    private readonly int _maxPerCamera = maxPerCamera;
+    private readonly Dictionary<string, LinkedList<CameraSnapshot>> _data = [];
+    private readonly SemaphoreSlim _lock = new(1, 1);
+
+    public async Task SaveAsync(CameraSnapshot snapshot,
+        CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            if (!_data.TryGetValue(snapshot.CameraId, out var list))
+            {
+                list = new LinkedList<CameraSnapshot>();
+                _data[snapshot.CameraId] = list;
+            }
+
+            list.AddFirst(snapshot);
+            while (list.Count > _maxPerCamera)
+                list.RemoveLast();
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    public async Task<CameraSnapshot?> GetLatestAsync(string cameraId,
+        CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            return _data.TryGetValue(cameraId, out var list) ? list.First?.Value : null;
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    public async Task<IReadOnlyList<CameraSnapshot>> GetHistoryAsync(
+        string cameraId, int count = 20, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            if (!_data.TryGetValue(cameraId, out var list))
+                return [];
+
+            // Return metadata only (no JPEG data) to reduce memory pressure.
+            return list.Take(count).Select(s => new CameraSnapshot
+            {
+                CameraId = s.CameraId,
+                Label = s.Label,
+                CapturedAt = s.CapturedAt,
+                Width = s.Width,
+                Height = s.Height,
+                JpegData = []
+            }).ToList().AsReadOnly();
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryFarmRepository.cs b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryFarmRepository.cs
new file mode 100644
index 0000000..318c99f
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryFarmRepository.cs
@@ -0,0 +1,38 @@
+namespace MakerPrompt.Infrastructure.InMemoryStores;
+
+/// <summary>
+/// Thread-safe, in-memory implementation of <see cref="IFarmRepository"/>.
+/// </summary>
+public sealed class InMemoryFarmRepository : IFarmRepository
+{
+    private readonly Dictionary<Guid, FarmConfiguration> _farms = [];
+    private readonly SemaphoreSlim _lock = new(1, 1);
+
+    public async Task<IReadOnlyList<FarmConfiguration>> GetAllAsync(CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { return _farms.Values.OrderBy(f => f.CreatedAt).ToList().AsReadOnly(); }
+        finally { _lock.Release(); }
+    }
+
+    public async Task<FarmConfiguration?> GetByIdAsync(Guid farmId, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { return _farms.GetValueOrDefault(farmId); }
+        finally { _lock.Release(); }
+    }
+
+    public async Task SaveAsync(FarmConfiguration farm, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { _farms[farm.Id] = farm; }
+        finally { _lock.Release(); }
+    }
+
+    public async Task DeleteAsync(Guid farmId, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { _farms.Remove(farmId); }
+        finally { _lock.Release(); }
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryPrintProjectRepository.cs b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryPrintProjectRepository.cs
new file mode 100644
index 0000000..155dec6
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryPrintProjectRepository.cs
@@ -0,0 +1,73 @@
+namespace MakerPrompt.Infrastructure.InMemoryStores;
+
+/// <summary>
+/// Thread-safe, in-memory implementation of <see cref="IPrintProjectRepository"/>.
+/// G-code file "storage" is kept in-memory as byte arrays.
+/// </summary>
+public sealed class InMemoryPrintProjectRepository : IPrintProjectRepository
+{
+    private readonly Dictionary<Guid, PrintProject> _projects = [];
+    private readonly Dictionary<string, byte[]> _files = [];
+    private readonly SemaphoreSlim _lock = new(1, 1);
+
+    public async Task<IReadOnlyList<PrintProject>> GetAllAsync(CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { return _projects.Values.ToList().AsReadOnly(); }
+        finally { _lock.Release(); }
+    }
+
+    public async Task<PrintProject?> GetByIdAsync(Guid projectId, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { return _projects.GetValueOrDefault(projectId); }
+        finally { _lock.Release(); }
+    }
+
+    public async Task SaveAsync(PrintProject project, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { _projects[project.Id] = project; }
+        finally { _lock.Release(); }
+    }
+
+    public async Task DeleteAsync(Guid projectId, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { _projects.Remove(projectId); }
+        finally { _lock.Release(); }
+    }
+
+    public async Task<Stream?> OpenJobFileAsync(string storagePath, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            return _files.TryGetValue(storagePath, out var data)
+                ? new MemoryStream(data, writable: false)
+                : null;
+        }
+        finally { _lock.Release(); }
+    }
+
+    public async Task<string> SaveJobFileAsync(Guid projectId, string fileName, Stream content,
+        CancellationToken cancellationToken = default)
+    {
+        var storagePath = $"PrintProjects/{projectId}/{fileName}";
+        using var ms = new MemoryStream();
+        await content.CopyToAsync(ms, cancellationToken);
+
+        await _lock.WaitAsync(cancellationToken);
+        try { _files[storagePath] = ms.ToArray(); }
+        finally { _lock.Release(); }
+
+        return storagePath;
+    }
+
+    public async Task DeleteJobFileAsync(string storagePath, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try { _files.Remove(storagePath); }
+        finally { _lock.Release(); }
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryTelemetryStore.cs b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryTelemetryStore.cs
new file mode 100644
index 0000000..52d02df
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/InMemoryStores/InMemoryTelemetryStore.cs
@@ -0,0 +1,68 @@
+namespace MakerPrompt.Infrastructure.InMemoryStores;
+
+/// <summary>
+/// In-memory implementation of <see cref="ITelemetryStore"/>.
+/// Retains the last <c>N</c> snapshots per printer in a bounded ring buffer.
+/// Suitable for development; does not survive process restart.
+/// </summary>
+/// <param name="maxPerPrinter">Maximum snapshots retained per printer ID (default 500).</param>
+public sealed class InMemoryTelemetryStore(int maxPerPrinter = 500) : ITelemetryStore
+{
+    private readonly int _maxPerPrinter = maxPerPrinter;
+    private readonly Dictionary<string, LinkedList<PrinterTelemetry>> _data = [];
+    private readonly SemaphoreSlim _lock = new(1, 1);
+
+    public async Task SaveAsync(string printerId, PrinterTelemetry telemetry,
+        CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            if (!_data.TryGetValue(printerId, out var list))
+            {
+                list = new LinkedList<PrinterTelemetry>();
+                _data[printerId] = list;
+            }
+
+            list.AddFirst(telemetry);
+
+            while (list.Count > _maxPerPrinter)
+                list.RemoveLast();
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    public async Task<PrinterTelemetry?> GetLatestAsync(string printerId,
+        CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            return _data.TryGetValue(printerId, out var list) ? list.First?.Value : null;
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    public async Task<IReadOnlyList<PrinterTelemetry>> GetHistoryAsync(string printerId, int count,
+        CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            if (!_data.TryGetValue(printerId, out var list))
+                return [];
+
+            return list.Take(count).ToList().AsReadOnly();
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure/MakerPrompt.Infrastructure.csproj b/src/MakerPrompt.Infrastructure/MakerPrompt.Infrastructure.csproj
new file mode 100644
index 0000000..553495c
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/MakerPrompt.Infrastructure.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MakerPrompt.Core\MakerPrompt.Core.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/MakerPrompt.Infrastructure/Services/FarmService.cs b/src/MakerPrompt.Infrastructure/Services/FarmService.cs
new file mode 100644
index 0000000..e0dd488
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/Services/FarmService.cs
@@ -0,0 +1,97 @@
+namespace MakerPrompt.Infrastructure.Services;
+
+/// <summary>
+/// Application service for managing farm configurations.
+///
+/// Responsibilities:
+/// - CRUD for farm profiles.
+/// - Switching the active farm (saving current printer state, loading the new one).
+/// - Import / export as JSON.
+/// </summary>
+public sealed class FarmService(IFarmRepository repo, ILogger<FarmService> logger)
+{
+    private readonly IFarmRepository _repo = repo;
+    private readonly ILogger<FarmService> _logger = logger;
+
+    /// <summary>Raised whenever the list of farms changes.</summary>
+    public event EventHandler? FarmsChanged;
+
+    public Task<IReadOnlyList<FarmConfiguration>> GetFarmsAsync(CancellationToken cancellationToken = default)
+        => _repo.GetAllAsync(cancellationToken);
+
+    public Task<FarmConfiguration?> GetFarmAsync(Guid farmId, CancellationToken cancellationToken = default)
+        => _repo.GetByIdAsync(farmId, cancellationToken);
+
+    /// <summary>Creates a new farm profile with the given name.</summary>
+    public async Task<FarmConfiguration> CreateFarmAsync(string name, CancellationToken cancellationToken = default)
+    {
+        var farm = new FarmConfiguration { Name = name.Trim() };
+        await _repo.SaveAsync(farm, cancellationToken);
+        OnFarmsChanged();
+        return farm;
+    }
+
+    /// <summary>Updates the display name of a farm.</summary>
+    public async Task RenameFarmAsync(Guid farmId, string newName, CancellationToken cancellationToken = default)
+    {
+        var farm = await _repo.GetByIdAsync(farmId, cancellationToken);
+        if (farm is null)
+        {
+            _logger.LogWarning("RenameFarm: farm {FarmId} not found", farmId);
+            return;
+        }
+
+        farm.Name = newName.Trim();
+        await _repo.SaveAsync(farm, cancellationToken);
+        OnFarmsChanged();
+    }
+
+    /// <summary>
+    /// Saves a snapshot of the given printer definitions into the farm, then persists.
+    /// Used when switching away from this farm to preserve its current printer list.
+    /// </summary>
+    public async Task SnapshotPrintersAsync(Guid farmId,
+        IEnumerable<PrinterConnectionDefinition> currentPrinters,
+        CancellationToken cancellationToken = default)
+    {
+        var farm = await _repo.GetByIdAsync(farmId, cancellationToken);
+        if (farm is null) return;
+
+        farm.Printers = currentPrinters.ToList();
+        await _repo.SaveAsync(farm, cancellationToken);
+    }
+
+    /// <summary>Deletes a farm profile.</summary>
+    public async Task DeleteFarmAsync(Guid farmId, CancellationToken cancellationToken = default)
+    {
+        await _repo.DeleteAsync(farmId, cancellationToken);
+        OnFarmsChanged();
+    }
+
+    /// <summary>
+    /// Exports a farm as a JSON string suitable for file download / transfer.
+    /// </summary>
+    public async Task<string> ExportFarmAsync(Guid farmId, CancellationToken cancellationToken = default)
+    {
+        var farm = await _repo.GetByIdAsync(farmId, cancellationToken);
+        if (farm is null) return "{}";
+        return System.Text.Json.JsonSerializer.Serialize(farm, new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
+    }
+
+    /// <summary>
+    /// Imports a farm from a JSON string. Assigns a fresh ID to prevent collisions.
+    /// </summary>
+    public async Task<FarmConfiguration> ImportFarmAsync(string json, CancellationToken cancellationToken = default)
+    {
+        var farm = System.Text.Json.JsonSerializer.Deserialize<FarmConfiguration>(json)
+            ?? throw new InvalidOperationException("Invalid farm configuration JSON.");
+
+        farm.Id = Guid.NewGuid();
+        farm.CreatedAt = DateTime.UtcNow;
+        await _repo.SaveAsync(farm, cancellationToken);
+        OnFarmsChanged();
+        return farm;
+    }
+
+    private void OnFarmsChanged() => FarmsChanged?.Invoke(this, EventArgs.Empty);
+}
diff --git a/src/MakerPrompt.Infrastructure/Services/PrinterFleetService.cs b/src/MakerPrompt.Infrastructure/Services/PrinterFleetService.cs
new file mode 100644
index 0000000..aafbbf8
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/Services/PrinterFleetService.cs
@@ -0,0 +1,153 @@
+namespace MakerPrompt.Infrastructure.Services;
+
+/// <summary>
+/// Application service that manages a fleet of printers.
+///
+/// Responsibilities
+/// ----------------
+/// • Maintains a registry of active <see cref="IPrinterCommunicationService"/> instances,
+///   keyed by a stable printer identifier.
+/// • Surfaces aggregated fleet status and per-printer telemetry.
+/// • Coordinates with <see cref="IPrinterProvider"/> implementations to discover
+///   printers exposed by cloud/farm accounts, then creates the appropriate
+///   backend connection service for each one.
+///
+/// Design note
+/// -----------
+/// This service lives in the Application layer and has no dependency on Blazor,
+/// making it equally usable from the EdgeAgent, the Cloud backend, and any future
+/// CLI or native UI host.
+/// </summary>
+public sealed class PrinterFleetService(ILogger<PrinterFleetService> logger) : IAsyncDisposable
+{
+    private readonly ILogger<PrinterFleetService> _logger = logger;
+    private readonly Dictionary<string, IPrinterCommunicationService> _connections = [];
+    private readonly SemaphoreSlim _lock = new(1, 1);
+
+    /// <summary>Raised when any printer in the fleet changes state.</summary>
+    public event EventHandler? FleetChanged;
+
+    /// <summary>
+    /// Returns a read-only snapshot of all registered printer identifiers.
+    /// </summary>
+    public IReadOnlyCollection<string> PrinterIds
+    {
+        get
+        {
+            lock (_connections)
+                return _connections.Keys.ToArray();
+        }
+    }
+
+    /// <summary>
+    /// Returns the communication service for the given printer, or <c>null</c> if not registered.
+    /// </summary>
+    public IPrinterCommunicationService? GetConnection(string printerId)
+    {
+        lock (_connections)
+            return _connections.GetValueOrDefault(printerId);
+    }
+
+    /// <summary>
+    /// Registers a printer and immediately attempts to connect using the supplied settings.
+    /// If a connection for <paramref name="printerId"/> already exists it is disconnected
+    /// and replaced.
+    /// </summary>
+    public async Task<bool> AddAndConnectAsync(
+        string printerId,
+        IPrinterCommunicationService service,
+        PrinterConnectionSettings settings,
+        CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            if (_connections.TryGetValue(printerId, out var existing))
+            {
+                await existing.DisconnectAsync(cancellationToken);
+                await existing.DisposeAsync();
+            }
+
+            service.ConnectionStateChanged += (_, connected) => OnFleetChanged();
+            service.TelemetryUpdated += (_, _) => OnFleetChanged();
+
+            var connected = await service.ConnectAsync(settings, cancellationToken);
+            _connections[printerId] = service;
+            OnFleetChanged();
+            return connected;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to connect printer {PrinterId}", printerId);
+            return false;
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    /// <summary>
+    /// Disconnects and removes the printer with the given identifier from the fleet.
+    /// </summary>
+    public async Task RemoveAsync(string printerId, CancellationToken cancellationToken = default)
+    {
+        await _lock.WaitAsync(cancellationToken);
+        try
+        {
+            if (!_connections.Remove(printerId, out var service)) return;
+            await service.DisconnectAsync(cancellationToken);
+            await service.DisposeAsync();
+            OnFleetChanged();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error removing printer {PrinterId}", printerId);
+        }
+        finally
+        {
+            _lock.Release();
+        }
+    }
+
+    /// <summary>
+    /// Returns the latest telemetry for all connected printers, keyed by printer identifier.
+    /// </summary>
+    public IReadOnlyDictionary<string, PrinterTelemetry> GetFleetTelemetry()
+    {
+        lock (_connections)
+        {
+            return _connections
+                .Where(kv => kv.Value.IsConnected)
+                .ToDictionary(kv => kv.Key, kv => kv.Value.LastTelemetry);
+        }
+    }
+
+    private void OnFleetChanged() => FleetChanged?.Invoke(this, EventArgs.Empty);
+
+    public async ValueTask DisposeAsync()
+    {
+        await _lock.WaitAsync();
+        try
+        {
+            foreach (var service in _connections.Values)
+            {
+                try
+                {
+                    await service.DisconnectAsync();
+                    await service.DisposeAsync();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error disposing printer connection");
+                }
+            }
+            _connections.Clear();
+        }
+        finally
+        {
+            _lock.Release();
+            _lock.Dispose();
+        }
+    }
+}
diff --git a/MakerPrompt.Shared/Services/BambuLabApiService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/BambuLabApiService.cs
similarity index 89%
rename from MakerPrompt.Shared/Services/BambuLabApiService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/BambuLabApiService.cs
index e7d9000..5058f10 100644
--- a/MakerPrompt.Shared/Services/BambuLabApiService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/BambuLabApiService.cs
@@ -1,6 +1,6 @@
 using System.Net.WebSockets;
 
-namespace MakerPrompt.Shared.Services;
+namespace MakerPrompt.Infrastructure.Services.Printers;
 
 /// <summary>
 /// BambuLab printer backend using WebSocket MQTT + HTTP REST API.
@@ -59,7 +59,7 @@ private HttpClient Client
         }
     }
 
-    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
     {
         if (IsConnected) return true;
         if (connectionSettings.ConnectionType != ConnectionType)
@@ -67,16 +67,16 @@ public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSetting
             throw new ArgumentException("BambuLab connection type mismatch.", nameof(connectionSettings));
         }
 
-        if (connectionSettings.Api is null)
+        if (string.IsNullOrEmpty(connectionSettings.ApiUrl))
         {
             return false;
         }
 
-        _httpBaseUri = new Uri(connectionSettings.Api.Url);
-        ConfigureClient(connectionSettings.Api);
+        _httpBaseUri = new Uri(connectionSettings.ApiUrl);
+        ConfigureClient(connectionSettings);
 
-        _accessCode = connectionSettings.Api.Password;
-        _serial = connectionSettings.Api.UserName;
+        _accessCode = connectionSettings.Password;
+        _serial = connectionSettings.UserName;
 
         if (string.IsNullOrWhiteSpace(_accessCode) || string.IsNullOrWhiteSpace(_serial))
         {
@@ -393,14 +393,14 @@ private async Task SafeTelemetryAsync()
     {
         try
         {
-            await GetPrinterTelemetryAsync().ConfigureAwait(false);
+            await GetTelemetryAsync().ConfigureAwait(false);
         }
         catch
         {
         }
     }
 
-    public async Task DisconnectAsync()
+    public async Task DisconnectAsync(CancellationToken cancellationToken = default)
     {
         updateTimer.Stop();
         _cts.Cancel();
@@ -428,12 +428,12 @@ public async Task DisconnectAsync()
         RaiseConnectionChanged();
     }
 
-    public Task WriteDataAsync(string command)
+    public Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
     {
         return Task.CompletedTask;
     }
 
-    public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+    public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
     {
         if (!IsConnected || _httpBaseUri is null)
         {
@@ -458,9 +458,9 @@ public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
         return LastTelemetry;
     }
 
-    public Task<List<FileEntry>> GetFilesAsync()
+    public Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
     {
-        return Task.FromResult(new List<FileEntry>());
+        return Task.FromResult<IReadOnlyList<string>>(Array.Empty<string>());
     }
 
     private Task SendCommandAsync(string name, object payload)
@@ -474,25 +474,25 @@ private Task SendCommandAsync(string name, object payload)
         return SendRawAsync(envelope, _cts.Token);
     }
 
-    public Task SetHotendTemp(int targetTemp = 0) =>
+    public Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         SendCommandAsync("set_nozzle_temp", new { target = targetTemp });
 
-    public Task SetBedTemp(int targetTemp = 0) =>
+    public Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         SendCommandAsync("set_bed_temp", new { target = targetTemp });
 
-    public Task Home(bool x = true, bool y = true, bool z = true) =>
+    public Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default) =>
         SendCommandAsync("home", new { x, y, z });
 
-    public Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f) =>
+    public Task RelativeMoveAsync(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f, CancellationToken cancellationToken = default) =>
         SendCommandAsync("move_relative", new { feedRate, x, y, z, e });
 
-    public Task SetFanSpeed(int fanSpeedPercentage = 0) =>
+    public Task SetFanSpeedAsync(int fanSpeedPercentage = 0, CancellationToken cancellationToken = default) =>
         SendCommandAsync("set_fan_speed", new { speed = fanSpeedPercentage });
 
-    public Task SetPrintSpeed(int speed) =>
+    public Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default) =>
         SendCommandAsync("set_print_speed", new { speed });
 
-    public Task SetPrintFlow(int flow) =>
+    public Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default) =>
         SendCommandAsync("set_print_flow", new { flow });
 
     public Task SetAxisPerUnit(float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f) =>
@@ -504,10 +504,10 @@ public Task RunPidTuning(int cycles, int targetTemp, int extruderIndex) =>
     public Task RunThermalModelCalibration(int cycles, int targetTemp) =>
         SendCommandAsync("run_thermal_model_calibration", new { cycles, targetTemp });
 
-    public Task StartPrint(FileEntry file) =>
-        SendCommandAsync("start_print_file", new { path = file.FullPath });
+    public Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default) =>
+        SendCommandAsync("start_print_file", new { path = fileName });
 
-    public Task StartPrint(GCodeDoc gcodeDoc)
+    public Task StartPrintAsync(GCodeDoc gcodeDoc, CancellationToken cancellationToken = default)
     {
         if (!IsConnected || string.IsNullOrEmpty(gcodeDoc.Content))
         {
@@ -568,7 +568,7 @@ public override ValueTask DisposeAsync()
         return ValueTask.CompletedTask;
     }
 
-    private void ConfigureClient(ApiConnectionSettings settings)
+    private void ConfigureClient(PrinterConnectionSettings settings)
     {
         var client = Client;
         client.BaseAddress = _httpBaseUri;
diff --git a/MakerPrompt.Shared/Infrastructure/BasePrinterConnectionService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/BasePrinterConnectionService.cs
similarity index 92%
rename from MakerPrompt.Shared/Infrastructure/BasePrinterConnectionService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/BasePrinterConnectionService.cs
index 9acaa5e..f9fa280 100644
--- a/MakerPrompt.Shared/Infrastructure/BasePrinterConnectionService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/BasePrinterConnectionService.cs
@@ -1,32 +1,32 @@
-namespace MakerPrompt.Shared.Infrastructure
-{
-    public abstract class BasePrinterConnectionService : IAsyncDisposable
-    {
-        public event EventHandler<bool>? ConnectionStateChanged;
-        public event EventHandler<PrinterTelemetry>? TelemetryUpdated;
-        public PrinterTelemetry LastTelemetry { get; set; } = new();
-
-        public abstract PrinterConnectionType ConnectionType { get; }
-
-        public string ConnectionName { get; set; } = string.Empty;
-
-        public bool IsConnected { get; set; } = false;
-
-        public readonly System.Timers.Timer updateTimer = new(TimeSpan.FromMilliseconds(3000));
-
-        // True while a print job is actively streaming G-code to the printer.
-        public bool IsPrinting { get; protected set; }
-
-        public void RaiseConnectionChanged()
-        {
-            ConnectionStateChanged?.Invoke(this, IsConnected);
-        }
-
-        public void RaiseTelemetryUpdated()
-        {
-            TelemetryUpdated?.Invoke(this, LastTelemetry);
-        }
-        
-        public abstract ValueTask DisposeAsync();
-    }
-}
+namespace MakerPrompt.Infrastructure.Services.Printers
+{
+    public abstract class BasePrinterConnectionService : IAsyncDisposable
+    {
+        public event EventHandler<bool>? ConnectionStateChanged;
+        public event EventHandler<PrinterTelemetry>? TelemetryUpdated;
+        public PrinterTelemetry LastTelemetry { get; set; } = new();
+
+        public abstract PrinterConnectionType ConnectionType { get; }
+
+        public string ConnectionName { get; set; } = string.Empty;
+
+        public bool IsConnected { get; set; } = false;
+
+        public readonly System.Timers.Timer updateTimer = new(TimeSpan.FromMilliseconds(3000));
+
+        // True while a print job is actively streaming G-code to the printer.
+        public bool IsPrinting { get; protected set; }
+
+        public void RaiseConnectionChanged()
+        {
+            ConnectionStateChanged?.Invoke(this, IsConnected);
+        }
+
+        public void RaiseTelemetryUpdated()
+        {
+            TelemetryUpdated?.Invoke(this, LastTelemetry);
+        }
+        
+        public abstract ValueTask DisposeAsync();
+    }
+}
diff --git a/MakerPrompt.Shared/Services/DemoPrinterService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/DemoPrinterService.cs
similarity index 83%
rename from MakerPrompt.Shared/Services/DemoPrinterService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/DemoPrinterService.cs
index e1b1691..7b876c2 100644
--- a/MakerPrompt.Shared/Services/DemoPrinterService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/DemoPrinterService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.Infrastructure.Services.Printers
 {
     public class DemoPrinterService : BasePrinterConnectionService, IPrinterCommunicationService
     {
@@ -21,7 +21,7 @@ public DemoPrinterService()
             updateTimer.Elapsed += (s, e) => SimulateTelemetry();
         }
 
-        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
         {
             IsConnected = true;
             LastTelemetry = new PrinterTelemetry
@@ -45,7 +45,7 @@ public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSetting
             return true;
         }
 
-        public async Task DisconnectAsync()
+        public async Task DisconnectAsync(CancellationToken cancellationToken = default)
         {
             updateTimer.Stop();
             IsConnected = false;
@@ -55,48 +55,48 @@ public async Task DisconnectAsync()
             RaiseTelemetryUpdated();
         }
 
-        public async Task WriteDataAsync(string command)
+        public async Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
         {
             LastTelemetry.LastResponse = $"Received command: {command}";
             RaiseTelemetryUpdated();
             await Task.Delay(50);
         }
 
-        public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+        public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
         {
             await Task.Delay(50);
             return LastTelemetry;
         }
 
-        public async Task<List<FileEntry>> GetFilesAsync()
+        public async Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
         {
             await Task.Delay(100);
             return
             [
-                new() { FullPath = "/gcodes/DemoCube.gcode", Size = 123456, ModifiedDate = DateTime.Now.AddDays(-1), IsAvailable = true },
-                new() { FullPath = "/gcodes/Benchy.gcode", Size = 654321, ModifiedDate = DateTime.Now.AddDays(-2), IsAvailable = true }
+                "/gcodes/DemoCube.gcode",
+                "/gcodes/Benchy.gcode"
             ];
         }
 
-        public async Task SetHotendTemp(int targetTemp = 0)
+        public async Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default)
         {
             _hotendTarget = Math.Clamp(targetTemp, 0, 300);
             LastTelemetry.HotendTarget = _hotendTarget;
-            LastTelemetry.LastResponse = $"Set hotend target to {_hotendTarget}°C";
+            LastTelemetry.LastResponse = $"Set hotend target to {_hotendTarget}�C";
             RaiseTelemetryUpdated();
             await Task.Delay(50);
         }
 
-        public async Task SetBedTemp(int targetTemp = 0)
+        public async Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default)
         {
             _bedTarget = Math.Clamp(targetTemp, 0, 120);
             LastTelemetry.BedTarget = _bedTarget;
-            LastTelemetry.LastResponse = $"Set bed target to {_bedTarget}°C";
+            LastTelemetry.LastResponse = $"Set bed target to {_bedTarget}�C";
             RaiseTelemetryUpdated();
             await Task.Delay(50);
         }
 
-        public async Task Home(bool x = true, bool y = true, bool z = true)
+        public async Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default)
         {
             if (x) _position.X = 0;
             if (y) _position.Y = 0;
@@ -107,7 +107,7 @@ public async Task Home(bool x = true, bool y = true, bool z = true)
             await Task.Delay(100);
         }
 
-        public async Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f)
+        public async Task RelativeMoveAsync(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f, CancellationToken cancellationToken = default)
         {
             _position += new Vector3(x, y, z);
             LastTelemetry.Position = _position;
@@ -116,7 +116,7 @@ public async Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, flo
             await Task.Delay(100);
         }
 
-        public async Task SetFanSpeed(int fanSpeedPercentage = 0)
+        public async Task SetFanSpeedAsync(int fanSpeedPercentage = 0, CancellationToken cancellationToken = default)
         {
             _fanSpeed = Math.Clamp(fanSpeedPercentage, 0, 100);
             LastTelemetry.FanSpeed = _fanSpeed;
@@ -125,7 +125,7 @@ public async Task SetFanSpeed(int fanSpeedPercentage = 0)
             await Task.Delay(50);
         }
 
-        public async Task SetPrintSpeed(int speed)
+        public async Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default)
         {
             _feedRate = Math.Clamp(speed, 1, 200);
             LastTelemetry.FeedRate = _feedRate;
@@ -134,7 +134,7 @@ public async Task SetPrintSpeed(int speed)
             await Task.Delay(50);
         }
 
-        public async Task SetPrintFlow(int flow)
+        public async Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default)
         {
             _flowRate = Math.Clamp(flow, 1, 200);
             LastTelemetry.FlowRate = _flowRate;
@@ -175,29 +175,29 @@ public async Task SaveEEPROM()
             await Task.Delay(100);
         }
 
-        public async Task StartPrint(FileEntry file)
+        public async Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default)
         {
             // Simulate starting a print job in demo mode
-            if (file == null)
+            if (string.IsNullOrEmpty(fileName))
             {
                 LastTelemetry.LastResponse = "No file selected to print.";
                 RaiseTelemetryUpdated();
                 return;
             }
 
-            LastTelemetry.LastResponse = $"Started print job: {file.FullPath}";
+            LastTelemetry.LastResponse = $"Started print job: {fileName}";
             LastTelemetry.Status = PrinterStatus.Printing;
             RaiseTelemetryUpdated();
 
             // Simulate print duration
             await Task.Delay(1000);
 
-            LastTelemetry.LastResponse = $"Print job completed: {file.FullPath}";
+            LastTelemetry.LastResponse = $"Print job completed: {fileName}";
             LastTelemetry.Status = PrinterStatus.Connected;
             RaiseTelemetryUpdated();
         }
 
-        public Task StartPrint(GCodeDoc gcodeDoc)
+        public Task StartPrintAsync(GCodeDoc gcodeDoc, CancellationToken cancellationToken = default)
         {
             // For the demo printer, just log that we would print the provided G-code.
             LastTelemetry.LastResponse = string.IsNullOrWhiteSpace(gcodeDoc.Content)
diff --git a/MakerPrompt.Shared/Infrastructure/ISerialService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/ISerialService.cs
similarity index 87%
rename from MakerPrompt.Shared/Infrastructure/ISerialService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/ISerialService.cs
index 3a96c90..e81058d 100644
--- a/MakerPrompt.Shared/Infrastructure/ISerialService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/ISerialService.cs
@@ -1,15 +1,15 @@
-namespace MakerPrompt.Shared.Infrastructure
-{
-    public interface ISerialService : IPrinterCommunicationService
-    {
-        bool IsSupported { get; }
-
-        Task<IEnumerable<string>> GetAvailablePortsAsync();
-
-        Task<bool> CheckSupportedAsync();
-        Task RequestPortAsync();
-
-        //Task OpenPortAsync(string port, int baudRate, int dataBits = 8, int stopBits = 1,
-        //    string parity = "none", string flowControl = "none");
-    }
-}
+namespace MakerPrompt.Infrastructure.Services.Printers
+{
+    public interface ISerialService : IPrinterCommunicationService
+    {
+        bool IsSupported { get; }
+
+        Task<IEnumerable<string>> GetAvailablePortsAsync();
+
+        Task<bool> CheckSupportedAsync();
+        Task RequestPortAsync();
+
+        //Task OpenPortAsync(string port, int baudRate, int dataBits = 8, int stopBits = 1,
+        //    string parity = "none", string flowControl = "none");
+    }
+}
diff --git a/MakerPrompt.Shared/Services/MoonrakerApiService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/MoonrakerApiService.cs
similarity index 84%
rename from MakerPrompt.Shared/Services/MoonrakerApiService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/MoonrakerApiService.cs
index a8fe3da..bb01064 100644
--- a/MakerPrompt.Shared/Services/MoonrakerApiService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/MoonrakerApiService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.Infrastructure.Services.Printers
 {
     public class MoonrakerApiService : BasePrinterConnectionService, IPrinterCommunicationService
     {
@@ -9,7 +9,6 @@ public class MoonrakerApiService : BasePrinterConnectionService, IPrinterCommuni
         private string _jwtToken = string.Empty;
         private string _refreshToken = string.Empty;
         public override PrinterConnectionType ConnectionType { get; } = PrinterConnectionType.Moonraker;
-        public bool SupportsPrinterQueue => true;
 
         public MoonrakerApiService()
         {
@@ -49,11 +48,11 @@ public MoonrakerApiService(HttpMessageHandler handler)
 
         private bool _telemetryTimerInitialized;
 
-        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
         {
             if (IsConnected) return IsConnected;
 
-            if (connectionSettings.ConnectionType != ConnectionType || connectionSettings.Api == null) throw new ArgumentException();
+            if (connectionSettings.ConnectionType != ConnectionType || string.IsNullOrEmpty(connectionSettings.ApiUrl)) throw new ArgumentException();
 
             if (_cts.IsCancellationRequested)
             {
@@ -61,12 +60,12 @@ public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSetting
                 _cts = new CancellationTokenSource();
             }
 
-            _baseUri = new Uri(connectionSettings.Api.Url);
-            ConfigureClient(connectionSettings.Api);
+            _baseUri = new Uri(connectionSettings.ApiUrl);
+            ConfigureClient(connectionSettings);
 
-            if (!string.IsNullOrEmpty(connectionSettings.Api.UserName) && !string.IsNullOrEmpty(connectionSettings.Api.Password))
+            if (!string.IsNullOrEmpty(connectionSettings.UserName) && !string.IsNullOrEmpty(connectionSettings.Password))
             {
-                IsConnected = await AuthenticateAsync(connectionSettings.Api.UserName, connectionSettings.Api.Password);
+                IsConnected = await AuthenticateAsync(connectionSettings.UserName, connectionSettings.Password);
                 if (!IsConnected) return IsConnected;
             }
 
@@ -94,7 +93,7 @@ public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSetting
             return IsConnected;
         }
 
-        public async Task DisconnectAsync()
+        public async Task DisconnectAsync(CancellationToken cancellationToken = default)
         {
             updateTimer.Stop();
             _cts.Cancel();
@@ -104,7 +103,7 @@ public async Task DisconnectAsync()
             await Task.CompletedTask;
         }
 
-        public async Task WriteDataAsync(string command)
+        public async Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
         {
             if (!IsConnected) return;
 
@@ -117,7 +116,7 @@ public async Task WriteDataAsync(string command)
             LastTelemetry.LastResponse = content;
             RaiseTelemetryUpdated();
         }
-        public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+        public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
         {
             if (!IsConnected) return LastTelemetry;
 
@@ -274,7 +273,7 @@ public async Task<IReadOnlyList<PrinterCamera>> GetCamerasAsync(CancellationToke
             }
         }
 
-        public async Task<List<FileEntry>> GetFilesAsync()
+        public async Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
         {
             if (!IsConnected) return [];
 
@@ -283,52 +282,7 @@ public async Task<List<FileEntry>> GetFilesAsync()
             response.EnsureSuccessStatusCode();
             var content = JsonSerializer.Deserialize<FileListResponse>(await response.Content.ReadAsStringAsync());
             var files = content?.Files ?? [];
-            return files.Select(f => new FileEntry
-                {
-                    FullPath = f.Path,
-                    Size = f.Size,
-                    ModifiedDate = f.ModifiedDate,
-                    IsAvailable = f.Permissions.Contains("rw"),
-                }).ToList();
-        }
-
-        /// <summary>
-        /// Returns the current Moonraker print queue (queued job entries).
-        /// Returns an empty list when not connected or the API call fails.
-        /// </summary>
-        public async Task<List<PrintQueueEntry>> GetPrinterQueueAsync()
-        {
-            if (!IsConnected) return [];
-
-            try
-            {
-                var response = await Client.GetAsync("/server/print_queue", _cts.Token);
-                if (!response.IsSuccessStatusCode) return [];
-
-                var json = await response.Content.ReadAsStringAsync();
-                using var doc = JsonDocument.Parse(json);
-                if (!doc.RootElement.TryGetProperty("result", out var result)) return [];
-                if (!result.TryGetProperty("queued_jobs", out var jobs) ||
-                    jobs.ValueKind != JsonValueKind.Array) return [];
-
-                var entries = new List<PrintQueueEntry>();
-                foreach (var job in jobs.EnumerateArray())
-                {
-                    entries.Add(new PrintQueueEntry
-                    {
-                        JobId = job.TryGetProperty("job_id", out var id) ? id.GetString() ?? string.Empty : string.Empty,
-                        FileName = job.TryGetProperty("filename", out var fn) ? fn.GetString() ?? string.Empty : string.Empty,
-                        TimeAdded = job.TryGetProperty("time_added", out var ta) ? ta.GetDouble() : 0,
-                    });
-                }
-                return entries;
-            }
-            catch
-            {
-                // Swallow API errors silently — the caller (ControlPanel) handles
-                // the empty-list case and uses RunAsync for user-facing error reporting.
-                return [];
-            }
+            return files.Select(f => f.Path).ToList();
         }
 
         public async Task<Stream?> OpenReadAsync(string fullPath, CancellationToken cancellationToken = default)
@@ -415,7 +369,7 @@ public override ValueTask DisposeAsync()
             return ValueTask.CompletedTask;
         }
 
-        private void ConfigureClient(ApiConnectionSettings settings)
+        private void ConfigureClient(PrinterConnectionSettings settings)
         {
             var client = Client;
             client.BaseAddress = _baseUri;
@@ -435,7 +389,7 @@ private async Task SafeTelemetryAsync()
         {
             try
             {
-                await GetPrinterTelemetryAsync();
+                await GetTelemetryAsync();
             }
             catch
             {
@@ -445,13 +399,13 @@ private async Task SafeTelemetryAsync()
 
         private Task SendGcodeAsync(string gcode) => WriteDataAsync(gcode);
 
-        public Task SetHotendTemp(int targetTemp = 0) =>
+        public Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
             SendGcodeAsync($"M104 S{targetTemp}");
 
-        public Task SetBedTemp(int targetTemp = 0) =>
+        public Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
             SendGcodeAsync($"M140 S{targetTemp}");
 
-        public Task Home(bool x = true, bool y = true, bool z = true)
+        public Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default)
         {
             var axes = new StringBuilder();
             if (x) axes.Append(" X");
@@ -461,7 +415,7 @@ public Task Home(bool x = true, bool y = true, bool z = true)
             return SendGcodeAsync(command);
         }
 
-        public Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f)
+        public Task RelativeMoveAsync(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f, CancellationToken cancellationToken = default)
         {
             var sb = new StringBuilder();
             sb.Append("G91\nG1");
@@ -473,20 +427,20 @@ public Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z =
             return SendGcodeAsync(sb.ToString());
         }
 
-        public Task SetFanSpeed(int speed)
+        public Task SetFanSpeedAsync(int speed, CancellationToken cancellationToken = default)
         {
             var clamped = Math.Clamp(speed, 0, 100);
             var duty = (int)Math.Round(clamped * 255.0 / 100.0, MidpointRounding.AwayFromZero);
             return SendGcodeAsync($"M106 S{duty}");
         }
 
-        public Task SetPrintSpeed(int speed)
+        public Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default)
         {
             var clamped = Math.Clamp(speed, 1, 200);
             return SendGcodeAsync($"M220 S{clamped}");
         }
 
-        public Task SetPrintFlow(int flow)
+        public Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default)
         {
             var clamped = Math.Clamp(flow, 1, 200);
             return SendGcodeAsync($"M221 S{clamped}");
@@ -514,13 +468,13 @@ public Task RunThermalModelCalibration(int cycles, int targetTemp)
             return SendGcodeAsync($"PID_CALIBRATE HEATER=heater_bed TARGET={targetTemp}");
         }
 
-        public async Task StartPrint(FileEntry file)
+        public async Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default)
         {
-            var filename = WebUtility.UrlEncode(file.FullPath);
-            await Client.PostAsync($"/printer/print/start?filename={filename}", null, _cts.Token);
+            var encoded = WebUtility.UrlEncode(fileName);
+            await Client.PostAsync($"/printer/print/start?filename={encoded}", null, _cts.Token);
         }
 
-        public Task StartPrint(GCodeDoc gcodeDoc)
+        public Task StartPrintAsync(GCodeDoc gcodeDoc, CancellationToken cancellationToken = default)
         {
             if (!IsConnected || string.IsNullOrEmpty(gcodeDoc.Content))
             {
@@ -659,14 +613,3 @@ private sealed record WebcamEntry
     }
 
 }
-
-/// <summary>
-/// Represents a single entry in the Moonraker print queue.
-/// </summary>
-public sealed class PrintQueueEntry
-{
-    public string JobId { get; init; } = string.Empty;
-    public string FileName { get; init; } = string.Empty;
-    /// <summary>Unix timestamp when the job was added to the queue.</summary>
-    public double TimeAdded { get; init; }
-}
diff --git a/MakerPrompt.Shared/Services/OctoPrintApiService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/OctoPrintApiService.cs
similarity index 89%
rename from MakerPrompt.Shared/Services/OctoPrintApiService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/OctoPrintApiService.cs
index 205998d..9cd2a0b 100644
--- a/MakerPrompt.Shared/Services/OctoPrintApiService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/OctoPrintApiService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Services;
+namespace MakerPrompt.Infrastructure.Services.Printers;
 
 /// <summary>
 /// OctoPrint REST API backend.
@@ -48,15 +48,15 @@ private HttpClient Client
         }
     }
 
-    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
     {
         if (IsConnected) return true;
 
-        if (connectionSettings.Api is null)
+        if (string.IsNullOrEmpty(connectionSettings.ApiUrl))
             throw new ArgumentException("OctoPrint connection requires API settings.", nameof(connectionSettings));
 
-        _baseUri = new Uri(connectionSettings.Api.Url);
-        ConfigureClient(connectionSettings.Api);
+        _baseUri = new Uri(connectionSettings.ApiUrl);
+        ConfigureClient(connectionSettings);
 
         try
         {
@@ -135,7 +135,7 @@ private async Task SendConnectCommandAsync()
         }
     }
 
-    public async Task DisconnectAsync()
+    public async Task DisconnectAsync(CancellationToken cancellationToken = default)
     {
         updateTimer.Stop();
         _cts.Cancel();
@@ -145,7 +145,7 @@ public async Task DisconnectAsync()
         await Task.CompletedTask;
     }
 
-    public async Task WriteDataAsync(string command)
+    public async Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
     {
         if (!IsConnected) return;
 
@@ -169,7 +169,7 @@ private async Task SendGcodeAsync(params string[] commands)
         await Client.PostAsync("/api/printer/command", content, _cts.Token).ConfigureAwait(false);
     }
 
-    public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+    public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
     {
         if (!IsConnected) return LastTelemetry;
 
@@ -283,7 +283,7 @@ private void ParseJobState(string json)
         }
     }
 
-    public async Task<List<FileEntry>> GetFilesAsync()
+    public async Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
     {
         if (!IsConnected) return [];
 
@@ -300,7 +300,7 @@ public async Task<List<FileEntry>> GetFilesAsync()
 
             var files = new List<FileEntry>();
             ParseFilesRecursive(filesArray, files);
-            return files;
+            return files.Select(fe => fe.FullPath).ToList();
         }
         catch
         {
@@ -388,13 +388,13 @@ public async Task<IReadOnlyList<PrinterCamera>> GetCamerasAsync(CancellationToke
 
     // ── Printer control commands via G-code ────────────────────────────
 
-    public Task SetHotendTemp(int targetTemp = 0) =>
+    public Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         SendGcodeAsync($"M104 S{targetTemp}");
 
-    public Task SetBedTemp(int targetTemp = 0) =>
+    public Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         SendGcodeAsync($"M140 S{targetTemp}");
 
-    public Task Home(bool x = true, bool y = true, bool z = true)
+    public Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default)
     {
         var axes = new StringBuilder("G28");
         if (x) axes.Append(" X");
@@ -403,7 +403,7 @@ public Task Home(bool x = true, bool y = true, bool z = true)
         return SendGcodeAsync(axes.ToString());
     }
 
-    public Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f)
+    public Task RelativeMoveAsync(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f, CancellationToken cancellationToken = default)
     {
         var sb = new StringBuilder();
         sb.Append("G91\nG1");
@@ -415,16 +415,16 @@ public Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z =
         return SendGcodeAsync(sb.ToString().Split('\n'));
     }
 
-    public Task SetFanSpeed(int fanSpeedPercentage = 0)
+    public Task SetFanSpeedAsync(int fanSpeedPercentage = 0, CancellationToken cancellationToken = default)
     {
         var duty = (int)Math.Round(Math.Clamp(fanSpeedPercentage, 0, 100) * 255.0 / 100.0);
         return SendGcodeAsync($"M106 S{duty}");
     }
 
-    public Task SetPrintSpeed(int speed) =>
+    public Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default) =>
         SendGcodeAsync($"M220 S{Math.Clamp(speed, 1, 200)}");
 
-    public Task SetPrintFlow(int flow) =>
+    public Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default) =>
         SendGcodeAsync($"M221 S{Math.Clamp(flow, 1, 200)}");
 
     public Task SetAxisPerUnit(float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f)
@@ -443,9 +443,9 @@ public Task RunPidTuning(int cycles, int targetTemp, int extruderIndex) =>
     public Task RunThermalModelCalibration(int cycles, int targetTemp) =>
         SendGcodeAsync($"M303 E-1 S{targetTemp} C{cycles}");
 
-    public async Task StartPrint(FileEntry file)
+    public async Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default)
     {
-        if (!IsConnected || string.IsNullOrWhiteSpace(file.FullPath)) return;
+        if (!IsConnected || string.IsNullOrWhiteSpace(fileName)) return;
 
         var payload = JsonSerializer.Serialize(new
         {
@@ -456,11 +456,11 @@ public async Task StartPrint(FileEntry file)
 
         // OctoPrint expects POST to /api/files/{location}/{filename}
         var location = "local";
-        var filePath = file.FullPath.TrimStart('/');
+        var filePath = fileName.TrimStart('/');
         await Client.PostAsync($"/api/files/{location}/{filePath}", content, _cts.Token).ConfigureAwait(false);
     }
 
-    public Task StartPrint(GCodeDoc gcodeDoc)
+    public Task StartPrintAsync(GCodeDoc gcodeDoc, CancellationToken cancellationToken = default)
     {
         if (!IsConnected || string.IsNullOrEmpty(gcodeDoc.Content))
             return Task.CompletedTask;
@@ -483,7 +483,7 @@ private async Task SafeTelemetryAsync()
     {
         try
         {
-            await GetPrinterTelemetryAsync().ConfigureAwait(false);
+            await GetTelemetryAsync().ConfigureAwait(false);
         }
         catch
         {
@@ -491,10 +491,10 @@ private async Task SafeTelemetryAsync()
         }
     }
 
-    private void ConfigureClient(ApiConnectionSettings settings)
+    private void ConfigureClient(PrinterConnectionSettings settings)
     {
         var client = Client;
-        _baseUri = new Uri(settings.Url);
+        _baseUri = new Uri(settings.ApiUrl!);
         client.BaseAddress = _baseUri;
         client.Timeout = TimeSpan.FromSeconds(30);
         client.DefaultRequestHeaders.Accept.Clear();
diff --git a/MakerPrompt.Shared/Services/PrinterCommunicationServiceFactory.cs b/src/MakerPrompt.Infrastructure/Services/Printers/PrinterCommunicationServiceFactory.cs
similarity index 96%
rename from MakerPrompt.Shared/Services/PrinterCommunicationServiceFactory.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/PrinterCommunicationServiceFactory.cs
index ce4396d..8d64c17 100644
--- a/MakerPrompt.Shared/Services/PrinterCommunicationServiceFactory.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/PrinterCommunicationServiceFactory.cs
@@ -1,83 +1,83 @@
-namespace MakerPrompt.Shared.Services
-{
-    public class PrinterCommunicationServiceFactory(
-        ISerialService serialService,
-        PrusaLinkApiService prusaLinkApiService,
-        PrusaConnectApiService prusaConnectApiService,
-        PrusaConnectPrinterService prusaConnectPrinterService,
-        MoonrakerApiService moonrakerApiService,
-        BambuLabApiService bambuLabApiService,
-        OctoPrintApiService octoPrintApiService) : IAsyncDisposable
-    {
-        public event EventHandler<bool>? ConnectionStateChanged;
-        public bool IsConnected { get; private set; }
-        public IPrinterCommunicationService? Current { get; private set; }
-
-		private readonly ISerialService serialService = serialService;
-		private readonly PrusaLinkApiService prusaLinkApiService = prusaLinkApiService;
-		private readonly PrusaConnectApiService prusaConnectApiService = prusaConnectApiService;
-		private readonly PrusaConnectPrinterService prusaConnectPrinterService = prusaConnectPrinterService;
-		private readonly MoonrakerApiService moonrakerApiService = moonrakerApiService;
-		private readonly BambuLabApiService bambuLabApiService = bambuLabApiService;
-		private readonly OctoPrintApiService octoPrintApiService = octoPrintApiService;
-
-        public async Task ConnectAsync(PrinterConnectionSettings connectionSettings)
-        {
-            if (Current != null && Current.ConnectionType != connectionSettings.ConnectionType)
-            {
-                await Current.DisposeAsync();
-            }
-
-			IPrinterCommunicationService service = connectionSettings.ConnectionType switch
-            {
-                PrinterConnectionType.Demo => new DemoPrinterService(),
-                PrinterConnectionType.Serial => serialService,
-				PrinterConnectionType.PrusaLink => prusaLinkApiService,
-				PrinterConnectionType.PrusaConnect => prusaConnectPrinterService,
-				PrinterConnectionType.Moonraker => moonrakerApiService,
-				PrinterConnectionType.BambuLab => bambuLabApiService,
-				PrinterConnectionType.OctoPrint => octoPrintApiService,
-                _ => throw new NotImplementedException(),
-            };
-
-            if (await service.ConnectAsync(connectionSettings))
-            {
-                Current = service;
-                IsConnected = Current.IsConnected;
-                ConnectionStateChanged?.Invoke(this, IsConnected);
-            }
-        }
-
-        public async Task DisconnectAsync()
-        {
-            if (Current == null) return;
-            await Current.DisconnectAsync();
-            IsConnected = Current.IsConnected;
-            ConnectionStateChanged?.Invoke(this, IsConnected);
-        }
-
-        /// <summary>
-        /// Called by PrinterConnectionManager to keep this factory in sync with the
-        /// currently active managed printer. Preserves backward compatibility with
-        /// all existing single-printer UI components that read factory.Current.
-        /// </summary>
-        public void SetManagedCurrent(IPrinterCommunicationService? service)
-        {
-            Current = service;
-            IsConnected = service?.IsConnected ?? false;
-            ConnectionStateChanged?.Invoke(this, IsConnected);
-        }
-
-        public async ValueTask DisposeAsync()
-        {
-            await DisconnectAsync();
-			await serialService.DisposeAsync();
-			await prusaLinkApiService.DisposeAsync();
-			await prusaConnectPrinterService.DisposeAsync();
-			await moonrakerApiService.DisposeAsync();
-			await bambuLabApiService.DisposeAsync();
-			await octoPrintApiService.DisposeAsync();
-            GC.SuppressFinalize(this);
-        }
-    }
-}
+namespace MakerPrompt.Infrastructure.Services.Printers
+{
+    public class PrinterCommunicationServiceFactory(
+        ISerialService serialService,
+        PrusaLinkApiService prusaLinkApiService,
+        PrusaConnectApiService prusaConnectApiService,
+        PrusaConnectPrinterService prusaConnectPrinterService,
+        MoonrakerApiService moonrakerApiService,
+        BambuLabApiService bambuLabApiService,
+        OctoPrintApiService octoPrintApiService) : IAsyncDisposable
+    {
+        public event EventHandler<bool>? ConnectionStateChanged;
+        public bool IsConnected { get; private set; }
+        public IPrinterCommunicationService? Current { get; private set; }
+
+		private readonly ISerialService serialService = serialService;
+		private readonly PrusaLinkApiService prusaLinkApiService = prusaLinkApiService;
+		private readonly PrusaConnectApiService prusaConnectApiService = prusaConnectApiService;
+		private readonly PrusaConnectPrinterService prusaConnectPrinterService = prusaConnectPrinterService;
+		private readonly MoonrakerApiService moonrakerApiService = moonrakerApiService;
+		private readonly BambuLabApiService bambuLabApiService = bambuLabApiService;
+		private readonly OctoPrintApiService octoPrintApiService = octoPrintApiService;
+
+        public async Task ConnectAsync(PrinterConnectionSettings connectionSettings)
+        {
+            if (Current != null && Current.ConnectionType != connectionSettings.ConnectionType)
+            {
+                await Current.DisposeAsync();
+            }
+
+			IPrinterCommunicationService service = connectionSettings.ConnectionType switch
+            {
+                PrinterConnectionType.Demo => new DemoPrinterService(),
+                PrinterConnectionType.Serial => serialService,
+				PrinterConnectionType.PrusaLink => prusaLinkApiService,
+				PrinterConnectionType.PrusaConnect => prusaConnectPrinterService,
+				PrinterConnectionType.Moonraker => moonrakerApiService,
+				PrinterConnectionType.BambuLab => bambuLabApiService,
+				PrinterConnectionType.OctoPrint => octoPrintApiService,
+                _ => throw new NotImplementedException(),
+            };
+
+            if (await service.ConnectAsync(connectionSettings))
+            {
+                Current = service;
+                IsConnected = Current.IsConnected;
+                ConnectionStateChanged?.Invoke(this, IsConnected);
+            }
+        }
+
+        public async Task DisconnectAsync()
+        {
+            if (Current == null) return;
+            await Current.DisconnectAsync();
+            IsConnected = Current.IsConnected;
+            ConnectionStateChanged?.Invoke(this, IsConnected);
+        }
+
+        /// <summary>
+        /// Called by PrinterConnectionManager to keep this factory in sync with the
+        /// currently active managed printer. Preserves backward compatibility with
+        /// all existing single-printer UI components that read factory.Current.
+        /// </summary>
+        public void SetManagedCurrent(IPrinterCommunicationService? service)
+        {
+            Current = service;
+            IsConnected = service?.IsConnected ?? false;
+            ConnectionStateChanged?.Invoke(this, IsConnected);
+        }
+
+        public async ValueTask DisposeAsync()
+        {
+            await DisconnectAsync();
+			await serialService.DisposeAsync();
+			await prusaLinkApiService.DisposeAsync();
+			await prusaConnectPrinterService.DisposeAsync();
+			await moonrakerApiService.DisposeAsync();
+			await bambuLabApiService.DisposeAsync();
+			await octoPrintApiService.DisposeAsync();
+            GC.SuppressFinalize(this);
+        }
+    }
+}
diff --git a/MakerPrompt.Shared/Services/PrusaConnectApiService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/PrusaConnectApiService.cs
similarity index 87%
rename from MakerPrompt.Shared/Services/PrusaConnectApiService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/PrusaConnectApiService.cs
index 4601626..32f74ad 100644
--- a/MakerPrompt.Shared/Services/PrusaConnectApiService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/PrusaConnectApiService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Services;
+namespace MakerPrompt.Infrastructure.Services.Printers;
 
 /// <summary>
 /// PrusaConnect cloud API backend.
@@ -33,7 +33,6 @@ public sealed class PrusaConnectApiService : BasePrinterConnectionService, IPrin
     private string? _printerUuid;
 
     public override PrinterConnectionType ConnectionType => PrinterConnectionType.PrusaConnect;
-    public bool SupportsDirectControl => false;
 
     public PrusaConnectApiService() { }
 
@@ -44,13 +43,13 @@ public PrusaConnectApiService(HttpMessageHandler handler)
 
     private HttpClient Client => _httpClient ??= new HttpClient { BaseAddress = new Uri(BaseUrl) };
 
-    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
     {
-        if (connectionSettings.Api is null)
+        if (string.IsNullOrEmpty(connectionSettings.UserName))
             throw new ArgumentException("PrusaConnect connection requires API settings.", nameof(connectionSettings));
 
-        _printerUuid = connectionSettings.Api.UserName;
-        ConfigureClient(connectionSettings.Api.Password);
+        _printerUuid = connectionSettings.UserName;
+        ConfigureClient(connectionSettings.Password);
 
         try
         {
@@ -84,7 +83,7 @@ public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSetting
         return IsConnected;
     }
 
-    public async Task DisconnectAsync()
+    public async Task DisconnectAsync(CancellationToken cancellationToken = default)
     {
         updateTimer.Stop();
         _cts.Cancel();
@@ -94,10 +93,10 @@ public async Task DisconnectAsync()
         await Task.CompletedTask;
     }
 
-    public Task WriteDataAsync(string command) =>
+    public Task WriteDataAsync(string command, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support direct G-code commands."));
 
-    public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+    public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrEmpty(_printerUuid)) return LastTelemetry;
 
@@ -133,8 +132,8 @@ public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
         return LastTelemetry;
     }
 
-    public Task<List<FileEntry>> GetFilesAsync() =>
-        Task.FromResult(new List<FileEntry>());
+    public Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default) =>
+        Task.FromResult<IReadOnlyList<string>>(Array.Empty<string>());
 
     /// <summary>
     /// Retrieves cameras registered for this printer in Prusa Connect.
@@ -197,25 +196,25 @@ public async Task<IReadOnlyList<PrinterCamera>> GetCamerasAsync(CancellationToke
 
     // ── Unsupported operations (cloud API — no direct printer control) ────
 
-    public Task SetHotendTemp(int targetTemp = 0) =>
+    public Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support temperature control."));
 
-    public Task SetBedTemp(int targetTemp = 0) =>
+    public Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support temperature control."));
 
-    public Task Home(bool x = true, bool y = true, bool z = true) =>
+    public Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support homing commands."));
 
-    public Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f) =>
+    public Task RelativeMoveAsync(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support move commands."));
 
-    public Task SetFanSpeed(int fanSpeedPercentage = 0) =>
+    public Task SetFanSpeedAsync(int fanSpeedPercentage = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support fan control."));
 
-    public Task SetPrintSpeed(int speed) =>
+    public Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support print speed control."));
 
-    public Task SetPrintFlow(int flow) =>
+    public Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support flow control."));
 
     public Task SetAxisPerUnit(float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f) =>
@@ -227,10 +226,10 @@ public Task RunPidTuning(int cycles, int targetTemp, int extruderIndex) =>
     public Task RunThermalModelCalibration(int cycles, int targetTemp) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support thermal model calibration."));
 
-    public Task StartPrint(FileEntry file) =>
+    public Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support starting prints remotely."));
 
-    public Task StartPrint(GCodeDoc gcodeDoc) =>
+    public Task StartPrintAsync(GCodeDoc gcodeDoc, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support direct G-code printing."));
 
     public Task SaveEEPROM() =>
@@ -279,7 +278,7 @@ private async Task SafeTelemetryAsync()
     {
         try
         {
-            await GetPrinterTelemetryAsync();
+            await GetTelemetryAsync();
         }
         catch
         {
diff --git a/MakerPrompt.Shared/Services/PrusaConnectPrinterService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/PrusaConnectPrinterService.cs
similarity index 71%
rename from MakerPrompt.Shared/Services/PrusaConnectPrinterService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/PrusaConnectPrinterService.cs
index fbbe7b8..2c316ec 100644
--- a/MakerPrompt.Shared/Services/PrusaConnectPrinterService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/PrusaConnectPrinterService.cs
@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging;
-
-namespace MakerPrompt.Shared.Services;
+namespace MakerPrompt.Infrastructure.Services.Printers;
 
 /// <summary>
 /// PrusaConnect printer backend using the mobile API.
@@ -31,7 +29,6 @@ public sealed class PrusaConnectPrinterService : BasePrinterConnectionService, I
     private HttpClient? _httpClient;
     private bool _timerInitialized;
     private string? _printerUuid;
-    private readonly ILogger<PrusaConnectPrinterService>? _logger;
 
     private static readonly JsonSerializerOptions s_jsonOptions = new()
     {
@@ -41,13 +38,8 @@ public sealed class PrusaConnectPrinterService : BasePrinterConnectionService, I
 
     public override PrinterConnectionType ConnectionType => PrinterConnectionType.PrusaConnect;
 
-    // DI constructor — logger is injected automatically when registered in the container.
-    public PrusaConnectPrinterService(ILogger<PrusaConnectPrinterService>? logger = null)
-    {
-        _logger = logger;
-    }
+    public PrusaConnectPrinterService() { }
 
-    // Test constructor — bypasses DI; logger is unavailable.
     public PrusaConnectPrinterService(HttpMessageHandler handler)
     {
         _httpClient = new HttpClient(handler, false) { BaseAddress = new Uri(BaseUrl) };
@@ -55,13 +47,13 @@ public PrusaConnectPrinterService(HttpMessageHandler handler)
 
     private HttpClient Client => _httpClient ??= new HttpClient { BaseAddress = new Uri(BaseUrl) };
 
-    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
     {
-        if (connectionSettings.Api is null)
+        if (string.IsNullOrEmpty(connectionSettings.UserName))
             throw new ArgumentException("PrusaConnect requires API settings.", nameof(connectionSettings));
 
-        _printerUuid = connectionSettings.Api.UserName;
-        ConfigureClient(connectionSettings.Api.Password);
+        _printerUuid = connectionSettings.UserName;
+        ConfigureClient(connectionSettings.Password);
 
         try
         {
@@ -95,7 +87,7 @@ public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSetting
         return IsConnected;
     }
 
-    public async Task DisconnectAsync()
+    public async Task DisconnectAsync(CancellationToken cancellationToken = default)
     {
         updateTimer.Stop();
         _cts.Cancel();
@@ -108,7 +100,7 @@ public async Task DisconnectAsync()
     /// <summary>
     /// Sends a raw G-code command via POST /app/printers/{uuid}/command.
     /// </summary>
-    public async Task WriteDataAsync(string command)
+    public async Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrEmpty(_printerUuid)) return;
 
@@ -119,7 +111,7 @@ public async Task WriteDataAsync(string command)
         response.EnsureSuccessStatusCode();
     }
 
-    public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+    public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrEmpty(_printerUuid)) return LastTelemetry;
 
@@ -142,7 +134,7 @@ public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
         return LastTelemetry;
     }
 
-    public async Task<List<FileEntry>> GetFilesAsync()
+    public async Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrEmpty(_printerUuid)) return [];
 
@@ -177,7 +169,7 @@ public async Task<List<FileEntry>> GetFilesAsync()
                 result.Add(new FileEntry { FullPath = path, Size = size, ModifiedDate = modified });
             }
 
-            return result;
+            return result.Select(fe => fe.FullPath).ToList();
         }
         catch
         {
@@ -245,25 +237,25 @@ public async Task<IReadOnlyList<PrinterCamera>> GetCamerasAsync(CancellationToke
 
     // ── Unsupported cloud operations ──────────────────────────────────────
 
-    public Task SetHotendTemp(int targetTemp = 0) =>
+    public Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support temperature control."));
 
-    public Task SetBedTemp(int targetTemp = 0) =>
+    public Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support temperature control."));
 
-    public Task Home(bool x = true, bool y = true, bool z = true) =>
+    public Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support homing commands."));
 
-    public Task RelativeMove(int feedRate, float x = 0, float y = 0, float z = 0, float e = 0) =>
+    public Task RelativeMoveAsync(int feedRate, float x = 0, float y = 0, float z = 0, float e = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support move commands."));
 
-    public Task SetFanSpeed(int fanSpeedPercentage = 0) =>
+    public Task SetFanSpeedAsync(int fanSpeedPercentage = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support fan control."));
 
-    public Task SetPrintSpeed(int speed) =>
+    public Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support print speed control."));
 
-    public Task SetPrintFlow(int flow) =>
+    public Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support flow control."));
 
     public Task SetAxisPerUnit(float x = 0, float y = 0, float z = 0, float e = 0) =>
@@ -275,10 +267,10 @@ public Task RunPidTuning(int cycles, int targetTemp, int extruderIndex) =>
     public Task RunThermalModelCalibration(int cycles, int targetTemp) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support thermal model calibration."));
 
-    public Task StartPrint(FileEntry file) =>
+    public Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support starting prints remotely."));
 
-    public Task StartPrint(GCodeDoc gcodeDoc) =>
+    public Task StartPrintAsync(GCodeDoc gcodeDoc, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaConnect cloud API does not support direct G-code printing."));
 
     public Task SaveEEPROM() =>
@@ -309,91 +301,56 @@ private void ConfigureClient(string? bearerToken)
     private async Task<PrusaConnectMobilePrinterResponse?> FetchPrinterAsync(CancellationToken ct)
     {
         using var response = await Client.GetAsync($"/api/v1/printers/{_printerUuid}", ct);
-        if (!response.IsSuccessStatusCode)
-        {
-            _logger?.LogWarning("PrusaConnect printer endpoint returned {Status}", response.StatusCode);
-            return null;
-        }
-
-        var json = await response.Content.ReadAsStringAsync(ct);
-        _logger?.LogDebug("PrusaConnect GET /api/v1/printers/{Uuid} response: {Json}", _printerUuid, json);
+        if (!response.IsSuccessStatusCode) return null;
 
-        var result = JsonSerializer.Deserialize<PrusaConnectMobilePrinterResponse>(json, s_jsonOptions);
-        if (result is not null)
-        {
-            if (result.EffectiveState is null)
-                _logger?.LogWarning("PrusaConnect: 'state'/'printer_state' field is null/missing in printer response");
-            if (result.Telemetry is null)
-                _logger?.LogWarning("PrusaConnect: 'telemetry' object is null/missing in printer response");
-            if (result.EffectiveJobInfo is null)
-                _logger?.LogDebug("PrusaConnect: 'job_info'/'job' is null in printer response (expected when idle)");
-        }
-        return result;
+        await using var stream = await response.Content.ReadAsStreamAsync(ct);
+        return await JsonSerializer.DeserializeAsync<PrusaConnectMobilePrinterResponse>(stream, s_jsonOptions, ct);
     }
 
     private async Task<PrusaConnectMobileTelemetryResponse?> FetchTelemetryAsync(CancellationToken ct)
     {
         using var response = await Client.GetAsync($"/api/v1/printers/{_printerUuid}/telemetry", ct);
-        if (!response.IsSuccessStatusCode)
-        {
-            _logger?.LogWarning("PrusaConnect telemetry endpoint returned {Status} — telemetry will use inline printer data only", response.StatusCode);
-            return null;
-        }
+        if (!response.IsSuccessStatusCode) return null;
 
-        var json = await response.Content.ReadAsStringAsync(ct);
-        _logger?.LogDebug("PrusaConnect GET /api/v1/printers/{Uuid}/telemetry response: {Json}", _printerUuid, json);
-
-        return JsonSerializer.Deserialize<PrusaConnectMobileTelemetryResponse>(json, s_jsonOptions);
+        await using var stream = await response.Content.ReadAsStreamAsync(ct);
+        return await JsonSerializer.DeserializeAsync<PrusaConnectMobileTelemetryResponse>(stream, s_jsonOptions, ct);
     }
 
     private void ApplyTelemetry(PrusaConnectMobileTelemetryResponse t)
     {
-        LastTelemetry.HotendTemp   = t.TempNozzle   ?? LastTelemetry.HotendTemp;
+        LastTelemetry.HotendTemp   = t.TempNozzle  ?? LastTelemetry.HotendTemp;
         LastTelemetry.HotendTarget = t.TargetNozzle ?? LastTelemetry.HotendTarget;
         LastTelemetry.BedTemp      = t.TempBed      ?? LastTelemetry.BedTemp;
         LastTelemetry.BedTarget    = t.TargetBed    ?? LastTelemetry.BedTarget;
         LastTelemetry.FeedRate     = t.PrintSpeed   ?? LastTelemetry.FeedRate;
 
-        var z = t.EffectiveZHeight;
-        if (z.HasValue)
-            LastTelemetry.Position = LastTelemetry.Position with { Z = z.Value };
-
-        if (t.ExtraFields?.Count > 0)
-            _logger?.LogDebug("PrusaConnect telemetry has unmapped fields: {Fields}",
-                string.Join(", ", t.ExtraFields.Keys));
+        if (t.ZHeight.HasValue)
+            LastTelemetry.Position = LastTelemetry.Position with { Z = t.ZHeight.Value };
     }
 
     private void ApplyPrinterState(PrusaConnectMobilePrinterResponse p)
     {
-        LastTelemetry.Status = MapState(p.EffectiveState);
+        LastTelemetry.Status = MapState(p.State);
 
         if (p.Telemetry is not null)
             ApplyTelemetry(p.Telemetry);
 
-        var job = p.EffectiveJobInfo;
-        if (job is not null)
+        if (p.JobInfo is not null)
         {
-            LastTelemetry.SDCard.Progress = job.Progress ?? LastTelemetry.SDCard.Progress;
+            LastTelemetry.SDCard.Progress = p.JobInfo.Progress ?? LastTelemetry.SDCard.Progress;
             LastTelemetry.SDCard.Printing = LastTelemetry.Status == PrinterStatus.Printing;
             IsPrinting = LastTelemetry.SDCard.Printing;
 
-            if (job.TimePrinting.HasValue)
-                LastTelemetry.PrintDuration = TimeSpan.FromSeconds(job.TimePrinting.Value);
-
-            if (!string.IsNullOrEmpty(job.FileName))
-                LastTelemetry.PrintJobName = job.FileName;
+            if (p.JobInfo.TimePrinting.HasValue)
+                LastTelemetry.PrintDuration = TimeSpan.FromSeconds(p.JobInfo.TimePrinting.Value);
         }
 
-        if (p.ExtraFields?.Count > 0)
-            _logger?.LogDebug("PrusaConnect printer response has unmapped fields: {Fields}",
-                string.Join(", ", p.ExtraFields.Keys));
-
         LastTelemetry.LastResponse = "PrusaConnect telemetry update";
     }
 
     private async Task SafePollAsync()
     {
-        try { await GetPrinterTelemetryAsync(); }
+        try { await GetTelemetryAsync(); }
         catch { }
     }
 
@@ -421,47 +378,14 @@ public sealed class PrusaConnectMobilePrinterResponse
     [JsonPropertyName("printer_type")]
     public string? PrinterType { get; set; }
 
-    // Some API versions nest state in { "printer_state": { "text": "PRINTING" } };
-    // we keep both and resolve in ApplyPrinterState.
     [JsonPropertyName("state")]
     public string? State { get; set; }
 
-    [JsonPropertyName("printer_state")]
-    public PrusaConnectMobilePrinterState? PrinterState { get; set; }
-
     [JsonPropertyName("telemetry")]
     public PrusaConnectMobileTelemetryResponse? Telemetry { get; set; }
 
-    // PrusaConnect cloud uses "job_info"; some endpoints use "job".
     [JsonPropertyName("job_info")]
     public PrusaConnectMobileJobInfo? JobInfo { get; set; }
-
-    [JsonPropertyName("job")]
-    public PrusaConnectMobileJobInfo? Job { get; set; }
-
-    /// <summary>Captures any fields not matched above so they appear in debug logs.</summary>
-    [JsonExtensionData]
-    public Dictionary<string, JsonElement>? ExtraFields { get; set; }
-
-    /// <summary>Returns the effective job info regardless of which field is present.</summary>
-    [JsonIgnore]
-    public PrusaConnectMobileJobInfo? EffectiveJobInfo => JobInfo ?? Job;
-
-    /// <summary>Returns the effective state string, handling nested printer_state objects.</summary>
-    [JsonIgnore]
-    public string? EffectiveState => State ?? PrinterState?.Text;
-}
-
-public sealed class PrusaConnectMobilePrinterState
-{
-    [JsonPropertyName("text")]
-    public string? Text { get; set; }
-
-    [JsonPropertyName("state")]
-    public string? State { get; set; }
-
-    [JsonIgnore]
-    public string? EffectiveState => Text ?? State;
 }
 
 public sealed class PrusaConnectMobileTelemetryResponse
@@ -481,20 +405,9 @@ public sealed class PrusaConnectMobileTelemetryResponse
     [JsonPropertyName("print_speed")]
     public int? PrintSpeed { get; set; }
 
-    // Some firmware reports Z as "axis_z"; others use "z_height".
     [JsonPropertyName("z_height")]
     [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
     public float? ZHeight { get; set; }
-
-    [JsonPropertyName("axis_z")]
-    [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
-    public float? AxisZ { get; set; }
-
-    [JsonExtensionData]
-    public Dictionary<string, JsonElement>? ExtraFields { get; set; }
-
-    [JsonIgnore]
-    public float? EffectiveZHeight => ZHeight ?? AxisZ;
 }
 
 public sealed class PrusaConnectMobileJobInfo
@@ -507,7 +420,4 @@ public sealed class PrusaConnectMobileJobInfo
 
     [JsonPropertyName("time_printing")]
     public int? TimePrinting { get; set; }
-
-    [JsonPropertyName("file_name")]
-    public string? FileName { get; set; }
 }
diff --git a/MakerPrompt.Shared/Services/PrusaLinkApiService.cs b/src/MakerPrompt.Infrastructure/Services/Printers/PrusaLinkApiService.cs
similarity index 90%
rename from MakerPrompt.Shared/Services/PrusaLinkApiService.cs
rename to src/MakerPrompt.Infrastructure/Services/Printers/PrusaLinkApiService.cs
index 97930e7..5d78750 100644
--- a/MakerPrompt.Shared/Services/PrusaLinkApiService.cs
+++ b/src/MakerPrompt.Infrastructure/Services/Printers/PrusaLinkApiService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Services;
+namespace MakerPrompt.Infrastructure.Services.Printers;
 
 public class PrusaLinkApiService : BasePrinterConnectionService, IPrinterCommunicationService
 {
@@ -6,11 +6,9 @@ public class PrusaLinkApiService : BasePrinterConnectionService, IPrinterCommuni
     private readonly HttpMessageHandler? _customHandler;
     private HttpClient? _httpClient;
     private bool _ownsClient;
-    private ApiConnectionSettings? _connectionSettings;
     private Uri? _baseUri;
 
     public override PrinterConnectionType ConnectionType => PrinterConnectionType.PrusaLink;
-    public bool SupportsDirectControl => false;
 
     public PrusaLinkApiService()
     {
@@ -32,15 +30,14 @@ private HttpClient Client
         }
     }
 
-    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+    public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
     {
-        if (connectionSettings.Api is null)
+        if (string.IsNullOrEmpty(connectionSettings.ApiUrl))
         {
             throw new ArgumentException("PrusaLink connection requires API settings.", nameof(connectionSettings));
         }
 
-        _connectionSettings = connectionSettings.Api;
-        ConfigureClient(_connectionSettings);
+        ConfigureClient(connectionSettings);
 
         try
         {
@@ -53,7 +50,7 @@ public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSetting
             }
 
             var info = await GetInfoAsync(_cts.Token);
-            ConnectionName = _baseUri?.AbsoluteUri ?? _connectionSettings.Url;
+            ConnectionName = _baseUri?.AbsoluteUri ?? connectionSettings.ApiUrl;
             LastTelemetry.PrinterName = info?.Name ?? LastTelemetry.PrinterName;
             LastTelemetry.ConnectionTime ??= DateTime.UtcNow;
 
@@ -75,7 +72,7 @@ private async Task SafeTelemetryAsync()
     {
         try
         {
-            await GetPrinterTelemetryAsync();
+            await GetTelemetryAsync();
         }
         catch
         {
@@ -83,7 +80,7 @@ private async Task SafeTelemetryAsync()
         }
     }
 
-    public async Task DisconnectAsync()
+    public async Task DisconnectAsync(CancellationToken cancellationToken = default)
     {
         updateTimer.Stop();
         _cts.Cancel();
@@ -93,12 +90,12 @@ public async Task DisconnectAsync()
         await Task.CompletedTask;
     }
 
-    public Task WriteDataAsync(string command)
+    public Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
     {
         throw new NotSupportedException("Direct G-code injection is not supported by the PrusaLink API.");
     }
 
-    public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+    public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
     {
         var status = await GetStatusAsync(_cts.Token);
         if (status?.Printer is null)
@@ -138,7 +135,7 @@ public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
         return LastTelemetry;
     }
 
-    public async Task<List<FileEntry>> GetFilesAsync()
+    public async Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
     {
         var storages = await GetStorageAsync(_cts.Token);
         var firstStorage = storages?.StorageList?.FirstOrDefault();
@@ -157,7 +154,7 @@ public async Task<List<FileEntry>> GetFilesAsync()
         var storagePath = firstStorage.Path.TrimEnd('/');
         var result = new List<FileEntry>();
         CollectFiles(folder.Children, storagePath, result);
-        return result;
+        return result.Select(fe => fe.FullPath).ToList();
     }
 
     private static void CollectFiles(List<PrusaFileSystemEntry> entries, string parentPath, List<FileEntry> result)
@@ -186,25 +183,25 @@ private static void CollectFiles(List<PrusaFileSystemEntry> entries, string pare
         }
     }
 
-    public Task SetHotendTemp(int targetTemp = 0) =>
+    public Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose hotend temperature control."));
 
-    public Task SetBedTemp(int targetTemp = 0) =>
+    public Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose bed temperature control."));
 
-    public Task Home(bool x = true, bool y = true, bool z = true) =>
+    public Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose homing commands."));
 
-    public Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f) =>
+    public Task RelativeMoveAsync(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose move commands."));
 
-    public Task SetFanSpeed(int fanSpeedPercentage = 0) =>
+    public Task SetFanSpeedAsync(int fanSpeedPercentage = 0, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose fan control."));
 
-    public Task SetPrintSpeed(int speed) =>
+    public Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose print speed control."));
 
-    public Task SetPrintFlow(int flow) =>
+    public Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose flow control."));
 
     public Task SetAxisPerUnit(float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f) =>
@@ -216,10 +213,10 @@ public Task RunPidTuning(int cycles, int targetTemp, int extruderIndex) =>
     public Task RunThermalModelCalibration(int cycles, int targetTemp) =>
         Task.FromException(new NotSupportedException("PrusaLink API does not expose thermal model calibration."));
 
-    public Task StartPrint(FileEntry file) =>
+    public Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("Starting prints requires uploading with Print-After-Upload per PrusaLink spec."));
 
-    public Task StartPrint(GCodeDoc gcodeDoc) =>
+    public Task StartPrintAsync(GCodeDoc gcodeDoc, CancellationToken cancellationToken = default) =>
         Task.FromException(new NotSupportedException("Direct G-code printing is not supported by the PrusaLink API."));
 
     public Task SaveEEPROM() =>
@@ -247,9 +244,9 @@ public Task<IReadOnlyList<PrinterCamera>> GetCamerasAsync(CancellationToken canc
         return Task.FromResult((IReadOnlyList<PrinterCamera>)Array.Empty<PrinterCamera>());
     }
 
-    private void ConfigureClient(ApiConnectionSettings settings)
+    private void ConfigureClient(PrinterConnectionSettings settings)
     {
-        _baseUri = new Uri(settings.Url);
+        _baseUri = new Uri(settings.ApiUrl!);
         // In Blazor WebAssembly (browser) we cannot use HttpClientHandler.Credentials or
         // most handler-specific features. Instead, rely on the platform HttpClient and
         // send Basic auth via headers when credentials are supplied.
diff --git a/src/MakerPrompt.Infrastructure/Services/SerialCommunicationServiceBase.cs b/src/MakerPrompt.Infrastructure/Services/SerialCommunicationServiceBase.cs
new file mode 100644
index 0000000..54ae8a8
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/Services/SerialCommunicationServiceBase.cs
@@ -0,0 +1,347 @@
+namespace MakerPrompt.Infrastructure.Services;
+
+/// <summary>
+/// Base class for serial/USB printer communication services (Marlin / RepRap firmware).
+///
+/// Architecture
+/// ------------
+/// This class implements all <see cref="IPrinterCommunicationService"/> methods that
+/// are protocol-level (G-code command building, Marlin response parsing, telemetry
+/// polling timer).  Platform-specific transport (opening the port, writing/reading
+/// bytes) is left to the concrete subclass via <see cref="WriteTransportAsync"/> and
+/// the lifecycle hooks <see cref="OpenTransportAsync"/> / <see cref="CloseTransportAsync"/>.
+///
+/// Dependency
+/// ----------
+/// Only references <c>MakerPrompt.Core</c> — no Blazor, no MAUI, no platform APIs.
+/// Platform subclasses live in the host projects (MakerPrompt.UI.MAUI).
+/// </summary>
+public abstract class SerialCommunicationServiceBase : IPrinterCommunicationService
+{
+    // ── Regex patterns for Marlin response parsing ───────────────────────────
+    private static readonly Regex TempRegex =
+        new(@"T:([\d.]+)\s*/\s*([\d.]+)\s+B:([\d.]+)\s*/\s*([\d.]+)",
+            RegexOptions.Compiled | RegexOptions.CultureInvariant);
+
+    private static readonly Regex PrintProgressRegex =
+        new(@"SD printing byte (\d+)/(\d+)",
+            RegexOptions.Compiled | RegexOptions.CultureInvariant);
+
+    // ── Events ───────────────────────────────────────────────────────────────
+    public event EventHandler<bool>? ConnectionStateChanged;
+    public event EventHandler<PrinterTelemetry>? TelemetryUpdated;
+
+    // ── State ────────────────────────────────────────────────────────────────
+    public PrinterConnectionType ConnectionType => PrinterConnectionType.Serial;
+    public PrinterTelemetry LastTelemetry { get; private set; } = new();
+    public string ConnectionName { get; protected set; } = string.Empty;
+    public bool IsConnected { get; protected set; }
+    public bool IsPrinting { get; protected set; }
+
+    // ── Private fields ───────────────────────────────────────────────────────
+    /// <summary>Default baud rate for Marlin/RepRap firmware. 250 000 bps is standard.</summary>
+    protected const int DefaultBaudRate = 250_000;
+    private static readonly TimeSpan TelemetryPollInterval = TimeSpan.FromSeconds(3);
+
+    private readonly System.Timers.Timer _telemetryTimer = new(TelemetryPollInterval);
+    private readonly StringBuilder _receiveBuffer = new();
+
+    protected SerialCommunicationServiceBase()
+    {
+        _telemetryTimer.Elapsed += (_, _) => SafePollTelemetry();
+        _telemetryTimer.AutoReset = true;
+    }
+
+    // Non-async timer callback that fires-and-forgets with exception guarding.
+    private void SafePollTelemetry()
+    {
+        _ = PollTelemetryAsync().ContinueWith(
+            t => Console.WriteLine($"[SerialCommunicationServiceBase] Telemetry poll error: {t.Exception?.GetBaseException().Message}"),
+            System.Threading.Tasks.TaskContinuationOptions.OnlyOnFaulted);
+    }
+
+    // ── Abstract transport hooks ─────────────────────────────────────────────
+
+    /// <summary>
+    /// Opens the underlying transport (serial port, USB driver, etc.) using the
+    /// supplied connection settings.  Called by <see cref="ConnectAsync"/>.
+    /// </summary>
+    protected abstract Task OpenTransportAsync(PrinterConnectionSettings settings,
+        CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Closes the underlying transport.  Called by <see cref="DisconnectAsync"/>
+    /// and <see cref="DisposeAsync"/>.
+    /// </summary>
+    protected abstract Task CloseTransportAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Writes <paramref name="data"/> (a single G-code command line) to the transport.
+    /// The base class appends a newline; implementations should send the bytes as-is
+    /// or append their own framing.
+    /// </summary>
+    protected abstract Task WriteTransportAsync(string data, CancellationToken cancellationToken);
+
+    // ── IPrinterCommunicationService: Lifecycle ──────────────────────────────
+
+    public async Task<bool> ConnectAsync(PrinterConnectionSettings settings,
+        CancellationToken cancellationToken = default)
+    {
+        if (IsConnected) return true;
+
+        try
+        {
+            await OpenTransportAsync(settings, cancellationToken);
+            IsConnected = true;
+            ConnectionName = settings.PortName ?? settings.ConnectionType.ToString();
+            LastTelemetry = new PrinterTelemetry { Status = PrinterStatus.Connected };
+            _telemetryTimer.Start();
+            RaiseConnectionChanged();
+            return true;
+        }
+        catch
+        {
+            IsConnected = false;
+            return false;
+        }
+    }
+
+    public async Task DisconnectAsync(CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return;
+
+        _telemetryTimer.Stop();
+        IsConnected = false;
+        IsPrinting = false;
+
+        try
+        {
+            await CloseTransportAsync(cancellationToken);
+        }
+        catch
+        {
+            // Swallow close errors — we are already marking as disconnected.
+        }
+
+        RaiseConnectionChanged();
+    }
+
+    // ── IPrinterCommunicationService: Data transfer ──────────────────────────
+
+    public Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
+        => IsConnected ? WriteTransportAsync(command, cancellationToken) : Task.CompletedTask;
+
+    public async Task<PrinterTelemetry> GetTelemetryAsync(
+        CancellationToken cancellationToken = default)
+    {
+        await WriteTransportAsync("M105", cancellationToken); // temperatures
+        await WriteTransportAsync("M27", cancellationToken);  // SD print progress
+        await Task.Delay(200, cancellationToken);
+        return LastTelemetry;
+    }
+
+    public Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
+        => Task.FromResult<IReadOnlyList<string>>([]);
+
+    // ── IPrinterCommunicationService: Print control ──────────────────────────
+
+    public Task SetHotendTempAsync(int targetCelsius, CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return Task.CompletedTask;
+        return WriteTransportAsync($"M104 S{targetCelsius}", cancellationToken);
+    }
+
+    public Task SetBedTempAsync(int targetCelsius, CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return Task.CompletedTask;
+        return WriteTransportAsync($"M140 S{targetCelsius}", cancellationToken);
+    }
+
+    public async Task HomeAsync(bool x = true, bool y = true, bool z = true,
+        CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return;
+
+        var axes = string.Concat(
+            x ? "X" : "",
+            y ? "Y" : "",
+            z ? "Z" : "");
+
+        await WriteTransportAsync(axes.Length > 0 ? $"G28 {axes}" : "G28", cancellationToken);
+    }
+
+    public async Task RelativeMoveAsync(int feedRate,
+        float x = 0f, float y = 0f, float z = 0f, float e = 0f,
+        CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return;
+
+        var sb = new StringBuilder("G1");
+        if (x != 0f) sb.Append($" X{x:0.0}");
+        if (y != 0f) sb.Append($" Y{y:0.0}");
+        if (z != 0f) sb.Append($" Z{z:0.0}");
+        if (e != 0f) sb.Append($" E{e:0.0}");
+        sb.Append($" F{feedRate}");
+
+        await WriteTransportAsync("G91", cancellationToken);
+        await WriteTransportAsync(sb.ToString(), cancellationToken);
+        await WriteTransportAsync("G90", cancellationToken);
+    }
+
+    public Task SetFanSpeedAsync(int speedPercent, CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return Task.CompletedTask;
+        if (speedPercent <= 0)
+            return WriteTransportAsync("M107", cancellationToken);
+
+        var value = (int)Math.Clamp(speedPercent * 2.55, 0, 255);
+        return WriteTransportAsync($"M106 S{value}", cancellationToken);
+    }
+
+    public Task SetPrintSpeedAsync(int speedPercent, CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return Task.CompletedTask;
+        return WriteTransportAsync($"M220 S{speedPercent}", cancellationToken);
+    }
+
+    public Task SetPrintFlowAsync(int flowPercent, CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return Task.CompletedTask;
+        return WriteTransportAsync($"M221 S{flowPercent}", cancellationToken);
+    }
+
+    public Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected) return Task.CompletedTask;
+        IsPrinting = true;
+        return WriteTransportAsync($"M23 {fileName}", cancellationToken);
+    }
+
+    public async Task StartPrintAsync(GCodeDoc gcode, CancellationToken cancellationToken = default)
+    {
+        if (!IsConnected || string.IsNullOrWhiteSpace(gcode.Content)) return;
+        IsPrinting = true;
+        await foreach (var command in gcode.EnumerateCommandsAsync(cancellationToken))
+            await WriteTransportAsync(command, cancellationToken);
+    }
+
+    // ── Response parsing (called by platform subclasses) ─────────────────────
+
+    /// <summary>
+    /// Appends <paramref name="data"/> to the receive buffer and processes any
+    /// complete lines.  Platform subclasses call this from their read loops.
+    /// </summary>
+    protected void ProcessReceivedData(string data)
+    {
+        _receiveBuffer.Append(data);
+
+        while (true)
+        {
+            var bufferStr = _receiveBuffer.ToString();
+            var newlineIndex = bufferStr.IndexOf('\n');
+            if (newlineIndex < 0) break;
+
+            var line = bufferStr[..(newlineIndex + 1)].Trim('\r', '\n', ' ');
+            if (!string.IsNullOrEmpty(line))
+                ParseLine(line);
+
+            _receiveBuffer.Remove(0, newlineIndex + 1);
+        }
+    }
+
+    private void ParseLine(string line)
+    {
+        try
+        {
+            // Temperature response: ok T:200.00 /200.00 B:60.00 /60.00
+            if (line.StartsWith("ok T:", StringComparison.Ordinal) ||
+                line.StartsWith("T:", StringComparison.Ordinal))
+            {
+                var m = TempRegex.Match(line);
+                if (m.Success)
+                {
+                    LastTelemetry.HotendTemp = double.Parse(m.Groups[1].Value,
+                        System.Globalization.CultureInfo.InvariantCulture);
+                    LastTelemetry.HotendTarget = double.Parse(m.Groups[2].Value,
+                        System.Globalization.CultureInfo.InvariantCulture);
+                    LastTelemetry.BedTemp = double.Parse(m.Groups[3].Value,
+                        System.Globalization.CultureInfo.InvariantCulture);
+                    LastTelemetry.BedTarget = double.Parse(m.Groups[4].Value,
+                        System.Globalization.CultureInfo.InvariantCulture);
+                    LastTelemetry.CapturedAt = DateTimeOffset.UtcNow;
+                    LastTelemetry.Status = IsConnected ? PrinterStatus.Connected : PrinterStatus.Disconnected;
+                }
+            }
+            // SD progress: SD printing byte 12345/67890
+            else if (line.Contains("SD printing byte", StringComparison.Ordinal))
+            {
+                var m = PrintProgressRegex.Match(line);
+                if (m.Success)
+                {
+                    var done = double.Parse(m.Groups[1].Value,
+                        System.Globalization.CultureInfo.InvariantCulture);
+                    var total = double.Parse(m.Groups[2].Value,
+                        System.Globalization.CultureInfo.InvariantCulture);
+                    if (total > 0)
+                    {
+                        LastTelemetry.PrintProgress = done / total * 100.0;
+                        LastTelemetry.Status = PrinterStatus.Printing;
+                        IsPrinting = true;
+                    }
+                }
+            }
+            // Print complete
+            else if (line.Equals("Done printing file", StringComparison.OrdinalIgnoreCase))
+            {
+                LastTelemetry.PrintProgress = 100;
+                LastTelemetry.Status = PrinterStatus.Connected;
+                IsPrinting = false;
+            }
+
+            RaiseTelemetryUpdated();
+        }
+        catch
+        {
+            // Swallow parse errors — never crash the receive loop.
+        }
+    }
+
+    // ── Telemetry polling ────────────────────────────────────────────────────
+
+    private async Task PollTelemetryAsync()
+    {
+        if (!IsConnected) return;
+        try
+        {
+            await WriteTransportAsync("M105", CancellationToken.None);
+            await WriteTransportAsync("M27", CancellationToken.None);
+        }
+        catch
+        {
+            // Telemetry polling errors are swallowed silently — no log spam.
+        }
+    }
+
+    // ── Helpers ──────────────────────────────────────────────────────────────
+
+    protected void RaiseConnectionChanged() =>
+        ConnectionStateChanged?.Invoke(this, IsConnected);
+
+    protected void RaiseTelemetryUpdated() =>
+        TelemetryUpdated?.Invoke(this, LastTelemetry);
+
+    // ── IAsyncDisposable ─────────────────────────────────────────────────────
+
+    public async ValueTask DisposeAsync()
+    {
+        _telemetryTimer.Stop();
+        _telemetryTimer.Dispose();
+
+        if (IsConnected)
+        {
+            await DisconnectAsync();
+        }
+
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure/Utils/HttpEdgeAgentClient.cs b/src/MakerPrompt.Infrastructure/Utils/HttpEdgeAgentClient.cs
new file mode 100644
index 0000000..47050c7
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/Utils/HttpEdgeAgentClient.cs
@@ -0,0 +1,60 @@
+using System.Net.Http.Json;
+
+namespace MakerPrompt.Infrastructure.Utils;
+
+/// <summary>
+/// Pushes telemetry snapshots to the MakerPrompt Cloud backend over HTTP/JSON.
+///
+/// The <see cref="HttpClient"/> passed in must be pre-configured with:
+///   • <c>BaseAddress</c> — the cloud base URL (e.g. http://localhost:8080).
+///   • <c>DefaultRequestHeaders.Authorization</c> — Bearer token.
+///
+/// All network failures are swallowed at Debug level so they never crash the
+/// EdgeAgent polling loop.
+/// </summary>
+public sealed class HttpEdgeAgentClient(HttpClient http, ILogger<HttpEdgeAgentClient> logger) : IEdgeAgentClient
+{
+    private readonly HttpClient _http = http;
+    private readonly ILogger<HttpEdgeAgentClient> _logger = logger;
+
+    /// <inheritdoc />
+    public async Task SendTelemetryAsync(
+        string printerId,
+        PrinterTelemetry telemetry,
+        CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var response = await _http.PostAsJsonAsync(
+                $"api/telemetry/{Uri.EscapeDataString(printerId)}",
+                telemetry,
+                cancellationToken);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                _logger.LogDebug(
+                    "Cloud rejected telemetry for {PrinterId}: HTTP {StatusCode}",
+                    printerId, (int)response.StatusCode);
+            }
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            _logger.LogDebug(ex, "Cloud telemetry push failed for printer {PrinterId}", printerId);
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<bool> IsReachableAsync(CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var response = await _http.GetAsync("health", cancellationToken);
+            return response.IsSuccessStatusCode;
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            _logger.LogDebug(ex, "Cloud health check failed");
+            return false;
+        }
+    }
+}
diff --git a/src/MakerPrompt.Infrastructure/Utils/MjpegCameraProvider.cs b/src/MakerPrompt.Infrastructure/Utils/MjpegCameraProvider.cs
new file mode 100644
index 0000000..0b3c27f
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/Utils/MjpegCameraProvider.cs
@@ -0,0 +1,170 @@
+namespace MakerPrompt.Infrastructure.Utils;
+
+/// <summary>
+/// Camera provider that reads a single JPEG frame from an MJPEG HTTP stream.
+///
+/// Compatibility
+/// -------------
+/// Works with any device that exposes a standard MJPEG endpoint, including:
+/// - OctoPrint (e.g. http://printer:8080/?action=snapshot)
+/// - Mainsail / Fluidd webcam streams
+/// - Generic USB webcams served via mjpg-streamer
+/// - Any IP camera that exposes an MJPEG endpoint
+///
+/// The provider captures a single frame per <see cref="CaptureSnapshotAsync"/> call
+/// by reading only the first JPEG segment of the multipart MJPEG stream.
+/// </summary>
+/// <param name="cameraId">Printer/camera ID this feed belongs to.</param>
+/// <param name="label">Human-readable label for the camera.</param>
+/// <param name="streamUrl">
+///   MJPEG snapshot URL (e.g. http://printer:8080/?action=snapshot).
+///   May be a snapshot endpoint (returns a single JPEG) or a live MJPEG
+///   stream (the provider will extract the first frame automatically).
+/// </param>
+/// <param name="logger">Logger.</param>
+public sealed class MjpegCameraProvider(
+    string cameraId,
+    string label,
+    string streamUrl,
+    ILogger<MjpegCameraProvider> logger) : ICameraProvider
+{
+    private static readonly HttpClient SharedClient = new()
+    {
+        Timeout = TimeSpan.FromSeconds(10)
+    };
+
+    private readonly string _streamUrl = streamUrl;
+    private readonly ILogger<MjpegCameraProvider> _logger = logger;
+
+    /// <inheritdoc />
+    public string CameraId { get; } = cameraId;
+
+    /// <inheritdoc />
+    public string Label { get; } = label;
+
+    /// <inheritdoc />
+    public bool IsAvailable { get; private set; }
+
+    /// <inheritdoc />
+    public async Task<byte[]> CaptureSnapshotAsync(CancellationToken cancellationToken = default)
+    {
+        if (!IsAvailable) return [];
+
+        try
+        {
+            using var response = await SharedClient.GetAsync(
+                _streamUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+
+            response.EnsureSuccessStatusCode();
+
+            var contentType = response.Content.Headers.ContentType?.MediaType ?? string.Empty;
+
+            if (contentType.Equals("image/jpeg", StringComparison.OrdinalIgnoreCase) ||
+                contentType.Equals("image/jpg", StringComparison.OrdinalIgnoreCase))
+            {
+                // Snapshot endpoint — response is already a single JPEG.
+                return await response.Content.ReadAsByteArrayAsync(cancellationToken);
+            }
+            else if (contentType.StartsWith("multipart/x-mixed-replace", StringComparison.OrdinalIgnoreCase))
+            {
+                // MJPEG stream — extract the first JPEG frame.
+                return await ExtractFirstMjpegFrameAsync(response, cancellationToken);
+            }
+            else
+            {
+                _logger.LogWarning(
+                    "[CameraProvider:{CameraId}] Unexpected content-type: {ContentType}",
+                    CameraId, contentType);
+                return [];
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            return [];
+        }
+        catch (Exception ex)
+        {
+            // Swallow capture errors — camera may be temporarily unavailable.
+            _logger.LogDebug(ex, "[CameraProvider:{CameraId}] Snapshot capture failed", CameraId);
+            IsAvailable = false;
+            return [];
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<bool> CheckAvailabilityAsync(CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            using var request = new HttpRequestMessage(HttpMethod.Head, _streamUrl);
+            using var response = await SharedClient.SendAsync(
+                request, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+
+            IsAvailable = response.IsSuccessStatusCode;
+        }
+        catch
+        {
+            IsAvailable = false;
+        }
+
+        return IsAvailable;
+    }
+
+    // ── MJPEG frame extraction ────────────────────────────────────────────────
+
+    private static async Task<byte[]> ExtractFirstMjpegFrameAsync(
+        HttpResponseMessage response, CancellationToken ct)
+    {
+        // MJPEG multipart boundary is declared in the Content-Type header.
+        // e.g. multipart/x-mixed-replace;boundary=--myboundary
+        // We scan for the JPEG SOI marker (0xFF 0xD8) and EOF marker (0xFF 0xD9).
+        await using var stream = await response.Content.ReadAsStreamAsync(ct);
+
+        using var ms = new MemoryStream();
+        var buf = new byte[8192];
+        bool inJpeg = false;
+        int soi0 = -1;
+
+        while (true)
+        {
+            ct.ThrowIfCancellationRequested();
+            int read = await stream.ReadAsync(buf, ct);
+            if (read == 0) break;
+
+            if (!inJpeg)
+            {
+                for (int i = 0; i < read - 1; i++)
+                {
+                    if (buf[i] == 0xFF && buf[i + 1] == 0xD8)
+                    {
+                        soi0 = i;
+                        inJpeg = true;
+                        ms.Write(buf, i, read - i);
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                ms.Write(buf, 0, read);
+
+                // Check for EOI marker (0xFF 0xD9).
+                var data = ms.GetBuffer();
+                var len = (int)ms.Length;
+                for (int i = len - 2; i >= Math.Max(0, len - read - 2); i--)
+                {
+                    if (data[i] == 0xFF && data[i + 1] == 0xD9)
+                        return ms.ToArray()[..(i + 2)];
+                }
+            }
+
+            // Safety valve: don't buffer more than 5 MB.
+            if (ms.Length > 5 * 1024 * 1024)
+                break;
+        }
+
+        return ms.Length > 0 ? ms.ToArray() : [];
+    }
+
+    public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+}
diff --git a/src/MakerPrompt.Infrastructure/usings.cs b/src/MakerPrompt.Infrastructure/usings.cs
new file mode 100644
index 0000000..07a55dc
--- /dev/null
+++ b/src/MakerPrompt.Infrastructure/usings.cs
@@ -0,0 +1,10 @@
+global using System.Text;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
+global using System.Numerics;
+global using System.Net;
+global using System.Net.Http.Headers;
+global using Microsoft.Extensions.Logging;
+global using MakerPrompt.Core.Models;
+global using MakerPrompt.Core.Abstractions;
diff --git a/MakerPrompt.Blazor/MakerPrompt.Blazor.csproj b/src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj
similarity index 70%
rename from MakerPrompt.Blazor/MakerPrompt.Blazor.csproj
rename to src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj
index 976f6fe..155bc98 100644
--- a/MakerPrompt.Blazor/MakerPrompt.Blazor.csproj
+++ b/src/MakerPrompt.UI.Blazor/MakerPrompt.UI.Blazor.csproj
@@ -1,31 +1,31 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-	<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
-    <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
-    <!-- Enables source-map based debugging in both VS and VS Code for .NET 10 WASM.
-         Prevents the "failed to load metadata for System.Private.CoreLib.dll" error. -->
-    <WasmDebugLevel>2</WasmDebugLevel>
-	<Version>0.4.0</Version>
-	<AssemblyVersion>$(Version)</AssemblyVersion>
-    <FileVersion>$(Version)</FileVersion>
-    <InformationalVersion>$(Version)</InformationalVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MakerPrompt.Shared\MakerPrompt.Shared.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
+    <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+    <!-- Enables source-map based debugging in both VS and VS Code for .NET 10 WASM. -->
+    <WasmDebugLevel>2</WasmDebugLevel>
+    <Version>0.4.0</Version>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <FileVersion>$(Version)</FileVersion>
+    <InformationalVersion>$(Version)</InformationalVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MakerPrompt.UI.Components\MakerPrompt.UI.Components.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/MakerPrompt.UI.Blazor/Program.cs b/src/MakerPrompt.UI.Blazor/Program.cs
new file mode 100644
index 0000000..f14595c
--- /dev/null
+++ b/src/MakerPrompt.UI.Blazor/Program.cs
@@ -0,0 +1,60 @@
+using System.Globalization;
+using MakerPrompt.UI.Blazor.Services;
+using MakerPrompt.UI.Blazor.Storage;
+using MakerPrompt.UI.Components.Infrastructure;
+using MakerPrompt.UI.Components.Services;
+using MakerPrompt.Infrastructure.Services.Printers;
+using MakerPrompt.UI.Components.Utils;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.JSInterop;
+
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+builder.RootComponents.Add<MakerPrompt.UI.Components.App>("#app");
+builder.RootComponents.Add<HeadOutlet>("head::after");
+
+builder.Services.RegisterMakerPromptSharedServices<AppConfigurationService, WebSerialService>();
+builder.Services.AddScoped<IAppLocalStorageProvider, BlazorAppLocalStorageProvider>();
+// WASM: AES-GCM not supported in browser — use Base64 encoding fallback
+builder.Services.AddSingleton<IConnectionEncryptionService, Base64ConnectionEncryptionService>();
+
+// ── Deployment-mode-specific services ────────────────────────────────────────
+// OIDC is enabled when an Authority URL is present in the "Local" config section.
+// This drives IDeploymentModeService.IsAuthEnabled and locks the farm in
+// cloud/makerspace mode.  Config lives in wwwroot/appsettings.json under "Local".
+var oidcAuthority = builder.Configuration["Local:Authority"] ?? string.Empty;
+if (!string.IsNullOrWhiteSpace(oidcAuthority))
+{
+    // Authorization Code + PKCE (never implicit grant).
+    // All options (ClientId, ResponseType, DefaultScopes, etc.) are bound from
+    // the "Local" section, which follows the Microsoft.AspNetCore.Components
+    // .WebAssembly.Authentication convention.
+    builder.Services.AddOidcAuthentication(options =>
+    {
+        builder.Configuration.Bind("Local", options.ProviderOptions);
+        // Enforce PKCE / code flow explicitly.
+        options.ProviderOptions.ResponseType = "code";
+    });
+}
+
+var host = builder.Build();
+const string defaultCulture = "en-US";
+
+// Initialize configuration from localStorage before the app renders so that
+// components see the persisted values on the very first render.
+var configService = host.Services.GetRequiredService<IAppConfigurationService>();
+await configService.InitializeAsync();
+
+var js = host.Services.GetRequiredService<IJSRuntime>();
+var result = await js.InvokeAsync<string>("blazorCulture.get");
+var culture = CultureInfo.GetCultureInfo(result ?? defaultCulture);
+
+if (result == null)
+{
+    await js.InvokeVoidAsync("blazorCulture.set", defaultCulture);
+}
+
+CultureInfo.DefaultThreadCurrentCulture = culture;
+CultureInfo.DefaultThreadCurrentUICulture = culture;
+
+await host.RunAsync();
diff --git a/MakerPrompt.Blazor/Properties/launchSettings.json b/src/MakerPrompt.UI.Blazor/Properties/launchSettings.json
similarity index 100%
rename from MakerPrompt.Blazor/Properties/launchSettings.json
rename to src/MakerPrompt.UI.Blazor/Properties/launchSettings.json
diff --git a/src/MakerPrompt.UI.Blazor/Services/AppConfigurationService.cs b/src/MakerPrompt.UI.Blazor/Services/AppConfigurationService.cs
new file mode 100644
index 0000000..1615124
--- /dev/null
+++ b/src/MakerPrompt.UI.Blazor/Services/AppConfigurationService.cs
@@ -0,0 +1,79 @@
+using MakerPrompt.UI.Components.Infrastructure;
+using MakerPrompt.UI.Components.Utils;
+using Microsoft.Extensions.Configuration;
+using Microsoft.JSInterop;
+using System.Text.Json;
+
+namespace MakerPrompt.UI.Blazor.Services
+{
+    public class AppConfigurationService : IAppConfigurationService, IAsyncDisposable
+    {
+        private const string StorageKey = "AppConfig";
+        private readonly IJSRuntime _jsRuntime;
+        private readonly IConfiguration _configuration;
+        private AppConfiguration _config = new();
+
+        public AppConfiguration Configuration => _config;
+
+        public AppConfigurationService(IJSRuntime jsRuntime, IConfiguration configuration)
+        {
+            _jsRuntime = jsRuntime;
+            _configuration = configuration;
+        }
+
+        public async Task InitializeAsync()
+        {
+            var json = await _jsRuntime.InvokeAsync<string>("localStorage.getItem", StorageKey);
+            _config = json != null
+                ? JsonSerializer.Deserialize<AppConfiguration>(json) ?? new AppConfiguration()
+                : new AppConfiguration();
+
+            // Overlay deployment-time settings from appsettings.json.
+            // These cannot be changed at runtime — they reflect the deployment environment.
+            ApplyDeploymentSettings();
+        }
+
+        public async Task SaveConfigurationAsync()
+        {
+            await _jsRuntime.InvokeVoidAsync("localStorage.setItem", StorageKey,
+                JsonSerializer.Serialize(_config));
+        }
+
+        public async Task ResetToDefaultsAsync()
+        {
+            _config = new AppConfiguration();
+            ApplyDeploymentSettings();
+            await SaveConfigurationAsync();
+        }
+
+        public async ValueTask DisposeAsync() => await SaveConfigurationAsync();
+
+        // ── private ──────────────────────────────────────────────────────────
+
+        /// <summary>
+        /// Reads deployment-time settings from appsettings.json and overlays them
+        /// onto the in-memory configuration. These values are not stored in localStorage
+        /// because they are controlled by whoever deploys the application, not the end user.
+        /// </summary>
+        private void ApplyDeploymentSettings()
+        {
+            var modeStr = _configuration["MakerPrompt:DeploymentMode"] ?? string.Empty;
+            _config.DeploymentMode = Enum.TryParse<AppDeploymentMode>(modeStr, true, out var parsedMode)
+                ? parsedMode
+                : AppDeploymentMode.Standalone;
+
+            _config.CloudApiBaseUrl = _configuration["MakerPrompt:CloudApiBaseUrl"] ?? string.Empty;
+
+            // In CloudMakerspace mode, farm mode is always enabled and the farm name
+            // comes from the deployment configuration.
+            if (_config.DeploymentMode == AppDeploymentMode.CloudMakerspace)
+            {
+                _config.FarmModeEnabled = true;
+
+                var configuredFarmName = _configuration["MakerPrompt:FarmName"];
+                if (!string.IsNullOrWhiteSpace(configuredFarmName))
+                    _config.FarmName = configuredFarmName;
+            }
+        }
+    }
+}
diff --git a/MakerPrompt.Blazor/Services/WebSerialService.cs b/src/MakerPrompt.UI.Blazor/Services/WebSerialService.cs
similarity index 85%
rename from MakerPrompt.Blazor/Services/WebSerialService.cs
rename to src/MakerPrompt.UI.Blazor/Services/WebSerialService.cs
index 5f4b407..7061a06 100644
--- a/MakerPrompt.Blazor/Services/WebSerialService.cs
+++ b/src/MakerPrompt.UI.Blazor/Services/WebSerialService.cs
@@ -1,9 +1,9 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
+using MakerPrompt.Core.Models;
+using MakerPrompt.UI.Components.Infrastructure;
 using Microsoft.JSInterop;
+using MakerPrompt.Infrastructure.Services.Printers;
 
-namespace MakerPrompt.Blazor.Services
+namespace MakerPrompt.UI.Blazor.Services
 {
     public class WebSerialService : BaseSerialService, ISerialService, IAsyncDisposable
     {
@@ -41,7 +41,7 @@ public async Task<IEnumerable<string>> GetAvailablePortsAsync()
             return ports.Select(p => $"{p.Name} ({p.Manufacturer})");
         }
 
-        public async Task DisconnectAsync()
+        public async Task DisconnectAsync(CancellationToken cancellationToken = default)
         {
             // Stop telemetry timer and detach handler first
             updateTimer.Stop();
@@ -58,10 +58,10 @@ public async Task DisconnectAsync()
             RaiseConnectionChanged();
         }
 
-        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings)
+        public async Task<bool> ConnectAsync(PrinterConnectionSettings connectionSettings, CancellationToken cancellationToken = default)
         {
-            if (connectionSettings.ConnectionType != ConnectionType || connectionSettings.Serial == null) throw new ArgumentException();
-            await OpenPortAsync(connectionSettings.Serial.PortName, connectionSettings.Serial.BaudRate); 
+            if (connectionSettings.ConnectionType != ConnectionType || string.IsNullOrEmpty(connectionSettings.PortName)) throw new ArgumentException();
+            await OpenPortAsync(connectionSettings.PortName, connectionSettings.BaudRate); 
             return IsConnected;
         }
 
@@ -93,7 +93,7 @@ private async void OnUpdateTimerElapsed(object? sender, System.Timers.ElapsedEve
 
             try
             {
-                await GetPrinterTelemetryAsync();
+                await GetTelemetryAsync();
             }
             catch
             {
@@ -101,7 +101,7 @@ private async void OnUpdateTimerElapsed(object? sender, System.Timers.ElapsedEve
             }
         }
 
-        public override async Task WriteDataAsync(string data)
+        public override async Task WriteDataAsync(string data, CancellationToken cancellationToken = default)
         {
             if (_portReference == null) throw new InvalidOperationException("Port not open");
             var module = await _moduleTask.Value;
diff --git a/MakerPrompt.Blazor/Storage/BlazorAppLocalStorageProvider.cs b/src/MakerPrompt.UI.Blazor/Storage/BlazorAppLocalStorageProvider.cs
similarity index 97%
rename from MakerPrompt.Blazor/Storage/BlazorAppLocalStorageProvider.cs
rename to src/MakerPrompt.UI.Blazor/Storage/BlazorAppLocalStorageProvider.cs
index aaf6f55..7f238fc 100644
--- a/MakerPrompt.Blazor/Storage/BlazorAppLocalStorageProvider.cs
+++ b/src/MakerPrompt.UI.Blazor/Storage/BlazorAppLocalStorageProvider.cs
@@ -1,9 +1,9 @@
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Infrastructure;
+using MakerPrompt.Core.Models;
+using MakerPrompt.UI.Components.Infrastructure;
 using Microsoft.JSInterop;
 using System.Text.Json;
 
-namespace MakerPrompt.Blazor.Storage
+namespace MakerPrompt.UI.Blazor.Storage
 {
     public sealed class BlazorAppLocalStorageProvider : IAppLocalStorageProvider
     {
diff --git a/MakerPrompt.Blazor/_Imports.razor b/src/MakerPrompt.UI.Blazor/_Imports.razor
similarity index 50%
rename from MakerPrompt.Blazor/_Imports.razor
rename to src/MakerPrompt.UI.Blazor/_Imports.razor
index 5419af9..5d61dc9 100644
--- a/MakerPrompt.Blazor/_Imports.razor
+++ b/src/MakerPrompt.UI.Blazor/_Imports.razor
@@ -1,16 +1,17 @@
-@using System.Text.Json
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.AspNetCore.Components.WebAssembly.Http
-@using Microsoft.JSInterop
-@using MakerPrompt.Blazor
-@using MakerPrompt.Shared.Components
-@using MakerPrompt.Shared.Layout
-@using MakerPrompt.Shared.Pages
-@using MakerPrompt.Shared.Infrastructure
-@using MakerPrompt.Shared.Utils
-@using BlazorBootstrap
\ No newline at end of file
+@using System.Text.Json
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.AspNetCore.Components.WebAssembly.Http
+@using Microsoft.JSInterop
+@using MakerPrompt.UI.Blazor
+@using MakerPrompt.UI.Components
+@using MakerPrompt.UI.Components.Components
+@using MakerPrompt.UI.Components.Layout
+@using MakerPrompt.UI.Components.Pages
+@using MakerPrompt.UI.Components.Infrastructure
+@using MakerPrompt.UI.Components.Utils
+@using BlazorBootstrap
diff --git a/src/MakerPrompt.UI.Blazor/wwwroot/appsettings.json b/src/MakerPrompt.UI.Blazor/wwwroot/appsettings.json
new file mode 100644
index 0000000..d037a99
--- /dev/null
+++ b/src/MakerPrompt.UI.Blazor/wwwroot/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Local": {
+    "Authority": "",
+    "ClientId": "",
+    "ResponseType": "code",
+    "ValidateAuthority": true,
+    "DefaultScopes": [ "openid", "profile", "email" ]
+  }
+}
diff --git a/src/MakerPrompt.UI.Blazor/wwwroot/css/app.css b/src/MakerPrompt.UI.Blazor/wwwroot/css/app.css
new file mode 100644
index 0000000..7be0b49
--- /dev/null
+++ b/src/MakerPrompt.UI.Blazor/wwwroot/css/app.css
@@ -0,0 +1,9 @@
+/* MakerPrompt.UI.Blazor – minimal shell styles */
+html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; height: 100%; }
+.page { display: flex; min-height: 100vh; }
+.sidebar { width: 220px; background-color: #1a1a2e; color: #eee; padding-top: 1rem; flex-shrink: 0; }
+.sidebar .nav-link { color: #ccc; font-size: .9rem; padding: .35rem 1rem; }
+.sidebar .nav-link.active, .sidebar .nav-link:hover { color: #fff; background: rgba(255,255,255,.1); border-radius: .25rem; }
+main { flex: 1; display: flex; flex-direction: column; overflow: auto; }
+.top-row { padding: .5rem 1rem; background: #f8f9fa; border-bottom: 1px solid #dee2e6; text-align: right; }
+.content { padding: 1.5rem; flex: 1; }
diff --git a/MakerPrompt.Blazor/wwwroot/index.html b/src/MakerPrompt.UI.Blazor/wwwroot/index.html
similarity index 81%
rename from MakerPrompt.Blazor/wwwroot/index.html
rename to src/MakerPrompt.UI.Blazor/wwwroot/index.html
index 97024d9..96ce954 100644
--- a/MakerPrompt.Blazor/wwwroot/index.html
+++ b/src/MakerPrompt.UI.Blazor/wwwroot/index.html
@@ -1,85 +1,87 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MakerPrompt</title>
-    <meta name="title" content="MakerPrompt - Open Source 3D Printer Management">
-    <meta name="description" content="Cross-platform interface for 3D printer management. Supports Prusalink, Moonraker, and direct serial control. Developed at x-hain hackspace using Blazor Hybrid.">
-    <meta name="keywords" content="3D printer management, 3D printer maintenance, Blazor Hybrid, open source 3D printing, Pronterface alternative, Prusalink, Moonraker, Web Serial control" />
-    <meta name="robots" content="index, follow">
-    <meta name="author" content="Akın Bender" />
-    <base href="/" />
-    <script>
-        (function () {
-            try {
-                var configJson = window.localStorage.getItem('AppConfig');
-                var themeKey = 'auto';
-                if (configJson) {
-                    var config = JSON.parse(configJson);
-                    if (config && config.Theme !== undefined && config.Theme !== null) {
-                        var raw = config.Theme;
-                        if (typeof raw === 'string') {
-                            themeKey = raw.toLowerCase();
-                        } else if (typeof raw === 'number') {
-                            switch (raw) {
-                                case 1: themeKey = 'light'; break;   // Theme.Light
-                                case 2: themeKey = 'dark'; break;    // Theme.Dark
-                                case 3: themeKey = 'mpdark'; break;  // Theme.MpDark
-                                default: themeKey = 'auto'; break;   // Theme.Auto or unknown
-                            }
-                        }
-                    }
-                }
-
-                var resolvedTheme = themeKey;
-                if (!resolvedTheme || resolvedTheme === 'auto') {
-                    resolvedTheme = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-                        ? 'dark'
-                        : 'light';
-                }
-
-                document.documentElement.setAttribute('data-bs-theme', resolvedTheme);
-                document.documentElement.style.colorScheme = resolvedTheme;
-            } catch { }
-        })();
-    </script>
-    <link rel="stylesheet" href="MakerPrompt.Blazor.styles.css" />
-    <link rel="stylesheet" href="_content/MakerPrompt.Shared/lib/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="_content/MakerPrompt.Shared/lib/bootstrap-icons/font/bootstrap-icons.min.css" />
-    <link rel="stylesheet" href="_content/Blazor.Bootstrap/blazor.bootstrap.css"  />
-    <link rel="stylesheet" href="_content/MakerPrompt.Shared/css/app.css" />
-    <link rel="icon" type="image/png" href="_content/MakerPrompt.Shared/favicon.png" />
-    <link href="manifest.webmanifest" rel="manifest" />
-    <link rel="apple-touch-icon" sizes="512x512" href="favicon.png" />
-</head>
-
-<body>
-    <div id="app">
-        <svg class="loading-progress">
-            <circle r="40%" cx="50%" cy="50%" />
-            <circle r="40%" cx="50%" cy="50%" />
-        </svg>
-        <div class="loading-progress-text"></div>
-    </div>
-
-    <div id="blazor-error-ui">
-        An unhandled error has occurred.
-        <a href="" class="reload">Reload</a>
-        <a class="dismiss">🗙</a>
-    </div>
-    <script src="_content/MakerPrompt.Shared/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
-    <script src="_content/MakerPrompt.Shared/lib/gcode-preview/gcode-preview.bundle.js"></script>
-    <script src="_framework/blazor.webassembly.js"></script>
-    <script src="_content/Blazor.Bootstrap/blazor.bootstrap.js"></script>
-    <script>navigator.serviceWorker.register('service-worker.js');</script>
-    <script>
-        window.blazorCulture = {
-            get: () => window.localStorage['BlazorCulture'],
-            set: (value) => window.localStorage['BlazorCulture'] = value
-        };
-    </script>
-</body>
-
-</html>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>MakerPrompt</title>
+    <meta name="title" content="MakerPrompt - Open Source 3D Printer Management">
+    <meta name="description" content="Cross-platform interface for 3D printer management. Supports Prusalink, Moonraker, and direct serial control. Developed at x-hain hackspace using Blazor Hybrid.">
+    <meta name="keywords" content="3D printer management, 3D printer maintenance, Blazor Hybrid, open source 3D printing, Pronterface alternative, Prusalink, Moonraker, Web Serial control" />
+    <meta name="robots" content="index, follow">
+    <meta name="author" content="Akın Bender" />
+    <base href="/" />
+    <script>
+        (function () {
+            try {
+                var configJson = window.localStorage.getItem('AppConfig');
+                var themeKey = 'auto';
+                if (configJson) {
+                    var config = JSON.parse(configJson);
+                    if (config && config.Theme !== undefined && config.Theme !== null) {
+                        var raw = config.Theme;
+                        if (typeof raw === 'string') {
+                            themeKey = raw.toLowerCase();
+                        } else if (typeof raw === 'number') {
+                            switch (raw) {
+                                case 1: themeKey = 'light'; break;   // Theme.Light
+                                case 2: themeKey = 'dark'; break;    // Theme.Dark
+                                case 3: themeKey = 'mpdark'; break;  // Theme.MpDark
+                                default: themeKey = 'auto'; break;   // Theme.Auto or unknown
+                            }
+                        }
+                    }
+                }
+
+                var resolvedTheme = themeKey;
+                if (!resolvedTheme || resolvedTheme === 'auto') {
+                    resolvedTheme = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
+                        ? 'dark'
+                        : 'light';
+                }
+
+                document.documentElement.setAttribute('data-bs-theme', resolvedTheme);
+                document.documentElement.style.colorScheme = resolvedTheme;
+            } catch { }
+        })();
+    </script>
+    <link rel="stylesheet" href="MakerPrompt.UI.Blazor.styles.css" />
+    <link rel="stylesheet" href="_content/MakerPrompt.UI.Components/lib/bootstrap/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="_content/MakerPrompt.UI.Components/lib/bootstrap-icons/font/bootstrap-icons.min.css" />
+    <link rel="stylesheet" href="_content/Blazor.Bootstrap/blazor.bootstrap.css" />
+    <link rel="stylesheet" href="_content/MakerPrompt.UI.Components/css/app.css" />
+    <link rel="icon" type="image/png" href="_content/MakerPrompt.UI.Components/favicon.png" />
+    <link href="manifest.webmanifest" rel="manifest" />
+    <link rel="apple-touch-icon" sizes="512x512" href="favicon.png" />
+</head>
+
+<body>
+    <div id="app">
+        <svg class="loading-progress">
+            <circle r="40%" cx="50%" cy="50%" />
+            <circle r="40%" cx="50%" cy="50%" />
+        </svg>
+        <div class="loading-progress-text"></div>
+    </div>
+
+    <div id="blazor-error-ui">
+        An unhandled error has occurred.
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+    <script src="_content/MakerPrompt.UI.Components/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <script src="_content/MakerPrompt.UI.Components/lib/gcode-preview/gcode-preview.bundle.js"></script>
+    <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
+    <script src="_framework/blazor.webassembly.js"></script>
+    <script src="_content/Blazor.Bootstrap/blazor.bootstrap.js"></script>
+    <script>navigator.serviceWorker.register('service-worker.js');</script>
+    <script>
+        window.blazorCulture = {
+            get: () => window.localStorage['BlazorCulture'],
+            set: (value) => window.localStorage['BlazorCulture'] = value
+        };
+    </script>
+</body>
+
+</html>
+
diff --git a/MakerPrompt.Blazor/wwwroot/manifest.webmanifest b/src/MakerPrompt.UI.Blazor/wwwroot/manifest.webmanifest
similarity index 100%
rename from MakerPrompt.Blazor/wwwroot/manifest.webmanifest
rename to src/MakerPrompt.UI.Blazor/wwwroot/manifest.webmanifest
diff --git a/MakerPrompt.Blazor/wwwroot/serialJsInterop.js b/src/MakerPrompt.UI.Blazor/wwwroot/serialJsInterop.js
similarity index 100%
rename from MakerPrompt.Blazor/wwwroot/serialJsInterop.js
rename to src/MakerPrompt.UI.Blazor/wwwroot/serialJsInterop.js
diff --git a/MakerPrompt.Blazor/wwwroot/service-worker.js b/src/MakerPrompt.UI.Blazor/wwwroot/service-worker.js
similarity index 100%
rename from MakerPrompt.Blazor/wwwroot/service-worker.js
rename to src/MakerPrompt.UI.Blazor/wwwroot/service-worker.js
diff --git a/MakerPrompt.Blazor/wwwroot/service-worker.published.js b/src/MakerPrompt.UI.Blazor/wwwroot/service-worker.published.js
similarity index 100%
rename from MakerPrompt.Blazor/wwwroot/service-worker.published.js
rename to src/MakerPrompt.UI.Blazor/wwwroot/service-worker.published.js
diff --git a/MakerPrompt.Blazor/App.razor b/src/MakerPrompt.UI.Components/App.razor
similarity index 84%
rename from MakerPrompt.Blazor/App.razor
rename to src/MakerPrompt.UI.Components/App.razor
index 9eb44bb..e0938f6 100644
--- a/MakerPrompt.Blazor/App.razor
+++ b/src/MakerPrompt.UI.Components/App.razor
@@ -1,7 +1,7 @@
 <ProcessError>
     <GlobalErrorBoundary>
         <AppInitializer>
-            <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="[typeof(MainLayout).Assembly]">
+            <Router AppAssembly="@typeof(App).Assembly">
                 <Found Context="routeData">
                     <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
                     <FocusOnNavigate RouteData="@routeData" Selector="h1" />
diff --git a/MakerPrompt.Shared/BrailleRAP/Models/BrailleCell.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Models/BrailleCell.cs
similarity index 95%
rename from MakerPrompt.Shared/BrailleRAP/Models/BrailleCell.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Models/BrailleCell.cs
index c8770b4..67b60a2 100644
--- a/MakerPrompt.Shared/BrailleRAP/Models/BrailleCell.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Models/BrailleCell.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.BrailleRAP.Models
+namespace MakerPrompt.UI.Components.BrailleRAP.Models
 {
     /// <summary>
     /// Represents a single Braille cell using Unicode Braille Patterns (U+2800 to U+28FF).
diff --git a/MakerPrompt.Shared/BrailleRAP/Models/BrailleDot.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Models/BrailleDot.cs
similarity index 90%
rename from MakerPrompt.Shared/BrailleRAP/Models/BrailleDot.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Models/BrailleDot.cs
index df4011a..d401e25 100644
--- a/MakerPrompt.Shared/BrailleRAP/Models/BrailleDot.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Models/BrailleDot.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.BrailleRAP.Models
+namespace MakerPrompt.UI.Components.BrailleRAP.Models
 {
     /// <summary>
     /// Represents the position of a dot in a Braille cell (0-7 for 8-dot Braille).
diff --git a/MakerPrompt.Shared/BrailleRAP/Models/BraillePageLayout.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Models/BraillePageLayout.cs
similarity index 93%
rename from MakerPrompt.Shared/BrailleRAP/Models/BraillePageLayout.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Models/BraillePageLayout.cs
index a88dda8..d68d2fa 100644
--- a/MakerPrompt.Shared/BrailleRAP/Models/BraillePageLayout.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Models/BraillePageLayout.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.BrailleRAP.Models
+namespace MakerPrompt.UI.Components.BrailleRAP.Models
 {
     /// <summary>
     /// Represents a paginated layout of Braille text.
diff --git a/MakerPrompt.Shared/BrailleRAP/Models/GeomPoint.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Models/GeomPoint.cs
similarity index 75%
rename from MakerPrompt.Shared/BrailleRAP/Models/GeomPoint.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Models/GeomPoint.cs
index 4f6d17d..006641f 100644
--- a/MakerPrompt.Shared/BrailleRAP/Models/GeomPoint.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Models/GeomPoint.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.BrailleRAP.Models
+namespace MakerPrompt.UI.Components.BrailleRAP.Models
 {
     /// <summary>
     /// Represents a geometric point in 2D space for BrailleRAP positioning.
diff --git a/MakerPrompt.Shared/BrailleRAP/Models/MachineConfig.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Models/MachineConfig.cs
similarity index 96%
rename from MakerPrompt.Shared/BrailleRAP/Models/MachineConfig.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Models/MachineConfig.cs
index 9852b6c..2301852 100644
--- a/MakerPrompt.Shared/BrailleRAP/Models/MachineConfig.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Models/MachineConfig.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.BrailleRAP.Models
+namespace MakerPrompt.UI.Components.BrailleRAP.Models
 {
     /// <summary>
     /// Configuration for BrailleRAP machine parameters.
diff --git a/MakerPrompt.Shared/BrailleRAP/Models/PageConfig.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Models/PageConfig.cs
similarity index 93%
rename from MakerPrompt.Shared/BrailleRAP/Models/PageConfig.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Models/PageConfig.cs
index 6dec25f..d0ba44c 100644
--- a/MakerPrompt.Shared/BrailleRAP/Models/PageConfig.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Models/PageConfig.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.BrailleRAP.Models
+namespace MakerPrompt.UI.Components.BrailleRAP.Models
 {
     /// <summary>
     /// Configuration for Braille page layout.
diff --git a/MakerPrompt.Shared/BrailleRAP/Services/BrailleGCodeGenerator.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleGCodeGenerator.cs
similarity index 94%
rename from MakerPrompt.Shared/BrailleRAP/Services/BrailleGCodeGenerator.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleGCodeGenerator.cs
index be2e6ff..fd673e4 100644
--- a/MakerPrompt.Shared/BrailleRAP/Services/BrailleGCodeGenerator.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleGCodeGenerator.cs
@@ -1,6 +1,6 @@
-using MakerPrompt.Shared.BrailleRAP.Models;
+using MakerPrompt.UI.Components.BrailleRAP.Models;
 
-namespace MakerPrompt.Shared.BrailleRAP.Services
+namespace MakerPrompt.UI.Components.BrailleRAP.Services
 {
     /// <summary>
     /// Generates G-code for BrailleRAP embossing from geometric points.
@@ -23,7 +23,7 @@ public string GenerateGCode(List<GeomPoint> points)
             var gcode = new StringBuilder();
 
             // Initialize
-            gcode.Append(Home());
+            gcode.Append(HomeAsync());
             gcode.Append(SetSpeed(_config.FeedRate));
             gcode.Append(MoveTo(0, 0));
 
@@ -61,7 +61,7 @@ private string MotorOff()
             return "M84;\r\n";
         }
 
-        private string Home()
+        private string HomeAsync()
         {
             var sb = new StringBuilder();
             sb.Append("G28 X;\r\n");
diff --git a/MakerPrompt.Shared/BrailleRAP/Services/BraillePaginator.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BraillePaginator.cs
similarity index 97%
rename from MakerPrompt.Shared/BrailleRAP/Services/BraillePaginator.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Services/BraillePaginator.cs
index 9c46b8a..e1713d7 100644
--- a/MakerPrompt.Shared/BrailleRAP/Services/BraillePaginator.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BraillePaginator.cs
@@ -1,6 +1,6 @@
-using MakerPrompt.Shared.BrailleRAP.Models;
+using MakerPrompt.UI.Components.BrailleRAP.Models;
 
-namespace MakerPrompt.Shared.BrailleRAP.Services
+namespace MakerPrompt.UI.Components.BrailleRAP.Services
 {
     /// <summary>
     /// Paginates Braille text into pages based on column and row constraints.
diff --git a/MakerPrompt.Shared/BrailleRAP/Services/BrailleRAPService.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleRAPService.cs
similarity index 97%
rename from MakerPrompt.Shared/BrailleRAP/Services/BrailleRAPService.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleRAPService.cs
index bf3dfa8..28c744c 100644
--- a/MakerPrompt.Shared/BrailleRAP/Services/BrailleRAPService.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleRAPService.cs
@@ -1,6 +1,6 @@
-using MakerPrompt.Shared.BrailleRAP.Models;
+using MakerPrompt.UI.Components.BrailleRAP.Models;
 
-namespace MakerPrompt.Shared.BrailleRAP.Services
+namespace MakerPrompt.UI.Components.BrailleRAP.Services
 {
     /// <summary>
     /// Main service for BrailleRAP operations.
diff --git a/MakerPrompt.Shared/BrailleRAP/Services/BrailleToGeometry.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleToGeometry.cs
similarity index 95%
rename from MakerPrompt.Shared/BrailleRAP/Services/BrailleToGeometry.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleToGeometry.cs
index 924ff75..ea2d53a 100644
--- a/MakerPrompt.Shared/BrailleRAP/Services/BrailleToGeometry.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleToGeometry.cs
@@ -1,6 +1,6 @@
-using MakerPrompt.Shared.BrailleRAP.Models;
+using MakerPrompt.UI.Components.BrailleRAP.Models;
 
-namespace MakerPrompt.Shared.BrailleRAP.Services
+namespace MakerPrompt.UI.Components.BrailleRAP.Services
 {
     /// <summary>
     /// Converts Braille cells to geometric points for embossing.
@@ -9,8 +9,8 @@ namespace MakerPrompt.Shared.BrailleRAP.Services
     public class BrailleToGeometry
     {
         // Standard 8-dot Braille dot positions
-        private static readonly (int X, int Y)[] DotPositions = new[]
-        {
+        private static readonly (int X, int Y)[] DotPositions =
+        [
             (0, 0), // Dot 1
             (0, 1), // Dot 2
             (0, 2), // Dot 3
@@ -19,7 +19,7 @@ private static readonly (int X, int Y)[] DotPositions = new[]
             (1, 2), // Dot 6
             (0, 3), // Dot 7
             (1, 3)  // Dot 8
-        };
+        ];
 
         private readonly MachineConfig _config;
 
diff --git a/MakerPrompt.Shared/BrailleRAP/Services/BrailleTranslator.cs b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleTranslator.cs
similarity index 99%
rename from MakerPrompt.Shared/BrailleRAP/Services/BrailleTranslator.cs
rename to src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleTranslator.cs
index e175fd1..ff15942 100644
--- a/MakerPrompt.Shared/BrailleRAP/Services/BrailleTranslator.cs
+++ b/src/MakerPrompt.UI.Components/BrailleRAP/Services/BrailleTranslator.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.BrailleRAP.Services
+namespace MakerPrompt.UI.Components.BrailleRAP.Services
 {
     /// <summary>
     /// Supported Braille languages and translation tables.
@@ -251,7 +251,7 @@ public List<string> Translate(string text)
             var translationMap = GetTranslationMap();
 
             // Split by newlines but preserve form feeds
-            var lines = text.Split(new[] { '\r', '\n' }, StringSplitOptions.None)
+            var lines = text.Split(['\r', '\n'], StringSplitOptions.None)
                 .Where(line => !string.IsNullOrEmpty(line) || line == string.Empty)
                 .ToList();
 
diff --git a/MakerPrompt.Shared/Components/AppInitializer.razor b/src/MakerPrompt.UI.Components/Components/AppInitializer.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/AppInitializer.razor
rename to src/MakerPrompt.UI.Components/Components/AppInitializer.razor
diff --git a/MakerPrompt.Shared/Components/Calculators/BeltStepsCalculator.razor b/src/MakerPrompt.UI.Components/Components/Calculators/BeltStepsCalculator.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/Calculators/BeltStepsCalculator.razor
rename to src/MakerPrompt.UI.Components/Components/Calculators/BeltStepsCalculator.razor
diff --git a/MakerPrompt.Shared/Components/Calculators/ExtruderStepsCalculator.razor b/src/MakerPrompt.UI.Components/Components/Calculators/ExtruderStepsCalculator.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/Calculators/ExtruderStepsCalculator.razor
rename to src/MakerPrompt.UI.Components/Components/Calculators/ExtruderStepsCalculator.razor
diff --git a/MakerPrompt.Shared/Components/Calculators/LeadScrewCalculator.razor b/src/MakerPrompt.UI.Components/Components/Calculators/LeadScrewCalculator.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/Calculators/LeadScrewCalculator.razor
rename to src/MakerPrompt.UI.Components/Components/Calculators/LeadScrewCalculator.razor
diff --git a/MakerPrompt.Shared/Components/Calculators/PrintPriceCalculator.razor b/src/MakerPrompt.UI.Components/Components/Calculators/PrintPriceCalculator.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/Calculators/PrintPriceCalculator.razor
rename to src/MakerPrompt.UI.Components/Components/Calculators/PrintPriceCalculator.razor
diff --git a/MakerPrompt.Shared/Components/Calibration.razor b/src/MakerPrompt.UI.Components/Components/Calibration.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/Calibration.razor
rename to src/MakerPrompt.UI.Components/Components/Calibration.razor
diff --git a/MakerPrompt.Shared/Components/CommandPrompt.razor b/src/MakerPrompt.UI.Components/Components/CommandPrompt.razor
similarity index 95%
rename from MakerPrompt.Shared/Components/CommandPrompt.razor
rename to src/MakerPrompt.UI.Components/Components/CommandPrompt.razor
index 7713b19..27bb93e 100644
--- a/MakerPrompt.Shared/Components/CommandPrompt.razor
+++ b/src/MakerPrompt.UI.Components/Components/CommandPrompt.razor
@@ -38,10 +38,10 @@
     <div class="input-group mt-auto">
         <input type="text" class="form-control bg-dark-subtle border-light-subtle"
                placeholder="@Localizer[Resources.CommandPrompt_EnterCommand]" @bind="inputCommand"
-               disabled="@(!IsConnected && PrinterServiceFactory.Current?.ConnectionType != Enums.PrinterConnectionType.PrusaLink)"
+               disabled="@(!IsConnected && PrinterServiceFactory.Current?.ConnectionType != PrinterConnectionType.PrusaLink)"
                @onkeypress="HandleKeyPress" />
         <button class="btn btn-outline-secondary" @onclick="SendCommand"
-                disabled="@(!IsConnected && PrinterServiceFactory.Current?.ConnectionType != Enums.PrinterConnectionType.PrusaLink)">
+                disabled="@(!IsConnected && PrinterServiceFactory.Current?.ConnectionType != PrinterConnectionType.PrusaLink)">
             @Localizer[Resources.CommandPrompt_Send]
         </button>
     </div>
diff --git a/MakerPrompt.Shared/Components/ControlPanel.razor b/src/MakerPrompt.UI.Components/Components/ControlPanel.razor
similarity index 70%
rename from MakerPrompt.Shared/Components/ControlPanel.razor
rename to src/MakerPrompt.UI.Components/Components/ControlPanel.razor
index 9907353..5c4b88b 100644
--- a/MakerPrompt.Shared/Components/ControlPanel.razor
+++ b/src/MakerPrompt.UI.Components/Components/ControlPanel.razor
@@ -66,8 +66,6 @@
 <div class="row g-3">
 
     @* ── Left: Position + Webcam ── *@
-    @if (SupportsDirectControl)
-    {
     <div class="col-lg-6 col-md-12">
         <div class="card">
             <div class="card-header d-flex align-items-center gap-2 py-2">
@@ -146,15 +144,6 @@
             <WebcamPanel />
         </div>
     </div>
-    }
-    else
-    {
-    <div class="col-lg-6 col-md-12">
-        <div class="mt-3">
-            <WebcamPanel />
-        </div>
-    </div>
-    }
 
     @* ── Right: Temps + Extrude + Speed/Flow + Calibration ── *@
     <div class="col-lg-6 col-md-12">
@@ -166,21 +155,18 @@
                 <span class="fw-semibold">@Localizer[Resources.ControlPanel_Heating]</span>
             </div>
             <div class="card-body pb-1">
-                @* Preheat presets (control-capable backends only) *@
-                @if (SupportsDirectControl)
-                {
-                    <div class="d-flex flex-wrap gap-1 mb-3">
-                        @foreach (var (label, hotend, bed) in PreheatProfiles)
-                        {
-                            var h = hotend; var b = bed;
-                            <button type="button" class="btn btn-sm btn-outline-secondary"
-                                    @onclick="() => PreheatAsync(h, b)" disabled="@(!IsConnected)"
-                                    title="@($"Hotend {hotend}°C / Bed {bed}°C")">
-                                @label
-                            </button>
-                        }
-                    </div>
-                }
+                @* Preheat presets *@
+                <div class="d-flex flex-wrap gap-1 mb-3">
+                    @foreach (var (label, hotend, bed) in PreheatProfiles)
+                    {
+                        var h = hotend; var b = bed;
+                        <button type="button" class="btn btn-sm btn-outline-secondary"
+                                @onclick="() => PreheatAsync(h, b)" disabled="@(!IsConnected)"
+                                title="@($"Hotend {hotend}°C / Bed {bed}°C")">
+                            @label
+                        </button>
+                    }
+                </div>
                 @* Hotend *@
                 <div class="dash-temp-row mb-3">
                     <div class="d-flex align-items-center justify-content-between mb-1">
@@ -197,14 +183,11 @@
                         <div class="progress-bar @(Telemetry.HotendTemp > 150 ? "bg-danger" : Telemetry.HotendTemp > 60 ? "bg-warning" : "bg-secondary")"
                              style="width:@($"{Math.Min(Telemetry.HotendTemp / 300.0 * 100, 100):F0}%")"></div>
                     </div>
-                    @if (SupportsDirectControl)
-                    {
-                        <div class="input-group input-group-sm">
-                            <input type="number" min="0" max="300" class="form-control" @bind="hotendTarget" disabled="@(!IsConnected)" placeholder="Target °C">
-                            <span class="input-group-text">°C</span>
-                            <button class="btn btn-outline-danger" @onclick="SetHotendTempAsync" disabled="@(!IsConnected)">@Localizer[Resources.ControlPanel_Set]</button>
-                        </div>
-                    }
+                    <div class="input-group input-group-sm">
+                        <input type="number" min="0" max="300" class="form-control" @bind="hotendTarget" disabled="@(!IsConnected)" placeholder="Target °C">
+                        <span class="input-group-text">°C</span>
+                        <button class="btn btn-outline-danger" @onclick="SetHotendTempAsync" disabled="@(!IsConnected)">@Localizer[Resources.ControlPanel_Set]</button>
+                    </div>
                 </div>
                 @* Bed *@
                 <div class="dash-temp-row mb-3">
@@ -221,14 +204,11 @@
                     <div class="progress mb-2" style="height:3px;">
                         <div class="progress-bar bg-warning" style="width:@($"{Math.Min(Telemetry.BedTemp / 120.0 * 100, 100):F0}%")"></div>
                     </div>
-                    @if (SupportsDirectControl)
-                    {
-                        <div class="input-group input-group-sm">
-                            <input type="number" min="0" max="120" class="form-control" @bind="bedTarget" disabled="@(!IsConnected)" placeholder="Target °C">
-                            <span class="input-group-text">°C</span>
-                            <button class="btn btn-outline-warning" @onclick="SetBedTempAsync" disabled="@(!IsConnected)">@Localizer[Resources.ControlPanel_Set]</button>
-                        </div>
-                    }
+                    <div class="input-group input-group-sm">
+                        <input type="number" min="0" max="120" class="form-control" @bind="bedTarget" disabled="@(!IsConnected)" placeholder="Target °C">
+                        <span class="input-group-text">°C</span>
+                        <button class="btn btn-outline-warning" @onclick="SetBedTempAsync" disabled="@(!IsConnected)">@Localizer[Resources.ControlPanel_Set]</button>
+                    </div>
                 </div>
                 @* Chamber temp (shown when data is available from printer) *@
                 @if (Telemetry.ChamberTemp > 0 || Telemetry.ChamberTarget > 0)
@@ -261,21 +241,16 @@
                     <div class="progress mb-2" style="height:3px;">
                         <div class="progress-bar bg-info" style="width:@Telemetry.FanSpeed%"></div>
                     </div>
-                    @if (SupportsDirectControl)
-                    {
-                        <div class="input-group input-group-sm">
-                            <input type="number" min="0" max="100" class="form-control" @bind="fanTarget" disabled="@(!IsConnected)" placeholder="Fan %">
-                            <span class="input-group-text">%</span>
-                            <button class="btn btn-outline-info" @onclick="SetFanSpeedAsync" disabled="@(!IsConnected)">@Localizer[Resources.ControlPanel_Set]</button>
-                        </div>
-                    }
+                    <div class="input-group input-group-sm">
+                        <input type="number" min="0" max="100" class="form-control" @bind="fanTarget" disabled="@(!IsConnected)" placeholder="Fan %">
+                        <span class="input-group-text">%</span>
+                        <button class="btn btn-outline-info" @onclick="SetFanSpeedAsync" disabled="@(!IsConnected)">@Localizer[Resources.ControlPanel_Set]</button>
+                    </div>
                 </div>
             </div>
         </div>
 
-        @* Extrude (direct-control backends only) *@
-        @if (SupportsDirectControl)
-        {
+        @* Extrude *@
         <div class="card mb-3">
             <div class="card-header d-flex align-items-center gap-2 py-2">
                 <i class="bi bi-moisture text-secondary"></i>
@@ -308,7 +283,6 @@
                 </div>
             </div>
         </div>
-        }
 
         @* Speed / Flow *@
         <div class="card mb-3">
@@ -323,34 +297,26 @@
                             @Localizer[Resources.ControlPanel_PrintSpeed]
                             <span class="badge bg-primary ms-1">@Telemetry.FeedRate%</span>
                         </label>
-                        @if (SupportsDirectControl)
-                        {
-                            <div class="input-group input-group-sm">
-                                <input type="number" min="1" max="300" class="form-control" @bind="printSpeed" @bind:after="UpdatePrintSpeedAsync" disabled="@(!IsConnected)">
-                                <span class="input-group-text">%</span>
-                            </div>
-                        }
+                        <div class="input-group input-group-sm">
+                            <input type="number" min="1" max="300" class="form-control" @bind="printSpeed" @bind:after="UpdatePrintSpeedAsync" disabled="@(!IsConnected)">
+                            <span class="input-group-text">%</span>
+                        </div>
                     </div>
                     <div class="col">
                         <label class="form-label small text-muted mb-1">
                             @Localizer[Resources.ControlPanel_PrintFlow]
                             <span class="badge bg-secondary ms-1">@Telemetry.FlowRate%</span>
                         </label>
-                        @if (SupportsDirectControl)
-                        {
-                            <div class="input-group input-group-sm">
-                                <input type="number" min="1" max="300" class="form-control" @bind="printFlow" @bind:after="UpdatePrintFlowAsync" disabled="@(!IsConnected)">
-                                <span class="input-group-text">%</span>
-                            </div>
-                        }
+                        <div class="input-group input-group-sm">
+                            <input type="number" min="1" max="300" class="form-control" @bind="printFlow" @bind:after="UpdatePrintFlowAsync" disabled="@(!IsConnected)">
+                            <span class="input-group-text">%</span>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
 
-        @* Calibration (direct-control backends only) *@
-        @if (SupportsDirectControl)
-        {
+        @* Calibration *@
         <div class="card">
             <div class="card-header d-flex align-items-center gap-2 py-2">
                 <i class="bi bi-rulers text-secondary"></i>
@@ -360,45 +326,6 @@
                 <Calibration />
             </div>
         </div>
-        }
-
-        @* Printer Queue (Moonraker only) *@
-        @if (SupportsPrinterQueue)
-        {
-        <div class="card mt-3">
-            <div class="card-header d-flex align-items-center gap-2 py-2">
-                <i class="bi bi-collection-play text-primary"></i>
-                <span class="fw-semibold">@Localizer[Resources.ControlPanel_PrinterQueue]</span>
-                <button class="btn btn-sm btn-outline-secondary ms-auto" @onclick="SafeRefreshPrinterQueueAsync" disabled="@(!IsConnected)" title="@Localizer[Resources.PrintQueue_Refresh]">
-                    <i class="bi bi-arrow-clockwise"></i>
-                </button>
-            </div>
-            <div class="card-body p-0">
-                @if (!_printerQueue.Any())
-                {
-                    <div class="text-center text-muted py-3">
-                        <i class="bi bi-inbox" style="font-size: 1.5rem;"></i>
-                        <p class="mt-1 mb-0 small">@Localizer[Resources.ControlPanel_PrinterQueueEmpty]</p>
-                    </div>
-                }
-                else
-                {
-                    <div class="list-group list-group-flush">
-                        @foreach (var job in _printerQueue)
-                        {
-                            <div class="list-group-item px-3 py-2">
-                                <div class="d-flex align-items-center gap-2">
-                                    <i class="bi bi-file-earmark-code text-muted"></i>
-                                    <span class="text-truncate flex-grow-1 small fw-semibold" title="@job.FileName">@job.FileName</span>
-                                    <small class="text-muted flex-shrink-0">@DateTimeOffset.FromUnixTimeSeconds((long)job.TimeAdded).ToLocalTime().ToString("HH:mm")</small>
-                                </div>
-                            </div>
-                        }
-                    </div>
-                }
-            </div>
-        </div>
-        }
     </div>
 
     @* ── File storage ── *@
@@ -407,15 +334,15 @@
                          EnableUpload="false" EnableDelete="true" EnableOpen="true" EnableCopy="true" />
     </div>
 
-    @* ── Command Prompt / Project Hub ── *@
-    <div class="col-12" style="min-height: 300px;">
-        @if (SupportsCommandPrompt)
+    @* ── Command Prompt (when supported) or Project Hub ── *@
+    <div class="col-12">
+        @if (IsConnected && (PrinterServiceFactory.Current?.SupportsCommandPrompt ?? false))
         {
             <CommandPrompt />
         }
         else
         {
-            <ProjectHub />
+            <PrintQueue />
         }
     </div>
 </div>
@@ -431,12 +358,6 @@
     private int printSpeed = 100;
     private int printFlow = 100;
 
-    private List<PrintQueueEntry> _printerQueue = [];
-
-    private bool SupportsDirectControl => PrinterServiceFactory.Current?.SupportsDirectControl ?? true;
-    private bool SupportsPrinterQueue => PrinterServiceFactory.Current?.SupportsPrinterQueue ?? false;
-    private bool SupportsCommandPrompt => PrinterServiceFactory.Current?.SupportsCommandPrompt ?? true;
-
     private static readonly (string Label, int Hotend, int Bed)[] PreheatProfiles =
     [
         ("PLA",       200,  60),
@@ -464,7 +385,7 @@
     private Task HomeAllAsync()
     {
         var printer = PrinterServiceFactory.Current;
-        return printer?.Home() ?? Task.CompletedTask;
+        return printer?.HomeAsync() ?? Task.CompletedTask;
     }
 
     private async Task HomeSelectedAxis()
@@ -475,13 +396,13 @@
         switch (ActiveTab)
         {
             case AxisTab.X:
-                await printer.Home(true, false, false);
+                await printer.HomeAsync(true, false, false);
                 break;
             case AxisTab.Y:
-                await printer.Home(false, true, false);
+                await printer.HomeAsync(false, true, false);
                 break;
             case AxisTab.Z:
-                await printer.Home(false, false, true);
+                await printer.HomeAsync(false, false, true);
                 break;
         }
     }
@@ -494,13 +415,13 @@
         switch (ActiveTab)
         {
             case AxisTab.X:
-                await printer.RelativeMove(xySpeed, length, 0, 0);
+                await printer.RelativeMoveAsync(xySpeed, length, 0, 0);
                 break;
             case AxisTab.Y:
-                await printer.RelativeMove(xySpeed, 0, length, 0);
+                await printer.RelativeMoveAsync(xySpeed, 0, length, 0);
                 break;
             case AxisTab.Z:
-                await printer.RelativeMove(zSpeed, 0, 0, length);
+                await printer.RelativeMoveAsync(zSpeed, 0, 0, length);
                 break;
         }
     }
@@ -508,19 +429,19 @@
     private Task SetHotendTempAsync()
     {
         var printer = PrinterServiceFactory.Current;
-        return printer?.SetHotendTemp(hotendTarget) ?? Task.CompletedTask;
+        return printer?.SetHotendTempAsync(hotendTarget) ?? Task.CompletedTask;
     }
 
     private Task SetBedTempAsync()
     {
         var printer = PrinterServiceFactory.Current;
-        return printer?.SetBedTemp(bedTarget) ?? Task.CompletedTask;
+        return printer?.SetBedTempAsync(bedTarget) ?? Task.CompletedTask;
     }
 
     private Task SetFanSpeedAsync()
     {
         var printer = PrinterServiceFactory.Current;
-        return printer?.SetFanSpeed(fanTarget) ?? Task.CompletedTask;
+        return printer?.SetFanSpeedAsync(fanTarget) ?? Task.CompletedTask;
     }
 
     private async Task PreheatAsync(int hotend, int bed)
@@ -529,55 +450,28 @@
         if (printer == null) return;
         hotendTarget = hotend;
         bedTarget = bed;
-        await printer.SetHotendTemp(hotend);
-        await printer.SetBedTemp(bed);
+        await printer.SetHotendTempAsync(hotend);
+        await printer.SetBedTempAsync(bed);
     }
 
     private Task ExtrudeAsync(int amount)
     {
         var printer = PrinterServiceFactory.Current;
-        return printer?.RelativeMove(extrudeSpeed, 0, 0, 0, amount) ?? Task.CompletedTask;
+        return printer?.RelativeMoveAsync(extrudeSpeed, 0, 0, 0, amount) ?? Task.CompletedTask;
     }
 
     private Task UpdatePrintSpeedAsync()
     {
         var printer = PrinterServiceFactory.Current;
-        return printer?.SetPrintSpeed(printSpeed) ?? Task.CompletedTask;
+        return printer?.SetPrintSpeedAsync(printSpeed) ?? Task.CompletedTask;
     }
 
     private Task UpdatePrintFlowAsync()
     {
         var printer = PrinterServiceFactory.Current;
-        return printer?.SetPrintFlow(printFlow) ?? Task.CompletedTask;
+        return printer?.SetPrintFlowAsync(printFlow) ?? Task.CompletedTask;
     }
 
-    protected override void OnInitialized()
-    {
-        base.OnInitialized();
-        if (SupportsPrinterQueue)
-            _ = SafeRefreshPrinterQueueAsync();
-    }
-
-    protected override void HandleConnectionChanged(object? sender, bool connected)
-    {
-        base.HandleConnectionChanged(sender, connected);
-        if (connected && SupportsPrinterQueue)
-            _ = SafeRefreshPrinterQueueAsync();
-    }
-
-    private async Task RefreshPrinterQueueAsync()
-    {
-        if (PrinterServiceFactory.Current is { SupportsPrinterQueue: true } printer)
-        {
-            _printerQueue = await printer.GetPrinterQueueAsync();
-            await InvokeAsync(StateHasChanged);
-        }
-    }
-
-    // Wraps RefreshPrinterQueueAsync with error handling for fire-and-forget calls
-    private Task SafeRefreshPrinterQueueAsync() =>
-        RunAsync(RefreshPrinterQueueAsync, Localizer[Resources.ControlPanel_PrinterQueue]);
-
     private readonly PrinterTelemetry fallbackTelemetry = new();
     private PrinterTelemetry Telemetry => PrinterServiceFactory.Current?.LastTelemetry ?? fallbackTelemetry;
 }
diff --git a/MakerPrompt.Shared/Components/CultureSelector.razor b/src/MakerPrompt.UI.Components/Components/CultureSelector.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/CultureSelector.razor
rename to src/MakerPrompt.UI.Components/Components/CultureSelector.razor
diff --git a/MakerPrompt.Shared/Components/FileExplorer.razor b/src/MakerPrompt.UI.Components/Components/FileExplorer.razor
similarity index 96%
rename from MakerPrompt.Shared/Components/FileExplorer.razor
rename to src/MakerPrompt.UI.Components/Components/FileExplorer.razor
index 10c1f00..ae5cf93 100644
--- a/MakerPrompt.Shared/Components/FileExplorer.razor
+++ b/src/MakerPrompt.UI.Components/Components/FileExplorer.razor
@@ -119,7 +119,8 @@
         {
             await RunAsync(async () =>
             {
-                _files = await printerService.GetFilesAsync() ?? new List<FileEntry>();
+                var paths = await printerService.GetFilesAsync();
+                _files = paths.Select(p => new FileEntry { FullPath = p }).ToList();
             }, "Failed to load files");
         }
         else
@@ -164,7 +165,7 @@
             return Task.CompletedTask;
         var file = selectedFile;
         var printer = PrinterServiceFactory.Current;
-        return RunAsync(() => printer.StartPrint(file), "Failed to start print");
+        return RunAsync(() => printer.StartPrintAsync(file.FullPath), "Failed to start print");
     }
 
     private async Task CopySelectedToApp()
diff --git a/MakerPrompt.Shared/Components/GCodeViewer.razor b/src/MakerPrompt.UI.Components/Components/GCodeViewer.razor
similarity index 99%
rename from MakerPrompt.Shared/Components/GCodeViewer.razor
rename to src/MakerPrompt.UI.Components/Components/GCodeViewer.razor
index a851826..843518a 100644
--- a/MakerPrompt.Shared/Components/GCodeViewer.razor
+++ b/src/MakerPrompt.UI.Components/Components/GCodeViewer.razor
@@ -187,7 +187,7 @@
 
         try
         {
-            await service.StartPrint(GCodeDoc.Document);
+            await service.StartPrintAsync(GCodeDoc.Document);
         }
         catch
         {
diff --git a/MakerPrompt.Shared/Components/GlobalErrorBoundary.cs b/src/MakerPrompt.UI.Components/Components/GlobalErrorBoundary.cs
similarity index 96%
rename from MakerPrompt.Shared/Components/GlobalErrorBoundary.cs
rename to src/MakerPrompt.UI.Components/Components/GlobalErrorBoundary.cs
index 96a423b..9be1f10 100644
--- a/MakerPrompt.Shared/Components/GlobalErrorBoundary.cs
+++ b/src/MakerPrompt.UI.Components/Components/GlobalErrorBoundary.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.Logging;
 
-namespace MakerPrompt.Shared.Components;
+namespace MakerPrompt.UI.Components.Components;
 
 /// <summary>
 /// Global error boundary that catches unhandled UI/component exceptions,
diff --git a/MakerPrompt.Shared/Components/LocalizedLabel.razor b/src/MakerPrompt.UI.Components/Components/LocalizedLabel.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/LocalizedLabel.razor
rename to src/MakerPrompt.UI.Components/Components/LocalizedLabel.razor
diff --git a/MakerPrompt.Shared/Components/LocalizedTitle.razor b/src/MakerPrompt.UI.Components/Components/LocalizedTitle.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/LocalizedTitle.razor
rename to src/MakerPrompt.UI.Components/Components/LocalizedTitle.razor
diff --git a/MakerPrompt.Shared/Components/PidCalibration.razor b/src/MakerPrompt.UI.Components/Components/PidCalibration.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/PidCalibration.razor
rename to src/MakerPrompt.UI.Components/Components/PidCalibration.razor
diff --git a/MakerPrompt.Shared/Components/PrintQueue.razor b/src/MakerPrompt.UI.Components/Components/PrintQueue.razor
similarity index 99%
rename from MakerPrompt.Shared/Components/PrintQueue.razor
rename to src/MakerPrompt.UI.Components/Components/PrintQueue.razor
index dab19ca..1035482 100644
--- a/MakerPrompt.Shared/Components/PrintQueue.razor
+++ b/src/MakerPrompt.UI.Components/Components/PrintQueue.razor
@@ -4,8 +4,8 @@
    Upload G-code files, organize them into project folders, and dispatch
    individual jobs to any connected idle printer in the fleet.
    ───────────────────────────────────────────────────────────────────── *@
-@using MakerPrompt.Shared.Infrastructure
-@using static MakerPrompt.Shared.Utils.Enums
+@using MakerPrompt.UI.Components.Infrastructure
+@using static MakerPrompt.UI.Components.Utils.Enums
 @inject PrintProjectService ProjectService
 @inject PrinterConnectionManager ConnectionManager
 @inject IStringLocalizer<Resources> localizer
@@ -327,7 +327,7 @@
             await ProjectService.AssignJobAsync(projectId, job.Id, target.Definition.Id, target.Definition.Name);
 
             // Start print
-            await target.Service.StartPrint(doc);
+            await target.Service.StartPrintAsync(doc);
 
             ToastService.Notify(new ToastMessage(
                 ToastType.Success,
diff --git a/MakerPrompt.Shared/Components/PrinterConnectionModal.razor b/src/MakerPrompt.UI.Components/Components/PrinterConnectionModal.razor
similarity index 93%
rename from MakerPrompt.Shared/Components/PrinterConnectionModal.razor
rename to src/MakerPrompt.UI.Components/Components/PrinterConnectionModal.razor
index 0f0b8ad..57b6aa7 100644
--- a/MakerPrompt.Shared/Components/PrinterConnectionModal.razor
+++ b/src/MakerPrompt.UI.Components/Components/PrinterConnectionModal.razor
@@ -5,8 +5,8 @@
    Connects automatically after saving when _connectAfterSave is set
    (default true for new printers in single-printer mode).
    ───────────────────────────────────────────────────────────────────── *@
-@using MakerPrompt.Shared.Infrastructure
-@using static MakerPrompt.Shared.Utils.Enums
+@using MakerPrompt.UI.Components.Infrastructure
+@using static MakerPrompt.UI.Components.Utils.Enums
 @inject PrinterConnectionManager ConnectionManager
 @inject FilamentInventoryService FilamentInventoryService
 @inject ISerialService SerialService
@@ -201,12 +201,12 @@
             AssignedFilamentSpoolId = definition.AssignedFilamentSpoolId,
         };
         _editConnectionType = definition.ConnectionType;
-        _editApiSettings = definition.Settings.Api is not null
-            ? new ApiConnectionSettings(definition.Settings.Api.Url, definition.Settings.Api.UserName, definition.Settings.Api.Password)
-            : new ApiConnectionSettings();
-        _editSerialSettings = definition.Settings.Serial is not null
-            ? new SerialConnectionSettings { PortName = definition.Settings.Serial.PortName, BaudRate = definition.Settings.Serial.BaudRate }
-            : new SerialConnectionSettings();
+        _editApiSettings = string.IsNullOrEmpty(definition.Settings.ApiUrl)
+            ? new ApiConnectionSettings()
+            : new ApiConnectionSettings(definition.Settings.ApiUrl, definition.Settings.UserName ?? string.Empty, definition.Settings.Password ?? string.Empty);
+        _editSerialSettings = string.IsNullOrEmpty(definition.Settings.PortName)
+            ? new SerialConnectionSettings()
+            : new SerialConnectionSettings { PortName = definition.Settings.PortName, BaudRate = definition.Settings.BaudRate };
         await _modal.ShowAsync();
     }
 
@@ -235,9 +235,9 @@
         _editDefinition.ConnectionType = _editConnectionType;
         _editDefinition.Settings = _editConnectionType switch
         {
-            PrinterConnectionType.Serial => new PrinterConnectionSettings(_editSerialSettings),
+            PrinterConnectionType.Serial => new PrinterConnectionSettings { ConnectionType = PrinterConnectionType.Serial, PortName = _editSerialSettings.PortName, BaudRate = _editSerialSettings.BaudRate },
             PrinterConnectionType.Demo => new PrinterConnectionSettings(),
-            _ => new PrinterConnectionSettings(_editApiSettings, _editConnectionType)
+            _ => new PrinterConnectionSettings { ConnectionType = _editConnectionType, ApiUrl = _editApiSettings.Url, UserName = _editApiSettings.UserName, Password = _editApiSettings.Password }
         };
 
         _isSaving = true;
diff --git a/MakerPrompt.Shared/Components/ProcessError.razor b/src/MakerPrompt.UI.Components/Components/ProcessError.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/ProcessError.razor
rename to src/MakerPrompt.UI.Components/Components/ProcessError.razor
diff --git a/MakerPrompt.Shared/Components/StorageExplorer.razor b/src/MakerPrompt.UI.Components/Components/StorageExplorer.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/StorageExplorer.razor
rename to src/MakerPrompt.UI.Components/Components/StorageExplorer.razor
diff --git a/MakerPrompt.Shared/Components/TestCommandModal.razor b/src/MakerPrompt.UI.Components/Components/TestCommandModal.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/TestCommandModal.razor
rename to src/MakerPrompt.UI.Components/Components/TestCommandModal.razor
diff --git a/MakerPrompt.Shared/Components/ThemeSelector.razor b/src/MakerPrompt.UI.Components/Components/ThemeSelector.razor
similarity index 93%
rename from MakerPrompt.Shared/Components/ThemeSelector.razor
rename to src/MakerPrompt.UI.Components/Components/ThemeSelector.razor
index 60d4839..5eba727 100644
--- a/MakerPrompt.Shared/Components/ThemeSelector.razor
+++ b/src/MakerPrompt.UI.Components/Components/ThemeSelector.razor
@@ -1,4 +1,4 @@
-@using static MakerPrompt.Shared.Utils.Enums
+@using static MakerPrompt.UI.Components.Utils.Enums
 @inject ThemeService ThemeService
 @inject IStringLocalizer<Resources> localizer
 
diff --git a/MakerPrompt.Shared/Components/ThermalModelCalibration.razor b/src/MakerPrompt.UI.Components/Components/ThermalModelCalibration.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/ThermalModelCalibration.razor
rename to src/MakerPrompt.UI.Components/Components/ThermalModelCalibration.razor
diff --git a/MakerPrompt.Shared/Components/WebcamPanel.razor b/src/MakerPrompt.UI.Components/Components/WebcamPanel.razor
similarity index 100%
rename from MakerPrompt.Shared/Components/WebcamPanel.razor
rename to src/MakerPrompt.UI.Components/Components/WebcamPanel.razor
diff --git a/MakerPrompt.Shared/Components/WebcamViewer.razor b/src/MakerPrompt.UI.Components/Components/WebcamViewer.razor
similarity index 97%
rename from MakerPrompt.Shared/Components/WebcamViewer.razor
rename to src/MakerPrompt.UI.Components/Components/WebcamViewer.razor
index 96ae9bf..02d91ed 100644
--- a/MakerPrompt.Shared/Components/WebcamViewer.razor
+++ b/src/MakerPrompt.UI.Components/Components/WebcamViewer.razor
@@ -1,5 +1,5 @@
-@using MakerPrompt.Shared.Models
-@using MakerPrompt.Shared.Services
+@using MakerPrompt.UI.Components.Models
+@using MakerPrompt.UI.Components.Services
 @inject ICameraProxyService CameraProxy
 @implements IAsyncDisposable
 
diff --git a/MakerPrompt.Shared/Infrastructure/BaseSerialService.cs b/src/MakerPrompt.UI.Components/Infrastructure/BaseSerialService.cs
similarity index 82%
rename from MakerPrompt.Shared/Infrastructure/BaseSerialService.cs
rename to src/MakerPrompt.UI.Components/Infrastructure/BaseSerialService.cs
index e43121d..0827ecf 100644
--- a/MakerPrompt.Shared/Infrastructure/BaseSerialService.cs
+++ b/src/MakerPrompt.UI.Components/Infrastructure/BaseSerialService.cs
@@ -1,16 +1,18 @@
-namespace MakerPrompt.Shared.Infrastructure
+using MakerPrompt.Infrastructure.Services.Printers;
+
+namespace MakerPrompt.UI.Components.Infrastructure
 {
     public abstract class BaseSerialService : BasePrinterConnectionService
     {
         private readonly Regex _tempRegex = new(@"T:([\d.]+)\s/\s*([\d.]+)\sB:([\d.]+)\s/\s*([\d.]+)");
         private readonly Regex _posRegex = new(@"X:([\d.]+)\sY:([\d.]+)\sZ:([\d.]+)");
-        public override Enums.PrinterConnectionType ConnectionType => Enums.PrinterConnectionType.Serial;
+        public override PrinterConnectionType ConnectionType => PrinterConnectionType.Serial;
         
         StringBuilder _receiveBuffer = new();
 
         // Core write entry point used by higher-level services. Implementations should
         // enqueue commands with appropriate metadata where available.
-        public abstract Task WriteDataAsync(string command);
+        public abstract Task WriteDataAsync(string command, CancellationToken cancellationToken = default);
 
         // Convenience helpers for tagging commands with their intent. Implementations
         // that support a queued sender can use this classification to prioritise work.
@@ -18,7 +20,7 @@ public abstract class BaseSerialService : BasePrinterConnectionService
         public virtual Task WriteTelemetryCommandAsync(string command) => WriteDataAsync(command);
         public virtual Task WritePrintCommandAsync(string command) => WriteDataAsync(command);
 
-        public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
+        public async Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
         {
             // Treat telemetry polling distinctly so queueing code can prioritise
             // active print commands when necessary.
@@ -32,7 +34,7 @@ public async Task<PrinterTelemetry> GetPrinterTelemetryAsync()
             return LastTelemetry;
         }
 
-        public async Task<List<FileEntry>> GetFilesAsync()
+        public async Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
         {
             // await WriteDataAsync("M20 L T");
             // await Task.Delay(500); // Wait for response
@@ -40,7 +42,7 @@ public async Task<List<FileEntry>> GetFilesAsync()
             return [];
         }
 
-        public async Task SetHotendTemp(int targetTemp = 0)
+        public async Task SetHotendTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default)
         {
             if (!IsConnected || (targetTemp < 0 || targetTemp > 300)) return;
             var command = GCodeCommands.SetTemp
@@ -49,7 +51,7 @@ public async Task SetHotendTemp(int targetTemp = 0)
             await WriteUserCommandAsync(command);
         }
 
-        public async Task SetBedTemp(int targetTemp = 0)
+        public async Task SetBedTempAsync(int targetTemp = 0, CancellationToken cancellationToken = default)
         {
             if (!IsConnected || (targetTemp < 0 || targetTemp > 120)) return;
             var command = GCodeCommands.SetBedTemp
@@ -58,7 +60,7 @@ public async Task SetBedTemp(int targetTemp = 0)
             await WriteUserCommandAsync(command);
         }
 
-        public async Task Home(bool x = true, bool y = true, bool z = true)
+        public async Task HomeAsync(bool x = true, bool y = true, bool z = true, CancellationToken cancellationToken = default)
         {
             if (!IsConnected) return;
             var command = GCodeCommands.Home;
@@ -72,7 +74,7 @@ public async Task Home(bool x = true, bool y = true, bool z = true)
             await WriteUserCommandAsync(command.ToString());
         }
 
-        public async Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f)
+        public async Task RelativeMoveAsync(int feedRate, float x = 0.0f, float y = 0.0f, float z = 0.0f, float e = 0.0f, CancellationToken cancellationToken = default)
         {
             if (!IsConnected) return;
             var command = GCodeCommands.MoveLinear;
@@ -88,7 +90,7 @@ public async Task RelativeMove(int feedRate, float x = 0.0f, float y = 0.0f, flo
             await WriteUserCommandAsync(GCodeCommands.AbsolutePositioning.ToString());
         }
 
-        public async Task SetFanSpeed(int fanSpeedPercentage = 0)
+        public async Task SetFanSpeedAsync(int fanSpeedPercentage = 0, CancellationToken cancellationToken = default)
         {
             if (!IsConnected || (fanSpeedPercentage < 0 || fanSpeedPercentage > 100)) return;
             var command = fanSpeedPercentage == 0 ? GCodeCommands.FanOff
@@ -96,14 +98,14 @@ public async Task SetFanSpeed(int fanSpeedPercentage = 0)
             await WriteUserCommandAsync(command.ToString());
         }
 
-        public async Task SetPrintSpeed(int speed)
+        public async Task SetPrintSpeedAsync(int speed, CancellationToken cancellationToken = default)
         {
             if (!IsConnected || (speed < 1 || speed > 200)) return;
             var command = GCodeCommands.SetFeedratePercentage.SetParameterValue(GCodeParameters.RatePercentage.Label, speed.ToString());
             await WriteUserCommandAsync(command.ToString());
         }
 
-        public async Task SetPrintFlow(int flow)
+        public async Task SetPrintFlowAsync(int flow, CancellationToken cancellationToken = default)
         {
             if (!IsConnected || (flow < 1 || flow > 200)) return;
             var command = GCodeCommands.SetFlowratePercentage.SetParameterValue(GCodeParameters.RatePercentage.Label, flow.ToString());
@@ -143,9 +145,19 @@ public async Task RunThermalModelCalibration(int cycles, int targetTemp)
             await WriteUserCommandAsync(command);
         }
 
-        public Task StartPrint(FileEntry file)
+        public Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default)
+        {
+            if (!IsConnected) return Task.CompletedTask;
+            IsPrinting = true;
+            return WriteDataAsync($"M23 {fileName}", cancellationToken);
+        }
+
+        public async Task StartPrintAsync(GCodeDoc gcode, CancellationToken cancellationToken = default)
         {
-            throw new NotImplementedException();
+            if (!IsConnected || string.IsNullOrWhiteSpace(gcode.Content)) return;
+            IsPrinting = true;
+            await foreach (var command in gcode.EnumerateCommandsAsync(cancellationToken))
+                await WriteDataAsync(command, cancellationToken);
         }
 
         public async Task SaveEEPROM()
diff --git a/MakerPrompt.Shared/Infrastructure/ConnectionComponentBase.cs b/src/MakerPrompt.UI.Components/Infrastructure/ConnectionComponentBase.cs
similarity index 96%
rename from MakerPrompt.Shared/Infrastructure/ConnectionComponentBase.cs
rename to src/MakerPrompt.UI.Components/Infrastructure/ConnectionComponentBase.cs
index 90d12e3..40b4b09 100644
--- a/MakerPrompt.Shared/Infrastructure/ConnectionComponentBase.cs
+++ b/src/MakerPrompt.UI.Components/Infrastructure/ConnectionComponentBase.cs
@@ -1,9 +1,10 @@
 using BlazorBootstrap;
+using MakerPrompt.Infrastructure.Services.Printers;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 
-namespace MakerPrompt.Shared.Infrastructure
+namespace MakerPrompt.UI.Components.Infrastructure
 {
     public abstract class ConnectionComponentBase : ComponentBase, IAsyncDisposable
     {
diff --git a/MakerPrompt.Shared/Infrastructure/IAppConfigurationService.cs b/src/MakerPrompt.UI.Components/Infrastructure/IAppConfigurationService.cs
similarity index 77%
rename from MakerPrompt.Shared/Infrastructure/IAppConfigurationService.cs
rename to src/MakerPrompt.UI.Components/Infrastructure/IAppConfigurationService.cs
index f561d26..07ff421 100644
--- a/MakerPrompt.Shared/Infrastructure/IAppConfigurationService.cs
+++ b/src/MakerPrompt.UI.Components/Infrastructure/IAppConfigurationService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Infrastructure
+namespace MakerPrompt.UI.Components.Infrastructure
 {
     public interface IAppConfigurationService
     {
diff --git a/MakerPrompt.Shared/Infrastructure/IStorageProvider.cs b/src/MakerPrompt.UI.Components/Infrastructure/IStorageProvider.cs
similarity index 86%
rename from MakerPrompt.Shared/Infrastructure/IStorageProvider.cs
rename to src/MakerPrompt.UI.Components/Infrastructure/IStorageProvider.cs
index 6e7c6e2..5559938 100644
--- a/MakerPrompt.Shared/Infrastructure/IStorageProvider.cs
+++ b/src/MakerPrompt.UI.Components/Infrastructure/IStorageProvider.cs
@@ -1,6 +1,6 @@
-namespace MakerPrompt.Shared.Infrastructure
+namespace MakerPrompt.UI.Components.Infrastructure
 {
-    using MakerPrompt.Shared.Models;
+    using MakerPrompt.UI.Components.Models;
 
     public interface IStorageProvider
     {
diff --git a/MakerPrompt.Shared/Infrastructure/PrinterStorageProvider.cs b/src/MakerPrompt.UI.Components/Infrastructure/PrinterStorageProvider.cs
similarity index 75%
rename from MakerPrompt.Shared/Infrastructure/PrinterStorageProvider.cs
rename to src/MakerPrompt.UI.Components/Infrastructure/PrinterStorageProvider.cs
index c00e200..34d58a9 100644
--- a/MakerPrompt.Shared/Infrastructure/PrinterStorageProvider.cs
+++ b/src/MakerPrompt.UI.Components/Infrastructure/PrinterStorageProvider.cs
@@ -1,6 +1,7 @@
-namespace MakerPrompt.Shared.Infrastructure
+using MakerPrompt.Infrastructure.Services.Printers;
+
+namespace MakerPrompt.UI.Components.Infrastructure
 {
-    using MakerPrompt.Shared.Models;
 
     public sealed class PrinterStorageProvider : IStorageProvider
     {
@@ -17,16 +18,17 @@ public async Task<List<FileEntry>> ListFilesAsync(CancellationToken cancellation
         {
             var svc = factory.Current;
             if (svc == null) return [];
-            return await svc.GetFilesAsync() ?? [];
+            var paths = await svc.GetFilesAsync(cancellationToken);
+            return paths.Select(p => new FileEntry { FullPath = p }).ToList();
         }
 
         public async Task<Stream?> OpenReadAsync(string fullPath, CancellationToken cancellationToken = default)
         {
             switch (factory.Current)
             {
-                case Services.DemoPrinterService demo:
+                case DemoPrinterService demo:
                     return await demo.OpenReadAsync(fullPath);
-                case Services.MoonrakerApiService moonraker:
+                case MoonrakerApiService moonraker:
                     return await moonraker.OpenReadAsync(fullPath, cancellationToken);
                 default:
                     return null;
@@ -35,7 +37,7 @@ public async Task<List<FileEntry>> ListFilesAsync(CancellationToken cancellation
 
         public async Task SaveFileAsync(string fullPath, Stream content, CancellationToken cancellationToken = default)
         {
-            if (factory.Current is Services.DemoPrinterService svc)
+            if (factory.Current is DemoPrinterService svc)
             {
                 await svc.SaveFileAsync(fullPath, content);
             }
@@ -43,7 +45,7 @@ public async Task SaveFileAsync(string fullPath, Stream content, CancellationTok
 
         public async Task DeleteFileAsync(string fullPath, CancellationToken cancellationToken = default)
         {
-            if (factory.Current is Services.DemoPrinterService svc)
+            if (factory.Current is DemoPrinterService svc)
             {
                 await svc.DeleteFileAsync(fullPath);
             }
diff --git a/MakerPrompt.Shared/Layout/MainLayout.razor b/src/MakerPrompt.UI.Components/Layout/MainLayout.razor
similarity index 91%
rename from MakerPrompt.Shared/Layout/MainLayout.razor
rename to src/MakerPrompt.UI.Components/Layout/MainLayout.razor
index 20bad52..7e3276d 100644
--- a/MakerPrompt.Shared/Layout/MainLayout.razor
+++ b/src/MakerPrompt.UI.Components/Layout/MainLayout.razor
@@ -6,12 +6,12 @@
 
 <header class="navbar sticky-top bg-body-secondary text-body flex-md-nowrap p-0 shadow">
     <a href="/" class="navbar-brand bg-body-tertiary d-flex align-items-center me-0 px-2 @(_navCollapsed ? "brand--collapsed" : "")">
-        <img class="ms-2" width="40" height="32" aria-hidden="true" src="_content/MakerPrompt.Shared/logo.svg" onerror="this.src='_content/MakerPrompt.Shared/favicon.png'" />
+        <img class="ms-2" width="40" height="32" aria-hidden="true" src="_content/MakerPrompt.UI.Components/logo.svg" onerror="this.src='_content/MakerPrompt.UI.Components/favicon.png'" />
         <span class="brand-label">MakerPrompt</span>
     </a>
     @if (ConfigService.Configuration.FarmModeEnabled && !string.IsNullOrWhiteSpace(ConfigService.Configuration.FarmName))
     {
-        <span class="ms-2 fw-semibold text-body-secondary text-truncate" style="min-width:0">@ConfigService.Configuration.FarmName</span>
+        <span class="ms-2 fw-semibold text-body-secondary d-none d-md-inline">@ConfigService.Configuration.FarmName</span>
     }
     <div class="ms-auto">
         <NavTop />
diff --git a/src/MakerPrompt.UI.Components/Layout/NavConnection.razor b/src/MakerPrompt.UI.Components/Layout/NavConnection.razor
new file mode 100644
index 0000000..2128b36
--- /dev/null
+++ b/src/MakerPrompt.UI.Components/Layout/NavConnection.razor
@@ -0,0 +1,265 @@
+@using Microsoft.JSInterop
+@inject IJSRuntime JS
+@inject ISerialService SerialService
+@inject PrinterCommunicationServiceFactory ServiceFactory;
+@inject IStringLocalizer<Resources> localizer
+@inject NavigationManager Navigation
+@inject ToastService ToastService
+@inject ILogger<NavConnection> Logger
+@implements IDisposable
+
+<nav class="navbar navbar-expand px-2">
+    <div class="container-fluid">
+        <div class="me-2">
+            <div class="collapse navbar-collapse" id="navbarNavDropdown">
+                <ul class="navbar-nav">
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" data-bs-auto-close="false" aria-expanded="false"
+                           @onclick="OnConnectionDropdownOpenedAsync">
+                            @NavButtonText
+                        </a>
+                        <div class="dropdown-menu dropdown-menu-end p-3" style="width:40vw; max-width:36rem;">
+                            <div class="accordion mb-2">
+                                <div class="accordion-item">
+                                    <h2 class="accordion-header">
+                                        <button class="accordion-button @(ActiveTab == PrinterConnectionType.Demo ? string.Empty : "collapsed")" type="button" @onclick="() => ShowTab(PrinterConnectionType.Demo)">
+                                            @PrinterConnectionType.Demo.GetDisplayName()
+                                        </button>
+                                    </h2>
+                                    <div class="accordion-collapse @(ActiveTab == PrinterConnectionType.Demo ? "show" : "collapse")">
+                                        <div class="accordion-body">
+                                            <div class="alert alert-info mb-0">
+                                                <p class="mb-0">@localizer[Resources.NavConnection_DemoServiceDescription]</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="accordion-item">
+                                    <h2 class="accordion-header">
+                                        <button class="accordion-button @(ActiveTab == PrinterConnectionType.Serial ? string.Empty : "collapsed")" type="button" @onclick="() => ShowTab(PrinterConnectionType.Serial)">
+                                            @PrinterConnectionType.Serial.GetDisplayName()
+                                        </button>
+                                    </h2>
+                                    <div class="accordion-collapse @(ActiveTab == PrinterConnectionType.Serial ? "show" : "collapse")">
+                                        <div class="accordion-body">
+                                            @if (!IsSerialAvailable)
+                                            {
+                                                <div class="alert alert-danger">
+                                                    <p class="mb-0">@localizer[Resources.NavConnection_BrowserNotSupported]</p>
+                                                </div>
+                                            }
+                                            <!-- Port Selection -->
+                                            <div class="input-group input-group-sm mb-2">
+                                                <span class="input-group-text">Port</span>
+                                                <select class="form-select" @bind="SerialConnectionSettings.PortName" disabled="@(!IsSerialAvailable || IsConnected)">
+                                                    <option value="">@localizer[Resources.NavConnection_SelectPort]</option>
+                                                    @foreach (var port in AvailablePorts)
+                                                    {
+                                                        <option value="@port">@port</option>
+                                                    }
+                                                </select>
+                                                <button class="btn btn-outline-secondary" type="button" disabled="@(!IsSerialAvailable || IsConnected)"
+                                                @onclick="RefreshPortsAsync" title="@localizer[Resources.NavConnection_RefreshPorts]">
+                                                    <i class="bi bi-arrow-clockwise"></i>
+                                                </button>
+                                            </div>
+
+                                            <div class="input-group input-group-sm">
+                                                <select class="form-select" @bind="SerialConnectionSettings.BaudRate" disabled="@(!IsSerialAvailable || IsConnected)">
+                                                    @foreach (var rate in BaudRates)
+                                                    {
+                                                        <option value="@rate">@rate</option>
+                                                    }
+                                                </select>
+                                                <span class="input-group-text">bps</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="accordion-item">
+                                    <h2 class="accordion-header">
+                                        <button class="accordion-button @(ActiveTab == PrinterConnectionType.PrusaLink ? string.Empty : "collapsed")" type="button" @onclick="() => ShowTab(PrinterConnectionType.PrusaLink)">
+                                            @PrinterConnectionType.PrusaLink.GetDisplayName()
+                                        </button>
+                                    </h2>
+                                    <div class="accordion-collapse @(ActiveTab == PrinterConnectionType.PrusaLink ? "show" : "collapse")">
+                                        <div class="accordion-body">
+                                            <input type="text" class="form-control mb-2" placeholder="Url" @bind="ApiConnectionSettings.Url">
+                                            <input type="text" class="form-control mb-2" placeholder="Username.." @bind="ApiConnectionSettings.UserName">
+                                            <input type="text" class="form-control mb-2" placeholder="Password.." @bind="ApiConnectionSettings.Password">
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="accordion-item">
+                                    <h2 class="accordion-header">
+                                        <button class="accordion-button @(ActiveTab == PrinterConnectionType.Moonraker ? string.Empty : "collapsed")" type="button" @onclick="() => ShowTab(PrinterConnectionType.Moonraker)">
+                                            @PrinterConnectionType.Moonraker.GetDisplayName()
+                                        </button>
+                                    </h2>
+                                    <div class="accordion-collapse @(ActiveTab == PrinterConnectionType.Moonraker ? "show" : "collapse")">
+                                        <div class="accordion-body">
+                                            <input type="text" class="form-control mb-2" placeholder="Url" @bind="ApiConnectionSettings.Url">
+                                            <input type="text" class="form-control mb-2" placeholder="Username.." @bind="ApiConnectionSettings.UserName">
+                                            <input type="text" class="form-control mb-2" placeholder="Password.." @bind="ApiConnectionSettings.Password">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="accordion-item">
+                                    <h2 class="accordion-header">
+                                        <button class="accordion-button @(ActiveTab == PrinterConnectionType.BambuLab ? string.Empty : "collapsed")" type="button" @onclick="() => ShowTab(PrinterConnectionType.BambuLab)" disabled="disabled">
+                                            @PrinterConnectionType.BambuLab.GetDisplayName()
+                                        </button>
+                                    </h2>
+                                    <div class="accordion-collapse @(ActiveTab == PrinterConnectionType.BambuLab ? "show" : "collapse")">
+                                        <div class="accordion-body">
+                                            <input type="text" class="form-control mb-2" placeholder="Url" @bind="ApiConnectionSettings.Url">
+                                            <input type="text" class="form-control mb-2" placeholder="Passcode.." @bind="ApiConnectionSettings.Password">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="d-flex align-items-end">
+                                <button class="btn btn-sm ms-auto @ConnectButtonClass"
+                                @onclick="ToggleConnectionAsync"
+                                disabled="@(!HasValidSelection)">
+                                    @ConnectButtonText
+                                </button>
+                            </div>
+                        </div>
+                    </li>
+                    <CultureSelector />
+                    <ThemeSelector />
+                    <li class="nav-item">
+                        <a class="nav-link" href="https://github.com/akinbender/MakerPrompt" target="_blank" rel="noopener noreferrer" title="GitHub">
+                            <i class="bi bi-github"></i>
+                        </a>
+                    </li>
+                    <li class="nav-item d-md-none">
+                        <button class="nav-link px-3 text-white" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</nav>
+
+@code {
+    SerialConnectionSettings SerialConnectionSettings { get; set; } = new();
+    ApiConnectionSettings ApiConnectionSettings { get; set; } = new();
+    private List<string> AvailablePorts { get; set; } = new();
+    private bool IsConnected { get; set; } = false;
+    private bool IsBusy { get; set; } = false;
+    private bool IsSerialAvailable { get; set; } = false;
+    private PrinterConnectionType ActiveTab = PrinterConnectionType.Serial;
+
+    private readonly List<int> BaudRates = new() 
+    { 
+        9600, 19200, 38400, 57600, 115200, 250000 
+    };
+
+    private bool HasValidSelection => ActiveTab == PrinterConnectionType.Demo || !string.IsNullOrEmpty(SerialConnectionSettings.PortName) || !string.IsNullOrEmpty(ApiConnectionSettings.Url);
+    private string ConnectButtonClass => IsConnected ? "btn-danger" : "btn-success";
+    private string ConnectButtonText => IsConnected ? localizer[Resources.NavConnection_Disconnect] : localizer[Resources.NavConnection_Connect];
+    private string NavButtonText => IsConnected ? ServiceFactory.Current?.ConnectionName ?? localizer[Resources.NavConnection_Connect] : localizer[Resources.NavConnection_Connect];
+
+    protected override async Task OnInitializedAsync()
+    {
+        IsSerialAvailable = await SerialService.CheckSupportedAsync();
+        ServiceFactory.ConnectionStateChanged += HandleConnectionChanged;
+        await base.OnInitializedAsync();
+    }
+
+    private async Task OnConnectionDropdownOpenedAsync()
+    {
+        if (!IsSerialAvailable) return;
+        // Only refresh serial ports when serial tab is active and not currently connected.
+        if (ActiveTab == PrinterConnectionType.Serial && IsSerialAvailable && !IsConnected)
+        {
+            await RefreshPortsAsync();
+
+            // Auto-select first available port if none selected yet.
+            if (string.IsNullOrEmpty(SerialConnectionSettings.PortName) && AvailablePorts.Count > 0)
+            {
+                SerialConnectionSettings.PortName = AvailablePorts[0];
+                StateHasChanged();
+            }
+        }
+    }
+
+    private async Task RefreshPortsAsync()
+    {
+        if (!IsSerialAvailable) return;
+        IsBusy = true;
+        try
+        {
+            AvailablePorts = (await SerialService.GetAvailablePortsAsync()).ToList();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Failed to enumerate serial ports");
+            ToastService.Notify(new(ToastType.Warning, "Could not refresh ports", ex.Message));
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task ToggleConnectionAsync()
+    {
+        IsBusy = true;
+        try
+        {
+            if (IsConnected)
+            {
+                if (ServiceFactory.Current == null) return;
+                await ServiceFactory.DisconnectAsync();
+            }
+            else
+            {
+                if (!IsSerialAvailable && ActiveTab == PrinterConnectionType.Serial)
+                {
+                    ToastService.Notify(new(ToastType.Danger, localizer[Resources.NavConnection_BrowserNotSupported]));
+                    return;
+                }
+
+                var connectionSettings = ActiveTab switch
+                {
+                    PrinterConnectionType.Demo => new PrinterConnectionSettings(),
+                    PrinterConnectionType.Serial => new PrinterConnectionSettings { ConnectionType = PrinterConnectionType.Serial, PortName = SerialConnectionSettings.PortName, BaudRate = SerialConnectionSettings.BaudRate },
+                    PrinterConnectionType.Moonraker => new PrinterConnectionSettings { ConnectionType = ActiveTab, ApiUrl = ApiConnectionSettings.Url, UserName = ApiConnectionSettings.UserName, Password = ApiConnectionSettings.Password },
+                    PrinterConnectionType.PrusaLink => new PrinterConnectionSettings { ConnectionType = ActiveTab, ApiUrl = ApiConnectionSettings.Url, UserName = ApiConnectionSettings.UserName, Password = ApiConnectionSettings.Password },
+                    _ => new PrinterConnectionSettings()
+                };
+
+                await ServiceFactory.ConnectAsync(connectionSettings);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Connection toggle failed");
+            ToastService.Notify(new(ToastType.Danger, "Connection failed", ex.Message));
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private void HandleConnectionChanged(object? sender, bool isConnected)
+    {
+        IsConnected = isConnected;
+        StateHasChanged();
+    }
+
+    private void ShowTab(PrinterConnectionType tab)
+    {
+        ActiveTab = tab;
+    }
+
+    public void Dispose()
+    {
+        ServiceFactory.ConnectionStateChanged -= HandleConnectionChanged;
+    }
+}
diff --git a/MakerPrompt.Shared/Layout/NavMenu.razor b/src/MakerPrompt.UI.Components/Layout/NavMenu.razor
similarity index 82%
rename from MakerPrompt.Shared/Layout/NavMenu.razor
rename to src/MakerPrompt.UI.Components/Layout/NavMenu.razor
index 2c3463e..f0514a3 100644
--- a/MakerPrompt.Shared/Layout/NavMenu.razor
+++ b/src/MakerPrompt.UI.Components/Layout/NavMenu.razor
@@ -58,8 +58,22 @@
                     <span class="sidebar-label">@Resources.PageTitle_BrailleRAP</span>
                 </NavLink>
             </li>
+            <li class="nav-item">
+                <NavLink class="nav-link sidebar-link px-3 py-2 rounded" href="settings">
+                    <i class="bi bi-gear sidebar-icon"></i>
+                    <span class="sidebar-label">@localizer[Resources.PageTitle_Settings]</span>
+                </NavLink>
+            </li>
         </ul>
         <hr class="mx-2 my-1" />
+        @if (ConfigService.Configuration.FarmModeEnabled && !string.IsNullOrWhiteSpace(ConfigService.Configuration.FarmName))
+        {
+            <div class="px-3 mb-1">
+                <small class="sidebar-label text-info fw-semibold" style="font-size:0.75rem;">
+                    <i class="bi bi-building sidebar-icon"></i> @ConfigService.Configuration.FarmName
+                </small>
+            </div>
+        }
         <div class="px-2 d-flex align-items-center gap-2">
             <button class="btn btn-link sidebar-toggle-btn flex-shrink-0 px-3 py-2 rounded" @onclick="OnToggle" title="Toggle navigation">
                 <i class="bi @(Collapsed ? "bi-chevron-double-right" : "bi-chevron-double-left") sidebar-icon"></i>
diff --git a/MakerPrompt.Shared/Layout/NavPrinters.razor b/src/MakerPrompt.UI.Components/Layout/NavPrinters.razor
similarity index 95%
rename from MakerPrompt.Shared/Layout/NavPrinters.razor
rename to src/MakerPrompt.UI.Components/Layout/NavPrinters.razor
index 3c545ea..ac175ed 100644
--- a/MakerPrompt.Shared/Layout/NavPrinters.razor
+++ b/src/MakerPrompt.UI.Components/Layout/NavPrinters.razor
@@ -6,8 +6,8 @@
    
    Design inspired by PrintQue multi-printer dashboard UX.
    ───────────────────────────────────────────────────────────────────── *@
-@using MakerPrompt.Shared.Infrastructure
-@using static MakerPrompt.Shared.Utils.Enums
+@using MakerPrompt.UI.Components.Infrastructure
+@using static MakerPrompt.UI.Components.Utils.Enums
 @inject PrinterConnectionManager ConnectionManager
 @inject ISerialService SerialService
 @inject IStringLocalizer<Resources> localizer
@@ -21,7 +21,7 @@
             <div class="collapse navbar-collapse" id="navbarNavDropdown">
                 <ul class="navbar-nav">
                     <li class="nav-item">
-                        <button class="btn btn-sm btn-outline-light d-flex align-items-center gap-1" @onclick="OpenPrintersModal" title="@localizer[Resources.Fleet_Printers]">
+                        <button class="btn btn-sm btn-outline-light d-flex align-items-center gap-1" @onclick="OpenPrintersModal" title="@localizer[Resources.Fleet_Printers]" data-testid="header-add-printer">
                             <i class="bi bi-printer"></i>
                             <span class="d-none d-md-inline">@NavButtonLabel</span>
                             @if (_connectedCount > 0)
@@ -355,12 +355,12 @@
             LastConnectedAt = definition.LastConnectedAt
         };
         _editConnectionType = definition.ConnectionType;
-        _editApiSettings = definition.Settings.Api is not null
-            ? new ApiConnectionSettings(definition.Settings.Api.Url, definition.Settings.Api.UserName, definition.Settings.Api.Password)
-            : new ApiConnectionSettings();
-        _editSerialSettings = definition.Settings.Serial is not null
-            ? new SerialConnectionSettings { PortName = definition.Settings.Serial.PortName, BaudRate = definition.Settings.Serial.BaudRate }
-            : new SerialConnectionSettings();
+        _editApiSettings = string.IsNullOrEmpty(definition.Settings.ApiUrl)
+            ? new ApiConnectionSettings()
+            : new ApiConnectionSettings(definition.Settings.ApiUrl, definition.Settings.UserName ?? string.Empty, definition.Settings.Password ?? string.Empty);
+        _editSerialSettings = string.IsNullOrEmpty(definition.Settings.PortName)
+            ? new SerialConnectionSettings()
+            : new SerialConnectionSettings { PortName = definition.Settings.PortName, BaudRate = definition.Settings.BaudRate };
         _showAddEditForm = true;
     }
 
@@ -380,9 +380,9 @@
         _editDefinition.ConnectionType = _editConnectionType;
         _editDefinition.Settings = _editConnectionType switch
         {
-            PrinterConnectionType.Serial => new PrinterConnectionSettings(_editSerialSettings),
+            PrinterConnectionType.Serial => new PrinterConnectionSettings { ConnectionType = PrinterConnectionType.Serial, PortName = _editSerialSettings.PortName, BaudRate = _editSerialSettings.BaudRate },
             PrinterConnectionType.Demo => new PrinterConnectionSettings(),
-            _ => new PrinterConnectionSettings(_editApiSettings, _editConnectionType)
+            _ => new PrinterConnectionSettings { ConnectionType = _editConnectionType, ApiUrl = _editApiSettings.Url, UserName = _editApiSettings.UserName, Password = _editApiSettings.Password }
         };
 
         try
diff --git a/MakerPrompt.Shared/Layout/NavTop.razor b/src/MakerPrompt.UI.Components/Layout/NavTop.razor
similarity index 73%
rename from MakerPrompt.Shared/Layout/NavTop.razor
rename to src/MakerPrompt.UI.Components/Layout/NavTop.razor
index a8c22b3..4a41060 100644
--- a/MakerPrompt.Shared/Layout/NavTop.razor
+++ b/src/MakerPrompt.UI.Components/Layout/NavTop.razor
@@ -1,6 +1,4 @@
-@inject IStringLocalizer<Resources> localizer
-
-<nav class="navbar navbar-expand px-2">
+<nav class="navbar navbar-expand px-2">
     <div class="container-fluid">
         <div class="me-2">
             <div class="collapse navbar-collapse" id="navbarNavDropdown">
@@ -12,11 +10,6 @@
                             <i class="bi bi-github"></i>
                         </a>
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="settings" title="@localizer[Resources.PageTitle_Settings]">
-                            <i class="bi bi-gear"></i>
-                        </a>
-                    </li>
                     <li class="nav-item d-md-none">
                         <button class="nav-link px-3 text-white" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
                     </li>
diff --git a/MakerPrompt.Shared/MakerPrompt.Shared.csproj b/src/MakerPrompt.UI.Components/MakerPrompt.UI.Components.csproj
similarity index 84%
rename from MakerPrompt.Shared/MakerPrompt.Shared.csproj
rename to src/MakerPrompt.UI.Components/MakerPrompt.UI.Components.csproj
index ecf5839..f6e9c9c 100644
--- a/MakerPrompt.Shared/MakerPrompt.Shared.csproj
+++ b/src/MakerPrompt.UI.Components/MakerPrompt.UI.Components.csproj
@@ -1,43 +1,42 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-
-  <ItemGroup>
-    <SupportedPlatform Include="browser" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.2" />
-    <PackageReference Include="Microsoft.JSInterop.WebAssembly" Version="10.0.2" />
-    <PackageReference Include="Blazor.bootstrap" Version="3.5.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Storage\" />
-    <Compile Include="Storage\*.cs" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.2" />
+    <PackageReference Include="Microsoft.JSInterop.WebAssembly" Version="10.0.2" />
+    <PackageReference Include="Blazor.bootstrap" Version="3.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MakerPrompt.Core\MakerPrompt.Core.csproj" />
+    <ProjectReference Include="..\MakerPrompt.Infrastructure\MakerPrompt.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
diff --git a/MakerPrompt.Shared/Models/CalibrationParameters.cs b/src/MakerPrompt.UI.Components/Models/CalibrationParameters.cs
similarity index 74%
rename from MakerPrompt.Shared/Models/CalibrationParameters.cs
rename to src/MakerPrompt.UI.Components/Models/CalibrationParameters.cs
index 2de2e6f..25cf8dd 100644
--- a/MakerPrompt.Shared/Models/CalibrationParameters.cs
+++ b/src/MakerPrompt.UI.Components/Models/CalibrationParameters.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Models
+namespace MakerPrompt.UI.Components.Models
 {
     internal class CalibrationParameters
     {
diff --git a/src/MakerPrompt.UI.Components/Models/ConnectionFormModels.cs b/src/MakerPrompt.UI.Components/Models/ConnectionFormModels.cs
new file mode 100644
index 0000000..b9198b5
--- /dev/null
+++ b/src/MakerPrompt.UI.Components/Models/ConnectionFormModels.cs
@@ -0,0 +1,33 @@
+namespace MakerPrompt.UI.Components.Models;
+
+/// <summary>
+/// UI form-binding model for serial/USB connection settings.
+/// Used to collect port name and baud rate before constructing a
+/// <see cref="MakerPrompt.Core.Models.PrinterConnectionSettings"/>.
+/// </summary>
+public record SerialConnectionSettings
+{
+    public string PortName { get; set; } = string.Empty;
+    public int BaudRate { get; set; } = 115_200;
+}
+
+/// <summary>
+/// UI form-binding model for HTTP/WebSocket API connection settings.
+/// Used to collect URL, username, and password before constructing a
+/// <see cref="MakerPrompt.Core.Models.PrinterConnectionSettings"/>.
+/// </summary>
+public class ApiConnectionSettings
+{
+    public ApiConnectionSettings() { }
+
+    public ApiConnectionSettings(string url, string username, string password)
+    {
+        Url = url;
+        UserName = username;
+        Password = password;
+    }
+
+    public string Url { get; set; } = string.Empty;
+    public string UserName { get; set; } = string.Empty;
+    public string Password { get; set; } = string.Empty;
+}
diff --git a/MakerPrompt.Shared/Models/GCodeCommand.cs b/src/MakerPrompt.UI.Components/Models/GCodeCommand.cs
similarity index 94%
rename from MakerPrompt.Shared/Models/GCodeCommand.cs
rename to src/MakerPrompt.UI.Components/Models/GCodeCommand.cs
index e13abe2..d090d36 100644
--- a/MakerPrompt.Shared/Models/GCodeCommand.cs
+++ b/src/MakerPrompt.UI.Components/Models/GCodeCommand.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace MakerPrompt.Shared.Models
+namespace MakerPrompt.UI.Components.Models
 {
     public partial class GCodeCommand(string command, string description, List<GCodeCategory> categories)
     {
diff --git a/MakerPrompt.Shared/Models/GCodeParameter.cs b/src/MakerPrompt.UI.Components/Models/GCodeParameter.cs
similarity index 84%
rename from MakerPrompt.Shared/Models/GCodeParameter.cs
rename to src/MakerPrompt.UI.Components/Models/GCodeParameter.cs
index afdb77c..9b00207 100644
--- a/MakerPrompt.Shared/Models/GCodeParameter.cs
+++ b/src/MakerPrompt.UI.Components/Models/GCodeParameter.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Models
+namespace MakerPrompt.UI.Components.Models
 {
     public partial class GCodeParameter(char label, string description)
     {
diff --git a/MakerPrompt.Shared/Models/ManagedPrinterState.cs b/src/MakerPrompt.UI.Components/Models/ManagedPrinterState.cs
similarity index 97%
rename from MakerPrompt.Shared/Models/ManagedPrinterState.cs
rename to src/MakerPrompt.UI.Components/Models/ManagedPrinterState.cs
index d8938b9..569735d 100644
--- a/MakerPrompt.Shared/Models/ManagedPrinterState.cs
+++ b/src/MakerPrompt.UI.Components/Models/ManagedPrinterState.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Models
+namespace MakerPrompt.UI.Components.Models
 {
     /// <summary>
     /// Runtime state for a managed printer — combines the persisted definition with
diff --git a/MakerPrompt.Shared/Pages/Analytics.razor b/src/MakerPrompt.UI.Components/Pages/Analytics.razor
similarity index 98%
rename from MakerPrompt.Shared/Pages/Analytics.razor
rename to src/MakerPrompt.UI.Components/Pages/Analytics.razor
index ae2bb44..108e4ef 100644
--- a/MakerPrompt.Shared/Pages/Analytics.razor
+++ b/src/MakerPrompt.UI.Components/Pages/Analytics.razor
@@ -1,6 +1,6 @@
 @page "/analytics"
-@using MakerPrompt.Shared.Models
-@using MakerPrompt.Shared.Services
+@using MakerPrompt.UI.Components.Models
+@using MakerPrompt.UI.Components.Services
 @inject AnalyticsService AnalyticsService
 @inject PrinterConnectionManager ConnectionManager
 @inject FilamentInventoryService InventoryService
diff --git a/MakerPrompt.Shared/Pages/BrailleRAPPage.razor b/src/MakerPrompt.UI.Components/Pages/BrailleRAPPage.razor
similarity index 99%
rename from MakerPrompt.Shared/Pages/BrailleRAPPage.razor
rename to src/MakerPrompt.UI.Components/Pages/BrailleRAPPage.razor
index c5158ca..ff22642 100644
--- a/MakerPrompt.Shared/Pages/BrailleRAPPage.razor
+++ b/src/MakerPrompt.UI.Components/Pages/BrailleRAPPage.razor
@@ -1,7 +1,7 @@
 @page "/braillerap"
 @inherits ConnectionComponentBase
-@using MakerPrompt.Shared.BrailleRAP.Models
-@using MakerPrompt.Shared.BrailleRAP.Services
+@using MakerPrompt.UI.Components.BrailleRAP.Models
+@using MakerPrompt.UI.Components.BrailleRAP.Services
 
 <LocalizedTitle TitleKey="@Resources.PageTitle_BrailleRAP" />
 
diff --git a/MakerPrompt.Shared/Pages/Calculators.razor b/src/MakerPrompt.UI.Components/Pages/Calculators.razor
similarity index 100%
rename from MakerPrompt.Shared/Pages/Calculators.razor
rename to src/MakerPrompt.UI.Components/Pages/Calculators.razor
diff --git a/MakerPrompt.Shared/Pages/CheatSheet.razor b/src/MakerPrompt.UI.Components/Pages/CheatSheet.razor
similarity index 96%
rename from MakerPrompt.Shared/Pages/CheatSheet.razor
rename to src/MakerPrompt.UI.Components/Pages/CheatSheet.razor
index eac4c3f..6ba49af 100644
--- a/MakerPrompt.Shared/Pages/CheatSheet.razor
+++ b/src/MakerPrompt.UI.Components/Pages/CheatSheet.razor
@@ -79,7 +79,7 @@
             </Content>
         </BlazorBootstrap.Tab>
 
-        @if (IsConnected && PrinterServiceFactory.Current?.ConnectionType == MakerPrompt.Shared.Utils.Enums.PrinterConnectionType.Moonraker)
+        @if (IsConnected && PrinterServiceFactory.Current?.ConnectionType == PrinterConnectionType.Moonraker)
         {
             <BlazorBootstrap.Tab Title="Moonraker G-code Help">
                 <Content>
@@ -168,7 +168,7 @@
     {
         _needsRender = true;
         base.HandleConnectionChanged(sender, connected);
-        if (connected && PrinterServiceFactory.Current?.ConnectionType == MakerPrompt.Shared.Utils.Enums.PrinterConnectionType.Moonraker)
+        if (connected && PrinterServiceFactory.Current?.ConnectionType == PrinterConnectionType.Moonraker)
         {
             _ = TryLoadMoonrakerHelpAsync();
         }
diff --git a/MakerPrompt.Shared/Pages/Dashboard.razor b/src/MakerPrompt.UI.Components/Pages/Dashboard.razor
similarity index 96%
rename from MakerPrompt.Shared/Pages/Dashboard.razor
rename to src/MakerPrompt.UI.Components/Pages/Dashboard.razor
index c53de98..5dd0855 100644
--- a/MakerPrompt.Shared/Pages/Dashboard.razor
+++ b/src/MakerPrompt.UI.Components/Pages/Dashboard.razor
@@ -4,7 +4,7 @@
 @inject IStringLocalizer<Resources> localizer
 @implements IDisposable
 
-<LocalizedTitle TitleKey="PageTitle_Dashboard" />
+<LocalizedTitle TitleKey="@Resources.PageTitle_Dashboard" />
 
 <div class="container-fluid">
     @if (ConnectionManager.Printers.Any(p => p.Service?.IsConnected == true))
diff --git a/MakerPrompt.Shared/Pages/FilamentInventory.razor b/src/MakerPrompt.UI.Components/Pages/FilamentInventory.razor
similarity index 98%
rename from MakerPrompt.Shared/Pages/FilamentInventory.razor
rename to src/MakerPrompt.UI.Components/Pages/FilamentInventory.razor
index 78690de..bf432ee 100644
--- a/MakerPrompt.Shared/Pages/FilamentInventory.razor
+++ b/src/MakerPrompt.UI.Components/Pages/FilamentInventory.razor
@@ -1,6 +1,6 @@
 @page "/filament"
-@using MakerPrompt.Shared.Models
-@using MakerPrompt.Shared.Services
+@using MakerPrompt.UI.Components.Models
+@using MakerPrompt.UI.Components.Services
 @inject FilamentInventoryService InventoryService
 @inject ToastService ToastService
 @implements IDisposable
diff --git a/MakerPrompt.Shared/Pages/Fleet.razor b/src/MakerPrompt.UI.Components/Pages/Fleet.razor
similarity index 92%
rename from MakerPrompt.Shared/Pages/Fleet.razor
rename to src/MakerPrompt.UI.Components/Pages/Fleet.razor
index 06b3ae3..99cb605 100644
--- a/MakerPrompt.Shared/Pages/Fleet.razor
+++ b/src/MakerPrompt.UI.Components/Pages/Fleet.razor
@@ -7,8 +7,8 @@
    printers show a connect button. Each card has edit/delete actions that
    appear when the card is selected.
    ───────────────────────────────────────────────────────────────────── *@
-@using MakerPrompt.Shared.Infrastructure
-@using static MakerPrompt.Shared.Utils.Enums
+@using MakerPrompt.UI.Components.Infrastructure
+@using static MakerPrompt.UI.Components.Utils.Enums
 @inject PrinterConnectionManager ConnectionManager
 @inject FilamentInventoryService FilamentInventoryService
 @inject IAppConfigurationService ConfigService
@@ -45,17 +45,15 @@ else
 {
     <div class="container-fluid">
         @* ── Toolbar ── *@
-        <div class="d-flex justify-content-end gap-2 mb-3">
-            <button class="btn btn-outline-secondary" @onclick="() => _importModal!.ShowAsync()" data-testid="fleet-prusaconnect-import-btn">
-                <i class="bi bi-cloud-download me-1"></i>Import from PrusaConnect
-            </button>
-            <button class="btn btn-outline-primary" @onclick="() => ConnectionModal!.ShowAddAsync()" data-testid="fleet-add-btn">
-                <i class="bi bi-plus-circle me-1"></i>@localizer[Resources.Fleet_AddPrinter]
-            </button>
+        <div class="d-flex justify-content-end mb-3">
+            @if (ConfigService.Configuration.DeploymentMode != AppDeploymentMode.CloudMakerspace)
+            {
+                <button class="btn btn-outline-primary" @onclick="() => ConnectionModal!.ShowAddAsync()" data-testid="fleet-add-btn">
+                    <i class="bi bi-plus-circle me-1"></i>@localizer[Resources.Fleet_AddPrinter]
+                </button>
+            }
         </div>
 
-        <PrusaConnectImportModal @ref="_importModal" />
-
         @if (!ConnectionManager.Printers.Any())
         {
             <div class="alert alert-info d-flex align-items-center">
@@ -101,12 +99,15 @@ else
                                                 <i class="bi bi-x-circle"></i>
                                             </button>
                                         }
-                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => ConnectionModal!.ShowEditAsync(printer.Definition)" title="@localizer[Resources.Fleet_EditPrinter]">
-                                            <i class="bi bi-pencil"></i>
-                                        </button>
-                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePrinter(printer.Definition.Id)" title="@localizer[Resources.Fleet_DeletePrinter]">
-                                            <i class="bi bi-trash"></i>
-                                        </button>
+                                        @if (ConfigService.Configuration.DeploymentMode != AppDeploymentMode.CloudMakerspace)
+                                        {
+                                            <button class="btn btn-sm btn-outline-secondary" @onclick="() => ConnectionModal!.ShowEditAsync(printer.Definition)" title="@localizer[Resources.Fleet_EditPrinter]">
+                                                <i class="bi bi-pencil"></i>
+                                            </button>
+                                            <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePrinter(printer.Definition.Id)" title="@localizer[Resources.Fleet_DeletePrinter]">
+                                                <i class="bi bi-trash"></i>
+                                            </button>
+                                        }
                                     </div>
                                 }
                             </div>
@@ -209,8 +210,6 @@ else
 @code {
     [CascadingParameter] private PrinterConnectionModal? ConnectionModal { get; set; }
 
-    private PrusaConnectImportModal? _importModal;
-
     private readonly Dictionary<Guid, PrinterCamera?> _cameras = new();
 
     // Selection state
diff --git a/MakerPrompt.Shared/Pages/Home.razor b/src/MakerPrompt.UI.Components/Pages/Home.razor
similarity index 100%
rename from MakerPrompt.Shared/Pages/Home.razor
rename to src/MakerPrompt.UI.Components/Pages/Home.razor
diff --git a/MakerPrompt.Shared/Pages/Index.razor b/src/MakerPrompt.UI.Components/Pages/Index.razor
similarity index 100%
rename from MakerPrompt.Shared/Pages/Index.razor
rename to src/MakerPrompt.UI.Components/Pages/Index.razor
diff --git a/MakerPrompt.Shared/Pages/Settings.razor b/src/MakerPrompt.UI.Components/Pages/Settings.razor
similarity index 67%
rename from MakerPrompt.Shared/Pages/Settings.razor
rename to src/MakerPrompt.UI.Components/Pages/Settings.razor
index eed7133..280a9b2 100644
--- a/MakerPrompt.Shared/Pages/Settings.razor
+++ b/src/MakerPrompt.UI.Components/Pages/Settings.razor
@@ -1,6 +1,6 @@
 @page "/settings"
-@using MakerPrompt.Shared.Infrastructure
-@using MakerPrompt.Shared.Utils
+@using MakerPrompt.UI.Components.Infrastructure
+@using MakerPrompt.UI.Components.Utils
 @inject IAppConfigurationService ConfigService
 @inject FarmConfigurationService FarmService
 @inject MakerPromptJsInterop JsInterop
@@ -11,65 +11,79 @@
 @inject IStringLocalizer<Resources> localizer
 @implements IDisposable
 
-<LocalizedTitle TitleKey="PageTitle_Settings" />
+<LocalizedTitle TitleKey="@Resources.PageTitle_Settings" />
 
 <div class="container-fluid">
     <div class="row">
-        <div class="col">
-            <p>@aboutContent</p>
+        <div class="col-12">
+            @((MarkupString)localizer[Resources.AboutPage_Content].Value)
         </div>
-    </div>
-    <div class="row">
         <div class="col-md-6 col-sm-12">
             <div class="card mb-4">
                 <div class="card-header">
                     <strong>@localizer[Resources.Settings_FarmMode]</strong>
                 </div>
                 <div class="card-body">
-                    <div class="form-check form-switch mb-3">
-                        <input class="form-check-input" type="checkbox" id="farmModeEnabled" @bind="_config.FarmModeEnabled" @bind:after="OnFarmModeChangedAsync" />
-                        <label class="form-check-label" for="farmModeEnabled">@localizer[Resources.Settings_EnableFarmMode]</label>
-                        <div class="form-text">@localizer[Resources.Settings_FarmModeDescription]</div>
-                    </div>
-
-                    @if (_config.FarmModeEnabled)
+                    @if (ConfigService.Configuration.DeploymentMode == AppDeploymentMode.CloudMakerspace)
                     {
-                        <hr />
-                        <h6>@localizer[Resources.Settings_FarmConfigurations]</h6>
-                        <div class="mb-3">
-                            <div class="input-group input-group-sm">
-                                <select class="form-select" @bind="_selectedFarmId">
-                                    <option value="">@localizer[Resources.Settings_SelectFarm]</option>
-                                    @foreach (var farm in FarmService.Farms)
-                                    {
-                                        <option value="@farm.Id">@farm.Name</option>
-                                    }
-                                </select>
-                                <button class="btn btn-outline-primary" type="button" @onclick="SwitchFarmAsync" disabled="@(_selectedFarmId == null)" title="@localizer[Resources.Settings_FarmMode]" data-testid="farm-switch-btn">
-                                    <i class="bi bi-arrow-repeat"></i>
-                                </button>
-                                <button class="btn btn-outline-danger" type="button" @onclick="DeleteFarmAsync" disabled="@(_selectedFarmId == null)" title="@localizer[Resources.Settings_Delete]">
-                                    <i class="bi bi-trash"></i>
-                                </button>
+                        <div class="alert alert-info d-flex align-items-center mb-0" role="alert">
+                            <i class="bi bi-cloud-check me-2"></i>
+                            <div>
+                                <strong>Cloud/Makerspace mode</strong> — farm configuration is managed by the server.
+                                @if (!string.IsNullOrWhiteSpace(ConfigService.Configuration.FarmName))
+                                {
+                                    <span> Active farm: <strong>@ConfigService.Configuration.FarmName</strong></span>
+                                }
                             </div>
                         </div>
-                        <div class="mb-3">
-                            <div class="input-group input-group-sm">
-                                <input type="text" class="form-control" id="farmNewName" placeholder="@localizer[Resources.Settings_NewFarmName]" @bind="_newFarmName" />
-                                <button class="btn btn-outline-success" type="button" @onclick="CreateFarmAsync" disabled="@(string.IsNullOrWhiteSpace(_newFarmName))" data-testid="farm-create-btn">
-                                    <i class="bi bi-plus-circle me-1"></i>@localizer[Resources.Settings_Create]
+                    }
+                    else
+                    {
+                        <div class="form-check form-switch mb-3">
+                            <input class="form-check-input" type="checkbox" id="farmModeEnabled" @bind="_config.FarmModeEnabled" @bind:after="OnFarmModeChangedAsync" />
+                            <label class="form-check-label" for="farmModeEnabled">@localizer[Resources.Settings_EnableFarmMode]</label>
+                            <div class="form-text">@localizer[Resources.Settings_FarmModeDescription]</div>
+                        </div>
+
+                        @if (_config.FarmModeEnabled)
+                        {
+                            <hr />
+                            <h6>@localizer[Resources.Settings_FarmConfigurations]</h6>
+                            <div class="mb-3">
+                                <div class="input-group input-group-sm">
+                                    <select class="form-select" @bind="_selectedFarmId">
+                                        <option value="">@localizer[Resources.Settings_SelectFarm]</option>
+                                        @foreach (var farm in FarmService.Farms)
+                                        {
+                                            <option value="@farm.Id">@farm.Name</option>
+                                        }
+                                    </select>
+                                    <button class="btn btn-outline-primary" type="button" @onclick="SwitchFarmAsync" disabled="@(_selectedFarmId == null)" title="@localizer[Resources.Settings_FarmMode]" data-testid="farm-switch-btn">
+                                        <i class="bi bi-arrow-repeat"></i>
+                                    </button>
+                                    <button class="btn btn-outline-danger" type="button" @onclick="DeleteFarmAsync" disabled="@(_selectedFarmId == null)" title="@localizer[Resources.Settings_Delete]">
+                                        <i class="bi bi-trash"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="mb-3">
+                                <div class="input-group input-group-sm">
+                                    <input type="text" class="form-control" id="farmNewName" placeholder="@localizer[Resources.Settings_NewFarmName]" @bind="_newFarmName" />
+                                    <button class="btn btn-outline-success" type="button" @onclick="CreateFarmAsync" disabled="@(string.IsNullOrWhiteSpace(_newFarmName))" data-testid="farm-create-btn">
+                                        <i class="bi bi-plus-circle me-1"></i>@localizer[Resources.Settings_Create]
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="d-flex gap-2">
+                                <button class="btn btn-sm btn-outline-secondary" @onclick="ExportFarmAsync" disabled="@(_selectedFarmId == null)" data-testid="farm-export-btn">
+                                    <i class="bi bi-download me-1"></i>@localizer[Resources.Settings_Export]
                                 </button>
+                                <label class="btn btn-sm btn-outline-secondary mb-0" data-testid="farm-import-label">
+                                    <i class="bi bi-upload me-1"></i>@localizer[Resources.Settings_Import]
+                                    <InputFile OnChange="ImportFarmAsync" style="display:none" accept=".json" />
+                                </label>
                             </div>
-                        </div>
-                        <div class="d-flex gap-2">
-                            <button class="btn btn-sm btn-outline-secondary" @onclick="ExportFarmAsync" disabled="@(_selectedFarmId == null)" data-testid="farm-export-btn">
-                                <i class="bi bi-download me-1"></i>@localizer[Resources.Settings_Export]
-                            </button>
-                            <label class="btn btn-sm btn-outline-secondary mb-0" data-testid="farm-import-label">
-                                <i class="bi bi-upload me-1"></i>@localizer[Resources.Settings_Import]
-                                <InputFile OnChange="ImportFarmAsync" style="display:none" accept=".json" />
-                            </label>
-                        </div>
+                        }
                     }
                 </div>
             </div>
@@ -105,11 +119,9 @@
     private static readonly string[] _hiddenPrefixes = ["MakerPrompt.PrinterConnections", "MakerPrompt.PrintProjects"];
     private Guid? _selectedFarmId;
     private string _newFarmName = string.Empty;
-    private MarkupString aboutContent;
 
     protected override async Task OnInitializedAsync()
     {
-        aboutContent = new MarkupString(localizer[Resources.AboutPage_Content]);
         _config = new AppConfiguration
         {
             Theme = ConfigService.Configuration.Theme,
diff --git a/MakerPrompt.Shared/Properties/Resources.Designer.cs b/src/MakerPrompt.UI.Components/Properties/Resources.Designer.cs
similarity index 99%
rename from MakerPrompt.Shared/Properties/Resources.Designer.cs
rename to src/MakerPrompt.UI.Components/Properties/Resources.Designer.cs
index c0dbdaf..d0c9b11 100644
--- a/MakerPrompt.Shared/Properties/Resources.Designer.cs
+++ b/src/MakerPrompt.UI.Components/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MakerPrompt.Shared.Properties {
+namespace MakerPrompt.UI.Components.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ internal Resources() {
         public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MakerPrompt.Shared.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MakerPrompt.UI.Components.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -671,18 +671,6 @@ public static string ControlPanel_FanSpeed {
                 return ResourceManager.GetString("ControlPanel_FanSpeed", resourceCulture);
             }
         }
-
-        public static string ControlPanel_PrinterQueue {
-            get {
-                return ResourceManager.GetString("ControlPanel_PrinterQueue", resourceCulture);
-            }
-        }
-
-        public static string ControlPanel_PrinterQueueEmpty {
-            get {
-                return ResourceManager.GetString("ControlPanel_PrinterQueueEmpty", resourceCulture);
-            }
-        }
         
         /// <summary>
         ///   Looks up a localized string similar to Heating.
@@ -1970,15 +1958,9 @@ public static string PageTitle_Fleet {
                 return ResourceManager.GetString("PageTitle_Fleet", resourceCulture);
             }
         }
-
-        public static string PageTitle_ProjectHub {
-            get {
-                return ResourceManager.GetString("PageTitle_ProjectHub", resourceCulture);
-            }
-        }
         
         /// <summary>
-        ///   Looks up a localized string similar to Project Hub.
+        ///   Looks up a localized string similar to Print Queue.
         /// </summary>
         public static string PrintQueue_Title {
             get {
diff --git a/MakerPrompt.Shared/Properties/Resources.de-DE.resx b/src/MakerPrompt.UI.Components/Properties/Resources.de-DE.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.de-DE.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.de-DE.resx
diff --git a/MakerPrompt.Shared/Properties/Resources.de.resx b/src/MakerPrompt.UI.Components/Properties/Resources.de.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.de.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.de.resx
index 8b81661..5269584 100644
--- a/MakerPrompt.Shared/Properties/Resources.de.resx
+++ b/src/MakerPrompt.UI.Components/Properties/Resources.de.resx
@@ -591,12 +591,12 @@
   <data name="PageTitle_GCodeViewer" xml:space="preserve">
     <value>G-Code-Viewer</value>
   </data>
-  <data name="PageTitle_BrailleRAP" xml:space="preserve">
-    <value>BrailleRAP</value>
-  </data>
   <data name="PageTitle_Settings" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
+  <data name="PageTitle_BrailleRAP" xml:space="preserve">
+    <value>BrailleRAP</value>
+  </data>
   <data name="BrailleRAP_Description" xml:space="preserve">
     <value>Text in Braille umwandeln und G-Code für BrailleRAP-Prägung generieren.</value>
   </data>
diff --git a/MakerPrompt.Shared/Properties/Resources.es-ES.resx b/src/MakerPrompt.UI.Components/Properties/Resources.es-ES.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.es-ES.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.es-ES.resx
diff --git a/MakerPrompt.Shared/Properties/Resources.es.resx b/src/MakerPrompt.UI.Components/Properties/Resources.es.resx
similarity index 99%
rename from MakerPrompt.Shared/Properties/Resources.es.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.es.resx
index f3e240f..238d1df 100644
--- a/MakerPrompt.Shared/Properties/Resources.es.resx
+++ b/src/MakerPrompt.UI.Components/Properties/Resources.es.resx
@@ -592,12 +592,12 @@
   <data name="PageTitle_GCodeViewer" xml:space="preserve">
     <value>Visor de G-Code</value>
   </data>
+  <data name="PageTitle_Settings" xml:space="preserve">
+    <value>Ajustes</value>
+  </data>
   <data name="PageTitle_BrailleRAP" xml:space="preserve">
     <value>BrailleRAP</value>
   </data>
-  <data name="PageTitle_Settings" xml:space="preserve">
-    <value>Configuraci&#243;n</value>
-  </data>
   <data name="BrailleRAP_Description" xml:space="preserve">
     <value>Convertir texto a Braille y generar código G para grabado BrailleRAP.</value>
   </data>
diff --git a/MakerPrompt.Shared/Properties/Resources.fr-FR.resx b/src/MakerPrompt.UI.Components/Properties/Resources.fr-FR.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.fr-FR.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.fr-FR.resx
diff --git a/MakerPrompt.Shared/Properties/Resources.fr.resx b/src/MakerPrompt.UI.Components/Properties/Resources.fr.resx
similarity index 99%
rename from MakerPrompt.Shared/Properties/Resources.fr.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.fr.resx
index 4ce8030..affafac 100644
--- a/MakerPrompt.Shared/Properties/Resources.fr.resx
+++ b/src/MakerPrompt.UI.Components/Properties/Resources.fr.resx
@@ -591,12 +591,12 @@
   <data name="PageTitle_GCodeViewer" xml:space="preserve">
     <value>Visionneuse G-Code</value>
   </data>
+  <data name="PageTitle_Settings" xml:space="preserve">
+    <value>Paramètres</value>
+  </data>
   <data name="PageTitle_BrailleRAP" xml:space="preserve">
     <value>BrailleRAP</value>
   </data>
-  <data name="PageTitle_Settings" xml:space="preserve">
-    <value>Param&#232;tres</value>
-  </data>
   <data name="BrailleRAP_Description" xml:space="preserve">
     <value>Convertir du texte en Braille et générer du G-code pour l'embossage BrailleRAP.</value>
   </data>
diff --git a/MakerPrompt.Shared/Properties/Resources.he-IL.resx b/src/MakerPrompt.UI.Components/Properties/Resources.he-IL.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.he-IL.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.he-IL.resx
diff --git a/MakerPrompt.Shared/Properties/Resources.it-IT.resx b/src/MakerPrompt.UI.Components/Properties/Resources.it-IT.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.it-IT.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.it-IT.resx
diff --git a/MakerPrompt.Shared/Properties/Resources.pl-PL.resx b/src/MakerPrompt.UI.Components/Properties/Resources.pl-PL.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.pl-PL.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.pl-PL.resx
diff --git a/MakerPrompt.Shared/Properties/Resources.pl.resx b/src/MakerPrompt.UI.Components/Properties/Resources.pl.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.pl.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.pl.resx
index 70145aa..15f6678 100644
--- a/MakerPrompt.Shared/Properties/Resources.pl.resx
+++ b/src/MakerPrompt.UI.Components/Properties/Resources.pl.resx
@@ -592,12 +592,12 @@
   <data name="PageTitle_GCodeViewer" xml:space="preserve">
     <value>PrzeglÄ…darka G-Code</value>
   </data>
-  <data name="PageTitle_BrailleRAP" xml:space="preserve">
-    <value>BrailleRAP</value>
-  </data>
   <data name="PageTitle_Settings" xml:space="preserve">
     <value>Ustawienia</value>
   </data>
+  <data name="PageTitle_BrailleRAP" xml:space="preserve">
+    <value>BrailleRAP</value>
+  </data>
   <data name="BrailleRAP_Description" xml:space="preserve">
     <value>Konwertuj tekst na alfabet Braille'a i generuj G-code do tłoczenia BrailleRAP.</value>
   </data>
diff --git a/MakerPrompt.Shared/Properties/Resources.resx b/src/MakerPrompt.UI.Components/Properties/Resources.resx
similarity index 96%
rename from MakerPrompt.Shared/Properties/Resources.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.resx
index 791aeaf..ae4d6df 100644
--- a/MakerPrompt.Shared/Properties/Resources.resx
+++ b/src/MakerPrompt.UI.Components/Properties/Resources.resx
@@ -483,12 +483,6 @@
   <data name="ControlPanel_FanSpeed" xml:space="preserve">
     <value>Fan speed</value>
   </data>
-  <data name="ControlPanel_PrinterQueue" xml:space="preserve">
-    <value>Printer Queue</value>
-  </data>
-  <data name="ControlPanel_PrinterQueueEmpty" xml:space="preserve">
-    <value>No jobs in printer queue</value>
-  </data>
   <data name="ControlPanel_HomeAll" xml:space="preserve">
     <value>Home all</value>
   </data>
@@ -756,11 +750,8 @@
   <data name="PageTitle_Fleet" xml:space="preserve">
     <value>Fleet</value>
   </data>
-  <data name="PageTitle_ProjectHub" xml:space="preserve">
-    <value>Project Hub</value>
-  </data>
   <data name="PrintQueue_Title" xml:space="preserve">
-    <value>Project Hub</value>
+    <value>Print Queue</value>
   </data>
   <data name="PrintQueue_NoFiles" xml:space="preserve">
     <value>No files available. Connect a printer to browse files.</value>
diff --git a/MakerPrompt.Shared/Properties/Resources.tr-TR.resx b/src/MakerPrompt.UI.Components/Properties/Resources.tr-TR.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.tr-TR.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.tr-TR.resx
diff --git a/MakerPrompt.Shared/Properties/Resources.tr.resx b/src/MakerPrompt.UI.Components/Properties/Resources.tr.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.tr.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.tr.resx
index 262d5ba..d5d1dba 100644
--- a/MakerPrompt.Shared/Properties/Resources.tr.resx
+++ b/src/MakerPrompt.UI.Components/Properties/Resources.tr.resx
@@ -592,12 +592,12 @@
   <data name="PageTitle_GCodeViewer" xml:space="preserve">
     <value>G-Code Görüntüleyici</value>
   </data>
-  <data name="PageTitle_BrailleRAP" xml:space="preserve">
-    <value>BrailleRAP</value>
-  </data>
   <data name="PageTitle_Settings" xml:space="preserve">
     <value>Ayarlar</value>
   </data>
+  <data name="PageTitle_BrailleRAP" xml:space="preserve">
+    <value>BrailleRAP</value>
+  </data>
   <data name="BrailleRAP_Description" xml:space="preserve">
     <value>Metni Braille'e dönüştürün ve BrailleRAP kabartma için G-kodu oluşturun.</value>
   </data>
diff --git a/MakerPrompt.Shared/Properties/Resources.zh-CN.resx b/src/MakerPrompt.UI.Components/Properties/Resources.zh-CN.resx
similarity index 100%
rename from MakerPrompt.Shared/Properties/Resources.zh-CN.resx
rename to src/MakerPrompt.UI.Components/Properties/Resources.zh-CN.resx
diff --git a/MakerPrompt.Shared/Services/AnalyticsService.cs b/src/MakerPrompt.UI.Components/Services/AnalyticsService.cs
similarity index 98%
rename from MakerPrompt.Shared/Services/AnalyticsService.cs
rename to src/MakerPrompt.UI.Components/Services/AnalyticsService.cs
index e78d24d..037361f 100644
--- a/MakerPrompt.Shared/Services/AnalyticsService.cs
+++ b/src/MakerPrompt.UI.Components/Services/AnalyticsService.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     public class AnalyticsService
     {
diff --git a/MakerPrompt.Shared/Services/CameraProxyService.cs b/src/MakerPrompt.UI.Components/Services/CameraProxyService.cs
similarity index 96%
rename from MakerPrompt.Shared/Services/CameraProxyService.cs
rename to src/MakerPrompt.UI.Components/Services/CameraProxyService.cs
index 7d62796..559b7b1 100644
--- a/MakerPrompt.Shared/Services/CameraProxyService.cs
+++ b/src/MakerPrompt.UI.Components/Services/CameraProxyService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     /// <summary>
     /// Abstracts camera frame fetching.
diff --git a/MakerPrompt.Shared/Services/ConnectionEncryptionService.cs b/src/MakerPrompt.UI.Components/Services/ConnectionEncryptionService.cs
similarity index 99%
rename from MakerPrompt.Shared/Services/ConnectionEncryptionService.cs
rename to src/MakerPrompt.UI.Components/Services/ConnectionEncryptionService.cs
index 290a3e7..a67e9a0 100644
--- a/MakerPrompt.Shared/Services/ConnectionEncryptionService.cs
+++ b/src/MakerPrompt.UI.Components/Services/ConnectionEncryptionService.cs
@@ -1,7 +1,7 @@
 using System.Runtime.Versioning;
 using System.Security.Cryptography;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     /// <summary>
     /// Provides AES-256-GCM encryption for sensitive connection data (API keys, passwords).
diff --git a/MakerPrompt.Shared/Services/FarmConfigurationService.cs b/src/MakerPrompt.UI.Components/Services/FarmConfigurationService.cs
similarity index 91%
rename from MakerPrompt.Shared/Services/FarmConfigurationService.cs
rename to src/MakerPrompt.UI.Components/Services/FarmConfigurationService.cs
index 673bc5d..48f1f79 100644
--- a/MakerPrompt.Shared/Services/FarmConfigurationService.cs
+++ b/src/MakerPrompt.UI.Components/Services/FarmConfigurationService.cs
@@ -1,23 +1,32 @@
 using Microsoft.Extensions.Logging;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     /// <summary>
     /// Manages multiple farm configurations. Supports creating, switching, importing,
     /// and exporting farm profiles. Each farm stores a snapshot of printer connection
     /// definitions that are loaded into <see cref="PrinterConnectionManager"/> when active.
     /// </summary>
-    public sealed class FarmConfigurationService
+    public sealed class FarmConfigurationService(
+        IAppLocalStorageProvider storage,
+        IAppConfigurationService configService,
+        PrinterConnectionManager connectionManager,
+        ILogger<FarmConfigurationService> logger)
     {
         private const string StorageKey = "MakerPrompt.FarmConfigurations";
         private const string PrinterStorageKey = "MakerPrompt.PrinterConnections";
 
-        private readonly IAppLocalStorageProvider _storage;
-        private readonly IAppConfigurationService _configService;
-        private readonly PrinterConnectionManager _connectionManager;
-        private readonly ILogger<FarmConfigurationService> _logger;
+        private readonly IAppLocalStorageProvider _storage = storage;
+        private readonly IAppConfigurationService _configService = configService;
+        private readonly PrinterConnectionManager _connectionManager = connectionManager;
+        private readonly ILogger<FarmConfigurationService> _logger = logger;
         private List<FarmConfiguration> _farms = [];
 
+        private static readonly JsonSerializerOptions _jsonOptions = new()
+        {
+            WriteIndented = true
+        };
+
         public IReadOnlyList<FarmConfiguration> Farms => _farms.AsReadOnly();
 
         public FarmConfiguration? ActiveFarm =>
@@ -25,18 +34,6 @@ public sealed class FarmConfigurationService
 
         public event EventHandler? FarmsChanged;
 
-        public FarmConfigurationService(
-            IAppLocalStorageProvider storage,
-            IAppConfigurationService configService,
-            PrinterConnectionManager connectionManager,
-            ILogger<FarmConfigurationService> logger)
-        {
-            _storage = storage;
-            _configService = configService;
-            _connectionManager = connectionManager;
-            _logger = logger;
-        }
-
         public async Task InitializeAsync()
         {
             try
@@ -154,7 +151,7 @@ public string ExportFarm(Guid farmId)
                     .ToList();
             }
 
-            return JsonSerializer.Serialize(farm, new JsonSerializerOptions { WriteIndented = true });
+            return JsonSerializer.Serialize(farm, _jsonOptions);
         }
 
         /// <summary>
diff --git a/MakerPrompt.Shared/Services/FilamentInventoryService.cs b/src/MakerPrompt.UI.Components/Services/FilamentInventoryService.cs
similarity index 98%
rename from MakerPrompt.Shared/Services/FilamentInventoryService.cs
rename to src/MakerPrompt.UI.Components/Services/FilamentInventoryService.cs
index 7e2ae47..8bff42c 100644
--- a/MakerPrompt.Shared/Services/FilamentInventoryService.cs
+++ b/src/MakerPrompt.UI.Components/Services/FilamentInventoryService.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     public class FilamentInventoryService
     {
diff --git a/src/MakerPrompt.UI.Components/Services/GCodeDocumentService.cs b/src/MakerPrompt.UI.Components/Services/GCodeDocumentService.cs
new file mode 100644
index 0000000..8219ea8
--- /dev/null
+++ b/src/MakerPrompt.UI.Components/Services/GCodeDocumentService.cs
@@ -0,0 +1,27 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.UI.Components.Services
+{
+    // Simple wrapper around the current G-code text; can be extended later to expose parsed structures
+    public class GCodeDocumentService
+    {
+        private string? _current;
+        public string? CurrentGCode => _current;
+        public event Action? Changed;
+
+        // Expose a lightweight document wrapper for higher-level APIs
+        public GCodeDoc Document => new(_current ?? string.Empty);
+
+        public void SetGCode(string? gcode)
+        {
+            _current = gcode ?? string.Empty;
+            Changed?.Invoke();
+        }
+
+        public void Clear()
+        {
+            _current = string.Empty;
+            Changed?.Invoke();
+        }
+    }
+}
diff --git a/MakerPrompt.Shared/Services/LocalizedTitleService.cs b/src/MakerPrompt.UI.Components/Services/LocalizedTitleService.cs
similarity index 92%
rename from MakerPrompt.Shared/Services/LocalizedTitleService.cs
rename to src/MakerPrompt.UI.Components/Services/LocalizedTitleService.cs
index 828ba1b..d2ce411 100644
--- a/MakerPrompt.Shared/Services/LocalizedTitleService.cs
+++ b/src/MakerPrompt.UI.Components/Services/LocalizedTitleService.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Localization;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     public class LocalizedTitleService : IDisposable
     {
diff --git a/MakerPrompt.Shared/Services/MakerPromptJsInterop.cs b/src/MakerPrompt.UI.Components/Services/MakerPromptJsInterop.cs
similarity index 94%
rename from MakerPrompt.Shared/Services/MakerPromptJsInterop.cs
rename to src/MakerPrompt.UI.Components/Services/MakerPromptJsInterop.cs
index 2139184..2c6051e 100644
--- a/MakerPrompt.Shared/Services/MakerPromptJsInterop.cs
+++ b/src/MakerPrompt.UI.Components/Services/MakerPromptJsInterop.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     public class MakerPromptJsInterop : IAsyncDisposable
     {
@@ -11,7 +11,7 @@ public MakerPromptJsInterop(IJSRuntime jsRuntime)
         {
             this.jsRuntime = jsRuntime ?? throw new ArgumentNullException(nameof(jsRuntime));
             moduleTask = new(() => jsRuntime.InvokeAsync<IJSObjectReference>(
-                "import", "./_content/MakerPrompt.Shared/js/makerpromptJsInterop.js").AsTask());
+                "import", "./_content/MakerPrompt.UI.Components/js/makerpromptJsInterop.js").AsTask());
         }
 
         public async ValueTask<string> Prompt(string message)
diff --git a/MakerPrompt.Shared/Services/NotificationService.cs b/src/MakerPrompt.UI.Components/Services/NotificationService.cs
similarity index 98%
rename from MakerPrompt.Shared/Services/NotificationService.cs
rename to src/MakerPrompt.UI.Components/Services/NotificationService.cs
index debc274..2a1f14e 100644
--- a/MakerPrompt.Shared/Services/NotificationService.cs
+++ b/src/MakerPrompt.UI.Components/Services/NotificationService.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using BlazorBootstrap;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     public class NotificationService
     {
diff --git a/MakerPrompt.Shared/Services/PrintProjectService.cs b/src/MakerPrompt.UI.Components/Services/PrintProjectService.cs
similarity index 99%
rename from MakerPrompt.Shared/Services/PrintProjectService.cs
rename to src/MakerPrompt.UI.Components/Services/PrintProjectService.cs
index 45adda4..0b72c29 100644
--- a/MakerPrompt.Shared/Services/PrintProjectService.cs
+++ b/src/MakerPrompt.UI.Components/Services/PrintProjectService.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     /// <summary>
     /// Manages print projects — CRUD for projects and their jobs, persists to IAppLocalStorageProvider.
diff --git a/MakerPrompt.Shared/Services/PrinterCameraProvider.cs b/src/MakerPrompt.UI.Components/Services/PrinterCameraProvider.cs
similarity index 96%
rename from MakerPrompt.Shared/Services/PrinterCameraProvider.cs
rename to src/MakerPrompt.UI.Components/Services/PrinterCameraProvider.cs
index a8a04ae..cc362bc 100644
--- a/MakerPrompt.Shared/Services/PrinterCameraProvider.cs
+++ b/src/MakerPrompt.UI.Components/Services/PrinterCameraProvider.cs
@@ -1,4 +1,6 @@
-namespace MakerPrompt.Shared.Services
+using MakerPrompt.Infrastructure.Services.Printers;
+
+namespace MakerPrompt.UI.Components.Services
 {
     public interface IPrinterCameraProvider
     {
diff --git a/MakerPrompt.Shared/Services/PrinterConnectionManager.cs b/src/MakerPrompt.UI.Components/Services/PrinterConnectionManager.cs
similarity index 96%
rename from MakerPrompt.Shared/Services/PrinterConnectionManager.cs
rename to src/MakerPrompt.UI.Components/Services/PrinterConnectionManager.cs
index 0892ba5..a938166 100644
--- a/MakerPrompt.Shared/Services/PrinterConnectionManager.cs
+++ b/src/MakerPrompt.UI.Components/Services/PrinterConnectionManager.cs
@@ -1,6 +1,7 @@
+using MakerPrompt.Infrastructure.Services.Printers;
 using Microsoft.Extensions.Logging;
 
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     /// <summary>
     /// Manages multiple printer connections. Loads/saves definitions from local storage,
@@ -549,24 +550,18 @@ private async Task SaveDefinitionsAsync()
 
         private void EncryptSensitiveFields(PrinterConnectionDefinition def)
         {
-            if (def.Settings.Api != null)
-            {
-                if (!string.IsNullOrEmpty(def.Settings.Api.Password))
-                    def.Settings.Api.Password = _encryption.Encrypt(def.Settings.Api.Password);
-                if (!string.IsNullOrEmpty(def.Settings.Api.UserName))
-                    def.Settings.Api.UserName = _encryption.Encrypt(def.Settings.Api.UserName);
-            }
+            if (!string.IsNullOrEmpty(def.Settings.Password))
+                def.Settings.Password = _encryption.Encrypt(def.Settings.Password);
+            if (!string.IsNullOrEmpty(def.Settings.UserName))
+                def.Settings.UserName = _encryption.Encrypt(def.Settings.UserName);
         }
 
         private void DecryptSensitiveFields(PrinterConnectionDefinition def)
         {
-            if (def.Settings.Api != null)
-            {
-                if (!string.IsNullOrEmpty(def.Settings.Api.Password))
-                    def.Settings.Api.Password = _encryption.Decrypt(def.Settings.Api.Password);
-                if (!string.IsNullOrEmpty(def.Settings.Api.UserName))
-                    def.Settings.Api.UserName = _encryption.Decrypt(def.Settings.Api.UserName);
-            }
+            if (!string.IsNullOrEmpty(def.Settings.Password))
+                def.Settings.Password = _encryption.Decrypt(def.Settings.Password);
+            if (!string.IsNullOrEmpty(def.Settings.UserName))
+                def.Settings.UserName = _encryption.Decrypt(def.Settings.UserName);
         }
 
         private static PrinterConnectionDefinition CloneDefinition(PrinterConnectionDefinition original)
diff --git a/MakerPrompt.Shared/Services/PrusaConnectProvider.cs b/src/MakerPrompt.UI.Components/Services/PrusaConnectProvider.cs
similarity index 76%
rename from MakerPrompt.Shared/Services/PrusaConnectProvider.cs
rename to src/MakerPrompt.UI.Components/Services/PrusaConnectProvider.cs
index 3578125..00b730f 100644
--- a/MakerPrompt.Shared/Services/PrusaConnectProvider.cs
+++ b/src/MakerPrompt.UI.Components/Services/PrusaConnectProvider.cs
@@ -1,4 +1,7 @@
-namespace MakerPrompt.Shared.Services;
+using MakerPrompt.Core.Abstractions;
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.UI.Components.Services;
 
 /// <summary>
 /// Discovers printers registered to a PrusaConnect account via the mobile API.
@@ -7,7 +10,7 @@ namespace MakerPrompt.Shared.Services;
 /// Auth: Authorization: Bearer {token}
 ///
 /// Usage:
-///   provider.Configure(bearerToken);
+///   await provider.ConfigureAsync(bearerToken);
 ///   var printers = await provider.GetPrintersAsync();  // GET /api/v1/printers
 /// </summary>
 public sealed class PrusaConnectProvider : IPrinterProvider
@@ -33,26 +36,29 @@ public PrusaConnectProvider(HttpMessageHandler handler)
         _httpClient = new HttpClient(handler, false) { BaseAddress = new Uri(BaseUrl) };
     }
 
+    public PrinterConnectionType ProviderType => PrinterConnectionType.PrusaConnect;
+
     /// <summary>Sets the Bearer token used for all subsequent requests.</summary>
-    public void Configure(string bearerToken)
+    public Task ConfigureAsync(string bearerToken, CancellationToken cancellationToken = default)
     {
         _httpClient.DefaultRequestHeaders.Authorization =
             new AuthenticationHeaderValue("Bearer", bearerToken);
+        return Task.CompletedTask;
     }
 
     /// <summary>
     /// Returns all printers associated with the configured account.
     /// Returns an empty list on auth failure or network error.
     /// </summary>
-    public async Task<IReadOnlyList<RemotePrinterInfo>> GetPrintersAsync()
+    public async Task<IReadOnlyList<PrinterInfo>> GetPrintersAsync(CancellationToken cancellationToken = default)
     {
         try
         {
-            using var response = await _httpClient.GetAsync("/api/v1/printers?page=1&itemsPerPage=100");
+            using var response = await _httpClient.GetAsync("/api/v1/printers?page=1&itemsPerPage=100", cancellationToken);
             if (!response.IsSuccessStatusCode) return [];
 
-            await using var stream = await response.Content.ReadAsStreamAsync();
-            using var doc = await JsonDocument.ParseAsync(stream);
+            await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
+            using var doc = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken);
 
             var root = doc.RootElement;
             JsonElement printerArray;
@@ -63,7 +69,7 @@ public async Task<IReadOnlyList<RemotePrinterInfo>> GetPrintersAsync()
             else
                 return [];
 
-            var result = new List<RemotePrinterInfo>();
+            var result = new List<PrinterInfo>();
             foreach (var item in printerArray.EnumerateArray())
             {
                 var id     = item.TryGetProperty("uuid",         out var p1) ? p1.GetString() ?? string.Empty : string.Empty;
@@ -73,7 +79,7 @@ public async Task<IReadOnlyList<RemotePrinterInfo>> GetPrintersAsync()
 
                 if (string.IsNullOrEmpty(id)) continue;
 
-                result.Add(new RemotePrinterInfo { Id = id, Name = name, Model = model, Status = status });
+                result.Add(new PrinterInfo { Id = id, Name = name, Model = model, RawStatus = status, ProviderType = PrinterConnectionType.PrusaConnect });
             }
 
             return result;
@@ -84,3 +90,4 @@ public async Task<IReadOnlyList<RemotePrinterInfo>> GetPrintersAsync()
         }
     }
 }
+
diff --git a/MakerPrompt.Shared/Services/ThemeService.cs b/src/MakerPrompt.UI.Components/Services/ThemeService.cs
similarity index 93%
rename from MakerPrompt.Shared/Services/ThemeService.cs
rename to src/MakerPrompt.UI.Components/Services/ThemeService.cs
index a59c6d7..3dd4290 100644
--- a/MakerPrompt.Shared/Services/ThemeService.cs
+++ b/src/MakerPrompt.UI.Components/Services/ThemeService.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Services
+namespace MakerPrompt.UI.Components.Services
 {
     public sealed class ThemeService : IAsyncDisposable
     {
@@ -14,7 +14,7 @@ public ThemeService(IJSRuntime jsRuntime, IAppConfigurationService configService
         {
             _configService = configService;
             _moduleTask = new(() => jsRuntime.InvokeAsync<IJSObjectReference>(
-                "import", "./_content/MakerPrompt.Shared/js/themeJsInterop.js").AsTask());
+                "import", "./_content/MakerPrompt.UI.Components/js/themeJsInterop.js").AsTask());
 
             _dotNetRef = DotNetObjectReference.Create(this);
         }
diff --git a/src/MakerPrompt.UI.Components/Utils/AppConfiguration.cs b/src/MakerPrompt.UI.Components/Utils/AppConfiguration.cs
new file mode 100644
index 0000000..8412963
--- /dev/null
+++ b/src/MakerPrompt.UI.Components/Utils/AppConfiguration.cs
@@ -0,0 +1,31 @@
+namespace MakerPrompt.UI.Components.Utils
+{
+    public class AppConfiguration
+    {
+        public Theme Theme { get; set; } = Theme.Auto;
+		public string[] SupportedCultures { get; } = ["en-US", "de-DE", "tr-TR", "es-ES", "fr-FR", "it-IT", "pl-PL", "he-IL", "zh-CN"];
+        public string Language { get; set; } = "en-US";
+        public string FarmName { get; set; } = string.Empty;
+        public bool FarmModeEnabled { get; set; } = false;
+        public Guid? ActiveFarmId { get; set; }
+        public bool AnalyticsEnabled { get; set; } = true;
+        public bool EnableFilamentInventory { get; set; } = false;
+        public bool EnablePrintAnalytics { get; set; } = false;
+        public DateTime? LastUpdated { get; set; }
+
+        // ── Deployment mode ─────────────────────────────────────────────────
+        // Sourced from appsettings.json (MakerPrompt:DeploymentMode) at startup.
+        // NOT persisted to localStorage — this is a deployment-time decision.
+        // Default: Standalone (no auth, direct printer connections).
+        [System.Text.Json.Serialization.JsonIgnore]
+        public AppDeploymentMode DeploymentMode { get; set; } = AppDeploymentMode.Standalone;
+
+        /// <summary>
+        /// Base URL of the MakerPrompt Cloud API.
+        /// Required when DeploymentMode == CloudMakerspace.
+        /// Sourced from appsettings.json (MakerPrompt:CloudApiBaseUrl).
+        /// </summary>
+        [System.Text.Json.Serialization.JsonIgnore]
+        public string CloudApiBaseUrl { get; set; } = string.Empty;
+    }
+}
diff --git a/src/MakerPrompt.UI.Components/Utils/AppDeploymentMode.cs b/src/MakerPrompt.UI.Components/Utils/AppDeploymentMode.cs
new file mode 100644
index 0000000..71fbea0
--- /dev/null
+++ b/src/MakerPrompt.UI.Components/Utils/AppDeploymentMode.cs
@@ -0,0 +1,24 @@
+namespace MakerPrompt.UI.Components.Utils
+{
+    /// <summary>
+    /// Controls which deployment mode the app is running in.
+    /// The value is read from appsettings.json (MakerPrompt:DeploymentMode) at startup
+    /// and cannot be changed at runtime — it is a deployment-time decision.
+    /// </summary>
+    public enum AppDeploymentMode
+    {
+        /// <summary>
+        /// Default single-user / local mode.
+        /// Direct printer connections, local fleet management, no authentication required.
+        /// All existing backends (Moonraker, PrusaLink, Bambu, WebSerial, etc.) are available.
+        /// </summary>
+        Standalone = 0,
+
+        /// <summary>
+        /// Makerspace / cloud-hosted mode.
+        /// OIDC authentication is required. Fleet configuration is served from the cloud API
+        /// and cannot be modified by the user. Farm mode is automatically enabled.
+        /// </summary>
+        CloudMakerspace = 1
+    }
+}
diff --git a/MakerPrompt.Shared/Utils/Enums.cs b/src/MakerPrompt.UI.Components/Utils/Enums.cs
similarity index 76%
rename from MakerPrompt.Shared/Utils/Enums.cs
rename to src/MakerPrompt.UI.Components/Utils/Enums.cs
index 50591e3..5692de2 100644
--- a/MakerPrompt.Shared/Utils/Enums.cs
+++ b/src/MakerPrompt.UI.Components/Utils/Enums.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Resources;
 
-namespace MakerPrompt.Shared.Utils
+namespace MakerPrompt.UI.Components.Utils
 {
     public class Enums
     {
@@ -37,38 +37,6 @@ public enum MotorStepAngle
             Step15 = 150
         }
 
-		public enum PrinterConnectionType
-		{
-			[Display(Name = "Demo")]
-			Demo,
-			[Display(Name = "Serial")]
-			Serial,
-			[Display(Name = "Moonraker")]
-			Moonraker,
-			[Display(Name = "PrusaLink")]
-			PrusaLink,
-			[Display(Name = "PrusaConnect")]
-			PrusaConnect,
-			[Display(Name = "BambuLab")]
-			BambuLab,
-			[Display(Name = "OctoPrint")]
-			OctoPrint
-		}
-
-        public enum PrinterStatus
-        {
-            [Display(Name = nameof(Resources.PrinterStatus_Disconnected), ResourceType = typeof(Resources))]
-            Disconnected,
-            [Display(Name = nameof(Resources.PrinterStatus_Connected), ResourceType = typeof(Resources))]
-            Connected,
-            [Display(Name = nameof(Resources.PrinterStatus_Printing), ResourceType = typeof(Resources))]
-            Printing,
-            [Display(Name = nameof(Resources.PrinterStatus_Paused), ResourceType = typeof(Resources))]
-            Paused,
-            [Display(Name = nameof(Resources.PrinterStatus_Error), ResourceType = typeof(Resources))]
-            Error
-        }
-
         public enum Theme
         {
             [Display(Name = nameof(Resources.Theme_Auto), ResourceType = typeof(Resources))]
diff --git a/MakerPrompt.Shared/Utils/GCodeCommands.cs b/src/MakerPrompt.UI.Components/Utils/GCodeCommands.cs
similarity index 97%
rename from MakerPrompt.Shared/Utils/GCodeCommands.cs
rename to src/MakerPrompt.UI.Components/Utils/GCodeCommands.cs
index 5e8970a..30f5a57 100644
--- a/MakerPrompt.Shared/Utils/GCodeCommands.cs
+++ b/src/MakerPrompt.UI.Components/Utils/GCodeCommands.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Utils
+namespace MakerPrompt.UI.Components.Utils
 {
     internal class GCodeParameters
     {
diff --git a/MakerPrompt.Shared/Utils/SerialException.cs b/src/MakerPrompt.UI.Components/Utils/SerialException.cs
similarity index 70%
rename from MakerPrompt.Shared/Utils/SerialException.cs
rename to src/MakerPrompt.UI.Components/Utils/SerialException.cs
index 80b1383..2b53bf0 100644
--- a/MakerPrompt.Shared/Utils/SerialException.cs
+++ b/src/MakerPrompt.UI.Components/Utils/SerialException.cs
@@ -1,4 +1,4 @@
-namespace MakerPrompt.Shared.Utils
+namespace MakerPrompt.UI.Components.Utils
 {
     public class SerialException(string message, Exception inner) : Exception(message, inner)
     {
diff --git a/MakerPrompt.Shared/Utils/ServiceCollectionExtensions.cs b/src/MakerPrompt.UI.Components/Utils/ServiceCollectionExtensions.cs
similarity index 93%
rename from MakerPrompt.Shared/Utils/ServiceCollectionExtensions.cs
rename to src/MakerPrompt.UI.Components/Utils/ServiceCollectionExtensions.cs
index 1ca6d0e..87e6564 100644
--- a/MakerPrompt.Shared/Utils/ServiceCollectionExtensions.cs
+++ b/src/MakerPrompt.UI.Components/Utils/ServiceCollectionExtensions.cs
@@ -1,7 +1,8 @@
 using System.Globalization;
+using MakerPrompt.Infrastructure.Services.Printers;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace MakerPrompt.Shared.Utils
+namespace MakerPrompt.UI.Components.Utils
 {
     public static class ServiceCollectionExtensions
     {
diff --git a/src/MakerPrompt.UI.Components/_Imports.razor b/src/MakerPrompt.UI.Components/_Imports.razor
new file mode 100644
index 0000000..c1d4a91
--- /dev/null
+++ b/src/MakerPrompt.UI.Components/_Imports.razor
@@ -0,0 +1,18 @@
+@using System.ComponentModel
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.Extensions.Localization
+@using Microsoft.Extensions.Logging
+@using MakerPrompt.Core.Models
+@using MakerPrompt.UI.Components.Models
+@using MakerPrompt.UI.Components.Infrastructure
+@using MakerPrompt.UI.Components.Utils
+@using MakerPrompt.UI.Components.Components
+@using MakerPrompt.UI.Components.Components.Calculators
+@using MakerPrompt.UI.Components.Layout
+@using MakerPrompt.UI.Components.Properties
+@using MakerPrompt.UI.Components.Services
+@using BlazorBootstrap
+@using EnumExtensions = MakerPrompt.UI.Components.Utils.EnumExtensions
\ No newline at end of file
diff --git a/MakerPrompt.Shared/libman.json b/src/MakerPrompt.UI.Components/libman.json
similarity index 100%
rename from MakerPrompt.Shared/libman.json
rename to src/MakerPrompt.UI.Components/libman.json
diff --git a/src/MakerPrompt.UI.Components/usings.cs b/src/MakerPrompt.UI.Components/usings.cs
new file mode 100644
index 0000000..be30250
--- /dev/null
+++ b/src/MakerPrompt.UI.Components/usings.cs
@@ -0,0 +1,18 @@
+global using static MakerPrompt.UI.Components.Utils.Enums;
+global using System.Text;
+global using System.Text.Json;
+global using System.Text.RegularExpressions;
+global using System.Text.Json.Serialization;
+global using System.Reflection;
+global using System.Numerics;
+global using System.Net;
+global using System.Net.Http.Headers;
+global using MakerPrompt.Infrastructure.Services.Printers;
+global using MakerPrompt.Core.Abstractions;
+global using MakerPrompt.Core.Models;
+global using MakerPrompt.UI.Components.Infrastructure;
+global using MakerPrompt.UI.Components.Properties;
+global using MakerPrompt.UI.Components.Services;
+global using MakerPrompt.UI.Components.Models;
+global using MakerPrompt.UI.Components.Utils;
+global using Microsoft.JSInterop;
\ No newline at end of file
diff --git a/MakerPrompt.Shared/wwwroot/css/app.css b/src/MakerPrompt.UI.Components/wwwroot/css/app.css
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/css/app.css
rename to src/MakerPrompt.UI.Components/wwwroot/css/app.css
diff --git a/MakerPrompt.Shared/wwwroot/favicon.png b/src/MakerPrompt.UI.Components/wwwroot/favicon.png
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/favicon.png
rename to src/MakerPrompt.UI.Components/wwwroot/favicon.png
diff --git a/MakerPrompt.Shared/wwwroot/js/makerpromptJsInterop.js b/src/MakerPrompt.UI.Components/wwwroot/js/makerpromptJsInterop.js
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/js/makerpromptJsInterop.js
rename to src/MakerPrompt.UI.Components/wwwroot/js/makerpromptJsInterop.js
diff --git a/MakerPrompt.Shared/wwwroot/js/themeJsInterop.js b/src/MakerPrompt.UI.Components/wwwroot/js/themeJsInterop.js
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/js/themeJsInterop.js
rename to src/MakerPrompt.UI.Components/wwwroot/js/themeJsInterop.js
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.json b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.json
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.json
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.json
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.min.css b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.min.css
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.min.css
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/bootstrap-icons.min.css
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff2 b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff2
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff2
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap-icons/font/fonts/bootstrap-icons.woff2
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap/css/bootstrap.min.css b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap/css/bootstrap.min.css
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/css/bootstrap.min.css
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/js/bootstrap.bundle.js.map
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/js/bootstrap.bundle.min.js
diff --git a/MakerPrompt.Shared/wwwroot/lib/bootstrap/js/bootstrap.min.js b/src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/bootstrap/js/bootstrap.min.js
rename to src/MakerPrompt.UI.Components/wwwroot/lib/bootstrap/js/bootstrap.min.js
diff --git a/MakerPrompt.Shared/wwwroot/lib/gcode-preview/gcode-preview.bundle.js b/src/MakerPrompt.UI.Components/wwwroot/lib/gcode-preview/gcode-preview.bundle.js
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/gcode-preview/gcode-preview.bundle.js
rename to src/MakerPrompt.UI.Components/wwwroot/lib/gcode-preview/gcode-preview.bundle.js
diff --git a/MakerPrompt.Shared/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js b/src/MakerPrompt.UI.Components/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js
rename to src/MakerPrompt.UI.Components/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js
diff --git a/MakerPrompt.Shared/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js.map b/src/MakerPrompt.UI.Components/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js.map
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js.map
rename to src/MakerPrompt.UI.Components/wwwroot/lib/gcode-viewer/_bundles/gcode-viewer.min.js.map
diff --git a/MakerPrompt.Shared/wwwroot/logo.svg b/src/MakerPrompt.UI.Components/wwwroot/logo.svg
similarity index 100%
rename from MakerPrompt.Shared/wwwroot/logo.svg
rename to src/MakerPrompt.UI.Components/wwwroot/logo.svg
diff --git a/MakerPrompt.MAUI/App.xaml b/src/MakerPrompt.UI.MAUI/App.xaml
similarity index 80%
rename from MakerPrompt.MAUI/App.xaml
rename to src/MakerPrompt.UI.MAUI/App.xaml
index 40a40ab..c7f9e20 100644
--- a/MakerPrompt.MAUI/App.xaml
+++ b/src/MakerPrompt.UI.MAUI/App.xaml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:MakerPrompt.MAUI"
-             x:Class="MakerPrompt.MAUI.App">
-    <Application.Resources>
-        <ResourceDictionary>
-
-        <!--
-            For information about styling .NET MAUI pages
-            please refer to the documentation:
-            https://go.microsoft.com/fwlink/?linkid=2282329
-        -->
-
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
+<?xml version="1.0" encoding="UTF-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:MakerPrompt.UI.MAUI"
+             x:Class="MakerPrompt.UI.MAUI.App">
+    <Application.Resources>
+        <ResourceDictionary>
+
+        <!--
+            For information about styling .NET MAUI pages
+            please refer to the documentation:
+            https://go.microsoft.com/fwlink/?linkid=2282329
+        -->
+
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/src/MakerPrompt.UI.MAUI/App.xaml.cs b/src/MakerPrompt.UI.MAUI/App.xaml.cs
new file mode 100644
index 0000000..2eb69c1
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/App.xaml.cs
@@ -0,0 +1,14 @@
+namespace MakerPrompt.UI.MAUI;
+
+public partial class App : Application
+{
+    public App()
+    {
+        InitializeComponent();
+    }
+
+    protected override Window CreateWindow(IActivationState? activationState)
+    {
+        return new Window(new MainPage()) { Title = "MakerPrompt" };
+    }
+}
diff --git a/src/MakerPrompt.UI.MAUI/Components/Routes.razor b/src/MakerPrompt.UI.MAUI/Components/Routes.razor
new file mode 100644
index 0000000..ea7eb52
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/Components/Routes.razor
@@ -0,0 +1,18 @@
+<ProcessError>
+    <GlobalErrorBoundary>
+        <AppInitializer>
+            <Router AppAssembly="@typeof(MauiProgram).Assembly" AdditionalAssemblies="new[] { typeof(MakerPrompt.UI.Components.App).Assembly }">
+                <Found Context="routeData">
+                    <RouteView RouteData="@routeData"
+                               DefaultLayout="@typeof(MakerPrompt.UI.Components.Layout.MainLayout)" />
+                    <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+                </Found>
+                <NotFound>
+                    <LayoutView Layout="@typeof(MakerPrompt.UI.Components.Layout.MainLayout)">
+                        <p role="alert">Sorry, there's nothing at this address.</p>
+                    </LayoutView>
+                </NotFound>
+            </Router>
+        </AppInitializer>
+    </GlobalErrorBoundary>
+</ProcessError>
diff --git a/MakerPrompt.MAUI/Components/_Imports.razor b/src/MakerPrompt.UI.MAUI/Components/_Imports.razor
similarity index 59%
rename from MakerPrompt.MAUI/Components/_Imports.razor
rename to src/MakerPrompt.UI.MAUI/Components/_Imports.razor
index f439ce0..f63b67f 100644
--- a/MakerPrompt.MAUI/Components/_Imports.razor
+++ b/src/MakerPrompt.UI.MAUI/Components/_Imports.razor
@@ -1,16 +1,16 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.JSInterop
-@using Microsoft.AspNetCore.Components.WebView
-@using Microsoft.AspNetCore.Components.WebView.Maui
-@using MakerPrompt.Shared
-@using MakerPrompt.Shared.Components
-@using MakerPrompt.Shared.Services
-@using BlazorBootstrap
-@using MakerPrompt.MAUI
-@using MakerPrompt.MAUI.Components
-@using MakerPrompt.Shared.Layout
\ No newline at end of file
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using Microsoft.AspNetCore.Components.WebView
+@using Microsoft.AspNetCore.Components.WebView.Maui
+@using MakerPrompt.UI.Components
+@using MakerPrompt.UI.Components.Components
+@using MakerPrompt.UI.Components.Services
+@using BlazorBootstrap
+@using MakerPrompt.UI.MAUI
+@using MakerPrompt.UI.MAUI.Components
+@using MakerPrompt.UI.Components.Layout
diff --git a/MakerPrompt.MAUI/MainPage.xaml b/src/MakerPrompt.UI.MAUI/MainPage.xaml
similarity index 79%
rename from MakerPrompt.MAUI/MainPage.xaml
rename to src/MakerPrompt.UI.MAUI/MainPage.xaml
index e5be8e1..c09730a 100644
--- a/MakerPrompt.MAUI/MainPage.xaml
+++ b/src/MakerPrompt.UI.MAUI/MainPage.xaml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:MakerPrompt.MAUI"
-             x:Class="MakerPrompt.MAUI.MainPage">
-
-    <BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
-        <BlazorWebView.RootComponents>
-            <RootComponent Selector="#app" ComponentType="{x:Type local:Components.Routes}" />
-        </BlazorWebView.RootComponents>
-    </BlazorWebView>
-
-</ContentPage>
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:MakerPrompt.UI.MAUI"
+             x:Class="MakerPrompt.UI.MAUI.MainPage">
+
+    <BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
+        <BlazorWebView.RootComponents>
+            <RootComponent Selector="#app" ComponentType="{x:Type local:Components.Routes}" />
+        </BlazorWebView.RootComponents>
+    </BlazorWebView>
+
+</ContentPage>
diff --git a/src/MakerPrompt.UI.MAUI/MainPage.xaml.cs b/src/MakerPrompt.UI.MAUI/MainPage.xaml.cs
new file mode 100644
index 0000000..11f853c
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/MainPage.xaml.cs
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Components.WebView.Maui;
+using Microsoft.Maui.Controls;
+
+namespace MakerPrompt.UI.MAUI;
+
+public partial class MainPage : ContentPage
+{
+    public MainPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/MakerPrompt.UI.MAUI/MakerPrompt.UI.MAUI.csproj b/src/MakerPrompt.UI.MAUI/MakerPrompt.UI.MAUI.csproj
new file mode 100644
index 0000000..d1d99e0
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/MakerPrompt.UI.MAUI.csproj
@@ -0,0 +1,74 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <TargetFrameworks>net10.0-android;net10.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
+
+    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">android-arm64;android-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
+
+    <OutputType>Exe</OutputType>
+    <RootNamespace>MakerPrompt.UI.MAUI</RootNamespace>
+    <UseMaui>true</UseMaui>
+    <SingleProject>true</SingleProject>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <EnableDefaultCssItems>false</EnableDefaultCssItems>
+    <Nullable>enable</Nullable>
+
+    <ApplicationTitle>MakerPrompt</ApplicationTitle>
+    <ApplicationId>com.makerprompt.maui.v2</ApplicationId>
+    <ApplicationDisplayVersion>0.5.0</ApplicationDisplayVersion>
+    <ApplicationVersion>0</ApplicationVersion>
+
+    <WindowsPackageType>None</WindowsPackageType>
+
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">24.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+  </PropertyGroup>
+
+  <!-- Platform-specific file exclusions ──────────────────────────────────── -->
+  <ItemGroup Condition="$(TargetFramework.Contains('-android')) != true">
+    <Compile Remove="**\*.Android.cs" />
+    <None Include="**\*.Android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.Contains('-ios')) != true">
+    <Compile Remove="**\*.iOS.cs" />
+    <None Include="**\*.iOS.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.Contains('-maccatalyst')) != true">
+    <Compile Remove="**\*.MacOS.cs" />
+    <None Include="**\*.MacOS.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="$(TargetFramework.Contains('-windows')) != true">
+    <Compile Remove="**\*.Windows.cs" />
+    <None Include="**\*.Windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
+
+  <!-- Resources ──────────────────────────────────────────────────────────── -->
+  <ItemGroup>
+    <MauiIcon Include="Resources\AppIcon\appicon.png" Color="#151E3F" />
+    <MauiSplashScreen Include="Resources\AppIcon\appicon.png" Color="#151E3F" BaseSize="128,128" />
+    <MauiFont Include="Resources\Fonts\*" />
+  </ItemGroup>
+
+  <!-- Packages ───────────────────────────────────────────────────────────── -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="10.0.30" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.30" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.2" />
+    <PackageReference Include="UsbSerialForAndroid.Net" Version="1.0.4" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'" />
+    <PackageReference Include="UsbSerialForMacOS" Version="0.9.5" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'" />
+  </ItemGroup>
+
+  <!-- Project references ─────────────────────────────────────────────────── -->
+  <ItemGroup>
+    <ProjectReference Include="..\MakerPrompt.UI.Components\MakerPrompt.UI.Components.csproj" />
+    <ProjectReference Include="..\MakerPrompt.Infrastructure\MakerPrompt.Infrastructure.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/MakerPrompt.UI.MAUI/MauiProgram.cs b/src/MakerPrompt.UI.MAUI/MauiProgram.cs
new file mode 100644
index 0000000..f884dd0
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/MauiProgram.cs
@@ -0,0 +1,82 @@
+using System.Globalization;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using MakerPrompt.UI.Components.Utils;
+using MakerPrompt.Infrastructure.Services.Printers;
+using MakerPrompt.UI.Components.Services;
+using MakerPrompt.UI.MAUI.Services;
+using MakerPrompt.UI.MAUI.Storage;
+using MakerPrompt.UI.Components.Infrastructure;
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.UI.MAUI;
+
+public static class MauiProgram
+{
+    public static MauiApp CreateMauiApp()
+    {
+        var builder = MauiApp.CreateBuilder();
+        builder
+            .UseMauiApp<App>()
+            .ConfigureFonts(fonts =>
+            {
+                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+            });
+
+        builder.Services.AddMauiBlazorWebView();
+        // Enable WebGL in the embedded WebView2 on Windows.
+        var webViewArgs = "--ignore-gpu-blocklist --enable-gpu-rasterization";
+#if DEBUG
+        // Append remote-debugging port so E2E tests can connect via CDP / Playwright.
+        webViewArgs += " --remote-debugging-port=9222";
+        builder.Services.AddBlazorWebViewDeveloperTools();
+        builder.Logging.AddDebug();
+#endif
+        Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", webViewArgs);
+
+        // Restore the user's saved language from MAUI Preferences before Blazor starts.
+        RestoreSavedCulture(new AppConfiguration().SupportedCultures);
+
+        builder.Services.RegisterMakerPromptSharedServices<AppConfigurationService, SerialService>();
+        // Override the passthrough camera proxy with MAUI native HttpClient fetcher
+        builder.Services.AddSingleton<ICameraProxyService, MauiCameraProxyService>();
+        builder.Services.AddScoped<IAppLocalStorageProvider, MauiAppLocalStorageProvider>();
+        // MAUI: Use AES-256-GCM encryption for stored credentials
+        var deviceId = DeviceInfo.Current.Idiom.ToString();
+        var deviceName = DeviceInfo.Current.Name ?? "default";
+        builder.Services.AddSingleton<IConnectionEncryptionService>(
+            new AesConnectionEncryptionService($"MakerPrompt-{deviceId}-{deviceName}"));
+
+        return builder.Build();
+    }
+
+    /// <summary>
+    /// Reads the saved language from MAUI Preferences and applies it to the
+    /// current thread before Blazor starts, so the first render uses the correct
+    /// culture.
+    /// </summary>
+    private static void RestoreSavedCulture(string[] supportedCultures)
+    {
+        try
+        {
+            var json = Preferences.Get("Mak3rPromptAppConfig", (string?)null);
+            if (json == null) return;
+
+            using var doc = JsonDocument.Parse(json);
+            if (!doc.RootElement.TryGetProperty("Language", out var langProp)) return;
+
+            var lang = langProp.GetString();
+            if (string.IsNullOrEmpty(lang)) return;
+            if (!supportedCultures.Contains(lang, StringComparer.OrdinalIgnoreCase)) return;
+
+            var culture = new CultureInfo(lang);
+            CultureInfo.DefaultThreadCurrentCulture = culture;
+            CultureInfo.DefaultThreadCurrentUICulture = culture;
+        }
+        catch
+        {
+            // Config not saved yet or corrupt — use default culture.
+        }
+    }
+}
+
diff --git a/MakerPrompt.MAUI/Platforms/Android/AndroidManifest.xml b/src/MakerPrompt.UI.MAUI/Platforms/Android/AndroidManifest.xml
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/Android/AndroidManifest.xml
rename to src/MakerPrompt.UI.MAUI/Platforms/Android/AndroidManifest.xml
diff --git a/MakerPrompt.MAUI/Platforms/Android/MainActivity.cs b/src/MakerPrompt.UI.MAUI/Platforms/Android/MainActivity.cs
similarity index 87%
rename from MakerPrompt.MAUI/Platforms/Android/MainActivity.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/Android/MainActivity.cs
index f8e6188..5a2e105 100644
--- a/MakerPrompt.MAUI/Platforms/Android/MainActivity.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/Android/MainActivity.cs
@@ -2,7 +2,7 @@
 using Android.Content.PM;
 using Android.OS;
 
-namespace MakerPrompt.MAUI
+namespace MakerPrompt.UI.MAUI.Platforms.Android
 {
     [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
     public class MainActivity : MauiAppCompatActivity
diff --git a/MakerPrompt.MAUI/Platforms/Android/MainApplication.cs b/src/MakerPrompt.UI.MAUI/Platforms/Android/MainApplication.cs
similarity index 84%
rename from MakerPrompt.MAUI/Platforms/Android/MainApplication.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/Android/MainApplication.cs
index 62eb589..9582e7e 100644
--- a/MakerPrompt.MAUI/Platforms/Android/MainApplication.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/Android/MainApplication.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Runtime;
 
-namespace MakerPrompt.MAUI
+namespace MakerPrompt.UI.MAUI.Platforms.Android
 {
     [Application]
     public class MainApplication : MauiApplication
diff --git a/MakerPrompt.MAUI/Platforms/Android/Resources/values/colors.xml b/src/MakerPrompt.UI.MAUI/Platforms/Android/Resources/values/colors.xml
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/Android/Resources/values/colors.xml
rename to src/MakerPrompt.UI.MAUI/Platforms/Android/Resources/values/colors.xml
diff --git a/MakerPrompt.MAUI/Platforms/iOS/AppDelegate.cs b/src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/AppDelegate.cs
similarity index 77%
rename from MakerPrompt.MAUI/Platforms/iOS/AppDelegate.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/AppDelegate.cs
index ccef331..4d6926d 100644
--- a/MakerPrompt.MAUI/Platforms/iOS/AppDelegate.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Foundation;
 
-namespace MakerPrompt.MAUI
+namespace MakerPrompt.UI.MAUI.Platforms.MacCatalyst
 {
     [Register("AppDelegate")]
     public class AppDelegate : MauiUIApplicationDelegate
diff --git a/MakerPrompt.MAUI/Platforms/MacCatalyst/Entitlements.plist b/src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/Entitlements.plist
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/MacCatalyst/Entitlements.plist
rename to src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/Entitlements.plist
diff --git a/MakerPrompt.MAUI/Platforms/MacCatalyst/Info.plist b/src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/Info.plist
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/MacCatalyst/Info.plist
rename to src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/Info.plist
diff --git a/MakerPrompt.MAUI/Platforms/MacCatalyst/Program.cs b/src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/Program.cs
similarity index 85%
rename from MakerPrompt.MAUI/Platforms/MacCatalyst/Program.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/Program.cs
index 4dc0ea7..703933e 100644
--- a/MakerPrompt.MAUI/Platforms/MacCatalyst/Program.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/MacCatalyst/Program.cs
@@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;
 
-namespace MakerPrompt.MAUI
+namespace MakerPrompt.UI.MAUI.Platforms.MacCatalyst
 {
     public class Program
     {
diff --git a/MakerPrompt.MAUI/Platforms/Tizen/Main.cs b/src/MakerPrompt.UI.MAUI/Platforms/Tizen/Main.cs
similarity index 87%
rename from MakerPrompt.MAUI/Platforms/Tizen/Main.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/Tizen/Main.cs
index 2728734..d9ed8c8 100644
--- a/MakerPrompt.MAUI/Platforms/Tizen/Main.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/Tizen/Main.cs
@@ -2,7 +2,7 @@
 using Microsoft.Maui;
 using Microsoft.Maui.Hosting;
 
-namespace MakerPrompt.MAUI
+namespace MakerPrompt.UI.MAUI
 {
     internal class Program : MauiApplication
     {
diff --git a/MakerPrompt.MAUI/Platforms/Tizen/tizen-manifest.xml b/src/MakerPrompt.UI.MAUI/Platforms/Tizen/tizen-manifest.xml
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/Tizen/tizen-manifest.xml
rename to src/MakerPrompt.UI.MAUI/Platforms/Tizen/tizen-manifest.xml
diff --git a/MakerPrompt.MAUI/Platforms/Windows/App.xaml b/src/MakerPrompt.UI.MAUI/Platforms/Windows/App.xaml
similarity index 68%
rename from MakerPrompt.MAUI/Platforms/Windows/App.xaml
rename to src/MakerPrompt.UI.MAUI/Platforms/Windows/App.xaml
index 96d4f05..742d1e4 100644
--- a/MakerPrompt.MAUI/Platforms/Windows/App.xaml
+++ b/src/MakerPrompt.UI.MAUI/Platforms/Windows/App.xaml
@@ -1,8 +1,8 @@
 <maui:MauiWinUIApplication
-    x:Class="MakerPrompt.MAUI.WinUI.App"
+    x:Class="MakerPrompt.UI.MAUI.WinUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:maui="using:Microsoft.Maui"
-    xmlns:local="using:MakerPrompt.MAUI.WinUI">
+    xmlns:local="using:MakerPrompt.UI.MAUI.WinUI">
 
 </maui:MauiWinUIApplication>
diff --git a/MakerPrompt.MAUI/Platforms/Windows/App.xaml.cs b/src/MakerPrompt.UI.MAUI/Platforms/Windows/App.xaml.cs
similarity index 92%
rename from MakerPrompt.MAUI/Platforms/Windows/App.xaml.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/Windows/App.xaml.cs
index 8bbafcc..c54ca54 100644
--- a/MakerPrompt.MAUI/Platforms/Windows/App.xaml.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/Windows/App.xaml.cs
@@ -1,7 +1,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace MakerPrompt.MAUI.WinUI
+namespace MakerPrompt.UI.MAUI.WinUI
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
diff --git a/MakerPrompt.MAUI/Platforms/Windows/Package.appxmanifest b/src/MakerPrompt.UI.MAUI/Platforms/Windows/Package.appxmanifest
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/Windows/Package.appxmanifest
rename to src/MakerPrompt.UI.MAUI/Platforms/Windows/Package.appxmanifest
diff --git a/MakerPrompt.MAUI/Platforms/Windows/app.manifest b/src/MakerPrompt.UI.MAUI/Platforms/Windows/app.manifest
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/Windows/app.manifest
rename to src/MakerPrompt.UI.MAUI/Platforms/Windows/app.manifest
diff --git a/MakerPrompt.MAUI/Platforms/MacCatalyst/AppDelegate.cs b/src/MakerPrompt.UI.MAUI/Platforms/iOS/AppDelegate.cs
similarity index 83%
rename from MakerPrompt.MAUI/Platforms/MacCatalyst/AppDelegate.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/iOS/AppDelegate.cs
index ccef331..c8e08eb 100644
--- a/MakerPrompt.MAUI/Platforms/MacCatalyst/AppDelegate.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/iOS/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Foundation;
 
-namespace MakerPrompt.MAUI
+namespace MakerPrompt.UI.MAUI
 {
     [Register("AppDelegate")]
     public class AppDelegate : MauiUIApplicationDelegate
diff --git a/MakerPrompt.MAUI/Platforms/iOS/Info.plist b/src/MakerPrompt.UI.MAUI/Platforms/iOS/Info.plist
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/iOS/Info.plist
rename to src/MakerPrompt.UI.MAUI/Platforms/iOS/Info.plist
diff --git a/MakerPrompt.MAUI/Platforms/iOS/Program.cs b/src/MakerPrompt.UI.MAUI/Platforms/iOS/Program.cs
similarity index 89%
rename from MakerPrompt.MAUI/Platforms/iOS/Program.cs
rename to src/MakerPrompt.UI.MAUI/Platforms/iOS/Program.cs
index 053610a..81116c3 100644
--- a/MakerPrompt.MAUI/Platforms/iOS/Program.cs
+++ b/src/MakerPrompt.UI.MAUI/Platforms/iOS/Program.cs
@@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;
 
-namespace MakerPrompt.MAUI
+namespace MakerPrompt.UI.MAUI
 {
     public class Program
     {
diff --git a/MakerPrompt.MAUI/Platforms/iOS/Resources/PrivacyInfo.xcprivacy b/src/MakerPrompt.UI.MAUI/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
similarity index 100%
rename from MakerPrompt.MAUI/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
rename to src/MakerPrompt.UI.MAUI/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
diff --git a/src/MakerPrompt.UI.MAUI/Resources/AppIcon/appicon.png b/src/MakerPrompt.UI.MAUI/Resources/AppIcon/appicon.png
new file mode 100644
index 0000000..94381b4
Binary files /dev/null and b/src/MakerPrompt.UI.MAUI/Resources/AppIcon/appicon.png differ
diff --git a/MakerPrompt.MAUI/Services/AppConfigurationService.cs b/src/MakerPrompt.UI.MAUI/Services/AppConfigurationService.cs
similarity index 84%
rename from MakerPrompt.MAUI/Services/AppConfigurationService.cs
rename to src/MakerPrompt.UI.MAUI/Services/AppConfigurationService.cs
index 9b30489..5746803 100644
--- a/MakerPrompt.MAUI/Services/AppConfigurationService.cs
+++ b/src/MakerPrompt.UI.MAUI/Services/AppConfigurationService.cs
@@ -1,8 +1,8 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Utils;
+using MakerPrompt.UI.Components.Infrastructure;
+using MakerPrompt.UI.Components.Utils;
 using System.Text.Json;
 
-namespace MakerPrompt.MAUI.Services
+namespace MakerPrompt.UI.MAUI.Services
 {
     public class AppConfigurationService : IAppConfigurationService
     {
diff --git a/MakerPrompt.MAUI/Services/MauiCameraProxyService.cs b/src/MakerPrompt.UI.MAUI/Services/MauiCameraProxyService.cs
similarity index 94%
rename from MakerPrompt.MAUI/Services/MauiCameraProxyService.cs
rename to src/MakerPrompt.UI.MAUI/Services/MauiCameraProxyService.cs
index b9da6fa..72f5a1f 100644
--- a/MakerPrompt.MAUI/Services/MauiCameraProxyService.cs
+++ b/src/MakerPrompt.UI.MAUI/Services/MauiCameraProxyService.cs
@@ -1,6 +1,6 @@
-using MakerPrompt.Shared.Services;
+using MakerPrompt.UI.Components.Services;
 
-namespace MakerPrompt.MAUI.Services
+namespace MakerPrompt.UI.MAUI.Services
 {
     /// <summary>
     /// MAUI camera proxy: fetches snapshot images via the native HttpClient,
diff --git a/src/MakerPrompt.UI.MAUI/Services/SerialService.Android.cs b/src/MakerPrompt.UI.MAUI/Services/SerialService.Android.cs
new file mode 100644
index 0000000..cab8d5d
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/Services/SerialService.Android.cs
@@ -0,0 +1,111 @@
+using System.Text;
+using MakerPrompt.Core.Models;
+using UsbSerialForAndroid.Net;
+using UsbSerialForAndroid.Net.Drivers;
+using UsbSerialForAndroid.Net.Helper;
+
+namespace MakerPrompt.UI.MAUI.Services;
+
+public partial class SerialService
+{
+    // ── Android state ────────────────────────────────────────────────────────
+    private UsbDriverBase? _usbDriver;
+    private CancellationTokenSource? _androidCts;
+    private Task? _androidReceiveTask;
+
+    // ── Transport hooks ──────────────────────────────────────────────────────
+
+    protected override Task OpenTransportAsync(PrinterConnectionSettings settings,
+        CancellationToken cancellationToken)
+    {
+        var deviceName = settings.PortName
+            ?? throw new ArgumentException("PortName (device name) is required for Android serial connections");
+        var baudRate = settings.BaudRate == 0 ? DefaultBaudRate : settings.BaudRate;
+
+        // Locate the USB device by name.
+        var usbDevice = UsbManagerHelper.GetAllUsbDevices()
+            .FirstOrDefault(d => d.DeviceName == deviceName)
+            ?? throw new InvalidOperationException($"USB device '{deviceName}' not found.");
+
+        // Request permission if not yet granted.
+        if (!UsbManagerHelper.HasPermission(usbDevice))
+            UsbManagerHelper.RequestPermission(usbDevice);
+
+        _usbDriver = UsbDriverFactory.CreateUsbDriver(usbDevice.DeviceId);
+        _usbDriver.Open(baudRate,
+            dataBits: 8,
+            stopBits: UsbSerialForAndroid.Net.Enums.StopBits.One,
+            parity: UsbSerialForAndroid.Net.Enums.Parity.None);
+
+        _androidCts?.Dispose();
+        _androidCts = new CancellationTokenSource();
+        _androidReceiveTask = Task.Run(() => ReceiveLoopAsync(_androidCts.Token));
+
+        return Task.CompletedTask;
+    }
+
+    protected override async Task CloseTransportAsync(CancellationToken cancellationToken)
+    {
+        _androidCts?.Cancel();
+
+        if (_androidReceiveTask is not null)
+            await _androidReceiveTask.ContinueWith(_ => { }, TaskContinuationOptions.None);
+
+        try { _usbDriver?.Close(); }
+        catch { /* Ignore close errors */ }
+
+        _usbDriver = null;
+        _androidCts?.Dispose();
+        _androidCts = null;
+    }
+
+    protected override Task WriteTransportAsync(string data, CancellationToken cancellationToken)
+    {
+        if (_usbDriver is null) return Task.CompletedTask;
+
+        // Android USB driver uses synchronous write — run on thread pool.
+        return Task.Run(() =>
+        {
+            var bytes = Encoding.ASCII.GetBytes(data + "\n");
+            _usbDriver.Write(bytes);
+        }, cancellationToken);
+    }
+
+    // ── Receive loop (Android) ───────────────────────────────────────────────
+
+    private async Task ReceiveLoopAsync(CancellationToken ct)
+    {
+        while (!ct.IsCancellationRequested && IsConnected)
+        {
+            try
+            {
+                if (_usbDriver is null) break;
+
+                // Android driver read is synchronous; offload to thread pool.
+                var bytes = await Task.Run(() => _usbDriver.Read(), ct);
+                if (bytes != null && bytes.Length > 0)
+                    ProcessReceivedData(Encoding.ASCII.GetString(bytes));
+
+                await Task.Delay(10, ct);
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"[SerialService.Android] Receive error: {ex.Message}");
+                await DisconnectAsync();
+                break;
+            }
+        }
+    }
+
+    // ── Available ports (Android — USB device names) ─────────────────────────
+
+    public static partial Task<IReadOnlyList<string>> GetAvailablePortsAsync()
+        => Task.FromResult<IReadOnlyList<string>>(
+            UsbManagerHelper.GetAllUsbDevices()
+                .Select(d => d.DeviceName)
+                .ToArray());
+}
diff --git a/src/MakerPrompt.UI.MAUI/Services/SerialService.ISerialService.cs b/src/MakerPrompt.UI.MAUI/Services/SerialService.ISerialService.cs
new file mode 100644
index 0000000..6660de1
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/Services/SerialService.ISerialService.cs
@@ -0,0 +1,19 @@
+namespace MakerPrompt.UI.MAUI.Services;
+
+/// <summary>
+/// Platform-conditional ISerialService members.
+/// iOS does not support direct USB/serial — all other platforms do.
+/// </summary>
+public partial class SerialService
+{
+#if IOS
+    public bool IsSupported => false;
+    public Task<bool> CheckSupportedAsync() => Task.FromResult(false);
+    public Task RequestPortAsync() => throw new PlatformNotSupportedException(
+        "Direct USB/serial connections are not supported on iOS.");
+#else
+    public bool IsSupported => true;
+    public Task<bool> CheckSupportedAsync() => Task.FromResult(true);
+    public Task RequestPortAsync() => Task.CompletedTask;
+#endif
+}
diff --git a/src/MakerPrompt.UI.MAUI/Services/SerialService.MacOS.cs b/src/MakerPrompt.UI.MAUI/Services/SerialService.MacOS.cs
new file mode 100644
index 0000000..e0e9662
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/Services/SerialService.MacOS.cs
@@ -0,0 +1,126 @@
+using System.Text;
+using System.Threading.Tasks.Dataflow;
+using MakerPrompt.Core.Models;
+using UsbSerialForMacOS;
+
+namespace MakerPrompt.UI.MAUI.Services;
+
+public partial class SerialService
+{
+    // ── macOS state ──────────────────────────────────────────────────────────
+    private UsbSerialManager? _manager;
+    private readonly BufferBlock<string> _macCommandQueue = new();
+    private CancellationTokenSource? _macCts;
+    private Task? _macSendTask;
+    private Task? _macReceiveTask;
+
+    // ── Transport hooks ──────────────────────────────────────────────────────
+
+    protected override Task OpenTransportAsync(PrinterConnectionSettings settings,
+        CancellationToken cancellationToken)
+    {
+        var portName = settings.PortName
+            ?? throw new ArgumentException("PortName is required for macOS serial connections");
+        var baudRate = settings.BaudRate == 0 ? DefaultBaudRate : settings.BaudRate;
+
+        _manager?.Close();
+        _manager = new UsbSerialManager();
+
+        var opened = _manager.Open(portName, baudRate);
+        if (!opened)
+            throw new InvalidOperationException($"Failed to open serial port '{portName}'");
+
+        _macCts?.Dispose();
+        _macCts = new CancellationTokenSource();
+
+        _macSendTask = Task.Run(() => SendLoopAsync(_macCts.Token));
+        _macReceiveTask = Task.Run(() => ReceiveLoopAsync(_macCts.Token));
+
+        return Task.CompletedTask;
+    }
+
+    protected override async Task CloseTransportAsync(CancellationToken cancellationToken)
+    {
+        _macCts?.Cancel();
+
+        if (_macSendTask is not null)
+            await _macSendTask.ContinueWith(_ => { }, TaskContinuationOptions.None);
+        if (_macReceiveTask is not null)
+            await _macReceiveTask.ContinueWith(_ => { }, TaskContinuationOptions.None);
+
+        try { _manager?.Close(); }
+        catch { /* Swallow close errors */ }
+
+        _manager = null;
+        _macCts?.Dispose();
+        _macCts = null;
+    }
+
+    protected override Task WriteTransportAsync(string data, CancellationToken cancellationToken)
+    {
+        if (_manager is null) return Task.CompletedTask;
+        return _macCommandQueue.SendAsync(data, cancellationToken);
+    }
+
+    // ── Send loop (macOS) ────────────────────────────────────────────────────
+
+    private async Task SendLoopAsync(CancellationToken ct)
+    {
+        try
+        {
+            while (!ct.IsCancellationRequested && IsConnected)
+            {
+                var command = await _macCommandQueue.ReceiveAsync(ct);
+                var mgr = _manager;
+                if (mgr is null || ct.IsCancellationRequested) break;
+
+                mgr.Write(command + "\n");
+                await Task.Delay(10, ct);
+            }
+        }
+        catch (OperationCanceledException) { }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"[SerialService.MacOS] Send loop error: {ex.Message}");
+        }
+    }
+
+    // ── Receive loop (macOS) ─────────────────────────────────────────────────
+
+    private async Task ReceiveLoopAsync(CancellationToken ct)
+    {
+        while (!ct.IsCancellationRequested && IsConnected)
+        {
+            try
+            {
+                var mgr = _manager;
+                if (mgr is null) break;
+
+                var bytes = mgr.Read(4096);
+                if (bytes.Length > 0)
+                    ProcessReceivedData(Encoding.UTF8.GetString(bytes.ToArray()));
+
+                await Task.Delay(10, ct);
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"[SerialService.MacOS] Receive error: {ex.Message}");
+                await DisconnectAsync();
+                break;
+            }
+        }
+    }
+
+    // ── Available ports (macOS) ──────────────────────────────────────────────
+
+    public static partial Task<IReadOnlyList<string>> GetAvailablePortsAsync()
+    {
+        var mgr = new UsbSerialManager();
+        return Task.FromResult<IReadOnlyList<string>>(
+            mgr.AvailablePorts().OrderBy(p => p).ToArray());
+    }
+}
diff --git a/src/MakerPrompt.UI.MAUI/Services/SerialService.Windows.cs b/src/MakerPrompt.UI.MAUI/Services/SerialService.Windows.cs
new file mode 100644
index 0000000..7df5e53
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/Services/SerialService.Windows.cs
@@ -0,0 +1,150 @@
+using System.IO.Ports;
+using System.Text;
+using System.Threading.Tasks.Dataflow;
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.UI.MAUI.Services;
+
+public partial class SerialService
+{
+    // ── Windows state ────────────────────────────────────────────────────────
+    private SerialPort? _serialPort;
+    private readonly BufferBlock<string> _commandQueue = new();
+    private CancellationTokenSource? _cts;
+    private Task? _sendTask;
+    private Task? _receiveTask;
+
+    // ── Transport hooks ──────────────────────────────────────────────────────
+
+    protected override Task OpenTransportAsync(PrinterConnectionSettings settings,
+        CancellationToken cancellationToken)
+    {
+        _serialPort = new SerialPort
+        {
+            PortName = settings.PortName
+                ?? throw new ArgumentException("PortName is required for Serial connections"),
+            BaudRate = settings.BaudRate == 0 ? DefaultBaudRate : settings.BaudRate,
+            DataBits = 8,
+            Parity = Parity.None,
+            StopBits = StopBits.One,
+            Handshake = Handshake.None,
+            DtrEnable = true,
+            RtsEnable = true,
+            ReadTimeout = 2000,
+            WriteTimeout = 5000,
+            NewLine = "\n",
+            Encoding = Encoding.ASCII
+        };
+
+        _serialPort.Open();
+
+        _cts?.Dispose();
+        _cts = new CancellationTokenSource();
+
+        _sendTask = Task.Run(() => SendLoopAsync(_cts.Token));
+        _receiveTask = Task.Run(() => ReceiveLoopAsync(_cts.Token));
+
+        return Task.CompletedTask;
+    }
+
+    protected override async Task CloseTransportAsync(CancellationToken cancellationToken)
+    {
+        if (_cts is { } cts)
+        {
+            cts.Cancel();
+
+            if (_sendTask is not null)
+                // Suppress faults from the shutting-down send loop — intentional.
+                await _sendTask.ContinueWith(_ => { }, TaskContinuationOptions.None);
+            if (_receiveTask is not null)
+                await _receiveTask.ContinueWith(_ => { }, TaskContinuationOptions.None);
+        }
+
+        if (_serialPort is { IsOpen: true })
+        {
+            await Task.Run(() =>
+            {
+                try
+                {
+                    _serialPort.DiscardInBuffer();
+                    _serialPort.DiscardOutBuffer();
+                    _serialPort.Close();
+                }
+                catch
+                {
+                    // Ignore close errors during shutdown.
+                }
+            });
+        }
+
+        _serialPort?.Dispose();
+        _serialPort = null;
+        _cts?.Dispose();
+        _cts = null;
+    }
+
+    protected override async Task WriteTransportAsync(string data, CancellationToken cancellationToken)
+    {
+        if (_serialPort is not { IsOpen: true }) return;
+        await _commandQueue.SendAsync(data, cancellationToken);
+    }
+
+    // ── Send loop (Windows) ──────────────────────────────────────────────────
+
+    private async Task SendLoopAsync(CancellationToken ct)
+    {
+        try
+        {
+            while (!ct.IsCancellationRequested && IsConnected)
+            {
+                var command = await _commandQueue.ReceiveAsync(ct);
+                if (_serialPort is not { IsOpen: true }) break;
+
+                var payload = Encoding.ASCII.GetBytes(command + "\n");
+                await _serialPort.BaseStream.WriteAsync(payload, ct);
+                await _serialPort.BaseStream.FlushAsync(ct);
+                await Task.Delay(10, ct);
+            }
+        }
+        catch (OperationCanceledException) { }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"[SerialService.Windows] Send loop error: {ex.Message}");
+        }
+    }
+
+    // ── Receive loop (Windows) ───────────────────────────────────────────────
+
+    private async Task ReceiveLoopAsync(CancellationToken ct)
+    {
+        var buffer = new byte[4096];
+        while (!ct.IsCancellationRequested && IsConnected)
+        {
+            try
+            {
+                if (_serialPort is not { IsOpen: true }) break;
+
+                var bytesRead = await _serialPort.BaseStream.ReadAsync(buffer, ct);
+                if (bytesRead > 0)
+                    ProcessReceivedData(Encoding.ASCII.GetString(buffer, 0, bytesRead));
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                // Swallow receive errors — surface only as disconnection.
+                Console.WriteLine($"[SerialService.Windows] Receive loop error: {ex.Message}");
+                await DisconnectAsync();
+                break;
+            }
+        }
+    }
+
+    // ── Available ports (Windows) ────────────────────────────────────────────
+
+    public static partial Task<IReadOnlyList<string>> GetAvailablePortsAsync()
+        => Task.FromResult<IReadOnlyList<string>>(
+            SerialPort.GetPortNames().OrderBy(p => p).ToArray());
+}
diff --git a/src/MakerPrompt.UI.MAUI/Services/SerialService.cs b/src/MakerPrompt.UI.MAUI/Services/SerialService.cs
new file mode 100644
index 0000000..fa6f252
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/Services/SerialService.cs
@@ -0,0 +1,30 @@
+using MakerPrompt.Infrastructure.Services;
+using MakerPrompt.Infrastructure.Services.Printers;
+
+namespace MakerPrompt.UI.MAUI.Services;
+
+/// <summary>
+/// Platform-specific serial communication service.
+///
+/// Split across per-platform files:
+///   SerialService.Windows.cs  – System.IO.Ports.SerialPort
+///   SerialService.Android.cs  – UsbSerialForAndroid.Net
+///   SerialService.MacOS.cs    – UsbSerialForMacOS
+///   SerialService.iOS.cs      – stub (not supported)
+///
+/// <see cref="SerialCommunicationServiceBase"/> handles all G-code command
+/// building and Marlin response parsing.  Each platform file overrides only:
+///   • OpenTransportAsync  — open the hardware port
+///   • CloseTransportAsync — close hardware resources
+///   • WriteTransportAsync — write a G-code line to the port
+/// </summary>
+public partial class SerialService : SerialCommunicationServiceBase, ISerialService
+{
+    // Static platform-provided port enumeration.
+    public static partial Task<IReadOnlyList<string>> GetAvailablePortsAsync();
+
+    // ISerialService instance wrapper — delegates to the static platform method.
+    Task<IEnumerable<string>> ISerialService.GetAvailablePortsAsync() =>
+        GetAvailablePortsAsync().ContinueWith(t => t.Result.AsEnumerable());
+}
+
diff --git a/src/MakerPrompt.UI.MAUI/Services/SerialService.iOS.cs b/src/MakerPrompt.UI.MAUI/Services/SerialService.iOS.cs
new file mode 100644
index 0000000..d93dc5b
--- /dev/null
+++ b/src/MakerPrompt.UI.MAUI/Services/SerialService.iOS.cs
@@ -0,0 +1,27 @@
+using MakerPrompt.Core.Models;
+
+namespace MakerPrompt.UI.MAUI.Services;
+
+/// <summary>
+/// iOS serial service stub.
+/// Direct USB/serial connections are not supported on iOS (sandboxing restrictions).
+/// The class satisfies the partial class requirement but throws on any attempt to connect.
+/// </summary>
+public partial class SerialService
+{
+    protected override Task OpenTransportAsync(PrinterConnectionSettings settings,
+        CancellationToken cancellationToken)
+        => throw new PlatformNotSupportedException(
+            "Direct USB/serial connections are not supported on iOS. " +
+            "Use a network-based backend (Moonraker, PrusaLink) instead.");
+
+    protected override Task CloseTransportAsync(CancellationToken cancellationToken)
+        => Task.CompletedTask;
+
+    protected override Task WriteTransportAsync(string data, CancellationToken cancellationToken)
+        => throw new PlatformNotSupportedException(
+            "Direct USB/serial connections are not supported on iOS.");
+
+    public static partial Task<IReadOnlyList<string>> GetAvailablePortsAsync()
+        => Task.FromResult<IReadOnlyList<string>>([]);
+}
diff --git a/MakerPrompt.MAUI/Storage/MauiAppLocalStorageProvider.cs b/src/MakerPrompt.UI.MAUI/Storage/MauiAppLocalStorageProvider.cs
similarity index 95%
rename from MakerPrompt.MAUI/Storage/MauiAppLocalStorageProvider.cs
rename to src/MakerPrompt.UI.MAUI/Storage/MauiAppLocalStorageProvider.cs
index 4ebf612..e33f894 100644
--- a/MakerPrompt.MAUI/Storage/MauiAppLocalStorageProvider.cs
+++ b/src/MakerPrompt.UI.MAUI/Storage/MauiAppLocalStorageProvider.cs
@@ -1,7 +1,7 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
+using MakerPrompt.Core.Models;
+using MakerPrompt.UI.Components.Infrastructure;
 
-namespace MakerPrompt.MAUI.Storage
+namespace MakerPrompt.UI.MAUI.Storage
 {
     public sealed class MauiAppLocalStorageProvider : IAppLocalStorageProvider
     {
diff --git a/MakerPrompt.MAUI/wwwroot/index.html b/src/MakerPrompt.UI.MAUI/wwwroot/index.html
similarity index 66%
rename from MakerPrompt.MAUI/wwwroot/index.html
rename to src/MakerPrompt.UI.MAUI/wwwroot/index.html
index 60dfb72..a0a7c1a 100644
--- a/MakerPrompt.MAUI/wwwroot/index.html
+++ b/src/MakerPrompt.UI.MAUI/wwwroot/index.html
@@ -1,40 +1,40 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
-    <title>MakerPrompt</title>
-    <base href="/" />
-    <link rel="stylesheet" href="_content/MakerPrompt.Shared/lib/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="_content/MakerPrompt.Shared/lib/bootstrap-icons/font/bootstrap-icons.min.css" />
-    <link rel="stylesheet" href="_content/Blazor.Bootstrap/blazor.bootstrap.css" />
-    <link rel="stylesheet" href="_content/MakerPrompt.Shared/css/app.css" />
-    <link rel="stylesheet" href="MakerPrompt.MAUI.styles.css" />
-    <link rel="icon" type="image/png" href="_content/MakerPrompt.Shared/favicon.png" />
-</head>
-
-<body>
-
-    <div class="status-bar-safe-area"></div>
-
-    <div id="app">Loading...</div>
-
-    <div id="blazor-error-ui">
-        An unhandled error has occurred.
-        <a href="" class="reload">Reload</a>
-        <a class="dismiss">🗙</a>
-    </div>
-
-    <script src="_content/MakerPrompt.Shared/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
-    <script src="_content/MakerPrompt.Shared/lib/gcode-preview/gcode-preview.bundle.js"></script>
-    <script src="_framework/blazor.webview.js" autostart="false"></script>
-    <script src="_content/Blazor.Bootstrap/blazor.bootstrap.js"></script>
-    <script>
-        window.blazorCulture = {
-            get: () => window.localStorage['BlazorCulture'],
-            set: (value) => window.localStorage['BlazorCulture'] = value
-        };
-    </script>
-</body>
-
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
+    <title>MakerPrompt</title>
+    <base href="/" />
+    <link rel="stylesheet" href="_content/MakerPrompt.UI.Components/lib/bootstrap/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="_content/MakerPrompt.UI.Components/lib/bootstrap-icons/font/bootstrap-icons.min.css" />
+    <link rel="stylesheet" href="_content/Blazor.Bootstrap/blazor.bootstrap.css" />
+    <link rel="stylesheet" href="_content/MakerPrompt.UI.Components/css/app.css" />
+    <link rel="stylesheet" href="MakerPrompt.MAUI.styles.css" />
+    <link rel="icon" type="image/png" href="_content/MakerPrompt.UI.Components/favicon.png" />
+</head>
+
+<body>
+
+    <div class="status-bar-safe-area"></div>
+
+    <div id="app">Loading...</div>
+
+    <div id="blazor-error-ui">
+        An unhandled error has occurred.
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+
+    <script src="_content/MakerPrompt.UI.Components/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <script src="_content/MakerPrompt.UI.Components/lib/gcode-preview/gcode-preview.bundle.js"></script>
+    <script src="_framework/blazor.webview.js" autostart="false"></script>
+    <script src="_content/Blazor.Bootstrap/blazor.bootstrap.js"></script>
+    <script>
+        window.blazorCulture = {
+            get: () => window.localStorage['BlazorCulture'],
+            set: (value) => window.localStorage['BlazorCulture'] = value
+        };
+    </script>
+</body>
+
 </html>
\ No newline at end of file
diff --git a/MakerPrompt.E2E.Maui/Fixtures/AlphabeticalOrderer.cs b/tests/MakerPrompt.Tests.E2E.Maui/Fixtures/AlphabeticalOrderer.cs
similarity index 92%
rename from MakerPrompt.E2E.Maui/Fixtures/AlphabeticalOrderer.cs
rename to tests/MakerPrompt.Tests.E2E.Maui/Fixtures/AlphabeticalOrderer.cs
index 5fed64f..7de225b 100644
--- a/MakerPrompt.E2E.Maui/Fixtures/AlphabeticalOrderer.cs
+++ b/tests/MakerPrompt.Tests.E2E.Maui/Fixtures/AlphabeticalOrderer.cs
@@ -1,7 +1,7 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
-namespace MakerPrompt.E2E.Maui.Fixtures;
+namespace MakerPrompt.Test.E2E.Maui.Fixtures;
 
 /// <summary>
 /// Orders test cases alphabetically by class name then method name.
diff --git a/MakerPrompt.E2E.Maui/Fixtures/AppiumSetup.cs b/tests/MakerPrompt.Tests.E2E.Maui/Fixtures/AppiumSetup.cs
similarity index 90%
rename from MakerPrompt.E2E.Maui/Fixtures/AppiumSetup.cs
rename to tests/MakerPrompt.Tests.E2E.Maui/Fixtures/AppiumSetup.cs
index 14f496f..c64633c 100644
--- a/MakerPrompt.E2E.Maui/Fixtures/AppiumSetup.cs
+++ b/tests/MakerPrompt.Tests.E2E.Maui/Fixtures/AppiumSetup.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using Microsoft.Playwright;
 
-namespace MakerPrompt.E2E.Maui.Fixtures;
+namespace MakerPrompt.Test.E2E.Maui.Fixtures;
 
 /// <summary>
 /// xUnit collection fixture that launches the MAUI app as a native process and
@@ -107,8 +107,13 @@ public async Task DisposeAsync()
     /// a full WebView2 page reload. A full GotoAsync would destroy the Blazor circuit
     /// because blazor.webview.js has autostart="false" and the BlazorWebView handler
     /// may not reinitialize Blazor after a CDP-triggered navigation.
+    /// <para>
+    /// Pass <paramref name="waitForSelector"/> to block until a specific element
+    /// appears on the target page. Prefer this over the default 500ms fixed delay
+    /// whenever the target page has a reliable landmark element.
+    /// </para>
     /// </summary>
-    public static async Task NavigateAsync(string relativePath)
+    public static async Task NavigateAsync(string relativePath, string? waitForSelector = null, int timeout = 15_000)
     {
         var path = relativePath.StartsWith("/") ? relativePath : $"/{relativePath}";
 
@@ -121,8 +126,16 @@ await Page.EvaluateAsync(@$"
             }})()
         ");
 
-        // Give Blazor's router time to process the route change and render
-        await Page.WaitForTimeoutAsync(500);
+        if (waitForSelector != null)
+        {
+            await Page.WaitForSelectorAsync(waitForSelector,
+                new PageWaitForSelectorOptions { Timeout = timeout });
+        }
+        else
+        {
+            // Fallback: give Blazor's router time to process the route change
+            await Page.WaitForTimeoutAsync(500);
+        }
     }
 
     /// <summary>
@@ -228,7 +241,7 @@ private static string ResolveAppPath()
         var dir = AppContext.BaseDirectory;
         while (dir != null)
         {
-            var mauiBin = Path.Combine(dir, "MakerPrompt.MAUI", "bin");
+            var mauiBin = Path.Combine(dir, "src", "MakerPrompt.UI.MAUI", "bin");
             if (Directory.Exists(mauiBin))
             {
                 foreach (var config in configs)
@@ -236,11 +249,11 @@ private static string ResolveAppPath()
                     foreach (var tfm in tfms)
                     {
                         // TFM-only (default VS / dotnet build output)
-                        var direct = Path.Combine(mauiBin, config, tfm, "MakerPrompt.MAUI.exe");
+                        var direct = Path.Combine(mauiBin, config, tfm, "MakerPrompt.UI.MAUI.exe");
                         if (File.Exists(direct)) return direct;
 
                         // TFM + RID (dotnet build -r win-x64)
-                        var withRid = Path.Combine(mauiBin, config, tfm, "win-x64", "MakerPrompt.MAUI.exe");
+                        var withRid = Path.Combine(mauiBin, config, tfm, "win-x64", "MakerPrompt.UI.MAUI.exe");
                         if (File.Exists(withRid)) return withRid;
                     }
                 }
@@ -250,7 +263,7 @@ private static string ResolveAppPath()
         }
 
         throw new FileNotFoundException(
-            "Could not find MakerPrompt.MAUI.exe. " +
+            "Could not find MakerPrompt.UI.MAUI.exe. " +
             "Build the MAUI project for Windows first:\n" +
             "  dotnet build MakerPrompt.MAUI -f net10.0-windows10.0.19041.0\n" +
             "Or set MAUI_APP_PATH environment variable to the built exe path.");
diff --git a/MakerPrompt.E2E.Maui/MakerPrompt.E2E.Maui.csproj b/tests/MakerPrompt.Tests.E2E.Maui/MakerPrompt.Test.E2E.Maui.csproj
similarity index 100%
rename from MakerPrompt.E2E.Maui/MakerPrompt.E2E.Maui.csproj
rename to tests/MakerPrompt.Tests.E2E.Maui/MakerPrompt.Test.E2E.Maui.csproj
diff --git a/MakerPrompt.E2E.Maui/Tests/AppLaunchTests.cs b/tests/MakerPrompt.Tests.E2E.Maui/Tests/AppLaunchTests.cs
similarity index 97%
rename from MakerPrompt.E2E.Maui/Tests/AppLaunchTests.cs
rename to tests/MakerPrompt.Tests.E2E.Maui/Tests/AppLaunchTests.cs
index 890726e..29869f2 100644
--- a/MakerPrompt.E2E.Maui/Tests/AppLaunchTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Maui/Tests/AppLaunchTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Maui.Fixtures;
+using MakerPrompt.Test.E2E.Maui.Fixtures;
 
-namespace MakerPrompt.E2E.Maui.Tests;
+namespace MakerPrompt.Test.E2E.Maui.Tests;
 
 /// <summary>
 /// Verifies the MAUI app launches and the Blazor WebView renders correctly.
diff --git a/MakerPrompt.E2E.Maui/Tests/FarmModeTests.cs b/tests/MakerPrompt.Tests.E2E.Maui/Tests/FarmModeTests.cs
similarity index 84%
rename from MakerPrompt.E2E.Maui/Tests/FarmModeTests.cs
rename to tests/MakerPrompt.Tests.E2E.Maui/Tests/FarmModeTests.cs
index 7ece36b..ad122ce 100644
--- a/MakerPrompt.E2E.Maui/Tests/FarmModeTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Maui/Tests/FarmModeTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Maui.Fixtures;
+using MakerPrompt.Test.E2E.Maui.Fixtures;
 
-namespace MakerPrompt.E2E.Maui.Tests;
+namespace MakerPrompt.Test.E2E.Maui.Tests;
 
 /// <summary>
 /// End-to-end tests for the farm mode feature in the MAUI app.
@@ -56,28 +56,22 @@ public async Task FarmMode_C_Enabled_RedirectsToFleet()
     {
         await NavigateToSettingsAsync();
 
-        // Enable farm mode
+        // Enable farm mode — OnFarmModeChangedAsync saves and auto-navigates to /fleet
         var toggle = Page.Locator("#farmModeEnabled");
         if (!await toggle.IsCheckedAsync())
         {
             await toggle.CheckAsync();
+            // Wait for the fleet add-btn to confirm the navigation completed
+            await Page.Locator("[data-testid='fleet-add-btn']").WaitForAsync(
+                new LocatorWaitForOptions { Timeout = 15_000 });
         }
-        await SaveSettingsAsync();
 
         // Navigate to root — should redirect to fleet
-        await AppiumSetup.NavigateAsync("/");
+        await AppiumSetup.NavigateAsync("/", waitForSelector: "[data-testid='fleet-add-btn']");
         var addButton = Page.Locator("[data-testid='fleet-add-btn']");
-        await addButton.WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
         Assert.True(await addButton.IsVisibleAsync(), "Root should redirect to Fleet when farm mode is on");
 
-        // Restore default (disabled)
-        await NavigateToSettingsAsync();
-        toggle = Page.Locator("#farmModeEnabled");
-        if (await toggle.IsCheckedAsync())
-        {
-            await toggle.UncheckAsync();
-        }
-        await SaveSettingsAsync();
+        await RestoreDefaultFarmModeAsync();
     }
 
     [Fact]
@@ -131,7 +125,7 @@ public async Task FarmName_F_ShowsInSidebar_WhenFarmModeEnabled()
         await Page.WaitForTimeoutAsync(500);
 
         // Switch to the newly created farm
-        var selectEl = Page.Locator("select");
+        var selectEl = Page.Locator("select.form-select").First;
         await selectEl.SelectOptionAsync(new SelectOptionValue { Label = "Sidebar Test Farm" });
         var switchBtn = Page.Locator("[data-testid='farm-switch-btn']");
         await switchBtn.ClickAsync();
@@ -173,7 +167,7 @@ public async Task FarmConfig_G_CreateNewFarm()
         await Page.WaitForTimeoutAsync(1000);
 
         // The new farm should appear in the dropdown
-        var option = Page.Locator("select option:has-text('MAUI E2E Farm')");
+        var option = Page.Locator("select.form-select option:has-text('MAUI E2E Farm')");
         Assert.True(await option.CountAsync() > 0, "Created farm should appear in the dropdown");
 
         await RestoreDefaultFarmModeAsync();
@@ -243,12 +237,20 @@ private static async Task NavigateToSettingsAsync()
 
     private static async Task SaveSettingsAsync()
     {
-        await Page.Locator("[data-testid='save-settings-btn']").ClickAsync();
+        // Settings saves automatically via @bind:after — no explicit save button.
+        // Wait for Blazor's change handler and any navigation side-effect to settle.
         await Page.WaitForTimeoutAsync(1000);
     }
 
     /// <summary>
-    /// Ensures farm mode is enabled and the farm configuration section is visible.
+    /// Ensures farm mode is enabled and navigates back to settings so the
+    /// farm configuration section is visible.
+    /// <para>
+    /// Enabling farm mode triggers <c>OnFarmModeChangedAsync</c> which saves
+    /// config and calls <c>NavigationManager.NavigateTo("/fleet")</c>. We wait
+    /// for the fleet add-btn (DOM-based, reliable in WebView2) then navigate
+    /// back to settings before callers interact with the farm config section.
+    /// </para>
     /// </summary>
     private static async Task EnableFarmModeAsync()
     {
@@ -257,9 +259,13 @@ private static async Task EnableFarmModeAsync()
         if (!await toggle.IsCheckedAsync())
         {
             await toggle.CheckAsync();
-            await SaveSettingsAsync();
-            await NavigateToSettingsAsync();
+            // Wait for the fleet page to confirm navigation completed
+            await Page.Locator("[data-testid='fleet-add-btn']").WaitForAsync(
+                new LocatorWaitForOptions { Timeout = 15_000 });
         }
+
+        // Navigate back to settings so farm config section is accessible
+        await AppiumSetup.NavigateAsync("/settings", waitForSelector: "#farmNewName");
     }
 
     /// <summary>
diff --git a/tests/MakerPrompt.Tests.E2E.Maui/Tests/FleetWorkflowTests.cs b/tests/MakerPrompt.Tests.E2E.Maui/Tests/FleetWorkflowTests.cs
new file mode 100644
index 0000000..503c8be
--- /dev/null
+++ b/tests/MakerPrompt.Tests.E2E.Maui/Tests/FleetWorkflowTests.cs
@@ -0,0 +1,201 @@
+using Microsoft.Playwright;
+using MakerPrompt.Test.E2E.Maui.Fixtures;
+
+namespace MakerPrompt.Test.E2E.Maui.Tests;
+
+/// <summary>
+/// Fleet workflow tests for the MAUI app via Playwright + CDP.
+/// Covers: add printer → connect demo → telemetry → disconnect.
+/// Mirrors the WASM FleetWorkflowTests but runs inside the MAUI WebView2.
+///
+/// Each test run uses a unique name suffix so printers from previous runs
+/// don't cause strict-mode violations. MAUI stores printer data on the
+/// filesystem (not browser localStorage), and the PrinterConnectionManager
+/// singleton keeps state in memory — JS cleanup can't clear either. Unique
+/// names sidestep this entirely.
+///
+/// IAsyncLifetime.DisposeAsync deletes all remaining printer cards via the
+/// fleet UI so test runs don't accumulate stale printers.
+/// </summary>
+[Collection("Appium")]
+[Trait("Category", "E2E-Maui")]
+[TestCaseOrderer("MakerPrompt.E2E.Maui.Fixtures.AlphabeticalOrderer", "MakerPrompt.E2E.Maui")]
+public class FleetWorkflowTests : IAsyncLifetime
+{
+    private static IPage Page => AppiumSetup.Page;
+
+    // Unique suffix per test run so locators never match old printers
+    private static readonly string S = DateTime.UtcNow.Ticks.ToString()[^6..];
+
+    public Task InitializeAsync() => Task.CompletedTask;
+
+    public async Task DisposeAsync() => await DeleteAllPrintersAsync();
+
+    [Fact]
+    public async Task Fleet_AddPrinter_Demo_Mode()
+    {
+        await NavigateToFleetAsync();
+
+        var name = $"Add {S}";
+        await Page.Locator("[data-testid='fleet-add-btn']").ClickAsync();
+
+        var nameInput = Page.Locator("#printerNameInput");
+        await nameInput.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
+        await nameInput.FillAsync(name);
+
+        // Demo is the default connection type — click Save
+        await Page.Locator("[data-testid='fleet-save-printer-btn']").ClickAsync();
+
+        var card = Page.Locator($".card strong:has-text('{name}')").First;
+        await card.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
+        Assert.True(await card.IsVisibleAsync());
+    }
+
+    [Fact]
+    public async Task Fleet_ConnectDemoPrinter()
+    {
+        await NavigateToFleetAsync();
+        var name = $"Conn {S}";
+        await AddDemoPrinterAsync(name);
+        await SelectAndConnectAsync(name);
+
+        var badge = Page.Locator(".badge.bg-success");
+        await badge.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
+        Assert.True(await badge.IsVisibleAsync());
+    }
+
+    [Fact]
+    public async Task Fleet_TelemetryUpdates()
+    {
+        await NavigateToFleetAsync();
+        var name = $"Tele {S}";
+        await AddDemoPrinterAsync(name);
+        await SelectAndConnectAsync(name);
+
+        // After connecting the demo printer the Fleet page switches to the inline
+        // ControlPanel view. The Heating card header is the first stable landmark.
+        var heatingHeader = Page.Locator(".card-header span.fw-semibold",
+            new PageLocatorOptions { HasText = "Heating" });
+        await heatingHeader.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
+        Assert.True(await heatingHeader.IsVisibleAsync());
+
+        // The temperature input groups each end with an °C span.
+        // Use :has-text('°C') which matches the literal degree symbol rendered by Blazor.
+        var tempUnit = Page.Locator(".input-group-text:has-text('°C')");
+        await tempUnit.First.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
+        Assert.True(await tempUnit.First.IsVisibleAsync());
+    }
+
+    [Fact]
+    public async Task Fleet_DisconnectPrinter()
+    {
+        await NavigateToFleetAsync();
+        var name = $"Disc {S}";
+        await AddDemoPrinterAsync(name);
+        await SelectAndConnectAsync(name);
+
+        var disconnectBtn = Page.Locator("button.btn-outline-danger:has(.bi-x-circle)");
+        await disconnectBtn.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
+        await disconnectBtn.ClickAsync();
+
+        var disconnectedIcon = Page.Locator($".card:has-text('{name}') .bi-plug.text-muted").First;
+        await disconnectedIcon.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
+        Assert.True(await disconnectedIcon.IsVisibleAsync());
+    }
+
+    // ── Helpers ──
+
+    /// <summary>
+    /// Ensures farm mode is on, then navigates to the Fleet page.
+    /// Fleet's add-printer button is only present when farm mode is enabled.
+    /// Uses DOM-based waits throughout — WaitForURLAsync is unreliable in
+    /// WebView2/CDP because Blazor's NavigationManager uses history.pushState
+    /// which does not fire CDP network navigation events.
+    /// </summary>
+    private static async Task NavigateToFleetAsync()
+    {
+        // Navigate to settings and wait until the farm mode toggle is rendered
+        await AppiumSetup.NavigateAsync("/settings", waitForSelector: "#farmModeEnabled");
+
+        var toggle = Page.Locator("#farmModeEnabled");
+        if (!await toggle.IsCheckedAsync())
+        {
+            await toggle.CheckAsync();
+            // OnFarmModeChangedAsync saves config then calls NavigationManager.NavigateTo("/fleet").
+            // That is another pushState — wait for the fleet add-btn to appear instead
+            // of WaitForURLAsync which won't fire for Blazor client-side navigation.
+            await Page.Locator("[data-testid='fleet-add-btn']").WaitForAsync(
+                new LocatorWaitForOptions { Timeout = 15_000 });
+        }
+        else
+        {
+            // Already enabled — navigate to fleet and wait for the add-btn
+            await AppiumSetup.NavigateAsync("/fleet", waitForSelector: "[data-testid='fleet-add-btn']");
+        }
+    }
+
+    private static async Task AddDemoPrinterAsync(string name)
+    {
+        await Page.Locator("[data-testid='fleet-add-btn']").ClickAsync();
+        var nameInput = Page.Locator("#printerNameInput");
+        await nameInput.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
+        await nameInput.FillAsync(name);
+        await Page.Locator("[data-testid='fleet-save-printer-btn']").ClickAsync();
+        await Page.Locator($".card strong:has-text('{name}')").First.WaitForAsync(
+            new LocatorWaitForOptions { Timeout = 5_000 });
+    }
+
+    private static async Task SelectAndConnectAsync(string name)
+    {
+        await Page.Locator($".card:has-text('{name}')").First.ClickAsync();
+
+        var connectBtn = Page.Locator($".card:has-text('{name}') button.btn-outline-success").First;
+        await connectBtn.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
+        await connectBtn.ClickAsync();
+
+        await Page.Locator(".badge.bg-success").WaitForAsync(
+            new LocatorWaitForOptions { Timeout = 10_000 });
+    }
+
+    /// <summary>
+    /// Deletes every printer card visible on the fleet page.
+    /// Called from DisposeAsync so each test class instance leaves the app clean.
+    /// Silently exits if the fleet page is not reachable or no printers are present.
+    /// </summary>
+    private static async Task DeleteAllPrintersAsync()
+    {
+        try
+        {
+            // Navigate back to fleet (may already be there after the last test)
+            await AppiumSetup.NavigateAsync("/fleet", waitForSelector: ".container-fluid");
+
+            // If we landed on the inline ControlPanel (a printer is selected + connected),
+            // go back to the card grid first
+            var backBtn = Page.Locator("button.btn-outline-secondary:has(.bi-arrow-left)");
+            if (await backBtn.IsVisibleAsync())
+                await backBtn.ClickAsync();
+
+            // Repeatedly select the first card and delete it until none remain
+            while (true)
+            {
+                var cards = Page.Locator(".row.row-cols-1 .card");
+                if (await cards.CountAsync() == 0)
+                    break;
+
+                // Select the card to reveal the delete button
+                await cards.First.ClickAsync();
+
+                var deleteBtn = Page.Locator("button.btn-outline-danger:has(.bi-trash)");
+                await deleteBtn.WaitForAsync(new LocatorWaitForOptions { Timeout = 3_000 });
+                await deleteBtn.ClickAsync();
+
+                // Wait for that card to disappear before checking again
+                await Page.WaitForTimeoutAsync(500);
+            }
+        }
+        catch
+        {
+            // Best-effort cleanup — never fail the test run on teardown errors
+        }
+    }
+}
diff --git a/MakerPrompt.E2E.Maui/Tests/PageNavigationTests.cs b/tests/MakerPrompt.Tests.E2E.Maui/Tests/PageNavigationTests.cs
similarity index 85%
rename from MakerPrompt.E2E.Maui/Tests/PageNavigationTests.cs
rename to tests/MakerPrompt.Tests.E2E.Maui/Tests/PageNavigationTests.cs
index e6ecc69..e39b7ab 100644
--- a/MakerPrompt.E2E.Maui/Tests/PageNavigationTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Maui/Tests/PageNavigationTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Maui.Fixtures;
+using MakerPrompt.Test.E2E.Maui.Fixtures;
 
-namespace MakerPrompt.E2E.Maui.Tests;
+namespace MakerPrompt.Test.E2E.Maui.Tests;
 
 /// <summary>
 /// MAUI page navigation smoke tests.
@@ -89,21 +89,6 @@ public async Task Calculators_M500_Reminder_Visible()
         Assert.True(await m500Alert.IsVisibleAsync(), "M500 save reminder should be displayed");
     }
 
-    // ── About ──
-
-    [Fact]
-    public async Task About_Page_Loads()
-    {
-        await AppiumSetup.NavigateAsync("/about");
-        var content = Page.Locator(".col-12");
-        await content.WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
-        var text = await content.InnerTextAsync();
-        Assert.False(string.IsNullOrWhiteSpace(text), "About page should have content");
-        await SaveScreenshot("about");
-    }
-
-    // ── Settings ──
-
     [Fact]
     public async Task Settings_Page_Loads()
     {
@@ -128,18 +113,6 @@ public async Task Settings_Has_Feature_Toggles()
         Assert.True(await analyticsToggle.IsVisibleAsync(), "Print Analytics toggle should exist");
     }
 
-    [Fact]
-    public async Task Settings_Has_Save_Button()
-    {
-        await AppiumSetup.NavigateAsync("/settings");
-        await Page.Locator("h1:has-text('Settings')").WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
-
-        var saveBtn = Page.Locator("button.btn-primary:has-text('Save')");
-        Assert.True(await saveBtn.IsVisibleAsync(), "Save Settings button should exist");
-    }
-
-    // ── Fleet (home) ──
-
     [Fact]
     public async Task Fleet_Page_Loads()
     {
@@ -158,7 +131,8 @@ public async Task Sidebar_Has_Nav_Links()
         await AppiumSetup.NavigateAsync("/");
         await Page.Locator(".sidebar").WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
 
-        var navLinks = new[] { "cheatsheet", "calculators", "about", "settings" };
+        // About was merged into Settings — no dedicated sidebar link any more
+        var navLinks = new[] { "cheatsheet", "calculators", "settings" };
         foreach (var href in navLinks)
         {
             var link = Page.Locator($".sidebar a[href='{href}']");
diff --git a/MakerPrompt.E2E.Maui/Tests/ThemeAndLanguageTests.cs b/tests/MakerPrompt.Tests.E2E.Maui/Tests/ThemeAndLanguageTests.cs
similarity index 98%
rename from MakerPrompt.E2E.Maui/Tests/ThemeAndLanguageTests.cs
rename to tests/MakerPrompt.Tests.E2E.Maui/Tests/ThemeAndLanguageTests.cs
index f61d19e..897d171 100644
--- a/MakerPrompt.E2E.Maui/Tests/ThemeAndLanguageTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Maui/Tests/ThemeAndLanguageTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Maui.Fixtures;
+using MakerPrompt.Test.E2E.Maui.Fixtures;
 
-namespace MakerPrompt.E2E.Maui.Tests;
+namespace MakerPrompt.Test.E2E.Maui.Tests;
 
 /// <summary>
 /// Tests for theme switching and language changing inside the MAUI WebView2
diff --git a/MakerPrompt.E2E.Wasm/Fixtures/PlaywrightFixture.cs b/tests/MakerPrompt.Tests.E2E.Wasm/Fixtures/PlaywrightFixture.cs
similarity index 92%
rename from MakerPrompt.E2E.Wasm/Fixtures/PlaywrightFixture.cs
rename to tests/MakerPrompt.Tests.E2E.Wasm/Fixtures/PlaywrightFixture.cs
index 4ca4a37..daf0450 100644
--- a/MakerPrompt.E2E.Wasm/Fixtures/PlaywrightFixture.cs
+++ b/tests/MakerPrompt.Tests.E2E.Wasm/Fixtures/PlaywrightFixture.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using Microsoft.Playwright;
 
-namespace MakerPrompt.E2E.Wasm.Fixtures;
+namespace MakerPrompt.Tests.E2E.Wasm.Fixtures;
 
 /// <summary>
 /// Shared fixture that starts the Blazor WASM dev server and a single Playwright browser.
@@ -100,12 +100,13 @@ private static string FindProjectPath()
         var dir = AppContext.BaseDirectory;
         while (dir != null)
         {
-            var candidate = Path.Combine(dir, "MakerPrompt.Blazor", "MakerPrompt.Blazor.csproj");
-            if (File.Exists(candidate)) return candidate;
+            var candidateSrc = Path.Combine(dir, "src", "MakerPrompt.UI.Blazor", "MakerPrompt.UI.Blazor.csproj");
+            if (File.Exists(candidateSrc)) return candidateSrc;
+
             dir = Directory.GetParent(dir)?.FullName;
         }
         throw new FileNotFoundException(
-            "Could not find MakerPrompt.Blazor.csproj. " +
+            "Could not find MakerPrompt.UI.Blazor.csproj. " +
             "Run tests from the solution root or set E2E_BASE_URL to a running instance.");
     }
 }
diff --git a/MakerPrompt.E2E.Wasm/MakerPrompt.E2E.Wasm.csproj b/tests/MakerPrompt.Tests.E2E.Wasm/MakerPrompt.Tests.E2E.Wasm.csproj
similarity index 100%
rename from MakerPrompt.E2E.Wasm/MakerPrompt.E2E.Wasm.csproj
rename to tests/MakerPrompt.Tests.E2E.Wasm/MakerPrompt.Tests.E2E.Wasm.csproj
diff --git a/MakerPrompt.E2E.Wasm/README.md b/tests/MakerPrompt.Tests.E2E.Wasm/README.md
similarity index 100%
rename from MakerPrompt.E2E.Wasm/README.md
rename to tests/MakerPrompt.Tests.E2E.Wasm/README.md
diff --git a/MakerPrompt.E2E.Wasm/Tests/AppBootTests.cs b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/AppBootTests.cs
similarity index 95%
rename from MakerPrompt.E2E.Wasm/Tests/AppBootTests.cs
rename to tests/MakerPrompt.Tests.E2E.Wasm/Tests/AppBootTests.cs
index 6644a50..7a158e9 100644
--- a/MakerPrompt.E2E.Wasm/Tests/AppBootTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/AppBootTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Wasm.Fixtures;
+using MakerPrompt.Tests.E2E.Wasm.Fixtures;
 
-namespace MakerPrompt.E2E.Wasm.Tests;
+namespace MakerPrompt.Tests.E2E.Wasm.Tests;
 
 /// <summary>
 /// Verifies the Blazor WASM app boots without errors.
diff --git a/MakerPrompt.E2E.Wasm/Tests/FarmModeTests.cs b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/FarmModeTests.cs
similarity index 85%
rename from MakerPrompt.E2E.Wasm/Tests/FarmModeTests.cs
rename to tests/MakerPrompt.Tests.E2E.Wasm/Tests/FarmModeTests.cs
index f58abcd..4fdb0a0 100644
--- a/MakerPrompt.E2E.Wasm/Tests/FarmModeTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/FarmModeTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Wasm.Fixtures;
+using MakerPrompt.Tests.E2E.Wasm.Fixtures;
 
-namespace MakerPrompt.E2E.Wasm.Tests;
+namespace MakerPrompt.Tests.E2E.Wasm.Tests;
 
 /// <summary>
 /// End-to-end tests for the farm mode feature.
@@ -32,14 +32,13 @@ public async Task FarmMode_Enabled_RedirectsToFleet()
     {
         await NavigateToSettingsAsync();
 
-        // Enable farm mode
+        // Enable farm mode — OnFarmModeChangedAsync saves and auto-navigates to /fleet
         var toggle = Page.Locator("#farmModeEnabled");
         if (!await toggle.IsCheckedAsync())
         {
             await toggle.CheckAsync();
-            await Page.WaitForTimeoutAsync(300);
+            await Page.WaitForURLAsync("**/fleet", new PageWaitForURLOptions { Timeout = 10_000 });
         }
-        await SaveSettingsAsync();
 
         // Navigate to root — should redirect to fleet
         await Page.GotoAsync(_fixture.BaseUrl);
@@ -120,8 +119,8 @@ public async Task FarmName_ShowsInSidebar_WhenFarmModeEnabled()
         await createBtn.ClickAsync();
         await Page.WaitForTimeoutAsync(500);
 
-        // Switch to the newly created farm
-        var selectEl = Page.Locator("select");
+        // Switch to the newly created farm using the scoped farm select
+        var selectEl = Page.Locator("select.form-select").First;
         await selectEl.SelectOptionAsync(new SelectOptionValue { Label = "Sidebar Farm" });
         var switchBtn = Page.Locator("[data-testid='farm-switch-btn']");
         await switchBtn.ClickAsync();
@@ -159,7 +158,7 @@ public async Task FarmConfig_CreateNewFarm()
         await Page.WaitForTimeoutAsync(1000);
 
         // The new farm should appear in the dropdown
-        var option = Page.Locator("select option:has-text('E2E Test Farm')");
+        var option = Page.Locator("select.form-select option:has-text('E2E Test Farm')");
         Assert.True(await option.CountAsync() > 0);
 
         await RestoreDefaultFarmModeAsync();
@@ -230,15 +229,20 @@ private async Task NavigateToSettingsAsync()
 
     private async Task SaveSettingsAsync()
     {
-        await Page.Locator("[data-testid='save-settings-btn']").ClickAsync();
-        // Wait for the save toast to appear
+        // Settings saves automatically via @bind:after — no explicit save button.
+        // Wait for Blazor's change handler and any navigation side-effect to settle.
         await Page.WaitForTimeoutAsync(1000);
     }
 
     /// <summary>
-    /// Ensures farm mode is enabled in settings and reloads the page so the
-    /// farm configuration section is visible. Returns after the settings page
-    /// is ready.
+    /// Ensures farm mode is enabled in settings and navigates back to the
+    /// settings page so the farm configuration section is visible.
+    /// <para>
+    /// Enabling farm mode triggers <c>OnFarmModeChangedAsync</c> which saves
+    /// config and immediately calls <c>NavigationManager.NavigateTo("/fleet")</c>.
+    /// We must navigate back to settings afterwards and wait for the farm
+    /// config section to render before callers can interact with it.
+    /// </para>
     /// </summary>
     private async Task EnableFarmModeAsync()
     {
@@ -247,13 +251,14 @@ private async Task EnableFarmModeAsync()
         if (!await toggle.IsCheckedAsync())
         {
             await toggle.CheckAsync();
-            // Wait for Blazor to re-render after @bind change
-            await Page.WaitForTimeoutAsync(500);
-            await SaveSettingsAsync();
-            // Reload the page so the farm config section renders from persisted state
-            await NavigateToSettingsAsync();
+            // Blazor auto-navigates to /fleet after toggle; wait for that transition
+            await Page.WaitForURLAsync("**/fleet", new PageWaitForURLOptions { Timeout = 10_000 });
         }
-        // Wait for the farm config section to appear
+
+        // Navigate back to settings so the farm config section is accessible
+        await NavigateToSettingsAsync();
+
+        // Wait for the farm config section to appear (only visible when farm mode is on)
         await Page.Locator("#farmNewName").WaitForAsync(
             new LocatorWaitForOptions { Timeout = 5_000 });
     }
diff --git a/MakerPrompt.E2E.Wasm/Tests/FleetWorkflowTests.cs b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/FleetWorkflowTests.cs
similarity index 64%
rename from MakerPrompt.E2E.Wasm/Tests/FleetWorkflowTests.cs
rename to tests/MakerPrompt.Tests.E2E.Wasm/Tests/FleetWorkflowTests.cs
index 0ab099c..f0db885 100644
--- a/MakerPrompt.E2E.Wasm/Tests/FleetWorkflowTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/FleetWorkflowTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Wasm.Fixtures;
+using MakerPrompt.Tests.E2E.Wasm.Fixtures;
 
-namespace MakerPrompt.E2E.Wasm.Tests;
+namespace MakerPrompt.Tests.E2E.Wasm.Tests;
 
 /// <summary>
 /// End-to-end tests for the multi-printer fleet workflow using the Demo backend.
@@ -11,14 +11,28 @@ namespace MakerPrompt.E2E.Wasm.Tests;
 /// IMPORTANT: After connecting a printer and clicking its card, Fleet switches
 /// from the card grid to an inline ControlPanel view. Tests must account for
 /// this view transition.
+///
+/// IAsyncLifetime.DisposeAsync removes stored printer connections from localStorage
+/// so each test run starts with an empty fleet.
 /// </summary>
 [Collection("Playwright")]
 [Trait("Category", "E2E-Wasm")]
-public class FleetWorkflowTests(PlaywrightFixture fixture)
+public class FleetWorkflowTests(PlaywrightFixture fixture) : IAsyncLifetime
 {
     private readonly PlaywrightFixture _fixture = fixture;
     private IPage Page => _fixture.Page;
 
+    public Task InitializeAsync() => Task.CompletedTask;
+
+    public async Task DisposeAsync()
+    {
+        try
+        {
+            await Page.EvaluateAsync("() => localStorage.removeItem('MakerPrompt.PrinterConnections')");
+        }
+        catch { /* best-effort */ }
+    }
+
     [Fact]
     public async Task Fleet_AddPrinter_Demo_Mode()
     {
@@ -28,7 +42,7 @@ public async Task Fleet_AddPrinter_Demo_Mode()
         await Page.Locator("[data-testid='fleet-add-btn']").ClickAsync();
 
         // Modal should appear — fill in the name
-        var nameInput = Page.Locator("#printerName");
+        var nameInput = Page.Locator("#printerNameInput");
         await nameInput.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
         await nameInput.FillAsync("E2E Test Printer");
 
@@ -62,19 +76,16 @@ public async Task Fleet_TelemetryUpdates()
         await AddDemoPrinterAsync("Telemetry Test");
         await SelectAndConnectAsync("Telemetry Test");
 
-        // After connecting, the inline ControlPanel renders the Heating card
-        // with current temperature values (e.g. "C: 25.0") and °C labels.
-        var heatingCard = Page.Locator(".card-header", new PageLocatorOptions
-        {
-            HasTextRegex = new System.Text.RegularExpressions.Regex("Heating|Temperature", System.Text.RegularExpressions.RegexOptions.IgnoreCase)
-        });
-        await heatingCard.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
-        Assert.True(await heatingCard.IsVisibleAsync());
-
-        // Verify temperature value is rendered in the ControlPanel
-        var tempValue = Page.Locator(".input-group-text:has-text('C:')");
-        await tempValue.First.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
-        Assert.True(await tempValue.First.IsVisibleAsync());
+        // ControlPanel renders a Heating card header once the Demo backend is live.
+        var heatingHeader = Page.Locator(".card-header span.fw-semibold",
+            new PageLocatorOptions { HasText = "Heating" });
+        await heatingHeader.WaitForAsync(new LocatorWaitForOptions { Timeout = 10_000 });
+        Assert.True(await heatingHeader.IsVisibleAsync());
+
+        // Each temperature input group ends with an °C span.
+        var tempUnit = Page.Locator(".input-group-text:has-text('°C')");
+        await tempUnit.First.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
+        Assert.True(await tempUnit.First.IsVisibleAsync());
     }
 
     [Fact]
@@ -99,15 +110,34 @@ public async Task Fleet_DisconnectPrinter()
     // ── Helpers ──
 
     /// <summary>
-    /// Navigates to the Fleet page with a clean slate (clears stored printers).
+    /// Ensures farm mode is on, then navigates to the Fleet page with a clean
+    /// slate (clears only stored printer connections). Uses a targeted
+    /// localStorage.removeItem so the AppConfig key (which holds FarmModeEnabled)
+    /// is not wiped before the reload.
     /// </summary>
     private async Task NavigateToFleetAsync()
     {
-        await Page.GotoAsync($"{_fixture.BaseUrl}/fleet");
-        // Clear stored printers from previous tests so each test starts fresh
-        await Page.EvaluateAsync("() => localStorage.clear()");
+        // Ensure farm mode is enabled — fleet UI requires it
+        await Page.GotoAsync($"{_fixture.BaseUrl}/settings");
+        await Page.Locator("#farmModeEnabled").WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
+        var toggle = Page.Locator("#farmModeEnabled");
+        if (!await toggle.IsCheckedAsync())
+        {
+            await toggle.CheckAsync();
+            // OnFarmModeChangedAsync saves config and auto-navigates to /fleet
+            await Page.WaitForURLAsync("**/fleet", new PageWaitForURLOptions { Timeout = 10_000 });
+        }
+        else
+        {
+            await Page.GotoAsync($"{_fixture.BaseUrl}/fleet");
+            await Page.Locator("[data-testid='fleet-add-btn']").WaitForAsync(
+                new LocatorWaitForOptions { Timeout = 15_000 });
+        }
+
+        // Remove only the printer connections key — do NOT clear() the whole
+        // storage or AppConfig (FarmModeEnabled) will be wiped on reload.
+        await Page.EvaluateAsync("() => localStorage.removeItem('MakerPrompt.PrinterConnections')");
         await Page.ReloadAsync();
-        // Wait for the Fleet page to be interactive
         await Page.Locator("[data-testid='fleet-add-btn']").WaitForAsync(
             new LocatorWaitForOptions { Timeout = 30_000 });
     }
@@ -115,7 +145,7 @@ await Page.Locator("[data-testid='fleet-add-btn']").WaitForAsync(
     private async Task AddDemoPrinterAsync(string name)
     {
         await Page.Locator("[data-testid='fleet-add-btn']").ClickAsync();
-        var nameInput = Page.Locator("#printerName");
+        var nameInput = Page.Locator("#printerNameInput");
         await nameInput.WaitForAsync(new LocatorWaitForOptions { Timeout = 5_000 });
         await nameInput.FillAsync(name);
         await Page.Locator("[data-testid='fleet-save-printer-btn']").ClickAsync();
@@ -144,4 +174,4 @@ private async Task SelectAndConnectAsync(string name)
         await Page.Locator(".badge.bg-success").WaitForAsync(
             new LocatorWaitForOptions { Timeout = 10_000 });
     }
-}
+}
\ No newline at end of file
diff --git a/MakerPrompt.E2E.Wasm/Tests/StaticPageTests.cs b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/StaticPageTests.cs
similarity index 87%
rename from MakerPrompt.E2E.Wasm/Tests/StaticPageTests.cs
rename to tests/MakerPrompt.Tests.E2E.Wasm/Tests/StaticPageTests.cs
index f40d66b..850010a 100644
--- a/MakerPrompt.E2E.Wasm/Tests/StaticPageTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/StaticPageTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Wasm.Fixtures;
+using MakerPrompt.Tests.E2E.Wasm.Fixtures;
 
-namespace MakerPrompt.E2E.Wasm.Tests;
+namespace MakerPrompt.Tests.E2E.Wasm.Tests;
 
 /// <summary>
 /// E2E tests for stable, read-only pages that don't depend on printer connections.
@@ -140,21 +140,6 @@ public async Task Calculators_M500_Reminder_Visible()
         Assert.True(await m500Alert.IsVisibleAsync(), "M500 save reminder should be displayed");
     }
 
-    // ── About (/about) ──
-
-    [Fact]
-    public async Task About_Page_Loads()
-    {
-        await Page.GotoAsync($"{_fixture.BaseUrl}/about");
-        // Should render content (the localized about HTML)
-        var content = Page.Locator(".col-12");
-        await content.WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
-        var text = await content.InnerTextAsync();
-        Assert.False(string.IsNullOrWhiteSpace(text), "About page should have content");
-    }
-
-    // ── Settings (/settings) ──
-
     [Fact]
     public async Task Settings_Page_Loads()
     {
@@ -178,26 +163,14 @@ public async Task Settings_Has_Feature_Toggles()
         Assert.True(await analyticsToggle.IsVisibleAsync(), "Print Analytics toggle should exist");
     }
 
-    [Fact]
-    public async Task Settings_Has_Save_Button()
-    {
-        await Page.GotoAsync($"{_fixture.BaseUrl}/settings");
-        await Page.Locator("h1:has-text('Settings')").WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
-
-        var saveBtn = Page.Locator("button.btn-primary:has-text('Save')");
-        Assert.True(await saveBtn.IsVisibleAsync(), "Save Settings button should exist");
-    }
-
-    // ── Sidebar Navigation ──
-
     [Fact]
     public async Task Sidebar_All_Nav_Links_Present()
     {
         await Page.GotoAsync(_fixture.BaseUrl);
         await Page.Locator(".sidebar").WaitForAsync(new LocatorWaitForOptions { Timeout = 15_000 });
 
-        // All core nav links should be in the sidebar
-        var navLinks = new[] { "cheatsheet", "calculators", "about", "settings" };
+        // All core nav links should be in the sidebar (About was merged into Settings)
+        var navLinks = new[] { "cheatsheet", "calculators", "settings" };
         foreach (var href in navLinks)
         {
             var link = Page.Locator($".sidebar a[href='{href}']");
diff --git a/MakerPrompt.E2E.Wasm/Tests/ThemeAndLanguageTests.cs b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/ThemeAndLanguageTests.cs
similarity index 98%
rename from MakerPrompt.E2E.Wasm/Tests/ThemeAndLanguageTests.cs
rename to tests/MakerPrompt.Tests.E2E.Wasm/Tests/ThemeAndLanguageTests.cs
index 4783eef..f5788d8 100644
--- a/MakerPrompt.E2E.Wasm/Tests/ThemeAndLanguageTests.cs
+++ b/tests/MakerPrompt.Tests.E2E.Wasm/Tests/ThemeAndLanguageTests.cs
@@ -1,7 +1,7 @@
 using Microsoft.Playwright;
-using MakerPrompt.E2E.Wasm.Fixtures;
+using MakerPrompt.Tests.E2E.Wasm.Fixtures;
 
-namespace MakerPrompt.E2E.Wasm.Tests;
+namespace MakerPrompt.Tests.E2E.Wasm.Tests;
 
 /// <summary>
 /// E2E tests for theme switching and language changing in the Blazor WASM app.
diff --git a/tests/MakerPrompt.Tests.Unit/Helpers/InMemoryAppLocalStorageProvider.cs b/tests/MakerPrompt.Tests.Unit/Helpers/InMemoryAppLocalStorageProvider.cs
new file mode 100644
index 0000000..a5a7d8f
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Helpers/InMemoryAppLocalStorageProvider.cs
@@ -0,0 +1,48 @@
+using MakerPrompt.Core.Models;
+using MakerPrompt.UI.Components.Infrastructure;
+
+namespace MakerPrompt.Tests.Unit.Helpers;
+
+/// <summary>
+/// In-memory implementation of <see cref="IAppLocalStorageProvider"/> for unit tests.
+/// Stores files as byte arrays keyed by path.
+/// </summary>
+public sealed class InMemoryAppLocalStorageProvider : IAppLocalStorageProvider
+{
+    private readonly Dictionary<string, byte[]> _files = new();
+
+    public string DisplayName => "InMemory";
+    public string Key => "inmemory";
+    public string RootPath => "/";
+
+    public Task<List<FileEntry>> ListFilesAsync(CancellationToken cancellationToken = default)
+    {
+        var entries = _files.Keys.Select(k => new FileEntry
+        {
+            FullPath = k,
+            Size = _files[k].Length,
+            IsAvailable = true
+        }).ToList();
+        return Task.FromResult(entries);
+    }
+
+    public Task<Stream?> OpenReadAsync(string fullPath, CancellationToken cancellationToken = default)
+    {
+        if (_files.TryGetValue(fullPath, out var data))
+            return Task.FromResult<Stream?>(new MemoryStream(data, writable: false));
+        return Task.FromResult<Stream?>(null);
+    }
+
+    public async Task SaveFileAsync(string fullPath, Stream content, CancellationToken cancellationToken = default)
+    {
+        using var ms = new MemoryStream();
+        await content.CopyToAsync(ms, cancellationToken);
+        _files[fullPath] = ms.ToArray();
+    }
+
+    public Task DeleteFileAsync(string fullPath, CancellationToken cancellationToken = default)
+    {
+        _files.Remove(fullPath);
+        return Task.CompletedTask;
+    }
+}
diff --git a/tests/MakerPrompt.Tests.Unit/Infrastructure/CameraStoreTests.cs b/tests/MakerPrompt.Tests.Unit/Infrastructure/CameraStoreTests.cs
new file mode 100644
index 0000000..65ccd64
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Infrastructure/CameraStoreTests.cs
@@ -0,0 +1,99 @@
+namespace MakerPrompt.Tests.Unit.Infrastructure;
+
+/// <summary>
+/// Tests for the in-memory camera snapshot store and related types.
+/// </summary>
+public sealed class CameraStoreTests
+{
+    [Fact]
+    public async Task InMemoryCameraStore_Save_And_GetLatest_RoundTrip()
+    {
+        var store = new InMemoryCameraSnapshotStore();
+        var jpeg = new byte[] { 0xFF, 0xD8, 0xFF, 0xD9 };
+        var snapshot = new CameraSnapshot
+        {
+            CameraId = "cam-a",
+            Label = "Test Camera",
+            JpegData = jpeg,
+            Width = 1280,
+            Height = 720,
+            CapturedAt = DateTimeOffset.UtcNow
+        };
+
+        await store.SaveAsync(snapshot);
+        var latest = await store.GetLatestAsync("cam-a");
+
+        Assert.NotNull(latest);
+        Assert.Equal("Test Camera", latest.Label);
+        Assert.Equal(jpeg, latest.JpegData);
+        Assert.Equal(1280, latest.Width);
+        Assert.Equal(720, latest.Height);
+    }
+
+    [Fact]
+    public async Task InMemoryCameraStore_GetLatest_ReturnsNull_WhenEmpty()
+    {
+        var store = new InMemoryCameraSnapshotStore();
+        Assert.Null(await store.GetLatestAsync("cam-nonexistent"));
+    }
+
+    [Fact]
+    public async Task InMemoryCameraStore_GetHistory_ExcludesJpegBlob()
+    {
+        var store = new InMemoryCameraSnapshotStore();
+        for (int i = 0; i < 3; i++)
+        {
+            await store.SaveAsync(new CameraSnapshot
+            {
+                CameraId = "cam-b",
+                JpegData = new byte[500],
+                CapturedAt = DateTimeOffset.UtcNow.AddSeconds(i)
+            });
+        }
+
+        var history = await store.GetHistoryAsync("cam-b", count: 10);
+
+        Assert.Equal(3, history.Count);
+        Assert.All(history, s => Assert.Empty(s.JpegData));
+    }
+
+    [Fact]
+    public async Task InMemoryCameraStore_RingBuffer_DropsOldestWhenFull()
+    {
+        const int max = 3;
+        var store = new InMemoryCameraSnapshotStore(maxPerCamera: max);
+
+        for (int i = 1; i <= max + 2; i++)
+        {
+            await store.SaveAsync(new CameraSnapshot
+            {
+                CameraId = "cam-c",
+                Label = $"Snap-{i}",
+                JpegData = [(byte)i],
+                CapturedAt = DateTimeOffset.UtcNow.AddSeconds(i)
+            });
+        }
+
+        // Latest should be the newest (Snap-5).
+        var latest = await store.GetLatestAsync("cam-c");
+        Assert.Equal("Snap-5", latest!.Label);
+
+        // History should only contain max entries.
+        var history = await store.GetHistoryAsync("cam-c", count: 100);
+        Assert.Equal(max, history.Count);
+    }
+
+    [Fact]
+    public async Task InMemoryCameraStore_IsolatesCameras()
+    {
+        var store = new InMemoryCameraSnapshotStore();
+        await store.SaveAsync(new CameraSnapshot { CameraId = "camX", Label = "X", JpegData = [1] });
+        await store.SaveAsync(new CameraSnapshot { CameraId = "camY", Label = "Y", JpegData = [2] });
+
+        var latestX = await store.GetLatestAsync("camX");
+        var latestY = await store.GetLatestAsync("camY");
+
+        Assert.Equal("X", latestX!.Label);
+        Assert.Equal("Y", latestY!.Label);
+    }
+}
diff --git a/tests/MakerPrompt.Tests.Unit/Infrastructure/InMemoryStoreTests.cs b/tests/MakerPrompt.Tests.Unit/Infrastructure/InMemoryStoreTests.cs
new file mode 100644
index 0000000..1c7119a
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Infrastructure/InMemoryStoreTests.cs
@@ -0,0 +1,93 @@
+namespace MakerPrompt.Tests.Unit.Infrastructure;
+
+/// <summary>
+/// Verifies the thread-safety guarantees and contract compliance of
+/// the in-memory infrastructure store implementations.
+/// </summary>
+public sealed class InMemoryStoreTests
+{
+    // ── FarmRepository ────────────────────────────────────────────────────────
+
+    [Fact]
+    public async Task FarmRepo_Save_And_GetById_RoundTrip()
+    {
+        var repo = new InMemoryFarmRepository();
+        var farm = new FarmConfiguration { Name = "Test Farm" };
+
+        await repo.SaveAsync(farm);
+        var result = await repo.GetByIdAsync(farm.Id);
+
+        Assert.NotNull(result);
+        Assert.Equal("Test Farm", result.Name);
+    }
+
+    [Fact]
+    public async Task FarmRepo_Delete_RemovesEntry()
+    {
+        var repo = new InMemoryFarmRepository();
+        var farm = new FarmConfiguration { Name = "Delete Me" };
+        await repo.SaveAsync(farm);
+
+        await repo.DeleteAsync(farm.Id);
+
+        Assert.Null(await repo.GetByIdAsync(farm.Id));
+    }
+
+    [Fact]
+    public async Task FarmRepo_GetAll_OrderedByCreationDate()
+    {
+        var repo = new InMemoryFarmRepository();
+        var older = new FarmConfiguration { Name = "Older", CreatedAt = DateTime.UtcNow.AddDays(-1) };
+        var newer = new FarmConfiguration { Name = "Newer", CreatedAt = DateTime.UtcNow };
+        await repo.SaveAsync(newer);
+        await repo.SaveAsync(older);
+
+        var all = await repo.GetAllAsync();
+
+        Assert.Equal("Older", all[0].Name);
+        Assert.Equal("Newer", all[1].Name);
+    }
+
+    // ── PrintProjectRepository ────────────────────────────────────────────────
+
+    [Fact]
+    public async Task ProjectRepo_Save_And_GetAll_RoundTrip()
+    {
+        var repo = new InMemoryPrintProjectRepository();
+        var project = new PrintProject { Name = "Test Project" };
+
+        await repo.SaveAsync(project);
+        var all = await repo.GetAllAsync();
+
+        Assert.Single(all);
+        Assert.Equal("Test Project", all[0].Name);
+    }
+
+    [Fact]
+    public async Task ProjectRepo_SaveJobFile_And_OpenJobFile_RoundTrip()
+    {
+        var repo = new InMemoryPrintProjectRepository();
+        var projectId = Guid.NewGuid();
+        var gcode = System.Text.Encoding.UTF8.GetBytes("G28\nG0 X10\n");
+
+        var storagePath = await repo.SaveJobFileAsync(projectId, "test.gcode", new MemoryStream(gcode));
+
+        await using var stream = await repo.OpenJobFileAsync(storagePath);
+        Assert.NotNull(stream);
+        using var reader = new System.IO.StreamReader(stream!);
+        var content = await reader.ReadToEndAsync();
+        Assert.Equal("G28\nG0 X10\n", content);
+    }
+
+    [Fact]
+    public async Task ProjectRepo_DeleteJobFile_FileNoLongerAccessible()
+    {
+        var repo = new InMemoryPrintProjectRepository();
+        var storagePath = await repo.SaveJobFileAsync(Guid.NewGuid(), "delete.gcode",
+            new MemoryStream([1]));
+
+        await repo.DeleteJobFileAsync(storagePath);
+
+        Assert.Null(await repo.OpenJobFileAsync(storagePath));
+    }
+}
diff --git a/tests/MakerPrompt.Tests.Unit/Infrastructure/InMemoryTelemetryStoreTests.cs b/tests/MakerPrompt.Tests.Unit/Infrastructure/InMemoryTelemetryStoreTests.cs
new file mode 100644
index 0000000..a1fe62e
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Infrastructure/InMemoryTelemetryStoreTests.cs
@@ -0,0 +1,79 @@
+namespace MakerPrompt.Tests.Unit.Infrastructure;
+
+/// <summary>
+/// Unit tests for <see cref="InMemoryTelemetryStore"/>.
+/// </summary>
+public sealed class InMemoryTelemetryStoreTests
+{
+    private readonly InMemoryTelemetryStore _sut = new();
+
+    [Fact]
+    public async Task GetLatest_WhenNoDataSaved_ReturnsNull()
+    {
+        var result = await _sut.GetLatestAsync("unknown");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task SaveAndGetLatest_ReturnsMostRecentSnapshot()
+    {
+        var first = new PrinterTelemetry { HotendTemp = 200 };
+        var second = new PrinterTelemetry { HotendTemp = 210 };
+
+        await _sut.SaveAsync("p1", first);
+        await _sut.SaveAsync("p1", second);
+
+        var latest = await _sut.GetLatestAsync("p1");
+
+        Assert.NotNull(latest);
+        Assert.Equal(210, latest.HotendTemp);
+    }
+
+    [Fact]
+    public async Task GetHistory_ReturnsSnapshotsInDescendingOrder()
+    {
+        for (var i = 1; i <= 5; i++)
+            await _sut.SaveAsync("p1", new PrinterTelemetry { HotendTemp = i * 10 });
+
+        var history = await _sut.GetHistoryAsync("p1", count: 5);
+
+        Assert.Equal(5, history.Count);
+        Assert.Equal(50, history[0].HotendTemp);
+    }
+
+    [Fact]
+    public async Task GetHistory_CountParameter_LimitsResults()
+    {
+        for (var i = 0; i < 20; i++)
+            await _sut.SaveAsync("p1", new PrinterTelemetry { HotendTemp = i });
+
+        var history = await _sut.GetHistoryAsync("p1", count: 5);
+
+        Assert.Equal(5, history.Count);
+    }
+
+    [Fact]
+    public async Task RingBuffer_DropsOldestWhenFull()
+    {
+        var sut = new InMemoryTelemetryStore(maxPerPrinter: 3);
+
+        for (var i = 1; i <= 5; i++)
+            await sut.SaveAsync("p1", new PrinterTelemetry { HotendTemp = i * 10 });
+
+        var history = await sut.GetHistoryAsync("p1", count: 100);
+
+        Assert.Equal(3, history.Count);
+        Assert.Equal(50, history[0].HotendTemp);
+    }
+
+    [Fact]
+    public async Task IsolatesPrinters()
+    {
+        await _sut.SaveAsync("pA", new PrinterTelemetry { HotendTemp = 200 });
+        await _sut.SaveAsync("pB", new PrinterTelemetry { HotendTemp = 999 });
+
+        var latest = await _sut.GetLatestAsync("pA");
+
+        Assert.Equal(200, latest!.HotendTemp);
+    }
+}
diff --git a/tests/MakerPrompt.Tests.Unit/Infrastructure/SqliteStoreTests.cs b/tests/MakerPrompt.Tests.Unit/Infrastructure/SqliteStoreTests.cs
new file mode 100644
index 0000000..1929653
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Infrastructure/SqliteStoreTests.cs
@@ -0,0 +1,251 @@
+using MakerPrompt.Infrastructure.Sqlite;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace MakerPrompt.Tests.Unit.Infrastructure;
+
+/// <summary>
+/// Integration-style tests for the SQLite-backed infrastructure stores.
+/// Each test creates a unique temp-file SQLite database and cleans it up on dispose.
+/// </summary>
+public sealed class SqliteStoreTests
+{
+    // ── Helper: unique temp-file SQLite database per test ────────────────────
+
+    // SQLite in-memory databases disappear when the last connection closes.
+    // Using a temp file per test ensures the schema (created in the constructor)
+    // persists across multiple connection open/close cycles in the same test.
+    // The returned TempDb is IDisposable and deletes the file on dispose.
+    private static TempDb CreateTempDb()
+    {
+        var path = Path.Combine(Path.GetTempPath(), $"makerprompt_test_{Guid.NewGuid():N}.db");
+        return new TempDb(path);
+    }
+
+    private sealed class TempDb : IDisposable
+    {
+        public string ConnectionString { get; }
+        private readonly string _path;
+
+        public TempDb(string path)
+        {
+            _path = path;
+            ConnectionString = $"Data Source={path}";
+        }
+
+        public void Dispose()
+        {
+            try { if (File.Exists(_path)) File.Delete(_path); }
+            catch { /* best-effort cleanup */ }
+        }
+    }
+
+    // ── SqliteTelemetryStore ──────────────────────────────────────────────────
+
+    [Fact]
+    public async Task TelemetryStore_Save_And_GetLatest_RoundTrip()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteTelemetryStore(
+            db.ConnectionString,
+            NullLogger<SqliteTelemetryStore>.Instance);
+
+        var telemetry = new PrinterTelemetry
+        {
+            PrinterName = "Ender-3",
+            HotendTemp = 215.0,
+            HotendTarget = 215.0,
+            BedTemp = 60.0,
+            Status = PrinterStatus.Printing,
+            PrintProgress = 45.0,
+            CapturedAt = DateTimeOffset.UtcNow
+        };
+
+        await store.SaveAsync("printer-1", telemetry);
+        var latest = await store.GetLatestAsync("printer-1");
+
+        Assert.NotNull(latest);
+        Assert.Equal("Ender-3", latest.PrinterName);
+        Assert.Equal(215.0, latest.HotendTemp);
+        Assert.Equal(PrinterStatus.Printing, latest.Status);
+        Assert.Equal(45.0, latest.PrintProgress);
+    }
+
+    [Fact]
+    public async Task TelemetryStore_GetLatest_ReturnsNull_WhenEmpty()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteTelemetryStore(
+            db.ConnectionString,
+            NullLogger<SqliteTelemetryStore>.Instance);
+
+        var result = await store.GetLatestAsync("printer-x");
+        Assert.Null(result);
+    }
+
+    [Fact]
+    public async Task TelemetryStore_GetHistory_ReturnsMultipleSnapshots_OrderedNewestFirst()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteTelemetryStore(
+            db.ConnectionString,
+            NullLogger<SqliteTelemetryStore>.Instance);
+
+        var baseTime = DateTimeOffset.UtcNow;
+        for (int i = 0; i < 5; i++)
+        {
+            await store.SaveAsync("p1", new PrinterTelemetry
+            {
+                PrinterName = $"Snap-{i}",
+                HotendTemp = 200 + i,
+                CapturedAt = baseTime.AddSeconds(i)
+            });
+        }
+
+        var history = await store.GetHistoryAsync("p1", count: 5);
+
+        Assert.Equal(5, history.Count);
+        // Newest (highest HotendTemp) should be first.
+        Assert.Equal(204.0, history[0].HotendTemp);
+    }
+
+    [Fact]
+    public async Task TelemetryStore_GetHistory_RespectsCountLimit()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteTelemetryStore(
+            db.ConnectionString,
+            NullLogger<SqliteTelemetryStore>.Instance);
+
+        for (int i = 0; i < 10; i++)
+            await store.SaveAsync("p2", new PrinterTelemetry { CapturedAt = DateTimeOffset.UtcNow.AddSeconds(i) });
+
+        var history = await store.GetHistoryAsync("p2", count: 3);
+
+        Assert.Equal(3, history.Count);
+    }
+
+    [Fact]
+    public async Task TelemetryStore_IsolatePrinters_DifferentPrinterIdsDontMix()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteTelemetryStore(
+            db.ConnectionString,
+            NullLogger<SqliteTelemetryStore>.Instance);
+
+        await store.SaveAsync("printerA", new PrinterTelemetry { HotendTemp = 190 });
+        await store.SaveAsync("printerB", new PrinterTelemetry { HotendTemp = 230 });
+
+        var latestA = await store.GetLatestAsync("printerA");
+        var latestB = await store.GetLatestAsync("printerB");
+
+        Assert.Equal(190.0, latestA!.HotendTemp);
+        Assert.Equal(230.0, latestB!.HotendTemp);
+    }
+
+    [Fact]
+    public async Task TelemetryStore_GetLatest_ReturnsNewestSnapshot()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteTelemetryStore(
+            db.ConnectionString,
+            NullLogger<SqliteTelemetryStore>.Instance);
+
+        var older = new PrinterTelemetry { HotendTemp = 100, CapturedAt = DateTimeOffset.UtcNow.AddSeconds(-10) };
+        var newer = new PrinterTelemetry { HotendTemp = 210, CapturedAt = DateTimeOffset.UtcNow };
+
+        await store.SaveAsync("p3", older);
+        await store.SaveAsync("p3", newer);
+
+        var latest = await store.GetLatestAsync("p3");
+        Assert.Equal(210.0, latest!.HotendTemp);
+    }
+
+    // ── SqliteCameraSnapshotStore ─────────────────────────────────────────────
+
+    [Fact]
+    public async Task CameraStore_Save_And_GetLatest_RoundTrip()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteCameraSnapshotStore(
+            db.ConnectionString,
+            NullLogger<SqliteCameraSnapshotStore>.Instance);
+
+        var jpeg = new byte[] { 0xFF, 0xD8, 0x00, 0x01, 0xFF, 0xD9 }; // minimal JPEG
+        var snapshot = new CameraSnapshot
+        {
+            CameraId = "cam-1",
+            Label = "Ender-3 Cam",
+            JpegData = jpeg,
+            Width = 640,
+            Height = 480,
+            CapturedAt = DateTimeOffset.UtcNow
+        };
+
+        await store.SaveAsync(snapshot);
+        var latest = await store.GetLatestAsync("cam-1");
+
+        Assert.NotNull(latest);
+        Assert.Equal("Ender-3 Cam", latest.Label);
+        Assert.Equal(640, latest.Width);
+        Assert.Equal(480, latest.Height);
+        Assert.Equal(jpeg, latest.JpegData);
+    }
+
+    [Fact]
+    public async Task CameraStore_GetLatest_ReturnsNull_WhenEmpty()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteCameraSnapshotStore(
+            db.ConnectionString,
+            NullLogger<SqliteCameraSnapshotStore>.Instance);
+
+        Assert.Null(await store.GetLatestAsync("cam-x"));
+    }
+
+    [Fact]
+    public async Task CameraStore_GetHistory_ExcludesJpegBlob()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteCameraSnapshotStore(
+            db.ConnectionString,
+            NullLogger<SqliteCameraSnapshotStore>.Instance);
+
+        for (int i = 0; i < 3; i++)
+        {
+            await store.SaveAsync(new CameraSnapshot
+            {
+                CameraId = "cam-2",
+                Label = "Test",
+                JpegData = new byte[1000],
+                CapturedAt = DateTimeOffset.UtcNow.AddSeconds(i)
+            });
+        }
+
+        var history = await store.GetHistoryAsync("cam-2", count: 10);
+
+        Assert.Equal(3, history.Count);
+        // History should strip JPEG data (returns metadata only).
+        Assert.All(history, s => Assert.Empty(s.JpegData));
+    }
+
+    [Fact]
+    public async Task CameraStore_GetHistory_RespectsCountLimit()
+    {
+        using var db = CreateTempDb();
+        await using var store = new SqliteCameraSnapshotStore(
+            db.ConnectionString,
+            NullLogger<SqliteCameraSnapshotStore>.Instance);
+
+        for (int i = 0; i < 5; i++)
+        {
+            await store.SaveAsync(new CameraSnapshot
+            {
+                CameraId = "cam-3",
+                CapturedAt = DateTimeOffset.UtcNow.AddSeconds(i)
+            });
+        }
+
+        var history = await store.GetHistoryAsync("cam-3", count: 2);
+        Assert.Equal(2, history.Count);
+    }
+}
diff --git a/MakerPrompt.Tests/MakerPrompt.Tests.csproj b/tests/MakerPrompt.Tests.Unit/MakerPrompt.Tests.Unit.csproj
similarity index 58%
rename from MakerPrompt.Tests/MakerPrompt.Tests.csproj
rename to tests/MakerPrompt.Tests.Unit/MakerPrompt.Tests.Unit.csproj
index d6361e5..54b612c 100644
--- a/MakerPrompt.Tests/MakerPrompt.Tests.csproj
+++ b/tests/MakerPrompt.Tests.Unit/MakerPrompt.Tests.Unit.csproj
@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -22,7 +22,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MakerPrompt.Shared\MakerPrompt.Shared.csproj" />
+    <ProjectReference Include="..\..\src\MakerPrompt.Core\MakerPrompt.Core.csproj" />
+    <ProjectReference Include="..\..\src\MakerPrompt.Infrastructure\MakerPrompt.Infrastructure.csproj" />
+    <ProjectReference Include="..\..\src\MakerPrompt.Infrastructure.Sqlite\MakerPrompt.Infrastructure.Sqlite.csproj" />
+    <ProjectReference Include="..\..\src\MakerPrompt.UI.Components\MakerPrompt.UI.Components.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/MakerPrompt.Tests.Unit/Services/AnalyticsServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/AnalyticsServiceTests.cs
new file mode 100644
index 0000000..ae5339f
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Services/AnalyticsServiceTests.cs
@@ -0,0 +1,111 @@
+using MakerPrompt.Tests.Unit.Helpers;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace MakerPrompt.Tests.Unit.Services;
+
+/// <summary>
+/// Unit tests for <see cref="AnalyticsService"/>.
+/// </summary>
+public sealed class AnalyticsServiceTests
+{
+    private static AnalyticsService CreateSut() =>
+        new(new InMemoryAppLocalStorageProvider(), NullLogger<AnalyticsService>.Instance);
+
+    private static readonly Guid PrinterA = Guid.NewGuid();
+    private static readonly Guid PrinterB = Guid.NewGuid();
+    private static readonly Guid SpoolX = Guid.NewGuid();
+
+    [Fact]
+    public void GetRecords_Initially_ReturnsEmpty()
+    {
+        var sut = CreateSut();
+        Assert.Empty(sut.GetRecords());
+    }
+
+    [Fact]
+    public async Task RecordUsage_AppearsInGetRecords()
+    {
+        var sut = CreateSut();
+        var record = new PrintJobUsageRecord
+        {
+            PrinterId = PrinterA,
+            JobName = "Benchy",
+            Duration = TimeSpan.FromHours(2),
+            EstimatedFilamentUsedGrams = 30,
+        };
+
+        await sut.RecordUsageAsync(record);
+
+        var records = sut.GetRecords();
+        Assert.Single(records);
+        Assert.Equal("Benchy", records[0].JobName);
+    }
+
+    [Fact]
+    public async Task GetTotalPrintTime_SumsAllDurations()
+    {
+        var sut = CreateSut();
+        await sut.RecordUsageAsync(new PrintJobUsageRecord { Duration = TimeSpan.FromHours(1) });
+        await sut.RecordUsageAsync(new PrintJobUsageRecord { Duration = TimeSpan.FromHours(2.5) });
+
+        Assert.Equal(TimeSpan.FromHours(3.5), sut.GetTotalPrintHours());
+    }
+
+    [Fact]
+    public async Task GetTotalFilamentConsumed_UsesActualWhenPresent()
+    {
+        var sut = CreateSut();
+        await sut.RecordUsageAsync(new PrintJobUsageRecord
+        {
+            EstimatedFilamentUsedGrams = 50,
+            ActualFilamentUsedGrams = 48,
+        });
+        await sut.RecordUsageAsync(new PrintJobUsageRecord
+        {
+            EstimatedFilamentUsedGrams = 30,
+            ActualFilamentUsedGrams = 0,
+        });
+
+        Assert.Equal(78, sut.GetTotalFilamentConsumed()); // 48 + 30
+    }
+
+    [Fact]
+    public async Task GetFilamentConsumedByPrinter_FiltersCorrectly()
+    {
+        var sut = CreateSut();
+        await sut.RecordUsageAsync(new PrintJobUsageRecord { PrinterId = PrinterA, EstimatedFilamentUsedGrams = 40 });
+        await sut.RecordUsageAsync(new PrintJobUsageRecord { PrinterId = PrinterB, EstimatedFilamentUsedGrams = 60 });
+        await sut.RecordUsageAsync(new PrintJobUsageRecord { PrinterId = PrinterA, EstimatedFilamentUsedGrams = 20 });
+
+        Assert.Equal(60, sut.GetFilamentConsumedByPrinter(PrinterA)); // 40 + 20
+    }
+
+    [Fact]
+    public async Task GetFilamentConsumedBySpool_FiltersCorrectly()
+    {
+        var sut = CreateSut();
+        await sut.RecordUsageAsync(new PrintJobUsageRecord { FilamentSpoolId = SpoolX, EstimatedFilamentUsedGrams = 35 });
+        await sut.RecordUsageAsync(new PrintJobUsageRecord { FilamentSpoolId = Guid.NewGuid(), EstimatedFilamentUsedGrams = 100 });
+
+        Assert.Equal(35, sut.GetFilamentConsumedBySpool(SpoolX));
+    }
+
+    [Fact]
+    public async Task RecordUsage_RaisesAnalyticsUpdatedEvent()
+    {
+        var sut = CreateSut();
+        var raised = false;
+        sut.AnalyticsUpdated += (_, _) => raised = true;
+
+        await sut.RecordUsageAsync(new PrintJobUsageRecord());
+
+        Assert.True(raised);
+    }
+
+    [Fact]
+    public void GetTotalPrintTime_WhenNoRecords_ReturnsZero()
+    {
+        var sut = CreateSut();
+        Assert.Equal(TimeSpan.Zero, sut.GetTotalPrintHours());
+    }
+}
diff --git a/MakerPrompt.Tests/BaseSerialServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/BaseSerialServiceTests.cs
similarity index 91%
rename from MakerPrompt.Tests/BaseSerialServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/BaseSerialServiceTests.cs
index 7b62d1f..5b926b8 100644
--- a/MakerPrompt.Tests/BaseSerialServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/BaseSerialServiceTests.cs
@@ -1,7 +1,4 @@
-using MakerPrompt.Shared.Infrastructure;
-using MakerPrompt.Shared.Models;
-
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services;
 
 public class BaseSerialServiceTests
 {
@@ -10,7 +7,7 @@ private sealed class StubSerialService : BaseSerialService
     {
         public List<string> WrittenCommands { get; } = [];
 
-        public override Task WriteDataAsync(string command)
+        public override Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
         {
             WrittenCommands.Add(command);
             return Task.CompletedTask;
@@ -116,7 +113,7 @@ public async Task SetHotendTemp_ValidTemp_WritesCorrectGcode()
     {
         var svc = Create();
         svc.IsConnected = true;
-        await svc.SetHotendTemp(200);
+        await svc.SetHotendTempAsync(200);
         Assert.Contains(svc.WrittenCommands, c => c == "M104 S200");
     }
 
@@ -125,7 +122,7 @@ public async Task SetHotendTemp_OutOfRange_WritesNothing()
     {
         var svc = Create();
         svc.IsConnected = true;
-        await svc.SetHotendTemp(350);  // max is 300
+        await svc.SetHotendTempAsync(350);  // max is 300
         Assert.Empty(svc.WrittenCommands);
     }
 
@@ -134,7 +131,7 @@ public async Task SetHotendTemp_NotConnected_WritesNothing()
     {
         var svc = Create();
         // IsConnected defaults to false
-        await svc.SetHotendTemp(200);
+        await svc.SetHotendTempAsync(200);
         Assert.Empty(svc.WrittenCommands);
     }
 
@@ -143,7 +140,7 @@ public async Task SetBedTemp_ValidTemp_WritesCorrectGcode()
     {
         var svc = Create();
         svc.IsConnected = true;
-        await svc.SetBedTemp(60);
+        await svc.SetBedTempAsync(60);
         Assert.Contains(svc.WrittenCommands, c => c == "M140 S60");
     }
 
@@ -152,7 +149,7 @@ public async Task SetBedTemp_OutOfRange_WritesNothing()
     {
         var svc = Create();
         svc.IsConnected = true;
-        await svc.SetBedTemp(150);  // max is 120
+        await svc.SetBedTempAsync(150);  // max is 120
         Assert.Empty(svc.WrittenCommands);
     }
 
@@ -161,7 +158,7 @@ public async Task SetPrintSpeed_ValidSpeed_WritesGcode()
     {
         var svc = Create();
         svc.IsConnected = true;
-        await svc.SetPrintSpeed(150);
+        await svc.SetPrintSpeedAsync(150);
         Assert.Contains(svc.WrittenCommands, c => c.StartsWith("M220"));
         Assert.Contains(svc.WrittenCommands, c => c.Contains("S150"));
     }
@@ -171,7 +168,7 @@ public async Task SetFanSpeed_ZeroPercent_WritesFanOffCommand()
     {
         var svc = Create();
         svc.IsConnected = true;
-        await svc.SetFanSpeed(0);
+        await svc.SetFanSpeedAsync(0);
         Assert.Contains(svc.WrittenCommands, c => c == "M107");
     }
 
@@ -180,7 +177,7 @@ public async Task SetFanSpeed_FullSpeed_WritesMappedValue()
     {
         var svc = Create();
         svc.IsConnected = true;
-        await svc.SetFanSpeed(100);
+        await svc.SetFanSpeedAsync(100);
         // 100% → (int)(100 * 2.55) = 254 due to float truncation
         Assert.Contains(svc.WrittenCommands, c => c.StartsWith("M106") && c.Contains("S254"));
     }
diff --git a/tests/MakerPrompt.Tests.Unit/Services/FarmServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/FarmServiceTests.cs
new file mode 100644
index 0000000..86afe0b
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Services/FarmServiceTests.cs
@@ -0,0 +1,141 @@
+using MakerPrompt.Infrastructure.Services;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace MakerPrompt.Tests.Unit.Services;
+
+/// <summary>
+/// Unit tests for <see cref="FarmService"/>.
+/// </summary>
+public sealed class FarmServiceTests
+{
+    private static FarmService CreateSut() =>
+        new(new InMemoryFarmRepository(), NullLogger<FarmService>.Instance);
+
+    [Fact]
+    public async Task GetFarms_Initially_ReturnsEmpty()
+    {
+        var sut = CreateSut();
+        var farms = await sut.GetFarmsAsync();
+        Assert.Empty(farms);
+    }
+
+    [Fact]
+    public async Task CreateFarm_AppearsInList()
+    {
+        var sut = CreateSut();
+
+        var farm = await sut.CreateFarmAsync("Hackerspace A");
+
+        var farms = await sut.GetFarmsAsync();
+        Assert.Single(farms);
+        Assert.Equal("Hackerspace A", farms[0].Name);
+    }
+
+    [Fact]
+    public async Task CreateFarm_TrimsName()
+    {
+        var sut = CreateSut();
+        var farm = await sut.CreateFarmAsync("  Workshop  ");
+        Assert.Equal("Workshop", farm.Name);
+    }
+
+    [Fact]
+    public async Task RenameFarm_UpdatesName()
+    {
+        var sut = CreateSut();
+        var farm = await sut.CreateFarmAsync("Old");
+
+        await sut.RenameFarmAsync(farm.Id, "New");
+
+        var retrieved = await sut.GetFarmAsync(farm.Id);
+        Assert.Equal("New", retrieved?.Name);
+    }
+
+    [Fact]
+    public async Task RenameFarm_UnknownId_DoesNotThrow()
+    {
+        var sut = CreateSut();
+        await sut.RenameFarmAsync(Guid.NewGuid(), "Whatever");
+        // No exception expected
+    }
+
+    [Fact]
+    public async Task DeleteFarm_RemovesFromList()
+    {
+        var sut = CreateSut();
+        var farm = await sut.CreateFarmAsync("To Delete");
+
+        await sut.DeleteFarmAsync(farm.Id);
+
+        var farms = await sut.GetFarmsAsync();
+        Assert.Empty(farms);
+    }
+
+    [Fact]
+    public async Task SnapshotPrinters_StoresPrinterListInFarm()
+    {
+        var sut = CreateSut();
+        var farm = await sut.CreateFarmAsync("F");
+        var printers = new[]
+        {
+            new PrinterConnectionDefinition { Name = "MK4 Alpha" },
+            new PrinterConnectionDefinition { Name = "MK4 Beta" },
+        };
+
+        await sut.SnapshotPrintersAsync(farm.Id, printers);
+
+        var retrieved = await sut.GetFarmAsync(farm.Id);
+        Assert.Equal(2, retrieved!.Printers.Count);
+        Assert.Contains(retrieved.Printers, p => p.Name == "MK4 Alpha");
+    }
+
+    [Fact]
+    public async Task ExportFarm_ReturnsValidJson()
+    {
+        var sut = CreateSut();
+        var farm = await sut.CreateFarmAsync("Export Test");
+
+        var json = await sut.ExportFarmAsync(farm.Id);
+
+        Assert.Contains("Export Test", json);
+        Assert.Contains("\"Name\"", json);
+    }
+
+    [Fact]
+    public async Task ImportFarm_AddsNewFarmWithFreshId()
+    {
+        var sut = CreateSut();
+        var original = await sut.CreateFarmAsync("Original Farm");
+        var json = await sut.ExportFarmAsync(original.Id);
+
+        var imported = await sut.ImportFarmAsync(json);
+
+        // Imported farm should get a new ID
+        Assert.NotEqual(original.Id, imported.Id);
+        // But same name
+        Assert.Equal("Original Farm", imported.Name);
+
+        var farms = await sut.GetFarmsAsync();
+        Assert.Equal(2, farms.Count);
+    }
+
+    [Fact]
+    public async Task FarmsChanged_RaisedOnCreate()
+    {
+        var sut = CreateSut();
+        var raised = false;
+        sut.FarmsChanged += (_, _) => raised = true;
+
+        await sut.CreateFarmAsync("Event Farm");
+
+        Assert.True(raised);
+    }
+
+    [Fact]
+    public async Task ExportFarm_UnknownId_ReturnsEmptyObject()
+    {
+        var sut = CreateSut();
+        var result = await sut.ExportFarmAsync(Guid.NewGuid());
+        Assert.Equal("{}", result);
+    }
+}
diff --git a/tests/MakerPrompt.Tests.Unit/Services/FilamentInventoryServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/FilamentInventoryServiceTests.cs
new file mode 100644
index 0000000..9c3f189
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Services/FilamentInventoryServiceTests.cs
@@ -0,0 +1,116 @@
+using MakerPrompt.Tests.Unit.Helpers;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace MakerPrompt.Tests.Unit.Services;
+
+/// <summary>
+/// Unit tests for <see cref="FilamentInventoryService"/>.
+/// </summary>
+public sealed class FilamentInventoryServiceTests
+{
+    private static FilamentInventoryService CreateSut() =>
+        new(new InMemoryAppLocalStorageProvider(), NullLogger<FilamentInventoryService>.Instance);
+
+    [Fact]
+    public void GetSpools_Initially_ReturnsEmpty()
+    {
+        var sut = CreateSut();
+        Assert.Empty(sut.GetSpools());
+    }
+
+    [Fact]
+    public async Task AddSpool_SpoolAppearsInList()
+    {
+        var sut = CreateSut();
+        var spool = new FilamentSpool { Name = "PETG Black", Material = "PETG" };
+
+        await sut.AddSpoolAsync(spool);
+
+        var spools = sut.GetSpools();
+        Assert.Single(spools);
+        Assert.Equal("PETG Black", spools[0].Name);
+    }
+
+    [Fact]
+    public async Task UpdateSpool_ReplacesExistingEntry()
+    {
+        var sut = CreateSut();
+        var spool = new FilamentSpool { Name = "PLA White" };
+        await sut.AddSpoolAsync(spool);
+
+        spool.Name = "PLA White (renamed)";
+        await sut.UpdateSpoolAsync(spool);
+
+        Assert.Equal("PLA White (renamed)", sut.GetSpool(spool.Id)?.Name);
+    }
+
+    [Fact]
+    public async Task DeleteSpool_SpoolNoLongerInList()
+    {
+        var sut = CreateSut();
+        var spool = new FilamentSpool { Name = "ABS Red" };
+        await sut.AddSpoolAsync(spool);
+
+        await sut.DeleteSpoolAsync(spool.Id);
+
+        Assert.Empty(sut.GetSpools());
+    }
+
+    [Fact]
+    public async Task DeductFilament_ReducesRemainingWeight()
+    {
+        var sut = CreateSut();
+        var spool = new FilamentSpool { RemainingWeightGrams = 500 };
+        await sut.AddSpoolAsync(spool);
+
+        await sut.DeductFilamentAsync(spool.Id, 100);
+
+        Assert.Equal(400, sut.GetSpool(spool.Id)!.RemainingWeightGrams);
+    }
+
+    [Fact]
+    public async Task DeductFilament_ClampsAtZero_NeverGoesNegative()
+    {
+        var sut = CreateSut();
+        var spool = new FilamentSpool { RemainingWeightGrams = 50 };
+        await sut.AddSpoolAsync(spool);
+
+        await sut.DeductFilamentAsync(spool.Id, 999);
+
+        Assert.Equal(0, sut.GetSpool(spool.Id)!.RemainingWeightGrams);
+    }
+
+    [Fact]
+    public async Task DeductFilament_UnknownSpool_DoesNotThrow()
+    {
+        var sut = CreateSut();
+        await sut.DeductFilamentAsync(Guid.NewGuid(), 100);
+    }
+
+    [Fact]
+    public async Task AddSpool_RaisesInventoryChangedEvent()
+    {
+        var sut = CreateSut();
+        var raised = false;
+        sut.InventoryChanged += (_, _) => raised = true;
+
+        await sut.AddSpoolAsync(new FilamentSpool { Name = "TPU" });
+
+        Assert.True(raised);
+    }
+
+    [Fact]
+    public async Task DeleteSpool_RaisesInventoryChangedEvent()
+    {
+        var sut = CreateSut();
+        var spool = new FilamentSpool();
+        await sut.AddSpoolAsync(spool);
+
+        var raised = false;
+        sut.InventoryChanged += (_, _) => raised = true;
+
+        await sut.DeleteSpoolAsync(spool.Id);
+
+        Assert.True(raised);
+    }
+}
diff --git a/tests/MakerPrompt.Tests.Unit/Services/PrintProjectServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/PrintProjectServiceTests.cs
new file mode 100644
index 0000000..a9c8611
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Services/PrintProjectServiceTests.cs
@@ -0,0 +1,158 @@
+using MakerPrompt.Tests.Unit.Helpers;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace MakerPrompt.Tests.Unit.Services;
+
+/// <summary>
+/// Unit tests for <see cref="PrintProjectService"/>.
+/// </summary>
+public sealed class PrintProjectServiceTests
+{
+    private static PrintProjectService CreateSut() =>
+        new(new InMemoryAppLocalStorageProvider(), NullLogger<PrintProjectService>.Instance);
+
+    [Fact]
+    public void GetProjects_Initially_ReturnsEmpty()
+    {
+        var sut = CreateSut();
+        Assert.Empty(sut.Projects);
+    }
+
+    [Fact]
+    public async Task AddProject_AppearsInList()
+    {
+        var sut = CreateSut();
+
+        await sut.AddProjectAsync("Test Print", "Some notes");
+
+        Assert.Single(sut.Projects);
+        Assert.Equal("Test Print", sut.Projects[0].Name);
+        Assert.Equal("Some notes", sut.Projects[0].Notes);
+    }
+
+    [Fact]
+    public async Task AddProject_TrimsName()
+    {
+        var sut = CreateSut();
+
+        await sut.AddProjectAsync("  Trimmed  ");
+
+        Assert.Equal("Trimmed", sut.Projects[0].Name);
+    }
+
+    [Fact]
+    public async Task RenameProject_UpdatesName()
+    {
+        var sut = CreateSut();
+        await sut.AddProjectAsync("Old Name");
+        var projectId = sut.Projects[0].Id;
+
+        await sut.RenameProjectAsync(projectId, "New Name");
+
+        Assert.Equal("New Name", sut.Projects[0].Name);
+    }
+
+    [Fact]
+    public async Task DeleteProject_RemovesFromList()
+    {
+        var sut = CreateSut();
+        await sut.AddProjectAsync("To Delete");
+        var projectId = sut.Projects[0].Id;
+
+        await sut.DeleteProjectAsync(projectId);
+
+        Assert.Empty(sut.Projects);
+    }
+
+    [Fact]
+    public async Task AddJob_JobAppearsInProject()
+    {
+        var sut = CreateSut();
+        await sut.AddProjectAsync("Batch");
+        var projectId = sut.Projects[0].Id;
+        var content = new MemoryStream(System.Text.Encoding.UTF8.GetBytes("G28\nG0 X10\n"));
+
+        await sut.AddJobAsync(projectId, "test.gcode", content);
+
+        Assert.Single(sut.Projects[0].Jobs);
+        Assert.Equal("test.gcode", sut.Projects[0].Jobs[0].FileName);
+    }
+
+    [Fact]
+    public async Task RemoveJob_JobRemovedFromProject()
+    {
+        var sut = CreateSut();
+        await sut.AddProjectAsync("P");
+        var projectId = sut.Projects[0].Id;
+        await sut.AddJobAsync(projectId, "file.gcode", new MemoryStream([1, 2, 3]));
+
+        var jobId = sut.Projects[0].Jobs[0].Id;
+        await sut.RemoveJobAsync(projectId, jobId);
+
+        Assert.Empty(sut.Projects[0].Jobs);
+    }
+
+    [Fact]
+    public async Task AssignJob_SetsPrinterAndStatusToPrinting()
+    {
+        var sut = CreateSut();
+        await sut.AddProjectAsync("P");
+        var projectId = sut.Projects[0].Id;
+        await sut.AddJobAsync(projectId, "job.gcode", new MemoryStream([1]));
+
+        var jobId = sut.Projects[0].Jobs[0].Id;
+        var printerId = Guid.NewGuid();
+
+        await sut.AssignJobAsync(projectId, jobId, printerId, "MK4 Alpha");
+
+        var job = sut.Projects[0].Jobs[0];
+        Assert.Equal(PrintJobStatus.Printing, job.Status);
+        Assert.Equal(printerId, job.AssignedPrinterId);
+        Assert.Equal("MK4 Alpha", job.AssignedPrinterName);
+    }
+
+    [Fact]
+    public async Task UpdateJobStatus_ChangesStatus()
+    {
+        var sut = CreateSut();
+        await sut.AddProjectAsync("P");
+        var projectId = sut.Projects[0].Id;
+        await sut.AddJobAsync(projectId, "j.gcode", new MemoryStream([1]));
+
+        var jobId = sut.Projects[0].Jobs[0].Id;
+
+        await sut.UpdateJobStatusAsync(projectId, jobId, PrintJobStatus.Completed);
+
+        Assert.Equal(PrintJobStatus.Completed, sut.Projects[0].Jobs[0].Status);
+    }
+
+    [Fact]
+    public async Task OpenJobFile_ReturnsFileContent()
+    {
+        var sut = CreateSut();
+        await sut.AddProjectAsync("P");
+        var projectId = sut.Projects[0].Id;
+        var originalBytes = System.Text.Encoding.UTF8.GetBytes("G28\nG1 X100\n");
+        await sut.AddJobAsync(projectId, "file.gcode", new MemoryStream(originalBytes));
+
+        var jobId = sut.Projects[0].Jobs[0].Id;
+        await using var stream = await sut.OpenJobFileAsync(projectId, jobId);
+
+        Assert.NotNull(stream);
+        using var reader = new StreamReader(stream!);
+        var content = await reader.ReadToEndAsync();
+        Assert.Equal("G28\nG1 X100\n", content);
+    }
+
+    [Fact]
+    public async Task ProjectsChanged_RaisedOnAdd()
+    {
+        var sut = CreateSut();
+        var raised = false;
+        sut.ProjectsChanged += (_, _) => raised = true;
+
+        await sut.AddProjectAsync("Event Test");
+
+        Assert.True(raised);
+    }
+}
diff --git a/tests/MakerPrompt.Tests.Unit/Services/PrinterFleetServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/PrinterFleetServiceTests.cs
new file mode 100644
index 0000000..a379b29
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Services/PrinterFleetServiceTests.cs
@@ -0,0 +1,141 @@
+using MakerPrompt.Infrastructure.Services;
+using MakerPrompt.Tests.Unit.Helpers;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace MakerPrompt.Tests.Unit.Services;
+
+/// <summary>
+/// Unit tests for <see cref="PrinterFleetService"/>.
+/// </summary>
+public sealed class PrinterFleetServiceTests : IAsyncDisposable
+{
+    private readonly PrinterFleetService _sut = new(NullLogger<PrinterFleetService>.Instance);
+
+    // ── AddAndConnect ────────────────────────────────────────────────────────
+
+    [Fact]
+    public async Task AddAndConnect_SuccessfulConnect_ReturnsTrueAndPrinterIsTracked()
+    {
+        var fake = new FakePrinterService { ConnectShouldSucceed = true };
+
+        var result = await _sut.AddAndConnectAsync("p1", fake, new PrinterConnectionSettings());
+
+        Assert.True(result);
+        Assert.Contains("p1", _sut.PrinterIds);
+    }
+
+    [Fact]
+    public async Task AddAndConnect_FailedConnect_ReturnsFalseButPrinterStillRegistered()
+    {
+        var fake = new FakePrinterService { ConnectShouldSucceed = false };
+
+        var result = await _sut.AddAndConnectAsync("p1", fake, new PrinterConnectionSettings());
+
+        Assert.False(result);
+        // Service is registered even on connection failure so the caller can retry.
+        Assert.Contains("p1", _sut.PrinterIds);
+    }
+
+    [Fact]
+    public async Task AddAndConnect_ReplacesExistingConnection()
+    {
+        var first = new FakePrinterService();
+        var second = new FakePrinterService();
+
+        await _sut.AddAndConnectAsync("p1", first, new PrinterConnectionSettings());
+        await _sut.AddAndConnectAsync("p1", second, new PrinterConnectionSettings());
+
+        // first should have been disconnected when replaced
+        Assert.False(first.IsConnected);
+        Assert.True(second.IsConnected);
+    }
+
+    // ── Remove ───────────────────────────────────────────────────────────────
+
+    [Fact]
+    public async Task Remove_DisconnectsAndUnregisters()
+    {
+        var fake = new FakePrinterService();
+        await _sut.AddAndConnectAsync("p1", fake, new PrinterConnectionSettings());
+
+        await _sut.RemoveAsync("p1");
+
+        Assert.DoesNotContain("p1", _sut.PrinterIds);
+        Assert.False(fake.IsConnected);
+    }
+
+    [Fact]
+    public async Task Remove_UnknownId_DoesNotThrow()
+    {
+        await _sut.RemoveAsync("nonexistent");
+        // No exception expected
+    }
+
+    // ── GetConnection ────────────────────────────────────────────────────────
+
+    [Fact]
+    public async Task GetConnection_ReturnsServiceForKnownId()
+    {
+        var fake = new FakePrinterService();
+        await _sut.AddAndConnectAsync("p1", fake, new PrinterConnectionSettings());
+
+        var retrieved = _sut.GetConnection("p1");
+
+        Assert.Same(fake, retrieved);
+    }
+
+    [Fact]
+    public void GetConnection_ReturnsNullForUnknownId()
+    {
+        Assert.Null(_sut.GetConnection("unknown"));
+    }
+
+    // ── GetFleetTelemetry ────────────────────────────────────────────────────
+
+    [Fact]
+    public async Task GetFleetTelemetry_IncludesOnlyConnectedPrinters()
+    {
+        var connected = new FakePrinterService { ConnectShouldSucceed = true };
+        var disconnected = new FakePrinterService { ConnectShouldSucceed = false };
+
+        await _sut.AddAndConnectAsync("p-connected", connected, new PrinterConnectionSettings());
+        await _sut.AddAndConnectAsync("p-disconnected", disconnected, new PrinterConnectionSettings());
+
+        var telemetry = _sut.GetFleetTelemetry();
+
+        Assert.Contains("p-connected", telemetry.Keys);
+        Assert.DoesNotContain("p-disconnected", telemetry.Keys);
+    }
+
+    // ── FleetChanged event ───────────────────────────────────────────────────
+
+    [Fact]
+    public async Task AddAndConnect_RaisesFleetChangedEvent()
+    {
+        var fake = new FakePrinterService();
+        var raised = false;
+        _sut.FleetChanged += (_, _) => raised = true;
+
+        await _sut.AddAndConnectAsync("p1", fake, new PrinterConnectionSettings());
+
+        Assert.True(raised);
+    }
+
+    // ── Disposal ─────────────────────────────────────────────────────────────
+
+    [Fact]
+    public async Task Dispose_DisconnectsAllPrinters()
+    {
+        var p1 = new FakePrinterService();
+        var p2 = new FakePrinterService();
+        await _sut.AddAndConnectAsync("p1", p1, new PrinterConnectionSettings());
+        await _sut.AddAndConnectAsync("p2", p2, new PrinterConnectionSettings());
+
+        await _sut.DisposeAsync();
+
+        Assert.False(p1.IsConnected);
+        Assert.False(p2.IsConnected);
+    }
+
+    public async ValueTask DisposeAsync() => await _sut.DisposeAsync();
+}
diff --git a/MakerPrompt.Tests/DemoPrinterServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/DemoPrinterServiceTests.cs
similarity index 85%
rename from MakerPrompt.Tests/DemoPrinterServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/DemoPrinterServiceTests.cs
index 5cc5a84..9893dcc 100644
--- a/MakerPrompt.Tests/DemoPrinterServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/DemoPrinterServiceTests.cs
@@ -1,8 +1,6 @@
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using static MakerPrompt.Shared.Utils.Enums;
+using PrinterStatus = MakerPrompt.Core.Models.PrinterStatus;
 
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class DemoPrinterServiceTests
 {
@@ -55,7 +53,7 @@ public async Task DisconnectAsync_ClearsIsConnectedAndSetsStatus()
     public async Task SetHotendTemp_ValidValue_UpdatesTelemetry()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetHotendTemp(200);
+        await svc.SetHotendTempAsync(200);
         Assert.Equal(200.0, svc.LastTelemetry.HotendTarget);
     }
 
@@ -63,7 +61,7 @@ public async Task SetHotendTemp_ValidValue_UpdatesTelemetry()
     public async Task SetHotendTemp_TooHigh_ClampsTo300()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetHotendTemp(500);
+        await svc.SetHotendTempAsync(500);
         Assert.Equal(300.0, svc.LastTelemetry.HotendTarget);
     }
 
@@ -71,7 +69,7 @@ public async Task SetHotendTemp_TooHigh_ClampsTo300()
     public async Task SetHotendTemp_Negative_ClampsToZero()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetHotendTemp(-50);
+        await svc.SetHotendTempAsync(-50);
         Assert.Equal(0.0, svc.LastTelemetry.HotendTarget);
     }
 
@@ -79,7 +77,7 @@ public async Task SetHotendTemp_Negative_ClampsToZero()
     public async Task SetBedTemp_ValidValue_UpdatesTelemetry()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetBedTemp(60);
+        await svc.SetBedTempAsync(60);
         Assert.Equal(60.0, svc.LastTelemetry.BedTarget);
     }
 
@@ -87,7 +85,7 @@ public async Task SetBedTemp_ValidValue_UpdatesTelemetry()
     public async Task SetBedTemp_TooHigh_ClampsTo120()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetBedTemp(200);
+        await svc.SetBedTempAsync(200);
         Assert.Equal(120.0, svc.LastTelemetry.BedTarget);
     }
 
@@ -98,8 +96,8 @@ public async Task Home_AllAxes_ResetsPositionToZero()
     {
         await using var svc = new DemoPrinterService();
         // Move first so position is non-zero
-        await svc.RelativeMove(3000, 10f, 20f, 5f);
-        await svc.Home(true, true, true);
+        await svc.RelativeMoveAsync(3000, 10f, 20f, 5f);
+        await svc.HomeAsync(true, true, true);
         Assert.Equal(0f, svc.LastTelemetry.Position.X, 2);
         Assert.Equal(0f, svc.LastTelemetry.Position.Y, 2);
         Assert.Equal(0f, svc.LastTelemetry.Position.Z, 2);
@@ -109,8 +107,8 @@ public async Task Home_AllAxes_ResetsPositionToZero()
     public async Task Home_OnlyX_ResetsOnlyXAxis()
     {
         await using var svc = new DemoPrinterService();
-        await svc.RelativeMove(3000, 10f, 20f, 5f);
-        await svc.Home(x: true, y: false, z: false);
+        await svc.RelativeMoveAsync(3000, 10f, 20f, 5f);
+        await svc.HomeAsync(x: true, y: false, z: false);
         Assert.Equal(0f, svc.LastTelemetry.Position.X, 2);
         Assert.NotEqual(0f, svc.LastTelemetry.Position.Y);  // Y unchanged
     }
@@ -119,7 +117,7 @@ public async Task Home_OnlyX_ResetsOnlyXAxis()
     public async Task RelativeMove_UpdatesPosition()
     {
         await using var svc = new DemoPrinterService();
-        await svc.RelativeMove(3000, x: 5f, y: 10f, z: 2f);
+        await svc.RelativeMoveAsync(3000, x: 5f, y: 10f, z: 2f);
         Assert.Equal(5f, svc.LastTelemetry.Position.X, 2);
         Assert.Equal(10f, svc.LastTelemetry.Position.Y, 2);
         Assert.Equal(2f, svc.LastTelemetry.Position.Z, 2);
@@ -129,8 +127,8 @@ public async Task RelativeMove_UpdatesPosition()
     public async Task RelativeMove_MultipleMoves_AccumulatesPosition()
     {
         await using var svc = new DemoPrinterService();
-        await svc.RelativeMove(3000, x: 5f);
-        await svc.RelativeMove(3000, x: 3f);
+        await svc.RelativeMoveAsync(3000, x: 5f);
+        await svc.RelativeMoveAsync(3000, x: 3f);
         Assert.Equal(8f, svc.LastTelemetry.Position.X, 2);
     }
 
@@ -140,7 +138,7 @@ public async Task RelativeMove_MultipleMoves_AccumulatesPosition()
     public async Task SetFanSpeed_ValidValue_ClampsAndUpdatesTelemetry()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetFanSpeed(75);
+        await svc.SetFanSpeedAsync(75);
         Assert.Equal(75, svc.LastTelemetry.FanSpeed);
     }
 
@@ -148,7 +146,7 @@ public async Task SetFanSpeed_ValidValue_ClampsAndUpdatesTelemetry()
     public async Task SetFanSpeed_TooHigh_ClampsTo100()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetFanSpeed(200);
+        await svc.SetFanSpeedAsync(200);
         Assert.Equal(100, svc.LastTelemetry.FanSpeed);
     }
 
@@ -156,7 +154,7 @@ public async Task SetFanSpeed_TooHigh_ClampsTo100()
     public async Task SetPrintSpeed_ValidValue_UpdatesFeedRate()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetPrintSpeed(150);
+        await svc.SetPrintSpeedAsync(150);
         Assert.Equal(150, svc.LastTelemetry.FeedRate);
     }
 
@@ -164,7 +162,7 @@ public async Task SetPrintSpeed_ValidValue_UpdatesFeedRate()
     public async Task SetPrintFlow_ValidValue_UpdatesFlowRate()
     {
         await using var svc = new DemoPrinterService();
-        await svc.SetPrintFlow(90);
+        await svc.SetPrintFlowAsync(90);
         Assert.Equal(90, svc.LastTelemetry.FlowRate);
     }
 
@@ -176,8 +174,8 @@ public async Task GetFilesAsync_ReturnsTwoDemoFiles()
         await using var svc = new DemoPrinterService();
         var files = await svc.GetFilesAsync();
         Assert.Equal(2, files.Count);
-        Assert.Contains(files, f => f.FullPath.Contains("DemoCube"));
-        Assert.Contains(files, f => f.FullPath.Contains("Benchy"));
+        Assert.Contains(files, f => f.Contains("DemoCube"));
+        Assert.Contains(files, f => f.Contains("Benchy"));
     }
 
     [Fact]
diff --git a/MakerPrompt.Tests/EncryptionServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/EncryptionServiceTests.cs
similarity index 98%
rename from MakerPrompt.Tests/EncryptionServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/EncryptionServiceTests.cs
index 4517247..fa76052 100644
--- a/MakerPrompt.Tests/EncryptionServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/EncryptionServiceTests.cs
@@ -1,7 +1,6 @@
-using MakerPrompt.Shared.Services;
 using System.Security.Cryptography;
 
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class EncryptionServiceTests
 {
diff --git a/MakerPrompt.Tests/GCodeCommandTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/GCodeCommandTests.cs
similarity index 97%
rename from MakerPrompt.Tests/GCodeCommandTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/GCodeCommandTests.cs
index e18b281..1047d05 100644
--- a/MakerPrompt.Tests/GCodeCommandTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/GCodeCommandTests.cs
@@ -1,8 +1,4 @@
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using static MakerPrompt.Shared.Utils.Enums;
-
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class GCodeCommandTests
 {
diff --git a/MakerPrompt.Tests/MoonrakerApiServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/MoonrakerApiServiceTests.cs
similarity index 86%
rename from MakerPrompt.Tests/MoonrakerApiServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/MoonrakerApiServiceTests.cs
index 161cb26..0643c38 100644
--- a/MakerPrompt.Tests/MoonrakerApiServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/MoonrakerApiServiceTests.cs
@@ -1,10 +1,6 @@
-using System.Net;
-using System.Text;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using static MakerPrompt.Shared.Utils.Enums;
+using PrinterStatus = MakerPrompt.Core.Models.PrinterStatus;
 
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class MoonrakerApiServiceTests
 {
@@ -28,7 +24,7 @@ public async Task GetPrinterTelemetryAsync_MapsStatus()
         var service = new MoonrakerApiService(handler);
         await service.ConnectAsync(BuildSettings());
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(215, telemetry.HotendTarget);
         Assert.Equal(60, telemetry.BedTarget);
@@ -43,7 +39,7 @@ public async Task SetHotendTemp_SendsGcodeScript()
         var service = new MoonrakerApiService(handler);
         await service.ConnectAsync(BuildSettings());
 
-        await service.SetHotendTemp(200);
+        await service.SetHotendTempAsync(200);
 
         Assert.Contains(handler.RequestPaths, p => p.Contains("/printer/gcode/script", StringComparison.Ordinal));
         Assert.Contains("M104+S200", handler.RequestPaths.Last());
@@ -56,20 +52,18 @@ public async Task StartPrint_InvokesPrintStartEndpoint()
         var service = new MoonrakerApiService(handler);
         await service.ConnectAsync(BuildSettings());
 
-        await service.StartPrint(new FileEntry { FullPath = "gcodes/test.gcode" });
+        await service.StartPrintAsync("gcodes/test.gcode");
 
         Assert.Contains(handler.RequestPaths, p => p.Contains("/printer/print/start", StringComparison.Ordinal));
     }
 
-        [Fact]
+    [Fact]
     public async Task GetGcodeHelpAsync_ReturnsParsedCommands()
     {
         var handler = new FakeMoonrakerHandler(BuildDefaultResponses());
         var service = new MoonrakerApiService(handler);
 
-        await service.ConnectAsync(new MakerPrompt.Shared.Models.PrinterConnectionSettings(
-            new MakerPrompt.Shared.Models.ApiConnectionSettings("http://moonraker.local", string.Empty, string.Empty),
-            PrinterConnectionType.Moonraker));
+        await service.ConnectAsync(BuildSettings());
 
         var help = await service.GetGcodeHelpAsync();
 
@@ -104,7 +98,7 @@ private static Func<HttpRequestMessage, HttpResponseMessage> BuildDefaultRespons
     }
 
     private static PrinterConnectionSettings BuildSettings() =>
-        new(new ApiConnectionSettings("http://moonraker.local", string.Empty, string.Empty), PrinterConnectionType.Moonraker);
+        new() { ConnectionType = PrinterConnectionType.Moonraker, ApiUrl = "http://moonraker.local" };
 
     private static HttpResponseMessage JsonResponse(string json) =>
         new(HttpStatusCode.OK)
diff --git a/MakerPrompt.Tests/OctoPrintApiServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/OctoPrintApiServiceTests.cs
similarity index 90%
rename from MakerPrompt.Tests/OctoPrintApiServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/OctoPrintApiServiceTests.cs
index d125dc2..3363767 100644
--- a/MakerPrompt.Tests/OctoPrintApiServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/OctoPrintApiServiceTests.cs
@@ -1,10 +1,6 @@
-using System.Net;
-using System.Text;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using static MakerPrompt.Shared.Utils.Enums;
+using PrinterStatus = MakerPrompt.Core.Models.PrinterStatus;
 
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class OctoPrintApiServiceTests
 {
@@ -30,7 +26,7 @@ public async Task GetPrinterTelemetryAsync_MapsTemperaturesAndStatus()
         await service.ConnectAsync(BuildSettings());
         service.updateTimer.Stop();
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(200.0, telemetry.HotendTemp, 1);
         Assert.Equal(210.0, telemetry.HotendTarget, 1);
@@ -50,8 +46,8 @@ public async Task GetFilesAsync_ReturnsAllRecursiveMachineCodeFiles()
         var files = await service.GetFilesAsync();
 
         Assert.Equal(2, files.Count);
-        Assert.Contains(files, f => f.FullPath == "root.gcode");
-        Assert.Contains(files, f => f.FullPath == "folder/nested.gcode");
+        Assert.Contains("root.gcode", files);
+        Assert.Contains("folder/nested.gcode", files);
     }
 
     [Fact]
@@ -125,7 +121,7 @@ private static Func<HttpRequestMessage, HttpResponseMessage> BuildDefaultRespons
     }
 
     private static PrinterConnectionSettings BuildSettings() =>
-        new(new ApiConnectionSettings("http://octoprint.local", string.Empty, "api-key"), PrinterConnectionType.OctoPrint);
+        new() { ConnectionType = PrinterConnectionType.OctoPrint, ApiUrl = "http://octoprint.local", Password = "api-key" };
 
     private static HttpResponseMessage JsonResponse(string json) =>
         new(HttpStatusCode.OK)
diff --git a/MakerPrompt.Tests/PrusaConnectApiServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectApiServiceTests.cs
similarity index 94%
rename from MakerPrompt.Tests/PrusaConnectApiServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectApiServiceTests.cs
index f8b4151..bc92f81 100644
--- a/MakerPrompt.Tests/PrusaConnectApiServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectApiServiceTests.cs
@@ -1,10 +1,6 @@
-using System.Net;
-using System.Text;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using static MakerPrompt.Shared.Utils.Enums;
+using PrinterStatus = MakerPrompt.Core.Models.PrinterStatus;
 
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class PrusaConnectApiServiceTests
 {
@@ -40,7 +36,7 @@ public async Task GetPrinterTelemetryAsync_MapsTelemetryAndJobFields()
         var service = new PrusaConnectApiService(new FakeHandler(DefaultResponder()));
         await service.ConnectAsync(BuildSettings());
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(215.0, telemetry.HotendTarget);
         Assert.Equal(200.0, telemetry.HotendTemp, precision: 1);
@@ -62,7 +58,7 @@ public async Task GetPrinterTelemetryAsync_MapsIdleState()
         }));
         await service.ConnectAsync(BuildSettings());
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(PrinterStatus.Connected, telemetry.Status);
     }
@@ -145,7 +141,7 @@ public async Task GetFilesAsync_ReturnsEmptyList()
     // ── Helpers ──
 
     private static PrinterConnectionSettings BuildSettings() =>
-        new(new ApiConnectionSettings(string.Empty, TestUuid, "test-api-key"), PrinterConnectionType.PrusaConnect);
+        new() { ConnectionType = PrinterConnectionType.PrusaConnect, UserName = TestUuid, Password = "test-api-key" };
 
     private static Func<HttpRequestMessage, HttpResponseMessage> DefaultResponder() =>
         req =>
diff --git a/MakerPrompt.Tests/PrusaConnectPrinterServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectPrinterServiceTests.cs
similarity index 93%
rename from MakerPrompt.Tests/PrusaConnectPrinterServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectPrinterServiceTests.cs
index 6e8ab5e..efd989b 100644
--- a/MakerPrompt.Tests/PrusaConnectPrinterServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectPrinterServiceTests.cs
@@ -1,10 +1,6 @@
-using System.Net;
-using System.Text;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using static MakerPrompt.Shared.Utils.Enums;
+using PrinterStatus = MakerPrompt.Core.Models.PrinterStatus;
 
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class PrusaConnectPrinterServiceTests
 {
@@ -44,7 +40,7 @@ public async Task GetPrinterTelemetryAsync_MapsTelemetryFromTelemetryEndpoint()
         await service.ConnectAsync(BuildSettings());
         service.updateTimer.Stop();
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(210.0, telemetry.HotendTarget, precision: 1);
         Assert.Equal(195.0, telemetry.HotendTemp,   precision: 1);
@@ -60,7 +56,7 @@ public async Task GetPrinterTelemetryAsync_MapsPrintingStateAndJobProgress()
         await service.ConnectAsync(BuildSettings());
         service.updateTimer.Stop();
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(PrinterStatus.Printing, telemetry.Status);
         Assert.Equal(75.0, telemetry.SDCard.Progress);
@@ -82,7 +78,7 @@ public async Task GetPrinterTelemetryAsync_MapsIdleStateToConnected()
         await service.ConnectAsync(BuildSettings());
         service.updateTimer.Stop();
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(PrinterStatus.Connected, telemetry.Status);
     }
@@ -138,7 +134,7 @@ public async Task GetFilesAsync_ReturnsEmptyList()
     // ── Helpers ──────────────────────────────────────────────────────────
 
     private static PrinterConnectionSettings BuildSettings() =>
-        new(new ApiConnectionSettings(string.Empty, TestUuid, TestToken), PrinterConnectionType.PrusaConnect);
+        new() { ConnectionType = PrinterConnectionType.PrusaConnect, UserName = TestUuid, Password = TestToken };
 
     private static Func<HttpRequestMessage, HttpResponseMessage> DefaultResponder() =>
         req =>
diff --git a/MakerPrompt.Tests/PrusaConnectProviderTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectProviderTests.cs
similarity index 81%
rename from MakerPrompt.Tests/PrusaConnectProviderTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectProviderTests.cs
index 259c83e..cd4081f 100644
--- a/MakerPrompt.Tests/PrusaConnectProviderTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaConnectProviderTests.cs
@@ -1,9 +1,4 @@
-using System.Net;
-using System.Text;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class PrusaConnectProviderTests
 {
@@ -13,19 +8,19 @@ public class PrusaConnectProviderTests
     public async Task GetPrintersAsync_ReturnsMapping_FromRootArray()
     {
         var provider = new PrusaConnectProvider(new FakeHandler(DefaultResponder()));
-        provider.Configure(TestToken);
+        await provider.ConfigureAsync(TestToken);
 
         var printers = await provider.GetPrintersAsync();
 
         Assert.Equal(2, printers.Count);
-        Assert.Contains(printers, p => p.Id   == "uuid-001" &&
-                                       p.Name  == "MK4 Alpha" &&
-                                       p.Model == "MK4" &&
-                                       p.Status == "IDLE");
-        Assert.Contains(printers, p => p.Id   == "uuid-002" &&
-                                       p.Name  == "Mini Beta" &&
-                                       p.Model == "MINI" &&
-                                       p.Status == "PRINTING");
+        Assert.Contains(printers, p => p.Id    == "uuid-001" &&
+                                       p.Name   == "MK4 Alpha" &&
+                                       p.Model  == "MK4" &&
+                                       p.RawStatus == "IDLE");
+        Assert.Contains(printers, p => p.Id    == "uuid-002" &&
+                                       p.Name   == "Mini Beta" &&
+                                       p.Model  == "MINI" &&
+                                       p.RawStatus == "PRINTING");
     }
 
     [Fact]
@@ -39,7 +34,7 @@ public async Task GetPrintersAsync_ReturnsMapping_FromNestedPrintersProperty()
             }
             """;
         var provider = new PrusaConnectProvider(new FakeHandler(_ => JsonResponse(json)));
-        provider.Configure(TestToken);
+        await provider.ConfigureAsync(TestToken);
 
         var printers = await provider.GetPrintersAsync();
 
@@ -53,7 +48,7 @@ public async Task GetPrintersAsync_ReturnsMapping_FromNestedPrintersProperty()
     public async Task GetPrintersAsync_ReturnsEmpty_WhenResponseIsNotSuccess()
     {
         var provider = new PrusaConnectProvider(new FakeHandler(_ => new HttpResponseMessage(HttpStatusCode.Unauthorized)));
-        provider.Configure(TestToken);
+        await provider.ConfigureAsync(TestToken);
 
         var printers = await provider.GetPrintersAsync();
 
@@ -63,7 +58,7 @@ public async Task GetPrintersAsync_ReturnsEmpty_WhenResponseIsNotSuccess()
     [Fact]
     public async Task GetPrintersAsync_ReturnsEmpty_WithoutConfigure()
     {
-        // No Configure() call → no auth header → 401 from real server.
+        // No ConfigureAsync() call → no auth header → 401 from real server.
         // We simulate a 401 here too since no token was set.
         var provider = new PrusaConnectProvider(new FakeHandler(_ => new HttpResponseMessage(HttpStatusCode.Unauthorized)));
 
@@ -82,7 +77,7 @@ public async Task GetPrintersAsync_SkipsEntriesWithoutUuid()
             ]
             """;
         var provider = new PrusaConnectProvider(new FakeHandler(_ => JsonResponse(json)));
-        provider.Configure(TestToken);
+        await provider.ConfigureAsync(TestToken);
 
         var printers = await provider.GetPrintersAsync();
 
@@ -94,7 +89,7 @@ public async Task GetPrintersAsync_SkipsEntriesWithoutUuid()
     public async Task GetPrintersAsync_ReturnsEmpty_OnNetworkError()
     {
         var provider = new PrusaConnectProvider(new ThrowingHandler());
-        provider.Configure(TestToken);
+        await provider.ConfigureAsync(TestToken);
 
         var printers = await provider.GetPrintersAsync();
 
diff --git a/MakerPrompt.Tests/PrusaLinkApiServiceTests.cs b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaLinkApiServiceTests.cs
similarity index 89%
rename from MakerPrompt.Tests/PrusaLinkApiServiceTests.cs
rename to tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaLinkApiServiceTests.cs
index bb2a96d..add6b23 100644
--- a/MakerPrompt.Tests/PrusaLinkApiServiceTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Services/Printers/PrusaLinkApiServiceTests.cs
@@ -1,10 +1,6 @@
-using System.Net;
-using System.Text;
-using MakerPrompt.Shared.Models;
-using MakerPrompt.Shared.Services;
-using static MakerPrompt.Shared.Utils.Enums;
+using PrinterStatus = MakerPrompt.Core.Models.PrinterStatus;
 
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Services.Printers;
 
 public class PrusaLinkApiServiceTests
 {
@@ -29,7 +25,7 @@ public async Task GetPrinterTelemetryAsync_MapsStatusFields()
         var service = new PrusaLinkApiService(handler);
         await service.ConnectAsync(BuildSettings());
 
-        var telemetry = await service.GetPrinterTelemetryAsync();
+        var telemetry = await service.GetTelemetryAsync();
 
         Assert.Equal(215, telemetry.HotendTarget);
         Assert.Equal(60, telemetry.BedTarget);
@@ -47,8 +43,7 @@ public async Task GetFilesAsync_ReturnsChildrenFromDefaultStorage()
         var files = await service.GetFilesAsync();
 
         Assert.Single(files);
-        Assert.Equal("/local/file.gcode", files[0].FullPath);
-        Assert.Equal(424242, files[0].Size);
+        Assert.Equal("/local/file.gcode", files[0]);
     }
 
     private static Func<HttpRequestMessage, HttpResponseMessage> BuildDefaultResponses()
@@ -79,7 +74,7 @@ var p when p.StartsWith("/api/v1/files/local/") => JsonResponse("""
     }
 
     private static PrinterConnectionSettings BuildSettings() =>
-        new(new ApiConnectionSettings("http://printer.local", "user", "pass"), PrinterConnectionType.PrusaLink);
+        new() { ConnectionType = PrinterConnectionType.PrusaLink, ApiUrl = "http://printer.local", UserName = "user", Password = "pass" };
 
     private static HttpResponseMessage JsonResponse(string json) =>
         new(HttpStatusCode.OK)
diff --git a/MakerPrompt.Tests/EnumExtensionsTests.cs b/tests/MakerPrompt.Tests.Unit/Utils/EnumExtensionsTests.cs
similarity index 60%
rename from MakerPrompt.Tests/EnumExtensionsTests.cs
rename to tests/MakerPrompt.Tests.Unit/Utils/EnumExtensionsTests.cs
index b76c91f..065e6f4 100644
--- a/MakerPrompt.Tests/EnumExtensionsTests.cs
+++ b/tests/MakerPrompt.Tests.Unit/Utils/EnumExtensionsTests.cs
@@ -1,7 +1,4 @@
-using MakerPrompt.Shared.Utils;
-using static MakerPrompt.Shared.Utils.Enums;
-
-namespace MakerPrompt.Tests;
+namespace MakerPrompt.Tests.Unit.Utils;
 
 public class EnumExtensionsTests
 {
@@ -47,35 +44,4 @@ public void GetStepAngleValue_ReturnsCorrectDecimal()
         Assert.Equal(0.75m, MotorStepAngle.Step7_5.GetStepAngleValue());
         Assert.Equal(1.50m, MotorStepAngle.Step15.GetStepAngleValue());
     }
-
-    [Fact]
-    public void GetMotorStepAngleOptions_ReturnsFourOptions_WithNonEmptyLabels()
-    {
-        var opts = EnumExtensions.GetMotorStepAngleOptions();
-        Assert.Equal(4, opts.Count);
-        Assert.All(opts, o => Assert.NotEmpty(o.Value));
-        Assert.Contains(opts, o => o.Key == MotorStepAngle.Step1_8);
-        Assert.Contains(opts, o => o.Key == MotorStepAngle.Step0_9);
-    }
-
-    [Fact]
-    public void GetMicrosteppingOptions_ReturnsEightOptions_WithNonEmptyLabels()
-    {
-        var opts = EnumExtensions.GetMicrosteppingOptions();
-        Assert.Equal(8, opts.Count);
-        Assert.All(opts, o => Assert.NotEmpty(o.Value));
-        Assert.Contains(opts, o => o.Key == MicrosteppingMode.FullStep);
-        Assert.Contains(opts, o => o.Key == MicrosteppingMode.SixtyFourthStep);
-    }
-
-    [Fact]
-    public void GetAllValues_PrinterStatus_ReturnsAllStatuses()
-    {
-        var values = EnumExtensions.GetAllValues<PrinterStatus>().ToList();
-        Assert.Contains(PrinterStatus.Disconnected, values);
-        Assert.Contains(PrinterStatus.Connected, values);
-        Assert.Contains(PrinterStatus.Printing, values);
-        Assert.Contains(PrinterStatus.Paused, values);
-        Assert.Contains(PrinterStatus.Error, values);
-    }
 }
diff --git a/tests/MakerPrompt.Tests.Unit/Utils/FakePrinterService.cs b/tests/MakerPrompt.Tests.Unit/Utils/FakePrinterService.cs
new file mode 100644
index 0000000..84e71ed
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/Utils/FakePrinterService.cs
@@ -0,0 +1,80 @@
+namespace MakerPrompt.Tests.Unit.Utils;
+
+/// <summary>
+/// A minimal, fully-controllable in-memory implementation of
+/// <see cref="IPrinterCommunicationService"/> for use in unit tests.
+/// </summary>
+public sealed class FakePrinterService : IPrinterCommunicationService
+{
+    public PrinterConnectionType ConnectionType { get; set; } = PrinterConnectionType.Demo;
+    public PrinterTelemetry LastTelemetry { get; set; } = new();
+    public string ConnectionName { get; set; } = "FakePrinter";
+    public bool IsConnected { get; private set; }
+    public bool IsPrinting { get; private set; }
+
+    public bool ConnectShouldSucceed { get; set; } = true;
+    public PrinterTelemetry? TelemetryToReturn { get; set; }
+
+    public event EventHandler<bool>? ConnectionStateChanged;
+    public event EventHandler<PrinterTelemetry>? TelemetryUpdated;
+
+    public Task<bool> ConnectAsync(PrinterConnectionSettings settings,
+        CancellationToken cancellationToken = default)
+    {
+        IsConnected = ConnectShouldSucceed;
+        ConnectionStateChanged?.Invoke(this, IsConnected);
+        return Task.FromResult(IsConnected);
+    }
+
+    public Task DisconnectAsync(CancellationToken cancellationToken = default)
+    {
+        IsConnected = false;
+        IsPrinting = false;
+        ConnectionStateChanged?.Invoke(this, false);
+        return Task.CompletedTask;
+    }
+
+    public Task WriteDataAsync(string command, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task<PrinterTelemetry> GetTelemetryAsync(CancellationToken cancellationToken = default)
+    {
+        var t = TelemetryToReturn ?? LastTelemetry;
+        TelemetryUpdated?.Invoke(this, t);
+        return Task.FromResult(t);
+    }
+
+    public Task<IReadOnlyList<string>> GetFilesAsync(CancellationToken cancellationToken = default)
+        => Task.FromResult<IReadOnlyList<string>>([]);
+
+    public Task SetHotendTempAsync(int targetCelsius, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task SetBedTempAsync(int targetCelsius, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task HomeAsync(bool x = true, bool y = true, bool z = true,
+        CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task RelativeMoveAsync(int feedRate, float x = 0, float y = 0, float z = 0, float e = 0,
+        CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task SetFanSpeedAsync(int speedPercent, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task SetPrintSpeedAsync(int speedPercent, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task SetPrintFlowAsync(int flowPercent, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task StartPrintAsync(string fileName, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public Task StartPrintAsync(GCodeDoc gcode, CancellationToken cancellationToken = default)
+        => Task.CompletedTask;
+
+    public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+}
diff --git a/tests/MakerPrompt.Tests.Unit/usings.cs b/tests/MakerPrompt.Tests.Unit/usings.cs
new file mode 100644
index 0000000..69b8535
--- /dev/null
+++ b/tests/MakerPrompt.Tests.Unit/usings.cs
@@ -0,0 +1,12 @@
+global using static MakerPrompt.UI.Components.Utils.Enums;
+global using System.Text;
+global using System.Net;
+global using MakerPrompt.Infrastructure.Services.Printers;
+global using MakerPrompt.Infrastructure.InMemoryStores;
+global using MakerPrompt.Core.Abstractions;
+global using MakerPrompt.Core.Models;
+global using MakerPrompt.UI.Components.Infrastructure;
+global using MakerPrompt.UI.Components.Services;
+global using MakerPrompt.UI.Components.Models;
+global using MakerPrompt.UI.Components.Utils;
+global using MakerPrompt.Tests.Unit.Utils;