Massive organization of classes and namespaces

ProjectLighthouse.Servers.API/Controllers/SlotEndpoints.cs

@@ -1,8 +1,8 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.Levels;
 using LBPUnion.ProjectLighthouse.Servers.API.Responses;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.API/Controllers/UserEndpoints.cs

@@ -1,6 +1,6 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.API/Program.cs

@@ -1,7 +1,7 @@
+using LBPUnion.ProjectLighthouse.Configuration;
 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.Servers.API;

ProjectLighthouse.Servers.API/Responses/MinimalSlot.cs

@@ -1,5 +1,6 @@
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 
 namespace LBPUnion.ProjectLighthouse.Servers.API.Responses;
 

ProjectLighthouse.Servers.GameServer/Controllers/ClientConfigurationController.cs

@@ -1,7 +1,8 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;

ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs

@@ -1,10 +1,11 @@
 #nullable enable
 using System.Xml.Serialization;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/FriendsController.cs

@@ -1,11 +1,12 @@
 #nullable enable
 using System.Xml.Serialization;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.StorableLists;
 using LBPUnion.ProjectLighthouse.StorableLists.Stores;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/LoginController.cs

@@ -1,10 +1,13 @@
 #nullable enable
 using System.Net;
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.Match.Rooms;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.Tickets;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
-using LBPUnion.ProjectLighthouse.Types.Tickets;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/Matching/EnterLevelController.cs

@@ -1,6 +1,8 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/Matching/MatchController.cs

@@ -3,8 +3,12 @@ using System.Text.Json;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.Match;
+using LBPUnion.ProjectLighthouse.Match.MatchCommands;
+using LBPUnion.ProjectLighthouse.Match.Rooms;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Match;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
@@ -44,7 +48,7 @@ public class MatchController : ControllerBase
 
         Logger.LogInfo("Received match data: " + bodyString, LogArea.Match);
 
-        IMatchData? matchData;
+        IMatchCommand? matchData;
         try
         {
             matchData = MatchHelper.Deserialize(bodyString);

ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs

@@ -1,8 +1,10 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;

ProjectLighthouse.Servers.GameServer/Controllers/ReportController.cs

@@ -1,9 +1,10 @@
 #nullable enable
 using System.Text.Json;
 using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.Administration.Reports;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Reports;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers;

ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs

@@ -1,11 +1,13 @@
 #nullable enable
 using System.Xml.Serialization;
 using Discord;
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/Resources/ResourcesController.cs

@@ -2,11 +2,12 @@
 using System.Buffers;
 using System.IO.Pipelines;
 using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.Files;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Files;
 using Microsoft.AspNetCore.Mvc;
 using IOFile = System.IO.File;
 

ProjectLighthouse.Servers.GameServer/Controllers/Slots/CollectionController.cs

@@ -1,10 +1,12 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.Levels.Categories;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Categories;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;
@@ -31,7 +33,7 @@ public class CollectionController : ControllerBase
         User? user = await this.database.UserFromGameRequest(this.Request);
         if (user == null) return this.StatusCode(403, "");
 
-        string categoriesSerialized = CollectionHelper.Categories.Aggregate
+        string categoriesSerialized = CategoryHelper.Categories.Aggregate
         (
             string.Empty,
             (current, category) =>
@@ -60,7 +62,7 @@ public class CollectionController : ControllerBase
                         "hint_start", 1
                     },
                     {
-                        "total", CollectionHelper.Categories.Count
+                        "total", CategoryHelper.Categories.Count
                     },
                 }
             )
@@ -78,7 +80,7 @@ public class CollectionController : ControllerBase
         User user = userAndToken.Value.Item1;
         GameToken gameToken = userAndToken.Value.Item2;
 
-        Category? category = CollectionHelper.Categories.FirstOrDefault(c => c.Endpoint == endpointName);
+        Category? category = CategoryHelper.Categories.FirstOrDefault(c => c.Endpoint == endpointName);
         if (category == null) return this.NotFound();
 
         Logger.LogDebug("Found category " + category, LogArea.Category);

