diff --git a/NED.WoT.BattleResults.Client/App.xaml.cs b/NED.WoT.BattleResults.Client/App.xaml.cs
index 673911a..517fa70 100644
--- a/NED.WoT.BattleResults.Client/App.xaml.cs
+++ b/NED.WoT.BattleResults.Client/App.xaml.cs
@@ -1,11 +1,16 @@
-namespace NED.WoT.BattleResults.Client;
+
+namespace NED.WoT.BattleResults.Client;
 
 public partial class App : Application
 {
 	public App()
 	{
 		InitializeComponent();
+    }
+
+    protected override Window CreateWindow(IActivationState? activationState)
+    {
+        return new Window(new MainPage()) { Title = "test" };
+    }
 
-		MainPage = new MainPage();
-	}
 }
diff --git a/NED.WoT.BattleResults.Client/Shared/MainLayout.razor b/NED.WoT.BattleResults.Client/Components/Layout/MainLayout.razor
similarity index 100%
rename from NED.WoT.BattleResults.Client/Shared/MainLayout.razor
rename to NED.WoT.BattleResults.Client/Components/Layout/MainLayout.razor
diff --git a/NED.WoT.BattleResults.Client/Shared/MainLayout.razor.css b/NED.WoT.BattleResults.Client/Components/Layout/MainLayout.razor.css
similarity index 100%
rename from NED.WoT.BattleResults.Client/Shared/MainLayout.razor.css
rename to NED.WoT.BattleResults.Client/Components/Layout/MainLayout.razor.css
diff --git a/NED.WoT.BattleResults.Client/Pages/Index.razor b/NED.WoT.BattleResults.Client/Components/Pages/Index.razor
similarity index 100%
rename from NED.WoT.BattleResults.Client/Pages/Index.razor
rename to NED.WoT.BattleResults.Client/Components/Pages/Index.razor
diff --git a/NED.WoT.BattleResults.Client/Main.razor b/NED.WoT.BattleResults.Client/Components/Routes.razor
similarity index 53%
rename from NED.WoT.BattleResults.Client/Main.razor
rename to NED.WoT.BattleResults.Client/Components/Routes.razor
index 024ed16..c8bed4c 100644
--- a/NED.WoT.BattleResults.Client/Main.razor
+++ b/NED.WoT.BattleResults.Client/Components/Routes.razor
@@ -1,10 +1,10 @@
-<Router AppAssembly="@typeof(Main).Assembly">
+<Router AppAssembly="@typeof(MauiProgram).Assembly">
 	<Found Context="routeData">
-		<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+		<RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
 	</Found>
 	<NotFound>
-		<LayoutView Layout="@typeof(MainLayout)">
+		<LayoutView Layout="@typeof(Layout.MainLayout)">
 			<p role="alert">Sorry, there's nothing at this address.</p>
 		</LayoutView>
 	</NotFound>
diff --git a/NED.WoT.BattleResults.Client/Shared/ClanMembersDialog.razor b/NED.WoT.BattleResults.Client/Components/Shared/ClanMembersDialog.razor
similarity index 100%
rename from NED.WoT.BattleResults.Client/Shared/ClanMembersDialog.razor
rename to NED.WoT.BattleResults.Client/Components/Shared/ClanMembersDialog.razor
diff --git a/NED.WoT.BattleResults.Client/Shared/SettingsDialog.razor b/NED.WoT.BattleResults.Client/Components/Shared/SettingsDialog.razor
similarity index 100%
rename from NED.WoT.BattleResults.Client/Shared/SettingsDialog.razor
rename to NED.WoT.BattleResults.Client/Components/Shared/SettingsDialog.razor
diff --git a/NED.WoT.BattleResults.Client/Shared/TeamStats.razor b/NED.WoT.BattleResults.Client/Components/Shared/TeamStats.razor
similarity index 100%
rename from NED.WoT.BattleResults.Client/Shared/TeamStats.razor
rename to NED.WoT.BattleResults.Client/Components/Shared/TeamStats.razor
diff --git a/NED.WoT.BattleResults.Client/Shared/UndefinedNamesDialog.razor b/NED.WoT.BattleResults.Client/Components/Shared/UndefinedNamesDialog.razor
similarity index 100%
rename from NED.WoT.BattleResults.Client/Shared/UndefinedNamesDialog.razor
rename to NED.WoT.BattleResults.Client/Components/Shared/UndefinedNamesDialog.razor
diff --git a/NED.WoT.BattleResults.Client/_Imports.razor b/NED.WoT.BattleResults.Client/Components/_Imports.razor
similarity index 70%
rename from NED.WoT.BattleResults.Client/_Imports.razor
rename to NED.WoT.BattleResults.Client/Components/_Imports.razor
index 5bff648..a2d0554 100644
--- a/NED.WoT.BattleResults.Client/_Imports.razor
+++ b/NED.WoT.BattleResults.Client/Components/_Imports.razor
@@ -5,7 +5,9 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 @using NED.WoT.BattleResults.Client
-@using NED.WoT.BattleResults.Client.Shared
+@using NED.WoT.BattleResults.Client.Components.Shared
+@using NED.WoT.BattleResults.Client.Components.Layout
+@using NED.WoT.BattleResults.Client.Components.Pages
 @using NED.WoT.BattleResults.Client.Models
 @using NED.WoT.BattleResults.Client.Services
 @using MudBlazor
