diff --git a/Hosts/MoonlightServers.Api.Host/MoonlightServers.Api.Host.csproj b/Hosts/MoonlightServers.Api.Host/MoonlightServers.Api.Host.csproj
index 4b8fe6a..6d2dfe3 100644
--- a/Hosts/MoonlightServers.Api.Host/MoonlightServers.Api.Host.csproj
+++ b/Hosts/MoonlightServers.Api.Host/MoonlightServers.Api.Host.csproj
@@ -8,15 +8,14 @@
 
     <ItemGroup>
 
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.5"/>
 
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
 
         <PackageReference Include="SimplePlugin" Version="1.0.2"/>
-
         <PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/>
     </ItemGroup>
 
diff --git a/Hosts/MoonlightServers.Frontend.Host/MoonlightServers.Frontend.Host.csproj b/Hosts/MoonlightServers.Frontend.Host/MoonlightServers.Frontend.Host.csproj
index f3bb0c4..f1f2179 100644
--- a/Hosts/MoonlightServers.Frontend.Host/MoonlightServers.Frontend.Host.csproj
+++ b/Hosts/MoonlightServers.Frontend.Host/MoonlightServers.Frontend.Host.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3"/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" PrivateAssets="all"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" PrivateAssets="all"/>
         <PackageReference Include="SimplePlugin" Version="1.0.2"/>
         <PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/>
     </ItemGroup>
diff --git a/Hosts/MoonlightServers.Frontend.Host/Styles/styles.css b/Hosts/MoonlightServers.Frontend.Host/Styles/styles.css
index a327a22..7b01f45 100644
--- a/Hosts/MoonlightServers.Frontend.Host/Styles/styles.css
+++ b/Hosts/MoonlightServers.Frontend.Host/Styles/styles.css
@@ -5,7 +5,7 @@
 @import "../bin/ShadcnBlazor/default-theme.css";
 @import "./theme.css";
 
-@source "../bin/Moonlight.Frontend/*.map";
+@source "../bin/**/*.map";
 
 @source "../../../MoonlightServers.Api/**/*.razor";
 @source "../../../MoonlightServers.Api/**/*.cs";
diff --git a/MoonlightServers.Api/Admin/Nodes/CrudController.cs b/MoonlightServers.Api/Admin/Nodes/CrudController.cs
index 287dbf0..9533de2 100644
--- a/MoonlightServers.Api/Admin/Nodes/CrudController.cs
+++ b/MoonlightServers.Api/Admin/Nodes/CrudController.cs
@@ -3,8 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Hybrid;
-using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Api.Infrastructure.Implementations.NodeToken;
diff --git a/MoonlightServers.Api/Admin/Templates/CrudController.cs b/MoonlightServers.Api/Admin/Templates/CrudController.cs
index 6d39d5d..7df9be5 100644
--- a/MoonlightServers.Api/Admin/Templates/CrudController.cs
+++ b/MoonlightServers.Api/Admin/Templates/CrudController.cs
@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.Shared.Http.Requests;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Api.Infrastructure.Database.Json;
diff --git a/MoonlightServers.Api/Admin/Templates/DockerImagesController.cs b/MoonlightServers.Api/Admin/Templates/DockerImagesController.cs
index 646ac4f..2b2fc8b 100644
--- a/MoonlightServers.Api/Admin/Templates/DockerImagesController.cs
+++ b/MoonlightServers.Api/Admin/Templates/DockerImagesController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Shared;
diff --git a/MoonlightServers.Api/Admin/Templates/VariablesController.cs b/MoonlightServers.Api/Admin/Templates/VariablesController.cs
index fd2e07c..40340d5 100644
--- a/MoonlightServers.Api/Admin/Templates/VariablesController.cs
+++ b/MoonlightServers.Api/Admin/Templates/VariablesController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Shared;
diff --git a/MoonlightServers.Api/Infrastructure/Database/DataContext.cs b/MoonlightServers.Api/Infrastructure/Database/DataContext.cs
index 6eef4ec..7124553 100644
--- a/MoonlightServers.Api/Infrastructure/Database/DataContext.cs
+++ b/MoonlightServers.Api/Infrastructure/Database/DataContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using Moonlight.Api.Configuration;
+using Moonlight.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 
 namespace MoonlightServers.Api.Infrastructure.Database;
