diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj
index 3e10c132..4f49f9e0 100644
--- a/Moonlight/Moonlight.csproj
+++ b/Moonlight/Moonlight.csproj
@@ -79,4 +79,22 @@
     <Folder Include="storage\resources\public\background\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AdditionalFiles Include="Shared\Views\Server\Settings\DotnetFileSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\DotnetVersionSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\FabricVersionSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\ForgeVersionSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\JavaFileSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\JavaRuntimeVersionSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\JavascriptFileSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\JavascriptVersionSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\Join2StartSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\PaperVersionSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\PythonFileSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\PythonVersionSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\ServerDeleteSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\ServerRenameSetting.razor" />
+    <AdditionalFiles Include="Shared\Views\Server\Settings\ServerResetSetting.razor" />
+  </ItemGroup>
+
 </Project>
diff --git a/Moonlight/Shared/Views/Server/Index.razor b/Moonlight/Shared/Views/Server/Index.razor
index 2a83a246..ddfad9c1 100644
--- a/Moonlight/Shared/Views/Server/Index.razor
+++ b/Moonlight/Shared/Views/Server/Index.razor
@@ -5,14 +5,12 @@
 @using Logging.Net
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Events
-@using Moonlight.App.Helpers
 @using Moonlight.App.Helpers.Wings
 @using Moonlight.App.Helpers.Wings.Enums
 @using Moonlight.App.Repositories
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Sessions
 @using Moonlight.Shared.Components.Xterm
-@using Moonlight.Shared.Components.ServerControl
 @using Newtonsoft.Json
 
 @inject ImageRepository ImageRepository
@@ -106,61 +104,38 @@
                     <CascadingValue Value="Console">
                         <CascadingValue Value="CurrentServer">
                             <CascadingValue Value="Tags">
-                                <CascadingValue Value="Node">
-                                    <CascadingValue Value="Image">
-                                        <CascadingValue Value="NodeAllocation">
-                                            @{
-                                                var index = 0;
-
-                                                switch (Route)
-                                                {
-                                                    case "files":
-                                                        index = 1;
-                                                        break;
-                                                    case "backups":
-                                                        index = 2;
-                                                        break;
-                                                    case "network":
-                                                        index = 3;
-                                                        break;
-                                                    case "addons":
-                                                        index = 4;
-                                                        break;
-                                                    case "settings":
-                                                        index = 5;
-                                                        break;
-                                                    default:
-                                                        index = 0;
-                                                        break;
-                                                }
-                                            }
-
-                                            <ServerNavigation Index="index">
-                                                @switch (Route)
-                                                {
-                                                    case "files":
-                                                        <ServerFiles></ServerFiles>
-                                                        break;
-                                                    case "backups":
-                                                        <ServerBackups></ServerBackups>
-                                                        break;
-                                                    case "network":
-                                                        <ServerNetwork></ServerNetwork>
-                                                        break;
-                                                    case "addons":
-                                                        <ServerAddons></ServerAddons>
-                                                        break;
-                                                    case "settings":
-                                                        <ServerSettings></ServerSettings>
-                                                        break;
-                                                    default:
-                                                        <ServerConsole></ServerConsole>
-                                                        break;
-                                                }
-                                            </ServerNavigation>
-                                        </CascadingValue>
-                                    </CascadingValue>
-                                </CascadingValue>
+                                <SmartRouter Route="@Route">
+                                    <Route Path="/">
+                                        <ServerNavigation Index="0">
+                                            <ServerConsole/>
+                                        </ServerNavigation>
+                                    </Route>
+                                    <Route Path="/files">
+                                        <ServerNavigation Index="1">
+                                            <ServerFiles/>
+                                        </ServerNavigation>
+                                    </Route>
+                                    <Route Path="/backups">
+                                        <ServerNavigation Index="2">
+                                             <ServerBackups/>
+                                        </ServerNavigation>
+                                    </Route>
+                                    <Route Path="/network">
+                                        <ServerNavigation Index="3">
+                                            <ServerNetwork/>
+                                        </ServerNavigation>
+                                    </Route>
+                                    <Route Path="/addons">
+                                        <ServerNavigation Index="4">
+                                            <ServerAddons/>
+                                        </ServerNavigation>
+                                    </Route>
+                                    <Route Path="/settings">
+                                        <ServerNavigation Index="5">
+                                            <ServerSettings/>
+                                        </ServerNavigation>
+                                    </Route>
+                                </SmartRouter>
                             </CascadingValue>
                         </CascadingValue>
                     </CascadingValue>
