diff --git a/.run/Lighthouse API.run.xml b/.run/Lighthouse API.run.xml
index 6e12972b..bd337dfc 100644
--- a/.run/Lighthouse API.run.xml	
+++ b/.run/Lighthouse API.run.xml	
@@ -8,7 +8,8 @@
         <option name="USE_EXTERNAL_CONSOLE" value="0"/>
         <option name="USE_MONO" value="0"/>
         <option name="RUNTIME_ARGUMENTS" value=""/>
-        <option name="PROJECT_PATH" value="$PROJECT_DIR$/ProjectLighthouse.API/ProjectLighthouse.API.csproj"/>
+        <option name="PROJECT_PATH"
+                value="$PROJECT_DIR$/ProjectLighthouse.Servers.API/ProjectLighthouse.Servers.API.csproj"/>
         <option name="PROJECT_EXE_PATH_TRACKING" value="1"/>
         <option name="PROJECT_ARGUMENTS_TRACKING" value="1"/>
         <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0"/>
diff --git a/.run/Lighthouse Game API.run.xml b/.run/Lighthouse Game API.run.xml
index 10b4891c..7f8c19a2 100644
--- a/.run/Lighthouse Game API.run.xml	
+++ b/.run/Lighthouse Game API.run.xml	
@@ -1,14 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Lighthouse Game API" type="DotNetProject" factoryName=".NET Project">
+    <configuration default="false" name="Lighthouse Gameserver" type="DotNetProject" factoryName=".NET Project">
         <option name="EXE_PATH"
-                value="$PROJECT_DIR$/ProjectLighthouse.GameAPI/bin/Debug/net6.0/LBPUnion.ProjectLighthouse.GameAPI"/>
+                value="$PROJECT_DIR$/ProjectLighthouse.Servers.GameServer/bin/Debug/net6.0/LBPUnion.ProjectLighthouse.Servers.GameServer"/>
         <option name="PROGRAM_PARAMETERS" value=""/>
         <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/ProjectLighthouse"/>
         <option name="PASS_PARENT_ENVS" value="1"/>
         <option name="USE_EXTERNAL_CONSOLE" value="0"/>
         <option name="USE_MONO" value="0"/>
         <option name="RUNTIME_ARGUMENTS" value=""/>
-        <option name="PROJECT_PATH" value="$PROJECT_DIR$/ProjectLighthouse.GameAPI/ProjectLighthouse.GameAPI.csproj"/>
+        <option name="PROJECT_PATH"
+                value="$PROJECT_DIR$/ProjectLighthouse.Servers.GameServer/ProjectLighthouse.Servers.GameServer.csproj"/>
         <option name="PROJECT_EXE_PATH_TRACKING" value="1"/>
         <option name="PROJECT_ARGUMENTS_TRACKING" value="1"/>
         <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0"/>
diff --git a/.run/Lighthouse Website.run.xml b/.run/Lighthouse Website.run.xml
index 14983755..c9f59380 100644
--- a/.run/Lighthouse Website.run.xml	
+++ b/.run/Lighthouse Website.run.xml	
@@ -1,14 +1,15 @@
 <component name="ProjectRunConfigurationManager">
     <configuration default="false" name="Lighthouse Website" type="DotNetProject" factoryName=".NET Project">
         <option name="EXE_PATH"
-                value="$PROJECT_DIR$/ProjectLighthouse.Website/bin/Debug/net6.0/LBPUnion.ProjectLighthouse.Website"/>
+                value="$PROJECT_DIR$/ProjectLighthouse.Servers.Website/bin/Debug/net6.0/LBPUnion.ProjectLighthouse.Servers.Website"/>
         <option name="PROGRAM_PARAMETERS" value=""/>
         <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/ProjectLighthouse"/>
         <option name="PASS_PARENT_ENVS" value="1"/>
         <option name="USE_EXTERNAL_CONSOLE" value="0"/>
         <option name="USE_MONO" value="0"/>
         <option name="RUNTIME_ARGUMENTS" value=""/>
-        <option name="PROJECT_PATH" value="$PROJECT_DIR$/ProjectLighthouse.Website/ProjectLighthouse.Website.csproj"/>
+        <option name="PROJECT_PATH"
+                value="$PROJECT_DIR$/ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj"/>
         <option name="PROJECT_EXE_PATH_TRACKING" value="1"/>
         <option name="PROJECT_ARGUMENTS_TRACKING" value="1"/>
         <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0"/>
diff --git a/ProjectLighthouse.API/Controllers/SlotEndpoints.cs b/ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs
similarity index 97%
rename from ProjectLighthouse.API/Controllers/SlotEndpoints.cs
rename to ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs
index 5efa31fa..fb880953 100644
--- a/ProjectLighthouse.API/Controllers/SlotEndpoints.cs
+++ b/ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs
@@ -5,7 +5,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.API.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.API.Controllers;
 
 /// <summary>
 /// A collection of endpoints relating to slots.
diff --git a/ProjectLighthouse.API/Controllers/StatisticsEndpoints.cs b/ProjectLighthouse.Servers.API/Controllers/StatisticsEndpoints.cs
similarity index 94%
rename from ProjectLighthouse.API/Controllers/StatisticsEndpoints.cs
rename to ProjectLighthouse.Servers.API/Controllers/StatisticsEndpoints.cs
index 0341ec8a..046681c7 100644
--- a/ProjectLighthouse.API/Controllers/StatisticsEndpoints.cs
+++ b/ProjectLighthouse.Servers.API/Controllers/StatisticsEndpoints.cs
@@ -3,7 +3,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Api;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.API.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.API.Controllers;
 
 /// <summary>
 /// A collection of endpoints relating to statistics.
diff --git a/ProjectLighthouse.API/Controllers/UserEndpoints.cs b/ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs
similarity index 96%
rename from ProjectLighthouse.API/Controllers/UserEndpoints.cs
rename to ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs
index d8f6fcbf..b4ba41b5 100644
--- a/ProjectLighthouse.API/Controllers/UserEndpoints.cs
+++ b/ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs
@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore;
 
 // ReSharper disable RouteTemplates.ActionRoutePrefixCanBeExtractedToControllerRoute
 
-namespace LBPUnion.ProjectLighthouse.API.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.API.Controllers;
 
 /// <summary>
 /// A collection of endpoints relating to users.
diff --git a/ProjectLighthouse.API/Program.cs b/ProjectLighthouse.Servers.API/Program.cs
similarity index 91%
rename from ProjectLighthouse.API/Program.cs
rename to ProjectLighthouse.Servers.API/Program.cs
index f1ec4650..c3657584 100644
--- a/ProjectLighthouse.API/Program.cs
+++ b/ProjectLighthouse.Servers.API/Program.cs
@@ -1,10 +1,10 @@
-using LBPUnion.ProjectLighthouse.API.Startup;
 using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet;