diff --git a/MoonlightServers.Api/MoonlightServers.Api.csproj b/MoonlightServers.Api/MoonlightServers.Api.csproj
index 68327c1..36d3052 100644
--- a/MoonlightServers.Api/MoonlightServers.Api.csproj
+++ b/MoonlightServers.Api/MoonlightServers.Api.csproj
@@ -23,8 +23,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
         <PackageReference Include="Moonlight.Api" Version="2.1.0">
             <ExcludeAssets>content;contentfiles</ExcludeAssets>
         </PackageReference>
diff --git a/MoonlightServers.Api/Startup.cs b/MoonlightServers.Api/Startup.cs
index ec6ca01..2c9ac2c 100644
--- a/MoonlightServers.Api/Startup.cs
+++ b/MoonlightServers.Api/Startup.cs
@@ -8,8 +8,8 @@ using MoonlightServers.Api.Admin.Templates;
 using MoonlightServers.Api.Infrastructure.Configuration;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Implementations.NodeToken;
+using MoonlightServers.Shared;
 using SimplePlugin.Abstractions;
-using SerializationContext = MoonlightServers.Shared.SerializationContext;
 
 namespace MoonlightServers.Api;
 
diff --git a/MoonlightServers.Frontend/Admin/Nodes/Create.razor b/MoonlightServers.Frontend/Admin/Nodes/Create.razor
index 3a3fb1b..1f23a99 100644
--- a/MoonlightServers.Frontend/Admin/Nodes/Create.razor
+++ b/MoonlightServers.Frontend/Admin/Nodes/Create.razor
@@ -1,7 +1,7 @@
 @page "/admin/servers/nodes/create"
 
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Nodes
 @using ShadcnBlazor.Buttons
diff --git a/MoonlightServers.Frontend/Admin/Nodes/Edit.razor b/MoonlightServers.Frontend/Admin/Nodes/Edit.razor
index c9d5e10..54f28fe 100644
--- a/MoonlightServers.Frontend/Admin/Nodes/Edit.razor
+++ b/MoonlightServers.Frontend/Admin/Nodes/Edit.razor
@@ -2,7 +2,7 @@
 
 @using System.Net
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Nodes
 @using ShadcnBlazor.Buttons
diff --git a/MoonlightServers.Frontend/Admin/Nodes/Overview.razor b/MoonlightServers.Frontend/Admin/Nodes/Overview.razor
index 8c75fbe..f1436ac 100644
--- a/MoonlightServers.Frontend/Admin/Nodes/Overview.razor
+++ b/MoonlightServers.Frontend/Admin/Nodes/Overview.razor
@@ -1,13 +1,11 @@
 @using LucideBlazor
-@using Moonlight.Shared.Http.Requests
-@using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Shared
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Nodes
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Dropdowns
 @using ShadcnBlazor.Extras.AlertDialogs
-@using ShadcnBlazor.Extras.Dialogs
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Tabels
 
diff --git a/MoonlightServers.Frontend/Admin/Templates/Create.razor b/MoonlightServers.Frontend/Admin/Templates/Create.razor
index 7ad4bc6..5cff7c8 100644
--- a/MoonlightServers.Frontend/Admin/Templates/Create.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/Create.razor
@@ -1,7 +1,7 @@
 @page "/admin/servers/templates/create"
 
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Buttons
@@ -10,7 +10,6 @@
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Tab
 
 @inject HttpClient HttpClient
 @inject NavigationManager Navigation