ProjectLighthouse.Servers.GameServer/Controllers/Slots/LevelTagsController.cs

@@ -1,4 +1,4 @@
-using LBPUnion.ProjectLighthouse.Types.Levels;
+using LBPUnion.ProjectLighthouse.Levels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;

ProjectLighthouse.Servers.GameServer/Controllers/Slots/ListController.cs

@@ -1,7 +1,9 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/Slots/PublishController.cs

@@ -1,12 +1,13 @@
 #nullable enable
 using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.Files;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Files;
-using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Profiles;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/Slots/ReviewController.cs

@@ -1,11 +1,14 @@
 #nullable enable
 using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.Administration;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.PlayerData.Reviews;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Reviews;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/Slots/ScoreController.cs

@@ -2,9 +2,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Xml.Serialization;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LBPUnion.ProjectLighthouse.Servers.GameServer.Controllers.Slots;

ProjectLighthouse.Servers.GameServer/Controllers/Slots/SearchController.cs

@@ -1,7 +1,8 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs

@@ -1,11 +1,13 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.PlayerData.Reviews;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Reviews;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Controllers/UserController.cs

@@ -1,10 +1,12 @@
 #nullable enable
 using System.Text.Json;
 using System.Xml.Serialization;
+using LBPUnion.ProjectLighthouse.Files;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.GameServer/Program.cs

@@ -1,7 +1,7 @@
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet;
 using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace LBPUnion.ProjectLighthouse.Servers.GameServer;

ProjectLighthouse.Servers.GameServer/Startup/GameServerStartup.cs

@@ -1,9 +1,10 @@
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
 using LBPUnion.ProjectLighthouse.Middlewares;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Primitives;
 

ProjectLighthouse.Servers.Website/Controllers/Admin/AdminReportController.cs

@@ -1,6 +1,7 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Administration.Reports;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Reports;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Controllers/Admin/AdminSlotController.cs

@@ -1,6 +1,7 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Controllers/Admin/AdminUserController.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

ProjectLighthouse.Servers.Website/Controllers/Debug/RoomVisualizerController.cs

@@ -1,5 +1,7 @@
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Match.Rooms;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AuthenticationController.cs

@@ -1,4 +1,6 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

ProjectLighthouse.Servers.Website/Controllers/ExternalAuth/AutoApprovalController.cs

@@ -1,4 +1,6 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

ProjectLighthouse.Servers.Website/Controllers/ResourcesController.cs

@@ -1,5 +1,5 @@
+using LBPUnion.ProjectLighthouse.Files;
 using LBPUnion.ProjectLighthouse.Helpers;
-using LBPUnion.ProjectLighthouse.Types.Files;
 using Microsoft.AspNetCore.Mvc;
 using IOFile = System.IO.File;
 

ProjectLighthouse.Servers.Website/Controllers/SlotPageController.cs

@@ -1,8 +1,9 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Controllers/UserPageController.cs

@@ -1,6 +1,7 @@
 #nullable enable
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

ProjectLighthouse.Servers.Website/Pages/Admin/AdminBanUserPage.cshtml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml

@@ -1,7 +1,8 @@
 @page "/admin"
+@using LBPUnion.ProjectLighthouse.Administration
+@using LBPUnion.ProjectLighthouse.Administration.Maintenance
 @using LBPUnion.ProjectLighthouse.Extensions
 @using LBPUnion.ProjectLighthouse.Helpers
-@using LBPUnion.ProjectLighthouse.Maintenance
 @using LBPUnion.ProjectLighthouse.Types
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminPanelPage
 

ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelPage.cshtml.cs

@@ -1,6 +1,8 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Administration;
+using LBPUnion.ProjectLighthouse.Administration.Maintenance;
 using LBPUnion.ProjectLighthouse.Helpers;
-using LBPUnion.ProjectLighthouse.Maintenance;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml

@@ -1,4 +1,5 @@
 @page "/admin/users"