diff --git a/Moonlight/Shared/Components/ServerControl/ServerAddons.razor b/Moonlight/Shared/Views/Server/ServerAddons.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/ServerAddons.razor
rename to Moonlight/Shared/Views/Server/ServerAddons.razor
diff --git a/Moonlight/Shared/Components/ServerControl/ServerBackups.razor b/Moonlight/Shared/Views/Server/ServerBackups.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/ServerBackups.razor
rename to Moonlight/Shared/Views/Server/ServerBackups.razor
diff --git a/Moonlight/Shared/Components/ServerControl/ServerConsole.razor b/Moonlight/Shared/Views/Server/ServerConsole.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/ServerConsole.razor
rename to Moonlight/Shared/Views/Server/ServerConsole.razor
diff --git a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor b/Moonlight/Shared/Views/Server/ServerFiles.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/ServerFiles.razor
rename to Moonlight/Shared/Views/Server/ServerFiles.razor
diff --git a/Moonlight/Shared/Components/ServerControl/ServerNavigation.razor b/Moonlight/Shared/Views/Server/ServerNavigation.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/ServerNavigation.razor
rename to Moonlight/Shared/Views/Server/ServerNavigation.razor
diff --git a/Moonlight/Shared/Components/ServerControl/ServerNetwork.razor b/Moonlight/Shared/Views/Server/ServerNetwork.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/ServerNetwork.razor
rename to Moonlight/Shared/Views/Server/ServerNetwork.razor
diff --git a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor b/Moonlight/Shared/Views/Server/ServerSettings.razor
similarity index 98%
rename from Moonlight/Shared/Components/ServerControl/ServerSettings.razor
rename to Moonlight/Shared/Views/Server/ServerSettings.razor
index 3afd4ea1..1fba9e2e 100644
--- a/Moonlight/Shared/Components/ServerControl/ServerSettings.razor
+++ b/Moonlight/Shared/Views/Server/ServerSettings.razor
@@ -1,5 +1,5 @@
 @using Moonlight.App.Database.Entities
-@using Moonlight.Shared.Components.ServerControl.Settings
+@using Moonlight.Shared.Views.Server.Settings
 @using Microsoft.AspNetCore.Components.Rendering
 
 <LazyLoader Load="Load">
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/DotnetFileSetting.razor b/Moonlight/Shared/Views/Server/Settings/DotnetFileSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/DotnetFileSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/DotnetFileSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/DotnetVersionSetting.razor b/Moonlight/Shared/Views/Server/Settings/DotnetVersionSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/DotnetVersionSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/DotnetVersionSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/FabricVersionSetting.razor b/Moonlight/Shared/Views/Server/Settings/FabricVersionSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/FabricVersionSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/FabricVersionSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/ForgeVersionSetting.razor b/Moonlight/Shared/Views/Server/Settings/ForgeVersionSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/ForgeVersionSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/ForgeVersionSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/JavaFileSetting.razor b/Moonlight/Shared/Views/Server/Settings/JavaFileSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/JavaFileSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/JavaFileSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/JavaRuntimeVersionSetting.razor b/Moonlight/Shared/Views/Server/Settings/JavaRuntimeVersionSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/JavaRuntimeVersionSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/JavaRuntimeVersionSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor b/Moonlight/Shared/Views/Server/Settings/JavascriptFileSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/JavascriptFileSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/JavascriptFileSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/JavascriptVersionSetting.razor b/Moonlight/Shared/Views/Server/Settings/JavascriptVersionSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/JavascriptVersionSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/JavascriptVersionSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/Join2StartSetting.razor b/Moonlight/Shared/Views/Server/Settings/Join2StartSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/Join2StartSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/Join2StartSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor b/Moonlight/Shared/Views/Server/Settings/PaperVersionSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/PaperVersionSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor b/Moonlight/Shared/Views/Server/Settings/PythonFileSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/PythonFileSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/PythonFileSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/PythonVersionSetting.razor b/Moonlight/Shared/Views/Server/Settings/PythonVersionSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/PythonVersionSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/PythonVersionSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/ServerDeleteSetting.razor b/Moonlight/Shared/Views/Server/Settings/ServerDeleteSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/ServerDeleteSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/ServerDeleteSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/ServerRenameSetting.razor b/Moonlight/Shared/Views/Server/Settings/ServerRenameSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/ServerRenameSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/ServerRenameSetting.razor
diff --git a/Moonlight/Shared/Components/ServerControl/Settings/ServerResetSetting.razor b/Moonlight/Shared/Views/Server/Settings/ServerResetSetting.razor
similarity index 100%
rename from Moonlight/Shared/Components/ServerControl/Settings/ServerResetSetting.razor
rename to Moonlight/Shared/Views/Server/Settings/ServerResetSetting.razor