diff --git a/MoonlightServers.Frontend/Admin/Templates/CreateDockerImageDialog.razor b/MoonlightServers.Frontend/Admin/Templates/CreateDockerImageDialog.razor
index a4604dc..a2d20c8 100644
--- a/MoonlightServers.Frontend/Admin/Templates/CreateDockerImageDialog.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/CreateDockerImageDialog.razor
@@ -1,4 +1,4 @@
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Dialogs
diff --git a/MoonlightServers.Frontend/Admin/Templates/CreateVariableDialog.razor b/MoonlightServers.Frontend/Admin/Templates/CreateVariableDialog.razor
index 6f57b22..a7dcfe7 100644
--- a/MoonlightServers.Frontend/Admin/Templates/CreateVariableDialog.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/CreateVariableDialog.razor
@@ -1,4 +1,4 @@
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Dialogs
diff --git a/MoonlightServers.Frontend/Admin/Templates/DockerImageListEditor.razor b/MoonlightServers.Frontend/Admin/Templates/DockerImageListEditor.razor
index cc2c903..be19db8 100644
--- a/MoonlightServers.Frontend/Admin/Templates/DockerImageListEditor.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/DockerImageListEditor.razor
@@ -1,6 +1,6 @@
 @using System.Text.Json
 @using LucideBlazor
