diff --git a/src/NexusReader.Web.Client/Program.cs b/src/NexusReader.Web.Client/Program.cs
index 736517f..502d247 100644
--- a/src/NexusReader.Web.Client/Program.cs
+++ b/src/NexusReader.Web.Client/Program.cs
@@ -1,65 +1,52 @@
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.AspNetCore.Components.Authorization;
+using NexusReader.Web.Client;
+using NexusReader.UI.Shared.Services;
 using NexusReader.Application.Abstractions.Services;
 using NexusReader.Web.Client.Services;
-using NexusReader.UI.Shared.Services;
+using Microsoft.AspNetCore.Components.Authorization;
+using NexusReader.Web.Client.Handlers;
 using NexusReader.Application;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.AI;
-using NexusReader.Data.Persistence;
-
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-// Platform & UI Services
-builder.Services.AddScoped<IPlatformService, WebPlatformService>();
+// --- Identity & Auth ---
+builder.Services.AddAuthorizationCore();
+builder.Services.AddScoped<AuthenticationStateProvider, NexusAuthenticationStateProvider>();
+
+// --- Storage & Platform ---
 builder.Services.AddScoped<INativeStorageService, WebStorageService>();
+builder.Services.AddScoped<IPlatformService, WebPlatformService>();
+
+// --- Identity Service (WASM) ---
+builder.Services.AddScoped<IIdentityService, IdentityService>();
+
+// --- App Services ---
+builder.Services.AddScoped<IEpubReader, WasmEpubReader>();
+builder.Services.AddScoped<IEpubMetadataExtractor, WasmEpubMetadataExtractor>();
+builder.Services.AddScoped<IKnowledgeService, WasmKnowledgeService>();
+builder.Services.AddScoped<IKnowledgeGraphService, KnowledgeGraphService>();
 builder.Services.AddScoped<IThemeService, ThemeService>();
-builder.Services.AddScoped<IQuizStateService, QuizStateService>();
 builder.Services.AddScoped<IFocusModeService, FocusModeService>();
 builder.Services.AddScoped<IReaderNavigationService, ReaderNavigationService>();
-builder.Services.AddScoped<IKnowledgeGraphService, KnowledgeGraphService>();
 builder.Services.AddScoped<IReaderInteractionService, ReaderInteractionService>();
-builder.Services.AddScoped<KnowledgeCoordinator>();
+builder.Services.AddScoped<IQuizStateService, QuizStateService>();
 builder.Services.AddScoped<ISyncService, SyncService>();
+builder.Services.AddScoped<KnowledgeCoordinator>();
 
-// Identity & Auth Services
-builder.Services.AddOptions();
-builder.Services.AddAuthorizationCore();
-builder.Services.AddScoped<IIdentityService, IdentityService>();
-builder.Services.AddScoped<NexusAuthenticationStateProvider>();
-builder.Services.AddScoped<AuthenticationStateProvider>(sp => sp.GetRequiredService<NexusAuthenticationStateProvider>());
-builder.Services.AddCascadingAuthenticationState();
+// --- Application Layer (Mappings etc) ---
+builder.Services.AddApplication();
 
-// AI & Content Services
-builder.Services.AddScoped<IKnowledgeService, WasmKnowledgeService>();
+// --- HttpClient Configuration ---
+builder.Services.AddTransient<AuthenticationHeaderHandler>();
 
-builder.Services.AddTransient<NexusReader.Web.Client.Handlers.AuthenticationHeaderHandler>();
 builder.Services.AddHttpClient("NexusAPI", client => 
-{
-    client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress);
-}).AddHttpMessageHandler<NexusReader.Web.Client.Handlers.AuthenticationHeaderHandler>();
+    {
+        client.BaseAddress = new Uri(builder.HostEnvironment.BaseAddress);
+    })
+    .AddHttpMessageHandler<AuthenticationHeaderHandler>();
 
+// Default HttpClient for services that don't need the header handler (or handle it themselves)
 builder.Services.AddScoped(sp => sp.GetRequiredService<IHttpClientFactory>().CreateClient("NexusAPI"));
 
-// Dummy registrations for server-only handlers to satisfy DI validation
-builder.Services.AddSingleton<IDbContextFactory<AppDbContext>>(new ThrowingDbContextFactory());
-builder.Services.AddSingleton<IEmbeddingGenerator<string, Embedding<float>>>(new ThrowingEmbeddingGenerator());
-
-builder.Services.AddApplication();
-builder.Services.AddScoped<IEpubService, WasmEpubService>();
-
 await builder.Build().RunAsync();
-
-public class ThrowingDbContextFactory : IDbContextFactory<AppDbContext>
-{
-    public AppDbContext CreateDbContext() => throw new NotSupportedException("DbContext cannot be used in WASM client.");
-}
-
-public class ThrowingEmbeddingGenerator : IEmbeddingGenerator<string, Embedding<float>>
-{
-    public void Dispose() { }
-    public Task<GeneratedEmbeddings<Embedding<float>>> GenerateAsync(IEnumerable<string> values, EmbeddingGenerationOptions? options = null, CancellationToken cancellationToken = default) 
-        => throw new NotSupportedException("Embedding generation cannot be used in WASM client.");
-    public object? GetService(Type serviceType, object? serviceKey = null) => null;
-}