+using LBPUnion.ProjectLighthouse.Servers.API.Startup;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace LBPUnion.ProjectLighthouse.API;
+namespace LBPUnion.ProjectLighthouse.Servers.API;
 
 public static class Program
 {
diff --git a/ProjectLighthouse.API/ProjectLighthouse.API.csproj b/ProjectLighthouse.Servers.API/ProjectLighthouse.Servers.API.csproj
similarity index 92%
rename from ProjectLighthouse.API/ProjectLighthouse.API.csproj
rename to ProjectLighthouse.Servers.API/ProjectLighthouse.Servers.API.csproj
index 2c2412d8..5d40dd4f 100644
--- a/ProjectLighthouse.API/ProjectLighthouse.API.csproj
+++ b/ProjectLighthouse.Servers.API/ProjectLighthouse.Servers.API.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <AssemblyName>LBPUnion.ProjectLighthouse.API</AssemblyName>
-        <RootNamespace>LBPUnion.ProjectLighthouse.API</RootNamespace>
+        <AssemblyName>LBPUnion.ProjectLighthouse.Servers.API</AssemblyName>
+        <RootNamespace>LBPUnion.ProjectLighthouse.Servers.API</RootNamespace>
     </PropertyGroup>
 
     <PropertyGroup>
diff --git a/ProjectLighthouse.API/Startup/ApiStartup.cs b/ProjectLighthouse.Servers.API/Startup/ApiStartup.cs
similarity index 94%
rename from ProjectLighthouse.API/Startup/ApiStartup.cs
rename to ProjectLighthouse.Servers.API/Startup/ApiStartup.cs
index 0d3fe746..b25f8f85 100644
--- a/ProjectLighthouse.API/Startup/ApiStartup.cs
+++ b/ProjectLighthouse.Servers.API/Startup/ApiStartup.cs
@@ -3,7 +3,7 @@ using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Startup.Middlewares;
 using Microsoft.OpenApi.Models;
 
-namespace LBPUnion.ProjectLighthouse.API.Startup;
+namespace LBPUnion.ProjectLighthouse.Servers.API.Startup;
 
 public sealed class ApiStartup
 {
@@ -47,7 +47,7 @@ public sealed class ApiStartup
                 c.DocumentFilter<SwaggerFilter>();
 
                 // Add XMLDoc to swagger
-                c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "LBPUnion.ProjectLighthouse.API.xml"));
+                c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "LBPUnion.ProjectLighthouse.Servers.API.xml"));
             }
         );
     }
diff --git a/ProjectLighthouse.API/appsettings.Development.json b/ProjectLighthouse.Servers.API/appsettings.Development.json
similarity index 100%
rename from ProjectLighthouse.API/appsettings.Development.json
rename to ProjectLighthouse.Servers.API/appsettings.Development.json
diff --git a/ProjectLighthouse.API/appsettings.json b/ProjectLighthouse.Servers.API/appsettings.json
similarity index 100%
rename from ProjectLighthouse.API/appsettings.json
rename to ProjectLighthouse.Servers.API/appsettings.json
diff --git a/ProjectLighthouse.GameAPI/Controllers/ClientConfigurationController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/ClientConfigurationController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs
index bf94786a..98b1d2da 100644
--- a/ProjectLighthouse.GameAPI/Controllers/ClientConfigurationController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs
@@ -4,7 +4,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/CommentController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/CommentController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs
index 3cbbb260..09f6e0f1 100644
--- a/ProjectLighthouse.GameAPI/Controllers/CommentController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs
@@ -8,7 +8,7 @@ using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/DeveloperController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/DeveloperController.cs
similarity index 76%
rename from ProjectLighthouse.GameAPI/Controllers/DeveloperController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/DeveloperController.cs
index 46d950d7..00d98f51 100644
--- a/ProjectLighthouse.GameAPI/Controllers/DeveloperController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/DeveloperController.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/FriendsController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/FriendsController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs
index 688dcf0b..0c609de6 100644
--- a/ProjectLighthouse.GameAPI/Controllers/FriendsController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs
@@ -7,7 +7,7 @@ using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/LoginController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/LoginController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs
index 7d285d59..12d3e4fc 100644
--- a/ProjectLighthouse.GameAPI/Controllers/LoginController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs
@@ -8,7 +8,7 @@ using LBPUnion.ProjectLighthouse.Types.Tickets;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/login")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Matching/EnterLevelController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs
similarity index 97%
rename from ProjectLighthouse.GameAPI/Controllers/Matching/EnterLevelController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs
index 35d5f1f9..222e1e9e 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Matching/EnterLevelController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs
@@ -4,7 +4,7 @@ using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Matching;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Matching;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Matching/MatchController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/Matching/MatchController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs
index 3cfd9f85..589f59f6 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Matching/MatchController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs
@@ -8,7 +8,7 @@ using LBPUnion.ProjectLighthouse.Types.Match;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Matching;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Matching;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/MessageController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/MessageController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
index 27a4771b..d072f81f 100644
--- a/ProjectLighthouse.GameAPI/Controllers/MessageController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
@@ -5,7 +5,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/ReportController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs
similarity index 95%
rename from ProjectLighthouse.GameAPI/Controllers/ReportController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs
index 17557b39..f66c55b8 100644
--- a/ProjectLighthouse.GameAPI/Controllers/ReportController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs
@@ -6,7 +6,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Reports;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Resources/PhotosController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/Resources/PhotosController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs
index f3b1cb06..c2cde84b 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Resources/PhotosController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs
@@ -9,7 +9,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Resources;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Resources;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Resources/ResourcesController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs
similarity index 97%
rename from ProjectLighthouse.GameAPI/Controllers/Resources/ResourcesController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs
index dd7edea7..5bed0d37 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Resources/ResourcesController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs
@@ -8,7 +8,7 @@ using LBPUnion.ProjectLighthouse.Types.Files;
 using Microsoft.AspNetCore.Mvc;
 using IOFile = System.IO.File;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Resources;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Resources;
 
 [ApiController]
 [Produces("text/xml")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/CollectionController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/CollectionController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs
index 58e8b611..9dd0a153 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/CollectionController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs
@@ -7,7 +7,7 @@ using LBPUnion.ProjectLighthouse.Types.Categories;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/LevelTagsController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs
similarity index 87%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/LevelTagsController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs
index 5861dbe6..be4bc3d3 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/LevelTagsController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs
@@ -1,7 +1,7 @@
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/tags")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/ListController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/ListController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs
index 51cf477c..e8012c4d 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/ListController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs
@@ -5,7 +5,7 @@ using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/PublishController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs
similarity index 99%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/PublishController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs
index fb301f06..38f88b91 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/PublishController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs
@@ -10,7 +10,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/ReviewController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs
similarity index 99%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/ReviewController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs
index 3916073a..4d169379 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/ReviewController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs
@@ -9,7 +9,7 @@ using LBPUnion.ProjectLighthouse.Types.Reviews;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/ScoreController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs
similarity index 98%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/ScoreController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs
index a32fe5ab..866e6431 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/ScoreController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs
@@ -7,7 +7,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/SearchController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs
similarity index 96%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/SearchController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs
index 179707db..b4db356e 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/SearchController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs
@@ -5,7 +5,7 @@ using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/Slots/SlotsController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs
similarity index 99%
rename from ProjectLighthouse.GameAPI/Controllers/Slots/SlotsController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs
index a6f5a8f5..4578ee72 100644
--- a/ProjectLighthouse.GameAPI/Controllers/Slots/SlotsController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs
@@ -9,7 +9,7 @@ using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers.Slots;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/StatisticsController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/StatisticsController.cs
similarity index 93%
rename from ProjectLighthouse.GameAPI/Controllers/StatisticsController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/StatisticsController.cs
index d7f66a93..fef087b9 100644
--- a/ProjectLighthouse.GameAPI/Controllers/StatisticsController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/StatisticsController.cs
@@ -2,7 +2,7 @@ using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Serialization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/StoreController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/StoreController.cs
similarity index 77%
rename from ProjectLighthouse.GameAPI/Controllers/StoreController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/StoreController.cs
index 92ab63ab..ad214da9 100644
--- a/ProjectLighthouse.GameAPI/Controllers/StoreController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/StoreController.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Controllers/UserController.cs b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs
similarity index 99%
rename from ProjectLighthouse.GameAPI/Controllers/UserController.cs
rename to ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs
index 70c2315f..524b8970 100644
--- a/ProjectLighthouse.GameAPI/Controllers/UserController.cs
+++ b/ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs
@@ -8,7 +8,7 @@ using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;
 
 [ApiController]
 [Route("LITTLEBIGPLANETPS3_XML/")]
diff --git a/ProjectLighthouse.GameAPI/Program.cs b/ProjectLighthouse.Servers.GameServer/Program.cs
similarity index 84%
rename from ProjectLighthouse.GameAPI/Program.cs
rename to ProjectLighthouse.Servers.GameServer/Program.cs
index e3b97417..9f40e5fa 100644
--- a/ProjectLighthouse.GameAPI/Program.cs
+++ b/ProjectLighthouse.Servers.GameServer/Program.cs
@@ -1,10 +1,10 @@
 using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet;
-using LBPUnion.ProjectLighthouse.Startup;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace LBPUnion.ProjectLighthouse.GameAPI;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer;
 
 public static class Program
 {
@@ -21,7 +21,7 @@ public static class Program
             (
                 webBuilder =>
                 {
-                    webBuilder.UseStartup<GameApiStartup>();
+                    webBuilder.UseStartup<GameServerStartup>();
                     webBuilder.UseUrls(ServerConfiguration.Instance.GameApiListenUrl);
                 }
             )
diff --git a/ProjectLighthouse.GameAPI/ProjectLighthouse.GameAPI.csproj b/ProjectLighthouse.Servers.GameServer/ProjectLighthouse.Servers.GameServer.csproj
similarity index 90%
rename from ProjectLighthouse.GameAPI/ProjectLighthouse.GameAPI.csproj
rename to ProjectLighthouse.Servers.GameServer/ProjectLighthouse.Servers.GameServer.csproj
index b132f367..42dac9c7 100644
--- a/ProjectLighthouse.GameAPI/ProjectLighthouse.GameAPI.csproj
+++ b/ProjectLighthouse.Servers.GameServer/ProjectLighthouse.Servers.GameServer.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <AssemblyName>LBPUnion.ProjectLighthouse.GameAPI</AssemblyName>
-        <RootNamespace>LBPUnion.ProjectLighthouse.GameAPI</RootNamespace>
+        <AssemblyName>LBPUnion.ProjectLighthouse.Servers.GameServer</AssemblyName>
+        <RootNamespace>LBPUnion.ProjectLighthouse.Servers.GameServer</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/ProjectLighthouse.GameAPI/Startup/GameApiStartup.cs b/ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs
similarity index 95%
rename from ProjectLighthouse.GameAPI/Startup/GameApiStartup.cs
rename to ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs
index 06a99fa1..9fcf4a66 100644
--- a/ProjectLighthouse.GameAPI/Startup/GameApiStartup.cs
+++ b/ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs
@@ -6,15 +6,12 @@ using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Primitives;
-#if RELEASE
-using Microsoft.Extensions.Hosting.Internal;
-#endif
 
-namespace LBPUnion.ProjectLighthouse.Startup;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 
-public class GameApiStartup
+public class GameServerStartup
 {
-    public GameApiStartup(IConfiguration configuration)
+    public GameServerStartup(IConfiguration configuration)
     {
         this.Configuration = configuration;
     }
@@ -44,12 +41,6 @@ public class GameApiStartup
                 options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
             }
         );
-
-        #if DEBUG
-        services.AddSingleton<IHostLifetime, DebugWarmupLifetime>();
-        #else
-        services.AddSingleton<IHostLifetime, ConsoleLifetime>();
-        #endif
     }
 
     // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/ProjectLighthouse.GameAPI/Startup/TestGameApiStartup.cs b/ProjectLighthouse.Servers.GameServer/Startup/GameServerTestStartup.cs