\ No newline at end of file
diff --git a/NED.WoT.BattleResults.Client/MainPage.xaml b/NED.WoT.BattleResults.Client/MainPage.xaml
index 679e557..dbfb0ff 100644
--- a/NED.WoT.BattleResults.Client/MainPage.xaml
+++ b/NED.WoT.BattleResults.Client/MainPage.xaml
@@ -7,7 +7,7 @@
 
     <BlazorWebView HostPage="wwwroot/index.html">
         <BlazorWebView.RootComponents>
-            <RootComponent Selector="#app" ComponentType="{x:Type local:Main}" />
+            <RootComponent Selector="#app" ComponentType="{x:Type local:Components.Routes}" />
         </BlazorWebView.RootComponents>
     </BlazorWebView>
 
diff --git a/NED.WoT.BattleResults.Client/MauiProgram.cs b/NED.WoT.BattleResults.Client/MauiProgram.cs
index 9015846..29807bf 100644
--- a/NED.WoT.BattleResults.Client/MauiProgram.cs
+++ b/NED.WoT.BattleResults.Client/MauiProgram.cs
@@ -1,4 +1,6 @@
-using MudBlazor.Services;
+using Microsoft.Extensions.Logging;
+
+using MudBlazor.Services;
 
 using NED.WoT.BattleResults.Client.Services;
 
@@ -11,11 +13,16 @@ public static MauiApp CreateMauiApp()
         var builder = MauiApp.CreateBuilder();
         builder
             .UseMauiApp<App>()
-            .ConfigureFonts(fonts => fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"));
+            .ConfigureFonts(fonts =>
+            {
+                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+            });
 
         builder.Services.AddMauiBlazorWebView();
+
 #if DEBUG
         builder.Services.AddBlazorWebViewDeveloperTools();
+        builder.Logging.AddDebug();
 #endif
 
         builder.Services.AddMudServices();
diff --git a/NED.WoT.BattleResults.Client/NED.WoT.BattleResults.Client.csproj b/NED.WoT.BattleResults.Client/NED.WoT.BattleResults.Client.csproj
index 461da49..4ba2d8b 100644
--- a/NED.WoT.BattleResults.Client/NED.WoT.BattleResults.Client.csproj
+++ b/NED.WoT.BattleResults.Client/NED.WoT.BattleResults.Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net8.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net9.0-windows10.0.19041.0</TargetFrameworks>
 
     <OutputType>Exe</OutputType>
     <RootNamespace>NED.WoT.BattleResults.Client</RootNamespace>
@@ -60,13 +60,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.92" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.92" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="8.0.92" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.10" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="$(MauiVersion)" />
     <PackageReference Include="MudBlazor" Version="7.15.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" Version="$(MauiVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/NED.WoT.BattleResults.Client/Platforms/Windows/Package.appxmanifest b/NED.WoT.BattleResults.Client/Platforms/Windows/Package.appxmanifest
index 2e6f707..3d602d2 100644
--- a/NED.WoT.BattleResults.Client/Platforms/Windows/Package.appxmanifest
+++ b/NED.WoT.BattleResults.Client/Platforms/Windows/Package.appxmanifest
@@ -6,7 +6,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="maui-package-name-placeholder" Publisher="CN=JimG" Version="1.10.1.0" />
+  <Identity Name="maui-package-name-placeholder" Publisher="CN=JimG" Version="1.11.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="3DAE7680-3F65-440F-908F-252D648F20FC" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>