Rename server project

LANCommander.SDK/LANCommander.SDK.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-	  <Version>0.8.0</Version>
+	  <Version>0.9.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

LANCommander.Server/ApiMiddleware.cs

@@ -1,6 +1,6 @@
-using LANCommander.Services;
+using LANCommander.Server.Services;
 
-namespace LANCommander
+namespace LANCommander.Server
 {
     public class ApiMiddleware
     {

LANCommander.Server/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs

@@ -4,7 +4,7 @@
 
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     /// <summary>
     ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used

LANCommander.Server/Areas/Identity/Pages/Account/FirstTimeSetup.cshtml

@@ -1,6 +1,6 @@
 @page
-@using LANCommander.Models;
-@using LANCommander.Services;
+@using LANCommander.Server.Models;
+@using LANCommander.Server.Services;
 @model FirstTimeSetupModel
 @{
     Layout = "/UI/Views/Shared/_LayoutBasic.cshtml";

LANCommander.Server/Areas/Identity/Pages/Account/FirstTimeSetup.cshtml.cs

@@ -12,7 +12,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
@@ -20,7 +20,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     public class FirstTimeSetupModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs

@@ -8,14 +8,14 @@ using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     public class ForgotPasswordModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/Login.cshtml

@@ -1,6 +1,6 @@
 @page
-@using LANCommander.Models;
-@using LANCommander.Services;
+@using LANCommander.Server.Models;
+@using LANCommander.Server.Services;
 @model LoginModel
 @{ Layout = "/UI/Views/Shared/_LayoutBasic.cshtml"; }
 

LANCommander.Server/Areas/Identity/Pages/Account/Login.cshtml.cs

@@ -8,16 +8,16 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     public class LoginModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/Logout.cshtml.cs

@@ -5,13 +5,13 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     public class LogoutModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs

@@ -5,13 +5,13 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace LANCommander.Areas.Identity.Pages.Account.Manage
+namespace LANCommander.Server.Areas.Identity.Pages.Account.Manage
 {
     public class ChangePasswordModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs

@@ -6,12 +6,12 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LANCommander.Areas.Identity.Pages.Account.Manage
+namespace LANCommander.Server.Areas.Identity.Pages.Account.Manage
 {
     public class IndexModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs

@@ -5,7 +5,7 @@
 using System;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace  LANCommander.Areas.Identity.Pages.Account.Manage
+namespace LANCommander.Server.Areas.Identity.Pages.Account.Manage
 {
     /// <summary>
     ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used

LANCommander.Server/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs

@@ -5,12 +5,12 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LANCommander.Areas.Identity.Pages.Account.Manage
+namespace LANCommander.Server.Areas.Identity.Pages.Account.Manage
 {
     public class SetPasswordModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml

@@ -0,0 +1 @@
+@using LANCommander.Server.Areas.Identity.Pages.Account.Manage

LANCommander.Server/Areas/Identity/Pages/Account/Register.cshtml

@@ -1,6 +1,6 @@
 @page
-@using LANCommander.Models;
-@using LANCommander.Services;
+@using LANCommander.Server.Models;
+@using LANCommander.Server.Services;
 @model RegisterModel
 @{ Layout = "/UI/Views/Shared/_LayoutBasic.cshtml"; }
 @{

LANCommander.Server/Areas/Identity/Pages/Account/Register.cshtml.cs

@@ -12,16 +12,16 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     public class RegisterModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs

@@ -7,13 +7,13 @@ using System.ComponentModel.DataAnnotations;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.WebUtilities;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     public class ResetPasswordModel : PageModel
     {

LANCommander.Server/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs

@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace LANCommander.Areas.Identity.Pages.Account
+namespace LANCommander.Server.Areas.Identity.Pages.Account
 {
     /// <summary>
     ///     This API supports the ASP.NET Core Identity default UI infrastructure and is not intended to be used

LANCommander.Server/Areas/Identity/Pages/Account/_ViewImports.cshtml

@@ -0,0 +1 @@
+@using LANCommander.Server.Areas.Identity.Pages.Account

LANCommander.Server/Areas/Identity/Pages/_ViewImports.cshtml

@@ -0,0 +1,6 @@
+@using Microsoft.AspNetCore.Identity
+@using LANCommander.Server.Areas.Identity
+@using LANCommander.Server.Areas.Identity.Pages
+@using LANCommander.Server.Data.Models
+@using LANCommander.Server.UI.Components
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

LANCommander.Server/AutoMapper.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace LANCommander
+namespace LANCommander.Server
 {
     public class AutoMapper : Profile
     {

LANCommander.Server/Controllers/Api/ArchivesController.cs

@@ -1,13 +1,13 @@
-using LANCommander.Data;
-using LANCommander.Data.Models;
-using LANCommander.Extensions;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/AuthController.cs

@@ -1,6 +1,6 @@
-using LANCommander.Data.Models;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -11,7 +11,7 @@ using System.Security.Claims;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     public class TokenModel
     {

LANCommander.Server/Controllers/Api/GameSavesController.cs

@@ -1,13 +1,13 @@
-using LANCommander.Data;
-using LANCommander.Data.Models;
-using LANCommander.Extensions;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/GamesController.cs

@@ -1,17 +1,17 @@
 using AutoMapper;
-using LANCommander.Data;
-using LANCommander.Data.Enums;
-using LANCommander.Data.Models;
-using LANCommander.Extensions;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data;
+using LANCommander.Server.Data.Enums;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using ZiggyCreatures.Caching.Fusion;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/KeysController.cs

@@ -1,13 +1,13 @@
 using AutoMapper;
-using LANCommander.Data;
-using LANCommander.Data.Models;
-using LANCommander.Extensions;
+using LANCommander.Server.Data;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Services;
 using LANCommander.SDK.Models;
-using LANCommander.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/LauncherController.cs

@@ -1,10 +1,10 @@
 using LANCommander.SDK.Models;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Semver;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/MediaController.cs

@@ -1,14 +1,14 @@
 using AutoMapper;
-using LANCommander.Data;
-using LANCommander.Data.Models;
-using LANCommander.Extensions;
-using LANCommander.Models;
+using LANCommander.Server.Data;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Models;
 using LANCommander.SDK;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/PingController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Route("api/[controller]")]
     [ApiController]

LANCommander.Server/Controllers/Api/PlaySessionsController.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
-using LANCommander.Data.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/ProfileController.cs

@@ -1,6 +1,6 @@
-using LANCommander.Data.Models;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -11,7 +11,7 @@ using System.Security.Claims;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Route("api/[controller]")]
     [Authorize(AuthenticationSchemes = "Bearer")]

LANCommander.Server/Controllers/Api/RedistributablesController.cs

@@ -1,12 +1,12 @@
 using AutoMapper;
-using LANCommander.Data.Models;
-using LANCommander.Extensions;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/SavesController.cs

@@ -1,16 +1,16 @@
 using AutoMapper;
-using LANCommander.Data;
-using LANCommander.Data.Models;
-using LANCommander.Extensions;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data;
+using LANCommander.Server.Data.Models;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using System.Runtime.Intrinsics.X86;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/SettingsController.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Authorize(AuthenticationSchemes = "Bearer")]
     [Route("api/[controller]")]

LANCommander.Server/Controllers/Api/UploadController.cs

@@ -1,9 +1,9 @@
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers.Api
+namespace LANCommander.Server.Controllers.Api
 {
     [Route("api/[controller]")]
     [ApiController]

LANCommander.Server/Controllers/BaseController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json;
 
-namespace LANCommander.Controllers
+namespace LANCommander.Server.Controllers
 {
     public class BaseController : Controller
     {

LANCommander.Server/Controllers/DownloadController.cs

@@ -1,12 +1,12 @@
-using LANCommander.Data;
-using LANCommander.Extensions;
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Data;
+using LANCommander.Server.Extensions;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace LANCommander.Controllers
+namespace LANCommander.Server.Controllers
 {
     [Authorize]
     public class DownloadController : Controller

LANCommander.Server/Controllers/GamesController.cs

@@ -1,10 +1,10 @@
 using LANCommander.SDK.Helpers;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.IO.Compression;
 
-namespace LANCommander.Controllers
+namespace LANCommander.Server.Controllers
 {
     [Authorize(Roles = "Administrator")]
     public class GamesController : BaseController

LANCommander.Server/Controllers/RedistributablesController.cs

@@ -1,11 +1,11 @@
 using AutoMapper;
 using LANCommander.SDK.Helpers;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.IO.Compression;
 
-namespace LANCommander.Controllers
+namespace LANCommander.Server.Controllers
 {
     [Authorize(Roles = "Administrator")]
     public class RedistributablesController : BaseController

LANCommander.Server/Controllers/ServerController.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
 using LANCommander.SDK.Helpers;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Mvc;
 using System.IO.Compression;
 
-namespace LANCommander.Controllers
+namespace LANCommander.Server.Controllers
 {
     public class ServerController : Controller
     {

LANCommander.Server/Controllers/UploadController.cs

@@ -1,11 +1,11 @@
-using LANCommander.Models;
-using LANCommander.Services;
+using LANCommander.Server.Models;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using NLog;
 
-namespace LANCommander.Controllers
+namespace LANCommander.Server.Controllers
 {
     [Authorize(Roles = "Administrator")]
     public class UploadController : Controller

LANCommander.Server/Data/DatabaseContext.cs

@@ -1,10 +1,10 @@
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.Build.Framework;
 using Microsoft.EntityFrameworkCore;
 
-namespace LANCommander.Data
+namespace LANCommander.Server.Data
 {
     public class DatabaseContext : IdentityDbContext<User, Role, Guid>
     {
@@ -33,7 +33,7 @@ namespace LANCommander.Data
             builder.ConfigureBaseRelationships<Redistributable>();
             builder.ConfigureBaseRelationships<SavePath>();
             builder.ConfigureBaseRelationships<Script>();
-            builder.ConfigureBaseRelationships<Server>();
+            builder.ConfigureBaseRelationships<Data.Models.Server>();
             builder.ConfigureBaseRelationships<ServerConsole>();
             builder.ConfigureBaseRelationships<ServerHttpPath>();
             builder.ConfigureBaseRelationships<Tag>();
@@ -182,31 +182,31 @@ namespace LANCommander.Data
             #endregion
 
             #region Server Relationships
-            builder.Entity<Server>()
+            builder.Entity<Data.Models.Server>()
                 .HasOne(s => s.Game)
                 .WithMany(g => g.Servers)
                 .IsRequired(false)
                 .OnDelete(DeleteBehavior.SetNull);
 
-            builder.Entity<Server>()
+            builder.Entity<Data.Models.Server>()
                 .HasMany<ServerConsole>()
                 .WithOne(sl => sl.Server)
                 .IsRequired(true)
                 .OnDelete(DeleteBehavior.Cascade);
 
-            builder.Entity<Server>()
+            builder.Entity<Data.Models.Server>()
                 .HasMany<ServerHttpPath>()
                 .WithOne(s => s.Server)
                 .IsRequired(true)
                 .OnDelete(DeleteBehavior.Cascade);
 
-            builder.Entity<Server>()
+            builder.Entity<Data.Models.Server>()
                 .HasMany(s => s.Scripts)
                 .WithOne(s => s.Server)
                 .IsRequired(false)
                 .OnDelete(DeleteBehavior.Cascade);
 
-            builder.Entity<Server>()
+            builder.Entity<Data.Models.Server>()
                 .HasMany(s => s.Actions)
                 .WithOne(s => s.Server)
                 .IsRequired(false)
@@ -266,7 +266,7 @@ namespace LANCommander.Data
 
         public DbSet<PlaySession>? PlaySessions { get; set; }
 
-        public DbSet<Server>? Servers { get; set; }
+        public DbSet<Data.Models.Server>? Servers { get; set; }
 
         public DbSet<ServerConsole>? ServerConsoles { get; set; }
 

LANCommander.Server/Data/Enums/GameType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LANCommander.Data.Enums
+namespace LANCommander.Server.Data.Enums
 {
     public enum GameType
     {

LANCommander.Server/Data/Enums/SavePathType.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace LANCommander.Data.Enums
+namespace LANCommander.Server.Data.Enums
 {
     public enum SavePathType
     {

LANCommander.Server/Data/Enums/ScriptType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LANCommander.Data.Enums
+namespace LANCommander.Server.Data.Enums
 {
     public enum ScriptType
     {

LANCommander.Server/Data/Enums/ServerAutostartMethod.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace LANCommander.Data.Enums
+namespace LANCommander.Server.Data.Enums
 {
     public enum ServerAutostartMethod
     {

LANCommander.Server/Data/Enums/ServerConsoleType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace LANCommander.Data.Enums
+namespace LANCommander.Server.Data.Enums
 {
     public enum ServerConsoleType
     {

LANCommander.Server/Data/ModelBuilderExtensions.cs

@@ -1,7 +1,7 @@
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace LANCommander.Data
+namespace LANCommander.Server.Data
 {
     public static class ModelBuilderExtensions
     {

LANCommander.Server/Data/Models/Action.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Actions")]
     public class Action : BaseModel

LANCommander.Server/Data/Models/Archive.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     public class Archive : BaseModel
     {

LANCommander.Server/Data/Models/BaseModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     public abstract class BaseModel
     {

LANCommander.Server/Data/Models/BaseTaxonomyModel.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     public abstract class BaseTaxonomyModel : BaseModel
     {

LANCommander.Server/Data/Models/Category.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Categories")]
     public class Category : BaseTaxonomyModel

LANCommander.Server/Data/Models/Collection.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Collections")]
     public class Collection : BaseTaxonomyModel

LANCommander.Server/Data/Models/Company.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     public class Company : BaseModel
     {

LANCommander.Server/Data/Models/Engine.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Engines")]
     public class Engine : BaseTaxonomyModel

LANCommander.Server/Data/Models/Game.cs

@@ -1,8 +1,8 @@
-using LANCommander.Data.Enums;
+using LANCommander.Server.Data.Enums;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Games")]
     public class Game : BaseModel

LANCommander.Server/Data/Models/GameSave.cs

@@ -1,8 +1,8 @@
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("GameSaves")]
     public class GameSave : BaseModel

LANCommander.Server/Data/Models/Genre.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Genres")]
     public class Genre : BaseTaxonomyModel

LANCommander.Server/Data/Models/Key.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Keys")]
     public class Key : BaseModel

LANCommander.Server/Data/Models/Media.cs

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Media")]
     public class Media : BaseModel

LANCommander.Server/Data/Models/MultiplayerMode.cs

@@ -1,9 +1,9 @@
-using LANCommander.Data.Enums;
+using LANCommander.Server.Data.Enums;
 using LANCommander.SDK.Enums;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("MultiplayerModes")]
     public class MultiplayerMode : BaseModel

LANCommander.Server/Data/Models/Platform.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Platforms")]
     public class Platform : BaseTaxonomyModel

LANCommander.Server/Data/Models/PlaySession.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("PlaySessions")]
     public class PlaySession : BaseModel

LANCommander.Server/Data/Models/Redistributable.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Redistributables")]
     public class Redistributable : BaseModel

LANCommander.Server/Data/Models/Role.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Identity;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Roles")]
     public class Role : IdentityRole<Guid>

LANCommander.Server/Data/Models/SavePath.cs

@@ -1,8 +1,8 @@
-using LANCommander.Data.Enums;
+using LANCommander.Server.Data.Enums;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("SavePaths")]
     public class SavePath : BaseModel

LANCommander.Server/Data/Models/Script.cs

@@ -1,9 +1,9 @@
-using LANCommander.Data.Enums;
+using LANCommander.Server.Data.Enums;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Scripts")]
     public class Script : BaseModel

LANCommander.Server/Data/Models/Server.cs

@@ -1,9 +1,9 @@
-using LANCommander.Data.Enums;
+using LANCommander.Server.Data.Enums;
 using LANCommander.SDK.Enums;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     public class Server : BaseModel
     {

LANCommander.Server/Data/Models/ServerConsole.cs

@@ -1,8 +1,8 @@
-using LANCommander.Data.Enums;
+using LANCommander.Server.Data.Enums;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     public class ServerConsole : BaseModel
     {

LANCommander.Server/Data/Models/ServerHttpPath.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     public class ServerHttpPath : BaseModel
     {

LANCommander.Server/Data/Models/Tag.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Tags")]
     public class Tag : BaseTaxonomyModel

LANCommander.Server/Data/Models/User.cs

@@ -1,10 +1,10 @@
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.Identity;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace LANCommander.Data.Models
+namespace LANCommander.Server.Data.Models
 {
     [Table("Users")]
     public class User : IdentityUser<Guid>

LANCommander.Server/Data/Repository.cs

@@ -1,8 +1,8 @@
-using LANCommander.Data.Models;
+using LANCommander.Server.Data.Models;
 using Microsoft.EntityFrameworkCore;
 using System.Linq.Expressions;
 
-namespace LANCommander.Data
+namespace LANCommander.Server.Data
 {
     public class Repository<T> : IDisposable where T : BaseModel
     {

LANCommander.Server/Extensions/ArrayExtensions.cs

@@ -1,4 +1,4 @@
-namespace LANCommander.Extensions
+namespace LANCommander.Server.Extensions
 {
     public static class ArrayExtensions
     {

LANCommander.Server/Extensions/EnumExtensions.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 
-namespace LANCommander.Extensions
+namespace LANCommander.Server.Extensions
 {
     public static class EnumExtensions
     {

LANCommander.Server/Extensions/FileExtensions.cs

@@ -1,4 +1,4 @@
-namespace LANCommander.Extensions
+namespace LANCommander.Server.Extensions
 {
     public static class FileExtensions
     {

LANCommander.Server/Extensions/ListExtensions.cs

@@ -1,4 +1,4 @@
-namespace LANCommander.Extensions
+namespace LANCommander.Server.Extensions
 {
     public static class ListExtensions
     {

LANCommander.Server/Extensions/StringExtensions.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace LANCommander.Extensions
+namespace LANCommander.Server.Extensions
 {
     public static class StringExtensions
     {

LANCommander.Server/Extensions/ZipArchiveExtensions.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
 using System.IO.Compression;
 
-namespace LANCommander.Extensions
+namespace LANCommander.Server.Extensions
 {
     public static class ZipArchiveExtensions
     {

LANCommander.Server/Hubs/GameServerHub.cs

@@ -1,8 +1,8 @@
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.SignalR;
 using NLog;
 
-namespace LANCommander.Hubs
+namespace LANCommander.Server.Hubs
 {
     public class GameServerHub : Hub
     {

LANCommander.Server/Hubs/LoggingHub.cs

@@ -1,8 +1,8 @@
 using LANCommander.SDK;
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.SignalR;
 
-namespace LANCommander.Hubs
+namespace LANCommander.Server.Hubs
 {
     public class LoggingHub : Hub
     {

LANCommander.Server/Hubs/ServerProcessHub.cs

@@ -1,7 +1,7 @@
-using LANCommander.Services;
+using LANCommander.Server.Services;
 using Microsoft.AspNetCore.SignalR;
 
-namespace LANCommander.Hubs
+namespace LANCommander.Server.Hubs
 {
     public class ServerProcessHub : Hub
     {

LANCommander.Server/Jobs/Background/PatchArchiveBackgroundJob.cs

@@ -1,6 +1,6 @@
-using LANCommander.Services;
+using LANCommander.Server.Services;
 
-namespace LANCommander.Jobs.Background
+namespace LANCommander.Server.Jobs.Background
 {
     public class PatchArchiveBackgroundJob
     {