similarity index 55%
rename from ProjectLighthouse.GameAPI/Startup/TestGameApiStartup.cs
rename to ProjectLighthouse.Servers.GameServer/Startup/GameServerTestStartup.cs
index 00969713..c236aca6 100644
--- a/ProjectLighthouse.GameAPI/Startup/TestGameApiStartup.cs
+++ b/ProjectLighthouse.Servers.GameServer/Startup/GameServerTestStartup.cs
@@ -1,10 +1,10 @@
 using LBPUnion.ProjectLighthouse.Helpers.Middlewares;
 
-namespace LBPUnion.ProjectLighthouse.Startup;
+namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 
-public class TestGameApiStartup : GameApiStartup
+public class GameServerTestStartup : GameServerStartup
 {
-    public TestGameApiStartup(IConfiguration configuration) : base(configuration)
+    public GameServerTestStartup(IConfiguration configuration) : base(configuration)
     {}
 
     public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/ProjectLighthouse.GameAPI/appsettings.Development.json b/ProjectLighthouse.Servers.GameServer/appsettings.Development.json
similarity index 100%
rename from ProjectLighthouse.GameAPI/appsettings.Development.json
rename to ProjectLighthouse.Servers.GameServer/appsettings.Development.json
diff --git a/ProjectLighthouse.GameAPI/appsettings.json b/ProjectLighthouse.Servers.GameServer/appsettings.json
similarity index 100%
rename from ProjectLighthouse.GameAPI/appsettings.json
rename to ProjectLighthouse.Servers.GameServer/appsettings.json
diff --git a/ProjectLighthouse.Website/Controllers/Admin/AdminPanelController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminPanelController.cs
similarity index 79%
rename from ProjectLighthouse.Website/Controllers/Admin/AdminPanelController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/Admin/AdminPanelController.cs
index 6ab1ba75..67f71941 100644
--- a/ProjectLighthouse.Website/Controllers/Admin/AdminPanelController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminPanelController.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers.Admin;
 
 [ApiController]
 [Route("/admin")]
diff --git a/ProjectLighthouse.Website/Controllers/Admin/AdminReportController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs
similarity index 97%
rename from ProjectLighthouse.Website/Controllers/Admin/AdminReportController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs
index 9864a2e3..b41abd66 100644
--- a/ProjectLighthouse.Website/Controllers/Admin/AdminReportController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs
@@ -4,7 +4,7 @@ using LBPUnion.ProjectLighthouse.Types.Reports;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers.Admin;
 
 [ApiController]
 [Route("admin/report/{id:int}")]
diff --git a/ProjectLighthouse.Website/Controllers/Admin/AdminSlotController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs
similarity index 96%
rename from ProjectLighthouse.Website/Controllers/Admin/AdminSlotController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs
index ab426bad..5a3abb9f 100644
--- a/ProjectLighthouse.Website/Controllers/Admin/AdminSlotController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs
@@ -4,7 +4,7 @@ using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers.Admin;
 
 [ApiController]
 [Route("admin/slot/{id:int}")]
diff --git a/ProjectLighthouse.Website/Controllers/Admin/AdminUserController.cs b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs
similarity index 92%
rename from ProjectLighthouse.Website/Controllers/Admin/AdminUserController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs
index d4a54416..d9303b21 100644
--- a/ProjectLighthouse.Website/Controllers/Admin/AdminUserController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs
@@ -3,7 +3,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers.Admin;
 
 [ApiController]
 [Route("admin/user/{id:int}")]
diff --git a/ProjectLighthouse.Website/Controllers/Debug/RoomVisualizerController.cs b/ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs
similarity index 94%
rename from ProjectLighthouse.Website/Controllers/Debug/RoomVisualizerController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs
index 5305ddc9..2506d875 100644
--- a/ProjectLighthouse.Website/Controllers/Debug/RoomVisualizerController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs
@@ -3,7 +3,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers.Debug;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers.Debug;
 
 [ApiController]
 [Route("debug/roomVisualizer")]
diff --git a/ProjectLighthouse.Website/Controllers/ExternalAuth/AuthenticationController.cs b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs
similarity index 97%
rename from ProjectLighthouse.Website/Controllers/ExternalAuth/AuthenticationController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs
index 50c08fed..64bc5ddf 100644
--- a/ProjectLighthouse.Website/Controllers/ExternalAuth/AuthenticationController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs
@@ -4,7 +4,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers.ExternalAuth;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers.ExternalAuth;
 
 [ApiController]
 [Route("/authentication")]
diff --git a/ProjectLighthouse.Website/Controllers/ExternalAuth/AutoApprovalController.cs b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs
similarity index 96%
rename from ProjectLighthouse.Website/Controllers/ExternalAuth/AutoApprovalController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs
index 9dcc8640..c11af2fc 100644
--- a/ProjectLighthouse.Website/Controllers/ExternalAuth/AutoApprovalController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs
@@ -3,7 +3,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers.ExternalAuth;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers.ExternalAuth;
 
 [ApiController]
 [Route("/authentication")]
diff --git a/ProjectLighthouse.Website/Controllers/ResourcesController.cs b/ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs
similarity index 92%
rename from ProjectLighthouse.Website/Controllers/ResourcesController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs
index 17d222d4..830fbe98 100644
--- a/ProjectLighthouse.Website/Controllers/ResourcesController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs
@@ -3,7 +3,7 @@ using LBPUnion.ProjectLighthouse.Types.Files;
 using Microsoft.AspNetCore.Mvc;
 using IOFile = System.IO.File;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers;
 
 [ApiController]
 public class ResourcesController : ControllerBase
diff --git a/ProjectLighthouse.Website/Controllers/SlotPageController.cs b/ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs
similarity index 98%
rename from ProjectLighthouse.Website/Controllers/SlotPageController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs
index e4aa2a92..0c267353 100644
--- a/ProjectLighthouse.Website/Controllers/SlotPageController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs
@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore;
 // TODO: Clean up this file
 // - jvyden
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers;
 
 [ApiController]
 [Route("slot/{id:int}")]
diff --git a/ProjectLighthouse.Website/Controllers/UserPageController.cs b/ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs
similarity index 97%
rename from ProjectLighthouse.Website/Controllers/UserPageController.cs
rename to ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs
index 42dff1e0..753b8ffd 100644
--- a/ProjectLighthouse.Website/Controllers/UserPageController.cs
+++ b/ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs
@@ -5,7 +5,7 @@ using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Controllers;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Controllers;
 
 [ApiController]
 [Route("user/{id:int}")]
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminBanUserPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml
similarity index 87%
rename from ProjectLighthouse.Website/Pages/Admin/AdminBanUserPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml
index 2f44a443..e5138ee5 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminBanUserPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml
@@ -1,5 +1,5 @@
 @page "/admin/user/{id:int}/ban"
-@model LBPUnion.ProjectLighthouse.Website.Pages.Admin.AdminBanUserPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminBanUserPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminBanUserPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs
similarity index 92%
rename from ProjectLighthouse.Website/Pages/Admin/AdminBanUserPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs
index e96d5016..5da1b1b2 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminBanUserPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs
@@ -1,10 +1,10 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin;
 
 public class AdminBanUserPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminPanelPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml
similarity index 96%
rename from ProjectLighthouse.Website/Pages/Admin/AdminPanelPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml
index 9a96104c..21964f38 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminPanelPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml
@@ -3,7 +3,7 @@
 @using LBPUnion.ProjectLighthouse.Helpers.Extensions
 @using LBPUnion.ProjectLighthouse.Maintenance
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Website.Pages.Admin.AdminPanelPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminPanelPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminPanelPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs
similarity index 92%
rename from ProjectLighthouse.Website/Pages/Admin/AdminPanelPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs
index 5e5353c9..914dd3e3 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminPanelPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Maintenance;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin;
 
 public class AdminPanelPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminPanelUsersPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml
similarity index 92%
rename from ProjectLighthouse.Website/Pages/Admin/AdminPanelUsersPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml
index 37837420..3a10be7f 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminPanelUsersPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml
@@ -1,6 +1,6 @@
 @page "/admin/users"
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Website.Pages.Admin.AdminPanelUsersPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminPanelUsersPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs
similarity index 84%
rename from ProjectLighthouse.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs
index 7fd259a0..257b8ebd 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs
@@ -1,10 +1,10 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin;
 
 public class AdminPanelUsersPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml
similarity index 74%
rename from ProjectLighthouse.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml
index e7a1d02f..fe2ac408 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml
@@ -1,5 +1,5 @@
 @page "/admin/user/{id:int}/setGrantedSlots"
-@model LBPUnion.ProjectLighthouse.Website.Pages.Admin.AdminSetGrantedSlotsPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminSetGrantedSlotsPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs
similarity index 90%
rename from ProjectLighthouse.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs
index 5a542a4d..583fa680 100644
--- a/ProjectLighthouse.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs
@@ -1,10 +1,10 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Admin;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin;
 
 public class AdminSetGrantedSlotsPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/CompleteEmailVerificationPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml
similarity index 87%
rename from ProjectLighthouse.Website/Pages/CompleteEmailVerificationPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml
index 43a52c36..0cf5d127 100644
--- a/ProjectLighthouse.Website/Pages/CompleteEmailVerificationPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml
@@ -1,5 +1,5 @@
 @page "/verifyEmail"
-@model LBPUnion.ProjectLighthouse.Website.Pages.CompleteEmailVerificationPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.CompleteEmailVerificationPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/CompleteEmailVerificationPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs
similarity index 91%
rename from ProjectLighthouse.Website/Pages/CompleteEmailVerificationPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs
index e587e206..36cc1714 100644
--- a/ProjectLighthouse.Website/Pages/CompleteEmailVerificationPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs
@@ -1,12 +1,12 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class CompleteEmailVerificationPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Debug/FilterTestPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Debug/FilterTestPage.cshtml
similarity index 85%
rename from ProjectLighthouse.Website/Pages/Debug/FilterTestPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Debug/FilterTestPage.cshtml
index 61965353..864b9904 100644
--- a/ProjectLighthouse.Website/Pages/Debug/FilterTestPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Debug/FilterTestPage.cshtml
@@ -1,5 +1,5 @@
 @page "/debug/filter"
-@model LBPUnion.ProjectLighthouse.Website.Pages.Debug.FilterTestPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug.FilterTestPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/Debug/FilterTestPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Debug/FilterTestPage.cshtml.cs
similarity index 80%
rename from ProjectLighthouse.Website/Pages/Debug/FilterTestPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Debug/FilterTestPage.cshtml.cs
index bad1f3ac..bb305761 100644
--- a/ProjectLighthouse.Website/Pages/Debug/FilterTestPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Debug/FilterTestPage.cshtml.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Helpers;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Debug;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug;
 
 public class FilterTestPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Debug/RoomVisualizerPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml
similarity index 97%
rename from ProjectLighthouse.Website/Pages/Debug/RoomVisualizerPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml
index 77e4c14a..5e38349a 100644
--- a/ProjectLighthouse.Website/Pages/Debug/RoomVisualizerPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml
@@ -2,7 +2,7 @@
 @using LBPUnion.ProjectLighthouse.Helpers
 @using LBPUnion.ProjectLighthouse.Types
 @using LBPUnion.ProjectLighthouse.Types.Match
-@model LBPUnion.ProjectLighthouse.Website.Pages.Debug.RoomVisualizerPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug.RoomVisualizerPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/Debug/RoomVisualizerPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml.cs
similarity index 78%
rename from ProjectLighthouse.Website/Pages/Debug/RoomVisualizerPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml.cs
index f2cdd161..5cad861d 100644
--- a/ProjectLighthouse.Website/Pages/Debug/RoomVisualizerPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml.cs
@@ -1,12 +1,12 @@
 #nullable enable
 
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 #if !DEBUG
 using LBPUnion.ProjectLighthouse.Types;
 #endif
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Debug;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug;
 
 public class RoomVisualizerPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Debug/VersionInfoPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/Debug/VersionInfoPage.cshtml
similarity index 90%
rename from ProjectLighthouse.Website/Pages/Debug/VersionInfoPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Debug/VersionInfoPage.cshtml
index be959635..6c437967 100644
--- a/ProjectLighthouse.Website/Pages/Debug/VersionInfoPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Debug/VersionInfoPage.cshtml
@@ -1,6 +1,6 @@
 @page "/debug/version"
 @using LBPUnion.ProjectLighthouse.Helpers
-@model LBPUnion.ProjectLighthouse.Website.Pages.Debug.VersionInfoPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug.VersionInfoPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/Debug/VersionInfoPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Debug/VersionInfoPage.cshtml.cs
similarity index 64%
rename from ProjectLighthouse.Website/Pages/Debug/VersionInfoPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Debug/VersionInfoPage.cshtml.cs
index 08333a4b..3b3da0d4 100644
--- a/ProjectLighthouse.Website/Pages/Debug/VersionInfoPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Debug/VersionInfoPage.cshtml.cs
@@ -1,8 +1,8 @@
 using JetBrains.Annotations;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Debug;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug;
 
 public class VersionInfoPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/ExternalAuth/AuthenticationPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml
similarity index 96%
rename from ProjectLighthouse.Website/Pages/ExternalAuth/AuthenticationPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml
index 7d7d5b51..edf240b8 100644
--- a/ProjectLighthouse.Website/Pages/ExternalAuth/AuthenticationPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml
@@ -1,6 +1,6 @@
 @page "/authentication"
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Website.Pages.ExternalAuth.AuthenticationPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth.AuthenticationPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs
similarity index 87%
rename from ProjectLighthouse.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs
index 3197a423..b63e31c2 100644
--- a/ProjectLighthouse.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using System.Net;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.ExternalAuth;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth;
 
 public class AuthenticationPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml
similarity index 85%
rename from ProjectLighthouse.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml
index 6d84792c..fd3de4ce 100644
--- a/ProjectLighthouse.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml
@@ -1,6 +1,6 @@
 @page "/authentication/autoApprovals"
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Website.Pages.ExternalAuth.ManageUserApprovedIpAddressesPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth.ManageUserApprovedIpAddressesPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs
similarity index 83%
rename from ProjectLighthouse.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs
index 13d12355..1d2615a6 100644
--- a/ProjectLighthouse.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs
@@ -1,10 +1,10 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.ExternalAuth;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth;
 
 public class ManageUserApprovedIpAddressesPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/LandingPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml
similarity index 94%
rename from ProjectLighthouse.Website/Pages/LandingPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml
index 52e4d841..f64132a3 100644
--- a/ProjectLighthouse.Website/Pages/LandingPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml
@@ -1,7 +1,7 @@
 @page "/"
 @using LBPUnion.ProjectLighthouse.Types
 @using LBPUnion.ProjectLighthouse.Types.Settings
-@model LBPUnion.ProjectLighthouse.Website.Pages.LandingPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LandingPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/LandingPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs
similarity index 91%
rename from ProjectLighthouse.Website/Pages/LandingPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs
index 65079ebd..da810815 100644
--- a/ProjectLighthouse.Website/Pages/LandingPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using JetBrains.Annotations;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class LandingPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
similarity index 99%
rename from ProjectLighthouse.Website/Pages/Layouts/BaseLayout.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
index f911527b..8d5b4ae5 100644
--- a/ProjectLighthouse.Website/Pages/Layouts/BaseLayout.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
@@ -2,7 +2,7 @@
 @using LBPUnion.ProjectLighthouse.Helpers.Extensions
 @using LBPUnion.ProjectLighthouse.Types
 @using LBPUnion.ProjectLighthouse.Types.Settings
-@model LBPUnion.ProjectLighthouse.Website.Pages.Layouts.BaseLayout
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts.BaseLayout
 
 @{
     if (Model!.User == null)
diff --git a/ProjectLighthouse.Website/Pages/Layouts/BaseLayout.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
similarity index 94%
rename from ProjectLighthouse.Website/Pages/Layouts/BaseLayout.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
index ac6853fe..68e31951 100644
--- a/ProjectLighthouse.Website/Pages/Layouts/BaseLayout.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
@@ -2,7 +2,7 @@
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 
 public class BaseLayout : PageModel
 {
diff --git a/ProjectLighthouse.Website/Pages/LoginForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml
similarity index 96%
rename from ProjectLighthouse.Website/Pages/LoginForm.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml
index be68339b..17ad4902 100644
--- a/ProjectLighthouse.Website/Pages/LoginForm.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml
@@ -1,6 +1,6 @@
 @page "/login"
 @using LBPUnion.ProjectLighthouse.Types.Settings
-@model LBPUnion.ProjectLighthouse.Website.Pages.LoginForm
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LoginForm
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/LoginForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs
similarity index 96%
rename from ProjectLighthouse.Website/Pages/LoginForm.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs
index 959d8a66..e07d2d05 100644
--- a/ProjectLighthouse.Website/Pages/LoginForm.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs
@@ -3,14 +3,14 @@ using JetBrains.Annotations;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Helpers.Extensions;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class LoginForm : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/LogoutPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml
similarity index 80%
rename from ProjectLighthouse.Website/Pages/LogoutPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml
index 5e460ed7..62f902c1 100644
--- a/ProjectLighthouse.Website/Pages/LogoutPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml
@@ -1,5 +1,5 @@
 @page "/logout"
-@model LBPUnion.ProjectLighthouse.Website.Pages.LogoutPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LogoutPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/LogoutPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs
similarity index 81%
rename from ProjectLighthouse.Website/Pages/LogoutPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs
index 86666eb9..c7746866 100644
--- a/ProjectLighthouse.Website/Pages/LogoutPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs
@@ -1,9 +1,9 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class LogoutPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml
similarity index 100%
rename from ProjectLighthouse.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml
diff --git a/ProjectLighthouse.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml
similarity index 100%
rename from ProjectLighthouse.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml
diff --git a/ProjectLighthouse.Website/Pages/Partials/CaptchaPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/CaptchaPartial.cshtml
similarity index 100%
rename from ProjectLighthouse.Website/Pages/Partials/CaptchaPartial.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Partials/CaptchaPartial.cshtml
diff --git a/ProjectLighthouse.Website/Pages/Partials/CommentsPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml
similarity index 100%
rename from ProjectLighthouse.Website/Pages/Partials/CommentsPartial.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml
diff --git a/ProjectLighthouse.Website/Pages/Partials/PhotoPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml
similarity index 100%
rename from ProjectLighthouse.Website/Pages/Partials/PhotoPartial.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml
diff --git a/ProjectLighthouse.Website/Pages/Partials/SlotCardPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml
similarity index 100%
rename from ProjectLighthouse.Website/Pages/Partials/SlotCardPartial.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml
diff --git a/ProjectLighthouse.Website/Pages/Partials/UserCardPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/UserCardPartial.cshtml
similarity index 100%
rename from ProjectLighthouse.Website/Pages/Partials/UserCardPartial.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/Partials/UserCardPartial.cshtml
diff --git a/ProjectLighthouse.Website/Pages/PasswordResetPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml
similarity index 95%
rename from ProjectLighthouse.Website/Pages/PasswordResetPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml
index 00a27cb8..2f8a3ff3 100644
--- a/ProjectLighthouse.Website/Pages/PasswordResetPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml
@@ -1,5 +1,5 @@
 @page "/passwordReset"
-@model LBPUnion.ProjectLighthouse.Website.Pages.PasswordResetPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PasswordResetPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/PasswordResetPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs
similarity index 91%
rename from ProjectLighthouse.Website/Pages/PasswordResetPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs
index 2cc46d12..f22390d6 100644
--- a/ProjectLighthouse.Website/Pages/PasswordResetPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using JetBrains.Annotations;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class PasswordResetPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/PasswordResetRequiredPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml
similarity index 78%
rename from ProjectLighthouse.Website/Pages/PasswordResetRequiredPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml
index 85f5090d..6724cc96 100644
--- a/ProjectLighthouse.Website/Pages/PasswordResetRequiredPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml
@@ -1,5 +1,5 @@
 @page "/passwordResetRequired"
-@model LBPUnion.ProjectLighthouse.Website.Pages.PasswordResetRequiredPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PasswordResetRequiredPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/PasswordResetRequiredPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs
similarity index 82%
rename from ProjectLighthouse.Website/Pages/PasswordResetRequiredPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs
index 5f55129d..7620349f 100644
--- a/ProjectLighthouse.Website/Pages/PasswordResetRequiredPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs
@@ -1,9 +1,9 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class PasswordResetRequiredPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/PhotosPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml
similarity index 93%
rename from ProjectLighthouse.Website/Pages/PhotosPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml
index 63413c4f..d017c117 100644
--- a/ProjectLighthouse.Website/Pages/PhotosPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml
@@ -1,6 +1,6 @@
 @page "/photos/{pageNumber:int}"
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Website.Pages.PhotosPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PhotosPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/PhotosPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs
similarity index 92%
rename from ProjectLighthouse.Website/Pages/PhotosPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs
index b19b19b7..9fbb4c64 100644
--- a/ProjectLighthouse.Website/Pages/PhotosPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs
@@ -1,11 +1,11 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class PhotosPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/RegisterForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml
similarity index 98%
rename from ProjectLighthouse.Website/Pages/RegisterForm.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml
index 9e6c007b..c9007e40 100644
--- a/ProjectLighthouse.Website/Pages/RegisterForm.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml
@@ -1,6 +1,6 @@
 @page "/register"
 @using LBPUnion.ProjectLighthouse.Types.Settings
-@model LBPUnion.ProjectLighthouse.Website.Pages.RegisterForm
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.RegisterForm
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/RegisterForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs
similarity index 96%
rename from ProjectLighthouse.Website/Pages/RegisterForm.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs
index 047f89df..6625adbc 100644
--- a/ProjectLighthouse.Website/Pages/RegisterForm.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs
@@ -2,13 +2,13 @@ using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Helpers.Extensions;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class RegisterForm : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/ReportsPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml
similarity index 99%
rename from ProjectLighthouse.Website/Pages/ReportsPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml
index 7641c65c..ece77ab5 100644
--- a/ProjectLighthouse.Website/Pages/ReportsPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml
@@ -1,6 +1,6 @@
 @page "/admin/reports/{pageNumber:int}"
 @using LBPUnion.ProjectLighthouse.Types.Reports
-@model LBPUnion.ProjectLighthouse.Website.Pages.ReportsPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ReportsPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/ReportsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs
similarity index 94%
rename from ProjectLighthouse.Website/Pages/ReportsPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs
index db2de9b6..217e7d01 100644
--- a/ProjectLighthouse.Website/Pages/ReportsPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System.Text.Json;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Reports;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class ReportsPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/SendVerificationEmailPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml
similarity index 84%
rename from ProjectLighthouse.Website/Pages/SendVerificationEmailPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml
index 2b7cc56f..cae13524 100644
--- a/ProjectLighthouse.Website/Pages/SendVerificationEmailPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml
@@ -1,5 +1,5 @@
 @page "/login/sendVerificationEmail"
-@model LBPUnion.ProjectLighthouse.Website.Pages.SendVerificationEmailPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SendVerificationEmailPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/SendVerificationEmailPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs
similarity index 94%
rename from ProjectLighthouse.Website/Pages/SendVerificationEmailPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs
index e04ffa2d..b5dc5bb8 100644
--- a/ProjectLighthouse.Website/Pages/SendVerificationEmailPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class SendVerificationEmailPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/SetEmailForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml
similarity index 93%
rename from ProjectLighthouse.Website/Pages/SetEmailForm.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml
index 827a0a35..eddd7786 100644
--- a/ProjectLighthouse.Website/Pages/SetEmailForm.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml
@@ -1,6 +1,6 @@
 @page "/login/setEmail"
 @using LBPUnion.ProjectLighthouse.Types.Settings
-@model LBPUnion.ProjectLighthouse.Website.Pages.SetEmailForm
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SetEmailForm
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/SetEmailForm.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs
similarity index 95%
rename from ProjectLighthouse.Website/Pages/SetEmailForm.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs
index a4ce0611..deeb60ac 100644
--- a/ProjectLighthouse.Website/Pages/SetEmailForm.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class SetEmailForm : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/SlotPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml
similarity index 99%
rename from ProjectLighthouse.Website/Pages/SlotPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml
index be8efd2a..9cafd9c5 100644
--- a/ProjectLighthouse.Website/Pages/SlotPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml
@@ -4,7 +4,7 @@
 @using LBPUnion.ProjectLighthouse.Types
 @using LBPUnion.ProjectLighthouse.Types.Reviews
 @using LBPUnion.ProjectLighthouse.Types.Settings
-@model LBPUnion.ProjectLighthouse.Website.Pages.SlotPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SlotPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/SlotPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs
similarity index 94%
rename from ProjectLighthouse.Website/Pages/SlotPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs
index 83e2ac91..d95d0679 100644
--- a/ProjectLighthouse.Website/Pages/SlotPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs
@@ -1,14 +1,14 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using LBPUnion.ProjectLighthouse.Types.Profiles;
 using LBPUnion.ProjectLighthouse.Types.Reviews;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class SlotPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/SlotsPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml
similarity index 95%
rename from ProjectLighthouse.Website/Pages/SlotsPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml
index dc62cd72..add07625 100644
--- a/ProjectLighthouse.Website/Pages/SlotsPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml
@@ -1,7 +1,7 @@
 @page "/slots/{pageNumber:int}"
 @using LBPUnion.ProjectLighthouse.Helpers.Extensions
 @using LBPUnion.ProjectLighthouse.Types.Levels
-@model LBPUnion.ProjectLighthouse.Website.Pages.SlotsPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SlotsPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/SlotsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs
similarity index 95%
rename from ProjectLighthouse.Website/Pages/SlotsPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs
index 0cb72568..eb09cf6b 100644
--- a/ProjectLighthouse.Website/Pages/SlotsPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System.Text;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class SlotsPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/UserPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml
similarity index 98%
rename from ProjectLighthouse.Website/Pages/UserPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml
index 319aca8f..4ae58a8e 100644
--- a/ProjectLighthouse.Website/Pages/UserPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml
@@ -2,7 +2,7 @@
 @using System.Web
 @using LBPUnion.ProjectLighthouse.Helpers.Extensions
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Website.Pages.UserPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.UserPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/UserPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs
similarity index 94%
rename from ProjectLighthouse.Website/Pages/UserPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs
index dbc2bec7..73871bca 100644
--- a/ProjectLighthouse.Website/Pages/UserPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs
@@ -1,12 +1,12 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Profiles;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class UserPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Pages/UsersPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml
similarity index 94%
rename from ProjectLighthouse.Website/Pages/UsersPage.cshtml
rename to ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml
index d92cc89c..5e340006 100644
--- a/ProjectLighthouse.Website/Pages/UsersPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml
@@ -1,7 +1,7 @@
 @page "/users/{pageNumber:int}"
 @using LBPUnion.ProjectLighthouse.Helpers.Extensions
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Website.Pages.UsersPage
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.UsersPage
 
 @{
     Layout = "Layouts/BaseLayout";
diff --git a/ProjectLighthouse.Website/Pages/UsersPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs
similarity index 91%
rename from ProjectLighthouse.Website/Pages/UsersPage.cshtml.cs
rename to ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs
index c00aa8f1..bac18c8a 100644
--- a/ProjectLighthouse.Website/Pages/UsersPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs
@@ -1,11 +1,11 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Pages.Layouts;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Website.Pages;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
 
 public class UsersPage : BaseLayout
 {
diff --git a/ProjectLighthouse.Website/Program.cs b/ProjectLighthouse.Servers.Website/Program.cs
similarity index 91%
rename from ProjectLighthouse.Website/Program.cs
rename to ProjectLighthouse.Servers.Website/Program.cs
index 11843f92..67c4e17a 100644
--- a/ProjectLighthouse.Website/Program.cs
+++ b/ProjectLighthouse.Servers.Website/Program.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet;
+using LBPUnion.ProjectLighthouse.Servers.Website.Startup;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Website.Startup;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace LBPUnion.ProjectLighthouse.Website;
+namespace LBPUnion.ProjectLighthouse.Servers.Website;
 
 public static class Program
 {
diff --git a/ProjectLighthouse.Website/ProjectLighthouse.Website.csproj b/ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj
similarity index 91%
rename from ProjectLighthouse.Website/ProjectLighthouse.Website.csproj
rename to ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj
index 8ba39556..a7554621 100644
--- a/ProjectLighthouse.Website/ProjectLighthouse.Website.csproj
+++ b/ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <AssemblyName>LBPUnion.ProjectLighthouse.Website</AssemblyName>
-        <RootNamespace>LBPUnion.ProjectLighthouse.Website</RootNamespace>
+        <AssemblyName>LBPUnion.ProjectLighthouse.Servers.Website</AssemblyName>
+        <RootNamespace>LBPUnion.ProjectLighthouse.Servers.Website</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/ProjectLighthouse.Website/Startup/WebsiteStartup.cs b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
similarity index 96%
rename from ProjectLighthouse.Website/Startup/WebsiteStartup.cs
rename to ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
index a8d62f95..d6602244 100644
--- a/ProjectLighthouse.Website/Startup/WebsiteStartup.cs
+++ b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
@@ -2,7 +2,7 @@ using LBPUnion.ProjectLighthouse.Startup;
 using LBPUnion.ProjectLighthouse.Startup.Middlewares;
 using Microsoft.AspNetCore.HttpOverrides;
 
-namespace LBPUnion.ProjectLighthouse.Website.Startup;
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Startup;
 
 public sealed class WebsiteStartup
 {
diff --git a/ProjectLighthouse.Website/appsettings.Development.json b/ProjectLighthouse.Servers.Website/appsettings.Development.json
similarity index 100%
rename from ProjectLighthouse.Website/appsettings.Development.json
rename to ProjectLighthouse.Servers.Website/appsettings.Development.json
diff --git a/ProjectLighthouse.Website/appsettings.json b/ProjectLighthouse.Servers.Website/appsettings.json
similarity index 100%
rename from ProjectLighthouse.Website/appsettings.json
rename to ProjectLighthouse.Servers.Website/appsettings.json
diff --git a/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs b/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs
index 2cba33f4..956ab04f 100644
--- a/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs
+++ b/ProjectLighthouse.Tests.WebsiteTests/LighthouseWebTest.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using LBPUnion.ProjectLighthouse.Startup;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using OpenQA.Selenium;
@@ -15,7 +15,7 @@ public class LighthouseWebTest : IDisposable
     public readonly string BaseAddress;
 
     public readonly IWebDriver Driver;
-    public readonly IWebHost WebHost = new WebHostBuilder().UseKestrel().UseStartup<TestGameApiStartup>().UseWebRoot("StaticFiles").Build();
+    public readonly IWebHost WebHost = new WebHostBuilder().UseKestrel().UseStartup<GameServerTestStartup>().UseWebRoot("StaticFiles").Build();
 
     public LighthouseWebTest()
     {
diff --git a/ProjectLighthouse.Tests/LighthouseServerTest.cs b/ProjectLighthouse.Tests/LighthouseServerTest.cs
index 7f8fb83e..1b008b61 100644
--- a/ProjectLighthouse.Tests/LighthouseServerTest.cs
+++ b/ProjectLighthouse.Tests/LighthouseServerTest.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using System.Xml.Serialization;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Serialization;
-using LBPUnion.ProjectLighthouse.Startup;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
@@ -22,7 +22,7 @@ public class LighthouseServerTest
 
     public LighthouseServerTest()
     {
-        this.Server = new TestServer(new WebHostBuilder().UseStartup<TestGameApiStartup>());
+        this.Server = new TestServer(new WebHostBuilder().UseStartup<GameServerTestStartup>());
         this.Client = this.Server.CreateClient();
     }
     public async Task<HttpResponseMessage> AuthenticateResponse(int number = -1, bool createUser = true)
diff --git a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
index 706f348d..b877f486 100644
--- a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
+++ b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
@@ -35,9 +35,9 @@
         <Content Include="ExampleFiles\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
-        <ProjectReference Include="..\ProjectLighthouse.API\ProjectLighthouse.API.csproj"/>
-        <ProjectReference Include="..\ProjectLighthouse.GameAPI\ProjectLighthouse.GameAPI.csproj"/>
-        <ProjectReference Include="..\ProjectLighthouse.Website\ProjectLighthouse.Website.csproj"/>
+        <ProjectReference Include="..\ProjectLighthouse.Servers.API\ProjectLighthouse.Servers.API.csproj"/>
+        <ProjectReference Include="..\ProjectLighthouse.Servers.GameServer\ProjectLighthouse.Servers.GameServer.csproj"/>
+        <ProjectReference Include="..\ProjectLighthouse.Servers.Website\ProjectLighthouse.Servers.Website.csproj"/>
         <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/ProjectLighthouse.sln b/ProjectLighthouse.sln
index d463a4f8..b2f58bdc 100644
--- a/ProjectLighthouse.sln
+++ b/ProjectLighthouse.sln
@@ -10,11 +10,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Tests.Gam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Tests.WebsiteTests", "ProjectLighthouse.Tests.WebsiteTests\ProjectLighthouse.Tests.WebsiteTests.csproj", "{CF65EB5B-5364-4D2A-8639-F147A67F08E7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.API", "ProjectLighthouse.API\ProjectLighthouse.API.csproj", "{5593825E-F5C9-467F-9125-3E3249CFEEAB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Servers.API", "ProjectLighthouse.Servers.API\ProjectLighthouse.Servers.API.csproj", "{5593825E-F5C9-467F-9125-3E3249CFEEAB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.GameAPI", "ProjectLighthouse.GameAPI\ProjectLighthouse.GameAPI.csproj", "{0CD7F64B-7827-4AC9-B7D8-CE371D505544}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Servers.GameServer", "ProjectLighthouse.Servers.GameServer\ProjectLighthouse.Servers.GameServer.csproj", "{0CD7F64B-7827-4AC9-B7D8-CE371D505544}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Website", "ProjectLighthouse.Website\ProjectLighthouse.Website.csproj", "{FA9AEA06-D6B5-4E68-8370-DB9188108635}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Servers.Website", "ProjectLighthouse.Servers.Website\ProjectLighthouse.Servers.Website.csproj", "{FA9AEA06-D6B5-4E68-8370-DB9188108635}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Servers", "Servers", "{1DE7A758-1F4F-4BA5-BE1C-74F9D0AB9EA3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source Code", "Source Code", "{7805B410-9260-4907-A7C6-D739369B2F25}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,5 +56,10 @@ Global
 		{AFC74569-B289-4ACC-B21C-313A3A62C017} = {D360C08E-EA47-43AC-A566-FDF413442980}
 		{200EED99-FE3E-45C6-A51E-76ED9819CA2B} = {D360C08E-EA47-43AC-A566-FDF413442980}
 		{CF65EB5B-5364-4D2A-8639-F147A67F08E7} = {D360C08E-EA47-43AC-A566-FDF413442980}
+		{5593825E-F5C9-467F-9125-3E3249CFEEAB} = {1DE7A758-1F4F-4BA5-BE1C-74F9D0AB9EA3}
+		{0CD7F64B-7827-4AC9-B7D8-CE371D505544} = {1DE7A758-1F4F-4BA5-BE1C-74F9D0AB9EA3}
+		{FA9AEA06-D6B5-4E68-8370-DB9188108635} = {1DE7A758-1F4F-4BA5-BE1C-74F9D0AB9EA3}
+		{1DE7A758-1F4F-4BA5-BE1C-74F9D0AB9EA3} = {7805B410-9260-4907-A7C6-D739369B2F25}
+		{C6CFD4AD-47ED-4C86-B0C4-A4216D82E0DC} = {7805B410-9260-4907-A7C6-D739369B2F25}
 	EndGlobalSection
 EndGlobal
diff --git a/ProjectLighthouse/ProjectLighthouse.csproj b/ProjectLighthouse/ProjectLighthouse.csproj
index 73fcd251..c084cb22 100644
--- a/ProjectLighthouse/ProjectLighthouse.csproj
+++ b/ProjectLighthouse/ProjectLighthouse.csproj
@@ -38,20 +38,28 @@
         <EmbeddedResource Include="gitRemotes.txt">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </EmbeddedResource>
-        <None Remove="gitUnpushed.txt" />
+        <None Remove="gitUnpushed.txt"/>
         <EmbeddedResource Include="gitUnpushed.txt">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </EmbeddedResource>
-        <None Remove="chatCensoredList.txt" />
+        <None Remove="chatCensoredList.txt"/>
         <EmbeddedResource Include="chatCensoredList.txt">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </EmbeddedResource>
     </ItemGroup>
 
+    <ItemGroup>
+        <Folder Include="Extensions"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Remove="Extensions\SerializationExtensions.cs"/>
+    </ItemGroup>
+
     <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-        <Exec Command="git describe --long --always --dirty --exclude=\* --abbrev=8 &gt; &quot;$(ProjectDir)/gitVersion.txt&quot;" />
-        <Exec Command="git branch --show-current &gt; &quot;$(ProjectDir)/gitBranch.txt&quot;" />
-        <Exec Command="git remote -v &gt; &quot;$(ProjectDir)/gitRemotes.txt&quot;" />
-        <Exec Command="git log --branches --not --remotes --oneline &gt; &quot;$(ProjectDir)/gitUnpushed.txt&quot;" />
+        <Exec Command="git describe --long --always --dirty --exclude=\* --abbrev=8 &gt; &quot;$(ProjectDir)/gitVersion.txt&quot;"/>
+        <Exec Command="git branch --show-current &gt; &quot;$(ProjectDir)/gitBranch.txt&quot;"/>
+        <Exec Command="git remote -v &gt; &quot;$(ProjectDir)/gitRemotes.txt&quot;"/>
+        <Exec Command="git log --branches --not --remotes --oneline &gt; &quot;$(ProjectDir)/gitUnpushed.txt&quot;"/>
     </Target>
 </Project>