-@using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Shared
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Extras.Common
@@ -206,7 +206,7 @@
             try
             {
                 var problemDetails = await response.Content.ReadFromJsonAsync<ProblemDetails>(
-                    Moonlight.Shared.Http.SerializationContext.Default.Options
+                    Moonlight.Shared.SerializationContext.Default.Options
                 );
 
                 if (problemDetails == null)
diff --git a/MoonlightServers.Frontend/Admin/Templates/Overview.razor b/MoonlightServers.Frontend/Admin/Templates/Overview.razor
index 3385b34..67addb8 100644
--- a/MoonlightServers.Frontend/Admin/Templates/Overview.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/Overview.razor
@@ -1,6 +1,5 @@
 @using LucideBlazor
-@using Moonlight.Shared.Http.Requests
-@using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Shared
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.DataGrids
diff --git a/MoonlightServers.Frontend/Admin/Templates/Update.razor b/MoonlightServers.Frontend/Admin/Templates/Update.razor
index d6ded62..fea9176 100644
--- a/MoonlightServers.Frontend/Admin/Templates/Update.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/Update.razor
@@ -1,9 +1,8 @@
 @page "/admin/servers/templates/{Id:int}"
 
 @using System.Net
-@using System.Text.Json
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Buttons
diff --git a/MoonlightServers.Frontend/Admin/Templates/VariableEditor.razor b/MoonlightServers.Frontend/Admin/Templates/VariableEditor.razor
index 2f4157d..a2fd85e 100644
--- a/MoonlightServers.Frontend/Admin/Templates/VariableEditor.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/VariableEditor.razor
@@ -1,5 +1,5 @@
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Accordions
diff --git a/MoonlightServers.Frontend/Admin/Templates/VariableListEditor.razor b/MoonlightServers.Frontend/Admin/Templates/VariableListEditor.razor
index 3d6872b..862b8bf 100644
--- a/MoonlightServers.Frontend/Admin/Templates/VariableListEditor.razor
+++ b/MoonlightServers.Frontend/Admin/Templates/VariableListEditor.razor
@@ -1,12 +1,9 @@
 @using LucideBlazor
-@using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Shared
 @using MoonlightServers.Shared.Admin.Templates
-@using ShadcnBlazor.Accordions
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Extras.Common
 @using ShadcnBlazor.Extras.Dialogs
-@using ShadcnBlazor.Fields
-@using ShadcnBlazor.Inputs
 
 @inject HttpClient HttpClient
 @inject DialogService DialogService
diff --git a/MoonlightServers.Frontend/Infrastructure/PermissionProvider.cs b/MoonlightServers.Frontend/Infrastructure/PermissionProvider.cs
index 64b80d9..9719edb 100644
--- a/MoonlightServers.Frontend/Infrastructure/PermissionProvider.cs
+++ b/MoonlightServers.Frontend/Infrastructure/PermissionProvider.cs
@@ -1,6 +1,6 @@
 using LucideBlazor;
-using Moonlight.Frontend.Interfaces;
-using Moonlight.Frontend.Models;
+using Moonlight.Frontend.Admin.Users.Shared;
+using Moonlight.Frontend.Infrastructure.Hooks;
 using MoonlightServers.Shared;
 
 namespace MoonlightServers.Frontend.Infrastructure;
diff --git a/MoonlightServers.Frontend/Infrastructure/SidebarProvider.cs b/MoonlightServers.Frontend/Infrastructure/SidebarProvider.cs
index 04dece8..b398037 100644
--- a/MoonlightServers.Frontend/Infrastructure/SidebarProvider.cs
+++ b/MoonlightServers.Frontend/Infrastructure/SidebarProvider.cs
@@ -1,6 +1,6 @@
 using LucideBlazor;
-using Moonlight.Frontend.Interfaces;
-using Moonlight.Frontend.Models;
+using Moonlight.Frontend.Infrastructure.Hooks;
+using Moonlight.Frontend.Infrastructure.Models;
 using MoonlightServers.Shared;
 
 namespace MoonlightServers.Frontend.Infrastructure;
diff --git a/MoonlightServers.Frontend/Startup.cs b/MoonlightServers.Frontend/Startup.cs
index a4b7225..176d5df 100644
--- a/MoonlightServers.Frontend/Startup.cs
+++ b/MoonlightServers.Frontend/Startup.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Moonlight.Frontend;
-using Moonlight.Frontend.Configuration;
-using Moonlight.Frontend.Interfaces;
+using Moonlight.Frontend.Infrastructure.Configuration;
+using Moonlight.Frontend.Infrastructure.Hooks;
 using MoonlightServers.Frontend.Infrastructure;
 using SimplePlugin.Abstractions;
 
diff --git a/MoonlightServers.Shared/SerializationContext.cs b/MoonlightServers.Shared/SerializationContext.cs
index 5730d7d..772cee4 100644
--- a/MoonlightServers.Shared/SerializationContext.cs
+++ b/MoonlightServers.Shared/SerializationContext.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Shared.Admin.Nodes;
 using MoonlightServers.Shared.Admin.Templates;
 
@@ -21,19 +21,18 @@ namespace MoonlightServers.Shared;
 [JsonSerializable(typeof(DetailedTemplateDto))]
 [JsonSerializable(typeof(PagedData<TemplateDto>))]
 
- [JsonSerializable(typeof(VariableDto))]
- [JsonSerializable(typeof(PagedData<VariableDto>))]
- [JsonSerializable(typeof(CreateVariableDto))]
- [JsonSerializable(typeof(UpdateVariableDto))]
+// - Template - Variables
+[JsonSerializable(typeof(VariableDto))]
+[JsonSerializable(typeof(PagedData<VariableDto>))]
+[JsonSerializable(typeof(CreateVariableDto))]
+[JsonSerializable(typeof(UpdateVariableDto))]
 
+// - Template - Docker Image
 [JsonSerializable(typeof(DockerImageDto))]
 [JsonSerializable(typeof(PagedData<DockerImageDto>))]
 [JsonSerializable(typeof(CreateDockerImageDto))]
 [JsonSerializable(typeof(UpdateDockerImageDto))]
-
-
 [JsonSourceGenerationOptions(JsonSerializerDefaults.Web)]
 public partial class SerializationContext : JsonSerializerContext
 {
-    
 }
\ No newline at end of file
diff --git a/MoonlightServers.slnx b/MoonlightServers.slnx
index 33239f1..3ac668f 100644
--- a/MoonlightServers.slnx
+++ b/MoonlightServers.slnx
@@ -7,7 +7,9 @@
     <Project Path="Hosts\MoonlightServers.Api.Host\MoonlightServers.Api.Host.csproj" />
     <Project Path="Hosts\MoonlightServers.Frontend.Host\MoonlightServers.Frontend.Host.csproj" />
   </Folder>
-  <Project Path="MoonlightServers.Api\MoonlightServers.Api.csproj" />
-  <Project Path="MoonlightServers.Frontend\MoonlightServers.Frontend.csproj" />
-  <Project Path="MoonlightServers.Shared\MoonlightServers.Shared.csproj" />
+  <Folder Name="/Panel/">
+    <Project Path="MoonlightServers.Api\MoonlightServers.Api.csproj" />
+    <Project Path="MoonlightServers.Frontend\MoonlightServers.Frontend.csproj" />
+    <Project Path="MoonlightServers.Shared\MoonlightServers.Shared.csproj" />
+  </Folder>
 </Solution>