+@using LBPUnion.ProjectLighthouse.PlayerData.Profiles
 @using LBPUnion.ProjectLighthouse.Types
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Admin.AdminPanelUsersPage
 

ProjectLighthouse.Servers.Website/Pages/Admin/AdminPanelUsersPage.cshtml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/Admin/AdminSetGrantedSlotsPage.cshtml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/CompleteEmailVerificationPage.cshtml.cs

@@ -1,8 +1,9 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/Debug/RoomVisualizerPage.cshtml

@@ -1,8 +1,10 @@
 @page "/debug/roomVisualizer"
 @using LBPUnion.ProjectLighthouse.Extensions
 @using LBPUnion.ProjectLighthouse.Helpers
+@using LBPUnion.ProjectLighthouse.Match.Rooms
+@using LBPUnion.ProjectLighthouse.PlayerData
+@using LBPUnion.ProjectLighthouse.PlayerData.Profiles
 @using LBPUnion.ProjectLighthouse.Types
-@using LBPUnion.ProjectLighthouse.Types.Match
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Debug.RoomVisualizerPage
 
 @{

ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml

@@ -1,4 +1,5 @@
 @page "/authentication"
+@using LBPUnion.ProjectLighthouse.PlayerData
 @using LBPUnion.ProjectLighthouse.Types
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth.AuthenticationPage
 

ProjectLighthouse.Servers.Website/Pages/ExternalAuth/AuthenticationPage.cshtml.cs

@@ -1,8 +1,9 @@
 #nullable enable
 using System.Net;
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml

@@ -1,4 +1,5 @@
 @page "/authentication/autoApprovals"
+@using LBPUnion.ProjectLighthouse.PlayerData.Profiles
 @using LBPUnion.ProjectLighthouse.Types
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ExternalAuth.ManageUserApprovedIpAddressesPage
 

ProjectLighthouse.Servers.Website/Pages/ExternalAuth/ManageUserApprovedIpAddressesPage.cshtml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml

@@ -1,6 +1,7 @@
 @page "/"
+@using LBPUnion.ProjectLighthouse.Configuration
+@using LBPUnion.ProjectLighthouse.PlayerData.Profiles
 @using LBPUnion.ProjectLighthouse.Types
-@using LBPUnion.ProjectLighthouse.Types.Settings
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LandingPage
 
 @{

ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs

@@ -1,6 +1,7 @@
 #nullable enable
 using JetBrains.Annotations;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml

@@ -1,7 +1,7 @@
+@using LBPUnion.ProjectLighthouse.Configuration
 @using LBPUnion.ProjectLighthouse.Extensions
 @using LBPUnion.ProjectLighthouse.Helpers
 @using LBPUnion.ProjectLighthouse.Types
-@using LBPUnion.ProjectLighthouse.Types.Settings
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts.BaseLayout
 
 @{

ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 

ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml

@@ -1,5 +1,5 @@
 @page "/login"
-@using LBPUnion.ProjectLighthouse.Types.Settings
+@using LBPUnion.ProjectLighthouse.Configuration
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LoginForm
 
 @{

ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml.cs

@@ -1,12 +1,14 @@
 #nullable enable
 using JetBrains.Annotations;
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/Partials/AdminPanelStatisticPartial.cshtml

@@ -1,4 +1,4 @@
-@model LBPUnion.ProjectLighthouse.Types.AdminPanelStatistic
+@model LBPUnion.ProjectLighthouse.Administration.AdminPanelStatistic
 
 <div class="three wide column">
     <div class="ui center aligned blue segment">

ProjectLighthouse.Servers.Website/Pages/Partials/AdminSetGrantedSlotsFormPartial.cshtml

@@ -1,4 +1,4 @@
-@model LBPUnion.ProjectLighthouse.Types.User
+@model LBPUnion.ProjectLighthouse.PlayerData.Profiles.User
 
 <form method="post" action="/admin/user/@Model.UserId/setGrantedSlots">
     @Html.AntiForgeryToken()

ProjectLighthouse.Servers.Website/Pages/Partials/CaptchaPartial.cshtml

@@ -1,4 +1,4 @@
-@using LBPUnion.ProjectLighthouse.Types.Settings
+@using LBPUnion.ProjectLighthouse.Configuration
 @if (ServerConfiguration.Instance.Captcha.CaptchaEnabled)
 {
     <div class="h-captcha" data-sitekey="@ServerConfiguration.Instance.Captcha.SiteKey"></div>

ProjectLighthouse.Servers.Website/Pages/Partials/CommentsPartial.cshtml

@@ -1,5 +1,5 @@
 @using System.Web
-@using LBPUnion.ProjectLighthouse.Types.Profiles
+@using LBPUnion.ProjectLighthouse.PlayerData.Profiles
 <div class="ui yellow segment" id="comments">
     <h2>Comments</h2>
     @if (Model.Comments.Count == 0 && Model.CommentsEnabled)

ProjectLighthouse.Servers.Website/Pages/Partials/PhotoPartial.cshtml

@@ -1,5 +1,6 @@
+@using LBPUnion.ProjectLighthouse.PlayerData
 @using LBPUnion.ProjectLighthouse.Types
-@model LBPUnion.ProjectLighthouse.Types.Photo
+@model LBPUnion.ProjectLighthouse.PlayerData.Photo
 
 
 <div style="position: relative">

ProjectLighthouse.Servers.Website/Pages/Partials/SlotCardPartial.cshtml

@@ -1,8 +1,10 @@
 @using LBPUnion.ProjectLighthouse
+@using LBPUnion.ProjectLighthouse.Configuration
+@using LBPUnion.ProjectLighthouse.PlayerData
+@using LBPUnion.ProjectLighthouse.PlayerData.Profiles
 @using LBPUnion.ProjectLighthouse.Types
-@using LBPUnion.ProjectLighthouse.Types.Settings
 @using Microsoft.EntityFrameworkCore
-@model LBPUnion.ProjectLighthouse.Types.Levels.Slot
+@model LBPUnion.ProjectLighthouse.Levels.Slot
 
 @{
     User user = (User)ViewData["User"]!;

ProjectLighthouse.Servers.Website/Pages/Partials/UserCardPartial.cshtml

@@ -1,4 +1,4 @@
-@model LBPUnion.ProjectLighthouse.Types.User
+@model LBPUnion.ProjectLighthouse.PlayerData.Profiles.User
 
 @{
     bool showLink = (bool?)ViewData["ShowLink"] ?? false;

ProjectLighthouse.Servers.Website/Pages/PasswordResetPage.cshtml.cs

@@ -1,6 +1,7 @@
 #nullable enable
 using JetBrains.Annotations;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/PasswordResetRequiredPage.cshtml.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Mvc;

ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml

@@ -1,4 +1,5 @@
 @page "/photos/{pageNumber:int}"
+@using LBPUnion.ProjectLighthouse.PlayerData
 @using LBPUnion.ProjectLighthouse.Types
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.PhotosPage
 

ProjectLighthouse.Servers.Website/Pages/PhotosPage.cshtml.cs

@@ -1,7 +1,8 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml

@@ -1,5 +1,5 @@
 @page "/register"
-@using LBPUnion.ProjectLighthouse.Types.Settings
+@using LBPUnion.ProjectLighthouse.Configuration
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.RegisterForm
 
 @{

ProjectLighthouse.Servers.Website/Pages/RegisterForm.cshtml.cs

@@ -1,10 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Extensions;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml

@@ -1,5 +1,5 @@
 @page "/admin/reports/{pageNumber:int}"
-@using LBPUnion.ProjectLighthouse.Types.Reports
+@using LBPUnion.ProjectLighthouse.Administration.Reports
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ReportsPage
 
 @{

ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml.cs

@@ -1,9 +1,10 @@
 #nullable enable
 using System.Text.Json;
+using LBPUnion.ProjectLighthouse.Administration.Reports;
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Reports;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/SendVerificationEmailPage.cshtml.cs

@@ -1,9 +1,10 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 
 namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;

ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml

@@ -1,5 +1,5 @@
 @page "/login/setEmail"
-@using LBPUnion.ProjectLighthouse.Types.Settings
+@using LBPUnion.ProjectLighthouse.Configuration
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SetEmailForm
 
 @{

ProjectLighthouse.Servers.Website/Pages/SetEmailForm.cshtml.cs

@@ -1,10 +1,12 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles.Email;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles.Email;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml

@@ -1,9 +1,10 @@
 @page "/slot/{id:int}"
 @using System.Web
+@using LBPUnion.ProjectLighthouse.Administration
+@using LBPUnion.ProjectLighthouse.Configuration
 @using LBPUnion.ProjectLighthouse.Extensions
+@using LBPUnion.ProjectLighthouse.PlayerData.Reviews
 @using LBPUnion.ProjectLighthouse.Types
-@using LBPUnion.ProjectLighthouse.Types.Reviews
-@using LBPUnion.ProjectLighthouse.Types.Settings
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SlotPage
 
 @{

ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml.cs

@@ -1,10 +1,11 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.PlayerData.Reviews;
 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 Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml

@@ -1,6 +1,6 @@
 @page "/slots/{pageNumber:int}"
 @using LBPUnion.ProjectLighthouse.Extensions
-@using LBPUnion.ProjectLighthouse.Types.Levels
+@using LBPUnion.ProjectLighthouse.Levels
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.SlotsPage
 
 @{

ProjectLighthouse.Servers.Website/Pages/SlotsPage.cshtml.cs

@@ -1,9 +1,10 @@
 #nullable enable
 using System.Text;
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml

@@ -1,6 +1,7 @@
 @page "/user/{userId:int}"
 @using System.Web
 @using LBPUnion.ProjectLighthouse.Extensions
+@using LBPUnion.ProjectLighthouse.PlayerData
 @using LBPUnion.ProjectLighthouse.Types
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.UserPage
 

ProjectLighthouse.Servers.Website/Pages/UserPage.cshtml.cs

@@ -1,8 +1,9 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Profiles;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml

@@ -1,5 +1,6 @@
 @page "/users/{pageNumber:int}"
 @using LBPUnion.ProjectLighthouse.Extensions
+@using LBPUnion.ProjectLighthouse.PlayerData.Profiles
 @using LBPUnion.ProjectLighthouse.Types
 @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.UsersPage
 

ProjectLighthouse.Servers.Website/Pages/UsersPage.cshtml.cs

@@ -1,7 +1,8 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 

ProjectLighthouse.Servers.Website/Program.cs

@@ -1,8 +1,8 @@
 #nullable enable
+using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Logging.Loggers.AspNet;
 using LBPUnion.ProjectLighthouse.Servers.Website.Startup;
 using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace LBPUnion.ProjectLighthouse.Servers.Website;

ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs

@@ -1,12 +1,12 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Settings;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.GameApiTests;
+namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
 public class AuthenticationTests : LighthouseServerTest
 {

ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs

@@ -2,11 +2,11 @@ using System;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.GameApiTests;
+namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
 public class DatabaseTests : LighthouseServerTest
 {

ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs

@@ -4,11 +4,11 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.GameApiTests;
+namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
 public class MatchTests : LighthouseServerTest
 {

ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs

@@ -3,13 +3,13 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Levels;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
-using LBPUnion.ProjectLighthouse.Types.Levels;
-using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.GameApiTests;
+namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
 public class SlotTests : LighthouseServerTest
 {

ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs

@@ -3,11 +3,11 @@ using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.GameApiTests;
+namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
 public class UploadTests : LighthouseServerTest
 {

ProjectLighthouse.Tests.WebsiteTests/Tests/AdminTests.cs

@@ -2,12 +2,13 @@ using System;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
 using OpenQA.Selenium;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.WebsiteTests;
+namespace ProjectLighthouse.Tests.WebsiteTests.Tests;
 
 public class AdminTests : LighthouseWebTest
 {

ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs

@@ -3,13 +3,14 @@ using System.Linq;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.EntityFrameworkCore;
 using OpenQA.Selenium;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.WebsiteTests;
+namespace ProjectLighthouse.Tests.WebsiteTests.Tests;
 
 public class AuthenticationTests : LighthouseWebTest
 {

ProjectLighthouse.Tests.WebsiteTests/Tests/LighthouseWebTest.cs

@@ -7,7 +7,7 @@ using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.WebsiteTests;
+namespace ProjectLighthouse.Tests.WebsiteTests.Tests;
 
 [Collection(nameof(LighthouseWebTest))]
 public class LighthouseWebTest : IDisposable

ProjectLighthouse.Tests.WebsiteTests/Tests/RegisterTests.cs

@@ -3,13 +3,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using LBPUnion.ProjectLighthouse.Tests;
-using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.EntityFrameworkCore;
 using OpenQA.Selenium;
 using Xunit;
 
-namespace ProjectLighthouse.Tests.WebsiteTests;
+namespace ProjectLighthouse.Tests.WebsiteTests.Tests;
 
 public class RegisterTests : LighthouseWebTest
 {

ProjectLighthouse.Tests/DatabaseFactAttribute.cs

@@ -1,4 +1,4 @@
-using LBPUnion.ProjectLighthouse.Types.Settings;
+using LBPUnion.ProjectLighthouse.Configuration;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
 

ProjectLighthouse.Tests/LighthouseServerTest.cs

@@ -5,6 +5,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Serialization;
 using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Types;

ProjectLighthouse.Tests/Tests/FileTypeTests.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
-using LBPUnion.ProjectLighthouse.Types.Files;
+using LBPUnion.ProjectLighthouse.Files;
 using Xunit;
 
 namespace LBPUnion.ProjectLighthouse.Tests;

ProjectLighthouse/Administration/AdminPanelStatistic.cs

@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace LBPUnion.ProjectLighthouse.Types;
+namespace LBPUnion.ProjectLighthouse.Administration;
 
 public struct AdminPanelStatistic
 {

ProjectLighthouse/Administration/DeletedBy.cs

@@ -1,6 +1,6 @@
 using System.Xml.Serialization;
 
-namespace LBPUnion.ProjectLighthouse.Types;
+namespace LBPUnion.ProjectLighthouse.Administration;
 
 [XmlRoot("deleted_by")]
 public enum DeletedBy

ProjectLighthouse/Administration/Maintenance/Commands/CreateUserCommand.cs

@@ -2,10 +2,10 @@
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Logging;
-using LBPUnion.ProjectLighthouse.Types;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Maintenance.Commands;
+namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands;
 
 public class CreateUserCommand : ICommand
 {

ProjectLighthouse/Administration/Maintenance/Commands/DeleteUserCommand.cs

@@ -1,10 +1,10 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using LBPUnion.ProjectLighthouse.Types;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Maintenance.Commands;
+namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands;
 
 public class DeleteUserCommand : ICommand
 {

ProjectLighthouse/Administration/Maintenance/Commands/MakeUserAdminCommand.cs

@@ -1,10 +1,10 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using LBPUnion.ProjectLighthouse.Types;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Maintenance.Commands;
+namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands;
 
 public class MakeUserAdminCommand : ICommand
 {

ProjectLighthouse/Administration/Maintenance/Commands/RenameUserCommand.cs

@@ -1,10 +1,10 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using LBPUnion.ProjectLighthouse.Types;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Maintenance.Commands;
+namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands;
 
 public class RenameUserCommand : ICommand
 {

ProjectLighthouse/Administration/Maintenance/Commands/ResetPasswordCommand.cs

@@ -2,10 +2,10 @@
 using System;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse.Helpers;
-using LBPUnion.ProjectLighthouse.Types;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
 using Microsoft.EntityFrameworkCore;
 
-namespace LBPUnion.ProjectLighthouse.Maintenance.Commands;
+namespace LBPUnion.ProjectLighthouse.Administration.Maintenance.Commands;
 
 public class ResetPasswordCommand : ICommand
 {