diff --git a/Benchmarks/Benchmarks.csproj b/Benchmarks/Benchmarks.csproj
index def07bbe..dffb4173 100644
--- a/Benchmarks/Benchmarks.csproj
+++ b/Benchmarks/Benchmarks.csproj
@@ -9,10 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.14.0"/>
-    <ProjectReference Include="..\Libraries\Core\Core.csproj"/>
-    <ProjectReference Include="..\Libraries\SptAssets\SptAssets.csproj"/>
-    <ProjectReference Include="..\Libraries\SptCommon\SptCommon.csproj"/>
-    <ProjectReference Include="..\Libraries\SptDependencyInjection\SptDependencyInjection.csproj"/>
+    <ProjectReference Include="..\Libraries\SPTarkov.Server.Core\SPTarkov.Server.Core.csproj" />
+    <ProjectReference Include="..\Libraries\SPTarkov.Server.Assets\SPTarkov.Server.Assets.csproj" />
+    <ProjectReference Include="..\Libraries\SPTarkov.Common\SPTarkov.Common.csproj" />
+    <ProjectReference Include="..\Libraries\SPTarkov.DI\SPTarkov.DI.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Benchmarks/ClonerBenchmarks.cs b/Benchmarks/ClonerBenchmarks.cs
index 18925355..8997b529 100644
--- a/Benchmarks/ClonerBenchmarks.cs
+++ b/Benchmarks/ClonerBenchmarks.cs
@@ -1,8 +1,8 @@
 using BenchmarkDotNet.Attributes;
 using Benchmarks.Mock;
-using Core.Models.Spt.Templates;
-using Core.Utils;
-using Core.Utils.Cloners;
+using SPTarkov.Server.Core.Models.Spt.Templates;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
 
 namespace Benchmarks;
 
@@ -27,7 +27,7 @@ public class ClonerBenchmarks
         _templates = loadTask.Result;
         _jsonCloner = new JsonCloner(jsonUtil);
         _reflectionsCloner = new ReflectionsCloner(new MockLogger<ReflectionsCloner>());
-        _fastCloner = new Core.Utils.Cloners.FastCloner();
+        _fastCloner = new SPTarkov.Server.Core.Utils.Cloners.FastCloner();
     }
 
     [Benchmark]
diff --git a/Benchmarks/Mock/MockLogger.cs b/Benchmarks/Mock/MockLogger.cs
index 9e363fb3..1907879d 100644
--- a/Benchmarks/Mock/MockLogger.cs
+++ b/Benchmarks/Mock/MockLogger.cs
@@ -1,6 +1,6 @@
-using Core.Models.Logging;
-using Core.Models.Spt.Logging;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Logging;
+using SPTarkov.Server.Core.Models.Spt.Logging;
+using SPTarkov.Server.Core.Models.Utils;
 
 namespace Benchmarks.Mock;
 
diff --git a/Libraries/Core/Helpers/GameEventHelper.cs b/Libraries/Core/Helpers/GameEventHelper.cs
deleted file mode 100644
index a96bae00..00000000
--- a/Libraries/Core/Helpers/GameEventHelper.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using SptCommon.Annotations;
-
-namespace Core.Helpers;
-
-[Injectable]
-public class GameEventHelper
-{
-}
diff --git a/Libraries/Core/Models/Eft/Common/EmptyRequestData.cs b/Libraries/Core/Models/Eft/Common/EmptyRequestData.cs
deleted file mode 100644
index ce252e9e..00000000
--- a/Libraries/Core/Models/Eft/Common/EmptyRequestData.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Core.Models.Utils;
-
-namespace Core.Models.Eft.Common;
-
-public record EmptyRequestData : IRequestData
-{
-}
diff --git a/Libraries/Core/Models/Eft/Customization/WearClothingRequestData.cs b/Libraries/Core/Models/Eft/Customization/WearClothingRequestData.cs
deleted file mode 100644
index 934ccb36..00000000
--- a/Libraries/Core/Models/Eft/Customization/WearClothingRequestData.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Core.Models.Eft.Customization;
-
-public record WearClothingRequestData
-{
-}
diff --git a/Libraries/Core/Models/Eft/InRaid/ScavSaveRequestData.cs b/Libraries/Core/Models/Eft/InRaid/ScavSaveRequestData.cs
deleted file mode 100644
index 793fba81..00000000
--- a/Libraries/Core/Models/Eft/InRaid/ScavSaveRequestData.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Core.Models.Eft.Common;
-using Core.Models.Utils;
-
-namespace Core.Models.Eft.InRaid;
-
-public record ScavSaveRequestData : PostRaidPmcData, IRequestData
-{
-}
diff --git a/Libraries/Core/Models/Enums/Hideout/QteActivityType.cs b/Libraries/Core/Models/Enums/Hideout/QteActivityType.cs
deleted file mode 100644
index 424c1d2e..00000000
--- a/Libraries/Core/Models/Enums/Hideout/QteActivityType.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Core.Models.Enums.Hideout;
-
-public enum QteActivityType
-{
-    GYM = 0
-}
diff --git a/Libraries/Core/Models/Enums/Hideout/QteResultType.cs b/Libraries/Core/Models/Enums/Hideout/QteResultType.cs
deleted file mode 100644
index 8a87d16e..00000000
--- a/Libraries/Core/Models/Enums/Hideout/QteResultType.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Core.Models.Enums.Hideout;
-
-public enum QteResultType
-{
-    None,
-    Exit
-}
diff --git a/Libraries/Core/Models/Enums/Hideout/QteType.cs b/Libraries/Core/Models/Enums/Hideout/QteType.cs
deleted file mode 100644
index 5b0b13b6..00000000
--- a/Libraries/Core/Models/Enums/Hideout/QteType.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Core.Models.Enums.Hideout;
-
-public enum QteType
-{
-    ShrinkingCircle
-}
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs b/Libraries/Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs
deleted file mode 100644
index 0994cdc5..00000000
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Core.Models.Eft.Profile;
-using Core.Models.Utils;
-
-namespace Core.Models.Spt.Launcher;
-
-public class LauncherV2ProfileResponse : IRequestData
-{
-    public SptProfile Response
-    {
-        get;
-        set;
-    }
-}
diff --git a/Libraries/Core/Models/Utils/IRequestData.cs b/Libraries/Core/Models/Utils/IRequestData.cs
deleted file mode 100644
index 88164697..00000000
--- a/Libraries/Core/Models/Utils/IRequestData.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Core.Models.Utils;
-
-public interface IRequestData
-{
-}
diff --git a/Libraries/Core/Properties/launchSettings.json b/Libraries/Core/Properties/launchSettings.json
deleted file mode 100644
index 829a5441..00000000
--- a/Libraries/Core/Properties/launchSettings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "Core": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:64951;http://localhost:64952"
-    }
-  }
-}
\ No newline at end of file
diff --git a/Libraries/SptCommon/Annotations/Injectable.cs b/Libraries/SPTarkov.Common/Annotations/Injectable.cs
similarity index 93%
rename from Libraries/SptCommon/Annotations/Injectable.cs
rename to Libraries/SPTarkov.Common/Annotations/Injectable.cs
index 2d2ac842..11bddf86 100644
--- a/Libraries/SptCommon/Annotations/Injectable.cs
+++ b/Libraries/SPTarkov.Common/Annotations/Injectable.cs
@@ -1,4 +1,4 @@
-namespace SptCommon.Annotations;
+namespace SPTarkov.Common.Annotations;
 
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
 public class Injectable(InjectionType injectionType = InjectionType.Scoped, Type? type = null, int typePriority = int.MaxValue) : Attribute
diff --git a/Libraries/SptCommon/Extensions/ListExtensions.cs b/Libraries/SPTarkov.Common/Extensions/ListExtensions.cs
similarity index 93%
rename from Libraries/SptCommon/Extensions/ListExtensions.cs
rename to Libraries/SPTarkov.Common/Extensions/ListExtensions.cs
index e5ed52bd..de63cf8a 100644
--- a/Libraries/SptCommon/Extensions/ListExtensions.cs
+++ b/Libraries/SPTarkov.Common/Extensions/ListExtensions.cs
@@ -1,4 +1,4 @@
-namespace SptCommon.Extensions;
+namespace SPTarkov.Common.Extensions;
 
 public static class ListExtensions
 {
diff --git a/Libraries/SptCommon/Extensions/MemberInfoExtensions.cs b/Libraries/SPTarkov.Common/Extensions/MemberInfoExtensions.cs
similarity index 91%
rename from Libraries/SptCommon/Extensions/MemberInfoExtensions.cs
rename to Libraries/SPTarkov.Common/Extensions/MemberInfoExtensions.cs
index ed281c08..7a70ae8c 100644
--- a/Libraries/SptCommon/Extensions/MemberInfoExtensions.cs
+++ b/Libraries/SPTarkov.Common/Extensions/MemberInfoExtensions.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Text.Json.Serialization;
 
-namespace SptCommon.Extensions;
+namespace SPTarkov.Common.Extensions;
 
 public static class MemberInfoExtensions
 {
diff --git a/Libraries/SptCommon/Extensions/ObjectExtensions.cs b/Libraries/SPTarkov.Common/Extensions/ObjectExtensions.cs
similarity index 98%
rename from Libraries/SptCommon/Extensions/ObjectExtensions.cs
rename to Libraries/SPTarkov.Common/Extensions/ObjectExtensions.cs
index 3363d571..c485155f 100644
--- a/Libraries/SptCommon/Extensions/ObjectExtensions.cs
+++ b/Libraries/SPTarkov.Common/Extensions/ObjectExtensions.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Text.Json;
 
-namespace SptCommon.Extensions;
+namespace SPTarkov.Common.Extensions;
 
 public static class ObjectExtensions
 {
diff --git a/Libraries/SptCommon/Extensions/StringExtensions.cs b/Libraries/SPTarkov.Common/Extensions/StringExtensions.cs
similarity index 97%
rename from Libraries/SptCommon/Extensions/StringExtensions.cs
rename to Libraries/SPTarkov.Common/Extensions/StringExtensions.cs
index 7ed4017e..0c13f39b 100644
--- a/Libraries/SptCommon/Extensions/StringExtensions.cs
+++ b/Libraries/SPTarkov.Common/Extensions/StringExtensions.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
 
-namespace SptCommon.Extensions;
+namespace SPTarkov.Common.Extensions;
 
 public static class StringExtensions
 {
diff --git a/Libraries/SptCommon/SptCommon.csproj b/Libraries/SPTarkov.Common/SPTarkov.Common.csproj
similarity index 100%
rename from Libraries/SptCommon/SptCommon.csproj
rename to Libraries/SPTarkov.Common/SPTarkov.Common.csproj
diff --git a/Libraries/SptCommon/Semver/ISemVer.cs b/Libraries/SPTarkov.Common/Semver/ISemVer.cs
similarity index 92%
rename from Libraries/SptCommon/Semver/ISemVer.cs
rename to Libraries/SPTarkov.Common/Semver/ISemVer.cs
index c765c5c7..4ab78aed 100644
--- a/Libraries/SptCommon/Semver/ISemVer.cs
+++ b/Libraries/SPTarkov.Common/Semver/ISemVer.cs
@@ -1,4 +1,4 @@
-namespace SptCommon.Semver;
+namespace SPTarkov.Common.Semver;
 
 public interface ISemVer
 {
diff --git a/Libraries/SptCommon/Semver/Implementations/SemanticVersioningSemVer.cs b/Libraries/SPTarkov.Common/Semver/Implementations/SemanticVersioningSemVer.cs
similarity index 95%
rename from Libraries/SptCommon/Semver/Implementations/SemanticVersioningSemVer.cs
rename to Libraries/SPTarkov.Common/Semver/Implementations/SemanticVersioningSemVer.cs
index beb6f4dc..4ad00e60 100644
--- a/Libraries/SptCommon/Semver/Implementations/SemanticVersioningSemVer.cs
+++ b/Libraries/SPTarkov.Common/Semver/Implementations/SemanticVersioningSemVer.cs
@@ -1,7 +1,7 @@
 using Range = SemanticVersioning.Range;
 using Version = SemanticVersioning.Version;
 
-namespace SptCommon.Semver.Implementations;
+namespace SPTarkov.Common.Semver.Implementations;
 
 public class SemanticVersioningSemVer : ISemVer
 {
diff --git a/Libraries/SptDependencyInjection/DependencyInjectionRegistrator.cs b/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs
similarity index 98%
rename from Libraries/SptDependencyInjection/DependencyInjectionRegistrator.cs
rename to Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs
index ebea23a0..a861c9af 100644
--- a/Libraries/SptDependencyInjection/DependencyInjectionRegistrator.cs
+++ b/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs
@@ -1,8 +1,7 @@
 using System.Reflection;
-using Microsoft.Extensions.DependencyInjection;
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace SptDependencyInjection;
+namespace SPTarkov.DI;
 
 public static class DependencyInjectionRegistrator
 {
diff --git a/Libraries/SptDependencyInjection/SptDependencyInjection.csproj b/Libraries/SPTarkov.DI/SPTarkov.DI.csproj
similarity index 93%
rename from Libraries/SptDependencyInjection/SptDependencyInjection.csproj
rename to Libraries/SPTarkov.DI/SPTarkov.DI.csproj
index a7e0b37b..96ea6b26 100644
--- a/Libraries/SptDependencyInjection/SptDependencyInjection.csproj
+++ b/Libraries/SPTarkov.DI/SPTarkov.DI.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SptCommon\SptCommon.csproj" />
+    <ProjectReference Include="..\SPTarkov.Common\SPTarkov.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Libraries/SptAssets/Assets/configs/airdrop.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/airdrop.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/airdrop.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/airdrop.json
diff --git a/Libraries/SptAssets/Assets/configs/backup.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/backup.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/backup.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/backup.json
diff --git a/Libraries/SptAssets/Assets/configs/bot.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/bot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/bot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/bot.json
diff --git a/Libraries/SptAssets/Assets/configs/core.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/core.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/core.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/core.json
diff --git a/Libraries/SptAssets/Assets/configs/gifts.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/gifts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/gifts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/gifts.json
diff --git a/Libraries/SptAssets/Assets/configs/health.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/health.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/health.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/health.json
diff --git a/Libraries/SptAssets/Assets/configs/hideout.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/hideout.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/hideout.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/hideout.json
diff --git a/Libraries/SptAssets/Assets/configs/http.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/http.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/http.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/http.json
diff --git a/Libraries/SptAssets/Assets/configs/inraid.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/inraid.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/inraid.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/inraid.json
diff --git a/Libraries/SptAssets/Assets/configs/insurance.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/insurance.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/insurance.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/insurance.json
diff --git a/Libraries/SptAssets/Assets/configs/inventory.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/inventory.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/inventory.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/inventory.json
diff --git a/Libraries/SptAssets/Assets/configs/item.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/item.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/item.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/item.json
diff --git a/Libraries/SptAssets/Assets/configs/locale.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/locale.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/locale.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/locale.json
diff --git a/Libraries/SptAssets/Assets/configs/location.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/location.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/location.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/location.json
diff --git a/Libraries/SptAssets/Assets/configs/loot.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/loot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/loot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/loot.json
diff --git a/Libraries/SptAssets/Assets/configs/lostondeath.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/lostondeath.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/lostondeath.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/lostondeath.json
diff --git a/Libraries/SptAssets/Assets/configs/match.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/match.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/match.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/match.json
diff --git a/Libraries/SptAssets/Assets/configs/playerscav.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/playerscav.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/playerscav.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/playerscav.json
diff --git a/Libraries/SptAssets/Assets/configs/pmc.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/pmc.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/pmc.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/pmc.json
diff --git a/Libraries/SptAssets/Assets/configs/pmcchatresponse.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/pmcchatresponse.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/pmcchatresponse.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/pmcchatresponse.json
diff --git a/Libraries/SptAssets/Assets/configs/quest.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/quest.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/quest.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/quest.json
diff --git a/Libraries/SptAssets/Assets/configs/ragfair.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/ragfair.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/ragfair.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/ragfair.json
diff --git a/Libraries/SptAssets/Assets/configs/repair.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/repair.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/repair.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/repair.json
diff --git a/Libraries/SptAssets/Assets/configs/scavcase.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/scavcase.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/scavcase.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/scavcase.json
diff --git a/Libraries/SptAssets/Assets/configs/seasonalevents.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/seasonalevents.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/seasonalevents.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/seasonalevents.json
diff --git a/Libraries/SptAssets/Assets/configs/trader.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/trader.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/trader.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/trader.json
diff --git a/Libraries/SptAssets/Assets/configs/weather.json b/Libraries/SPTarkov.Server.Assets/Assets/configs/weather.json
similarity index 100%
rename from Libraries/SptAssets/Assets/configs/weather.json
rename to Libraries/SPTarkov.Server.Assets/Assets/configs/weather.json
diff --git a/Libraries/SptAssets/Assets/database/bots/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/base.json
diff --git a/Libraries/SptAssets/Assets/database/bots/core.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/core.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/core.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/core.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/arenafighterevent.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/arenafighterevent.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/arenafighterevent.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/arenafighterevent.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/assault.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/assault.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/assault.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/assault.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bear.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bear.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bear.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bear.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bossboar.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossboar.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bossboar.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossboar.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bossboarsniper.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossboarsniper.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bossboarsniper.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossboarsniper.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bossbully.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossbully.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bossbully.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossbully.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bossgluhar.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossgluhar.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bossgluhar.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossgluhar.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bosskilla.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosskilla.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bosskilla.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosskilla.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bossknight.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossknight.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bossknight.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bossknight.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bosskojaniy.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosskojaniy.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bosskojaniy.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosskojaniy.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bosskolontay.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosskolontay.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bosskolontay.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosskolontay.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bosspartisan.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosspartisan.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bosspartisan.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosspartisan.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bosssanitar.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosssanitar.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bosssanitar.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosssanitar.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bosstagilla.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosstagilla.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bosstagilla.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosstagilla.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/bosszryachiy.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosszryachiy.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/bosszryachiy.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/bosszryachiy.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/crazyassaultevent.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/crazyassaultevent.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/crazyassaultevent.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/crazyassaultevent.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/cursedassault.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/cursedassault.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/cursedassault.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/cursedassault.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/exusec.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/exusec.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/exusec.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/exusec.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerbigpipe.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerbigpipe.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerbigpipe.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerbigpipe.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerbirdeye.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerbirdeye.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerbirdeye.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerbirdeye.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerboar.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerboar.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerboar.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerboar.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerboarclose1.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerboarclose1.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerboarclose1.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerboarclose1.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerboarclose2.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerboarclose2.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerboarclose2.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerboarclose2.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerbully.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerbully.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerbully.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerbully.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followergluharassault.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followergluharassault.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followergluharassault.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followergluharassault.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followergluharscout.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followergluharscout.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followergluharscout.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followergluharscout.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followergluharsecurity.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followergluharsecurity.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followergluharsecurity.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followergluharsecurity.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerkojaniy.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerkojaniy.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerkojaniy.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerkojaniy.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerkolontayassault.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerkolontayassault.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerkolontayassault.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerkolontayassault.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerkolontaysecurity.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerkolontaysecurity.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerkolontaysecurity.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerkolontaysecurity.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followersanitar.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followersanitar.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followersanitar.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followersanitar.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/followerzryachiy.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerzryachiy.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/followerzryachiy.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/followerzryachiy.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/gifter.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/gifter.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/gifter.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/gifter.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/infectedassault.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedassault.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/infectedassault.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedassault.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/infectedcivil.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedcivil.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/infectedcivil.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedcivil.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/infectedlaborant.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedlaborant.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/infectedlaborant.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedlaborant.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/infectedpmc.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedpmc.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/infectedpmc.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedpmc.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/infectedtagilla.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedtagilla.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/infectedtagilla.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/infectedtagilla.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/marksman.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/marksman.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/marksman.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/marksman.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/peacemaker.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/peacemaker.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/peacemaker.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/peacemaker.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/pmcbear.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/pmcbear.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/pmcbear.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/pmcbear.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/pmcbot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/pmcbot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/pmcbot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/pmcbot.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/pmcusec.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/pmcusec.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/pmcusec.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/pmcusec.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/ravangezryachiyevent.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/ravangezryachiyevent.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/ravangezryachiyevent.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/ravangezryachiyevent.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/sectantoni.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantoni.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/sectantoni.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantoni.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/sectantpredvestnik.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantpredvestnik.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/sectantpredvestnik.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantpredvestnik.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/sectantpriest.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantpriest.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/sectantpriest.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantpriest.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/sectantprizrak.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantprizrak.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/sectantprizrak.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantprizrak.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/sectantwarrior.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantwarrior.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/sectantwarrior.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/sectantwarrior.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/shooterbtr.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/shooterbtr.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/shooterbtr.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/shooterbtr.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/skier.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/skier.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/skier.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/skier.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/spiritspring.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/spiritspring.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/spiritspring.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/spiritspring.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/spiritwinter.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/spiritwinter.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/spiritwinter.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/spiritwinter.json
diff --git a/Libraries/SptAssets/Assets/database/bots/types/usec.json b/Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/usec.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/bots/types/usec.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/bots/types/usec.json
diff --git a/Libraries/SptAssets/Assets/database/globals.json b/Libraries/SPTarkov.Server.Assets/Assets/database/globals.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/globals.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/globals.json
diff --git a/Libraries/SptAssets/Assets/database/hideout/areas.json b/Libraries/SPTarkov.Server.Assets/Assets/database/hideout/areas.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/hideout/areas.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/hideout/areas.json
diff --git a/Libraries/SptAssets/Assets/database/hideout/customisation.json b/Libraries/SPTarkov.Server.Assets/Assets/database/hideout/customisation.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/hideout/customisation.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/hideout/customisation.json
diff --git a/Libraries/SptAssets/Assets/database/hideout/production.json b/Libraries/SPTarkov.Server.Assets/Assets/database/hideout/production.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/hideout/production.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/hideout/production.json
diff --git a/Libraries/SptAssets/Assets/database/hideout/qte.json b/Libraries/SPTarkov.Server.Assets/Assets/database/hideout/qte.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/hideout/qte.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/hideout/qte.json
diff --git a/Libraries/SptAssets/Assets/database/hideout/settings.json b/Libraries/SPTarkov.Server.Assets/Assets/database/hideout/settings.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/hideout/settings.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/hideout/settings.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/ch.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ch.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/ch.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ch.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/cz.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/cz.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/cz.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/cz.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/en.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/en.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/en.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/en.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/es-mx.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/es-mx.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/es-mx.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/es-mx.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/es.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/es.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/es.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/es.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/fr.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/fr.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/fr.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/fr.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/ge.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ge.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/ge.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ge.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/hu.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/hu.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/hu.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/hu.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/it.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/it.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/it.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/it.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/jp.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/jp.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/jp.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/jp.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/kr.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/kr.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/kr.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/kr.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/pl.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/pl.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/pl.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/pl.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/po.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/po.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/po.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/po.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/ro.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ro.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/ro.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ro.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/ru.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ru.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/ru.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/ru.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/sk.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/sk.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/sk.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/sk.json
diff --git a/Libraries/SptAssets/Assets/database/locales/global/tu.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/tu.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/global/tu.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/global/tu.json
diff --git a/Libraries/SptAssets/Assets/database/locales/languages.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/languages.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/languages.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/languages.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/ch.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/ch.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/ch.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/ch.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/cz.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/cz.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/cz.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/cz.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/en.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/en.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/en.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/en.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/es-mx.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/es-mx.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/es-mx.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/es-mx.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/es.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/es.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/es.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/es.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/fr.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/fr.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/fr.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/fr.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/ge.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/ge.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/ge.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/ge.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/hu.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/hu.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/hu.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/hu.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/it.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/it.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/it.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/it.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/jp.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/jp.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/jp.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/jp.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/kr.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/kr.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/kr.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/kr.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/pl.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/pl.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/pl.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/pl.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/po.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/po.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/po.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/po.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/ru.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/ru.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/ru.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/ru.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/sk.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/sk.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/sk.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/sk.json
diff --git a/Libraries/SptAssets/Assets/database/locales/menu/tu.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/tu.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/menu/tu.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/menu/tu.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/ar.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ar.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/ar.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ar.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/cs.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/cs.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/cs.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/cs.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/da.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/da.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/da.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/da.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/de.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/de.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/de.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/de.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/el.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/el.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/el.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/el.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/en.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/en.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/en.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/en.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/es-es.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/es-es.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/es-es.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/es-es.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/fr.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/fr.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/fr.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/fr.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/hi.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/hi.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/hi.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/hi.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/hu.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/hu.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/hu.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/hu.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/id.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/id.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/id.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/id.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/it.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/it.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/it.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/it.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/ja.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ja.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/ja.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ja.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/ko.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ko.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/ko.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ko.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/nl.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/nl.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/nl.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/nl.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/no.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/no.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/no.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/no.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/pl.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/pl.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/pl.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/pl.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/pt-br.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/pt-br.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/pt-br.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/pt-br.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/pt-pt.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/pt-pt.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/pt-pt.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/pt-pt.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/ru.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ru.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/ru.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/ru.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/sv-se.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/sv-se.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/sv-se.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/sv-se.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/sv.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/sv.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/sv.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/sv.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/tr.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/tr.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/tr.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/tr.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/uk.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/uk.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/uk.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/uk.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/vi.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/vi.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/vi.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/vi.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/zh-TW.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/zh-TW.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/zh-TW.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/zh-TW.json
diff --git a/Libraries/SptAssets/Assets/database/locales/server/zh-cn.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/zh-cn.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locales/server/zh-cn.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locales/server/zh-cn.json
diff --git a/Libraries/SptAssets/Assets/database/locations/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/bigmap/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/bigmap/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/bigmap/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/bigmap/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/bigmap/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/bigmap/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/bigmap/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/bigmap/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/bigmap/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/bigmap/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/bigmap/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/bigmap/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/bigmap/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/develop/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/develop/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/develop/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/develop/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_day/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_day/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_day/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_day/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_day/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_day/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_day/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_day/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_day/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_day/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_day/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_day/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_day/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_night/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_night/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_night/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_night/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_night/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_night/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_night/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_night/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_night/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_night/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/factory4_night/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/factory4_night/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/factory4_night/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/hideout/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/hideout/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/hideout/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/hideout/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/interchange/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/interchange/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/interchange/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/interchange/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/interchange/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/interchange/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/interchange/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/interchange/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/interchange/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/interchange/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/interchange/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/interchange/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/interchange/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/laboratory/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/laboratory/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/laboratory/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/laboratory/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/laboratory/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/laboratory/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/laboratory/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/laboratory/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/laboratory/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/laboratory/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/laboratory/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/laboratory/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/laboratory/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/lighthouse/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/lighthouse/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/lighthouse/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/lighthouse/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/lighthouse/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/lighthouse/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/lighthouse/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/lighthouse/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/lighthouse/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/lighthouse/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/lighthouse/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/lighthouse/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/lighthouse/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/privatearea/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/privatearea/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/privatearea/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/privatearea/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/rezervbase/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/rezervbase/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/rezervbase/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/rezervbase/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/rezervbase/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/rezervbase/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/rezervbase/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/rezervbase/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/rezervbase/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/rezervbase/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/rezervbase/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/rezervbase/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/rezervbase/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox_high/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox_high/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox_high/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox_high/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox_high/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox_high/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox_high/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox_high/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox_high/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox_high/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/sandbox_high/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/sandbox_high/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/sandbox_high/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/shoreline/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/shoreline/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/shoreline/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/shoreline/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/shoreline/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/shoreline/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/shoreline/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/shoreline/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/shoreline/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/shoreline/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/shoreline/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/shoreline/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/shoreline/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/suburbs/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/suburbs/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/suburbs/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/suburbs/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/tarkovstreets/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/tarkovstreets/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/tarkovstreets/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/tarkovstreets/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/tarkovstreets/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/tarkovstreets/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/tarkovstreets/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/tarkovstreets/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/tarkovstreets/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/tarkovstreets/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/tarkovstreets/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/tarkovstreets/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/tarkovstreets/statics.json
diff --git a/Libraries/SptAssets/Assets/database/locations/terminal/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/terminal/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/terminal/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/terminal/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/town/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/town/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/town/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/town/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/woods/allExtracts.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/allExtracts.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/woods/allExtracts.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/allExtracts.json
diff --git a/Libraries/SptAssets/Assets/database/locations/woods/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/woods/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/base.json
diff --git a/Libraries/SptAssets/Assets/database/locations/woods/staticAmmo.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/staticAmmo.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/woods/staticAmmo.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/staticAmmo.json
diff --git a/Libraries/SptAssets/Assets/database/locations/woods/staticContainers.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/staticContainers.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/woods/staticContainers.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/staticContainers.json
diff --git a/Libraries/SptAssets/Assets/database/locations/woods/staticLoot.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/staticLoot.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/woods/staticLoot.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/staticLoot.json
diff --git a/Libraries/SptAssets/Assets/database/locations/woods/statics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/statics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/locations/woods/statics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/locations/woods/statics.json
diff --git a/Libraries/SptAssets/Assets/database/match/metrics.json b/Libraries/SPTarkov.Server.Assets/Assets/database/match/metrics.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/match/metrics.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/match/metrics.json
diff --git a/Libraries/SptAssets/Assets/database/server.json b/Libraries/SPTarkov.Server.Assets/Assets/database/server.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/server.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/server.json
diff --git a/Libraries/SptAssets/Assets/database/settings.json b/Libraries/SPTarkov.Server.Assets/Assets/database/settings.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/settings.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/settings.json
diff --git a/Libraries/SptAssets/Assets/database/templates/ArchivedQuests.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/ArchivedQuests.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/ArchivedQuests.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/ArchivedQuests.json
diff --git a/Libraries/SptAssets/Assets/database/templates/achievements.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/achievements.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/achievements.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/achievements.json
diff --git a/Libraries/SptAssets/Assets/database/templates/character.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/character.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/character.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/character.json
diff --git a/Libraries/SptAssets/Assets/database/templates/customisationStorage.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/customisationStorage.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/customisationStorage.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/customisationStorage.json
diff --git a/Libraries/SptAssets/Assets/database/templates/customization.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/customization.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/customization.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/customization.json
diff --git a/Libraries/SptAssets/Assets/database/templates/defaultEquipmentPresets.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/defaultEquipmentPresets.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/defaultEquipmentPresets.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/defaultEquipmentPresets.json
diff --git a/Libraries/SptAssets/Assets/database/templates/handbook.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/handbook.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/handbook.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/handbook.json
diff --git a/Libraries/SptAssets/Assets/database/templates/locationServices.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/locationServices.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/locationServices.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/locationServices.json
diff --git a/Libraries/SptAssets/Assets/database/templates/prestige.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/prestige.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/prestige.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/prestige.json
diff --git a/Libraries/SptAssets/Assets/database/templates/prices.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/prices.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/prices.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/prices.json
diff --git a/Libraries/SptAssets/Assets/database/templates/profiles.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/profiles.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/profiles.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/profiles.json
diff --git a/Libraries/SptAssets/Assets/database/templates/quests.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/quests.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/quests.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/quests.json
diff --git a/Libraries/SptAssets/Assets/database/templates/repeatableQuests.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/repeatableQuests.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/templates/repeatableQuests.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/templates/repeatableQuests.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/dialogue.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/dialogue.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/dialogue.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/dialogue.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb50c76803fa8b248b4571/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb50c76803fa8b248b4571/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/dialogue.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/dialogue.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/dialogue.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/dialogue.json
diff --git a/Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/54cb57776803fa99248b456e/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/54cb57776803fa99248b456e/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/dialogue.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/dialogue.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/dialogue.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/dialogue.json
diff --git a/Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/579dc571d53a0658a154fbec/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/579dc571d53a0658a154fbec/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/58330581ace78e27b8b10cee/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/58330581ace78e27b8b10cee/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/58330581ace78e27b8b10cee/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/58330581ace78e27b8b10cee/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/58330581ace78e27b8b10cee/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/58330581ace78e27b8b10cee/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/58330581ace78e27b8b10cee/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/58330581ace78e27b8b10cee/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/58330581ace78e27b8b10cee/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/58330581ace78e27b8b10cee/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/58330581ace78e27b8b10cee/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/58330581ace78e27b8b10cee/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5935c25fb3acc3127c3d8cd9/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5a7c2eca46aef81a7ca2145d/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/bearsuits.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/bearsuits.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/bearsuits.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/bearsuits.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/suits.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/suits.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/suits.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/suits.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/usecsuits.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/usecsuits.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5ac3b934156ae10c4430e83c/usecsuits.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5ac3b934156ae10c4430e83c/usecsuits.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5c0647fdd443bc2504c2d371/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5c0647fdd443bc2504c2d371/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5c0647fdd443bc2504c2d371/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5c0647fdd443bc2504c2d371/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5c0647fdd443bc2504c2d371/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5c0647fdd443bc2504c2d371/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5c0647fdd443bc2504c2d371/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5c0647fdd443bc2504c2d371/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/5c0647fdd443bc2504c2d371/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/5c0647fdd443bc2504c2d371/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/5c0647fdd443bc2504c2d371/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/5c0647fdd443bc2504c2d371/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/638f541a29ffd1183d187f57/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/638f541a29ffd1183d187f57/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/638f541a29ffd1183d187f57/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/638f541a29ffd1183d187f57/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/638f541a29ffd1183d187f57/services.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/638f541a29ffd1183d187f57/services.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/638f541a29ffd1183d187f57/services.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/638f541a29ffd1183d187f57/services.json
diff --git a/Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/dialogue.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/dialogue.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/dialogue.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/dialogue.json
diff --git a/Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/questassort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/services.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/services.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/656f0f98d80a697f855d34b1/services.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/656f0f98d80a697f855d34b1/services.json
diff --git a/Libraries/SptAssets/Assets/database/traders/6617beeaa9cfa777ca915b7c/assort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/6617beeaa9cfa777ca915b7c/assort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/6617beeaa9cfa777ca915b7c/assort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/6617beeaa9cfa777ca915b7c/assort.json
diff --git a/Libraries/SptAssets/Assets/database/traders/6617beeaa9cfa777ca915b7c/base.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/6617beeaa9cfa777ca915b7c/base.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/6617beeaa9cfa777ca915b7c/base.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/6617beeaa9cfa777ca915b7c/base.json
diff --git a/Libraries/SptAssets/Assets/database/traders/6617beeaa9cfa777ca915b7c/questassort.json b/Libraries/SPTarkov.Server.Assets/Assets/database/traders/6617beeaa9cfa777ca915b7c/questassort.json
similarity index 100%
rename from Libraries/SptAssets/Assets/database/traders/6617beeaa9cfa777ca915b7c/questassort.json
rename to Libraries/SPTarkov.Server.Assets/Assets/database/traders/6617beeaa9cfa777ca915b7c/questassort.json
diff --git a/Libraries/SptAssets/Assets/images/icon.ico b/Libraries/SPTarkov.Server.Assets/Assets/images/icon.ico
similarity index 100%
rename from Libraries/SptAssets/Assets/images/icon.ico
rename to Libraries/SPTarkov.Server.Assets/Assets/images/icon.ico
diff --git a/Libraries/SptAssets/SptAssets.csproj b/Libraries/SPTarkov.Server.Assets/SPTarkov.Server.Assets.csproj
similarity index 95%
rename from Libraries/SptAssets/SptAssets.csproj
rename to Libraries/SPTarkov.Server.Assets/SPTarkov.Server.Assets.csproj
index 156f9685..25259803 100644
--- a/Libraries/SptAssets/SptAssets.csproj
+++ b/Libraries/SPTarkov.Server.Assets/SPTarkov.Server.Assets.csproj
@@ -15,6 +15,7 @@
     <OutputType>Library</OutputType>
     <IsPackable>true</IsPackable>
     <ContentTargetFolders>content</ContentTargetFolders>
+    <RootNamespace>SptAssets</RootNamespace>
   </PropertyGroup>
 
 
diff --git a/Libraries/Core/Callbacks/AchievementCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs
similarity index 80%
rename from Libraries/Core/Callbacks/AchievementCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs
index 5c4e8fea..c7c8ef6a 100644
--- a/Libraries/Core/Callbacks/AchievementCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/AchievementCallbacks.cs
@@ -1,9 +1,9 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(AchievementCallbacks))]
 public class AchievementCallbacks(
diff --git a/Libraries/Core/Callbacks/BotCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs
similarity index 89%
rename from Libraries/Core/Callbacks/BotCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs
index 00b6fc95..64986901 100644
--- a/Libraries/Core/Callbacks/BotCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/BotCallbacks.cs
@@ -1,12 +1,12 @@
-using Core.Context;
-using Core.Controllers;
-using Core.Models.Eft.Bot;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Match;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Bot;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(BotCallbacks))]
 public class BotCallbacks(
diff --git a/Libraries/Core/Callbacks/BuildsCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/BuildsCallbacks.cs
similarity index 86%
rename from Libraries/Core/Callbacks/BuildsCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/BuildsCallbacks.cs
index f9b9a2c4..7dbdc2a5 100644
--- a/Libraries/Core/Callbacks/BuildsCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/BuildsCallbacks.cs
@@ -1,11 +1,11 @@
-using Core.Controllers;
-using Core.Models.Eft.Builds;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.PresetBuild;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Builds;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.PresetBuild;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class BuildsCallbacks(
diff --git a/Libraries/Core/Callbacks/BundleCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/BundleCallbacks.cs
similarity index 76%
rename from Libraries/Core/Callbacks/BundleCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/BundleCallbacks.cs
index aa74082a..7267041f 100644
--- a/Libraries/Core/Callbacks/BundleCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/BundleCallbacks.cs
@@ -1,9 +1,9 @@
-using Core.Loaders;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Loaders;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(BundleCallbacks))]
 public class BundleCallbacks(
diff --git a/Libraries/Core/Callbacks/ClientLogCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/ClientLogCallbacks.cs
similarity index 87%
rename from Libraries/Core/Callbacks/ClientLogCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/ClientLogCallbacks.cs
index fd8654ae..fd57bef7 100644
--- a/Libraries/Core/Callbacks/ClientLogCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/ClientLogCallbacks.cs
@@ -1,13 +1,13 @@
-using Core.Controllers;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Logging;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Server;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Logging;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class ClientLogCallbacks(
diff --git a/Libraries/Core/Callbacks/CustomizationCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/CustomizationCallbacks.cs
similarity index 86%
rename from Libraries/Core/Callbacks/CustomizationCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/CustomizationCallbacks.cs
index a8dc7cdf..5c292781 100644
--- a/Libraries/Core/Callbacks/CustomizationCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/CustomizationCallbacks.cs
@@ -1,12 +1,12 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Customization;
-using Core.Models.Eft.ItemEvent;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Customization;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class CustomizationCallbacks(
diff --git a/Libraries/Core/Callbacks/DataCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/DataCallbacks.cs
similarity index 95%
rename from Libraries/Core/Callbacks/DataCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/DataCallbacks.cs
index ef07a044..9b60baf8 100644
--- a/Libraries/Core/Callbacks/DataCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/DataCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(DataCallbacks))]
 public class DataCallbacks(
diff --git a/Libraries/Core/Callbacks/DialogueCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/DialogueCallbacks.cs
similarity index 95%
rename from Libraries/Core/Callbacks/DialogueCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/DialogueCallbacks.cs
index 5fdee242..32803afc 100644
--- a/Libraries/Core/Callbacks/DialogueCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/DialogueCallbacks.cs
@@ -1,13 +1,13 @@
-using Core.Controllers;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Dialog;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.DialogueCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(DialogueCallbacks))]
diff --git a/Libraries/Core/Callbacks/GameCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/GameCallbacks.cs
similarity index 93%
rename from Libraries/Core/Callbacks/GameCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/GameCallbacks.cs
index 0d696d09..6ba4c722 100644
--- a/Libraries/Core/Callbacks/GameCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/GameCallbacks.cs
@@ -1,13 +1,13 @@
-using Core.Controllers;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Game;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Game;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.GameCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(GameCallbacks))]
diff --git a/Libraries/Core/Callbacks/HandbookCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HandbookCallbacks.cs
similarity index 70%
rename from Libraries/Core/Callbacks/HandbookCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/HandbookCallbacks.cs
index 68204989..82b61216 100644
--- a/Libraries/Core/Callbacks/HandbookCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/HandbookCallbacks.cs
@@ -1,8 +1,8 @@
-using Core.Controllers;
-using Core.DI;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.HandbookCallbacks)]
 public class HandbookCallbacks(HandBookController _handBookController) : IOnLoad
diff --git a/Libraries/Core/Callbacks/HealthCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HealthCallbacks.cs
similarity index 86%
rename from Libraries/Core/Callbacks/HealthCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/HealthCallbacks.cs
index 0af83917..4c89c838 100644
--- a/Libraries/Core/Callbacks/HealthCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/HealthCallbacks.cs
@@ -1,12 +1,12 @@
-using Core.Controllers;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Health;
-using Core.Models.Eft.ItemEvent;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Health;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class HealthCallbacks(
diff --git a/Libraries/Core/Callbacks/HideoutCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HideoutCallbacks.cs
similarity index 94%
rename from Libraries/Core/Callbacks/HideoutCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/HideoutCallbacks.cs
index a5d7dfaa..b19145f3 100644
--- a/Libraries/Core/Callbacks/HideoutCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/HideoutCallbacks.cs
@@ -1,13 +1,13 @@
-using Core.Controllers;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.HideoutCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(HideoutCallbacks))]
diff --git a/Libraries/Core/Callbacks/HttpCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/HttpCallbacks.cs
similarity index 77%
rename from Libraries/Core/Callbacks/HttpCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/HttpCallbacks.cs
index 21571fab..14298ee8 100644
--- a/Libraries/Core/Callbacks/HttpCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/HttpCallbacks.cs
@@ -1,9 +1,9 @@
-using Core.Context;
-using Core.DI;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectionType.Singleton, InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.HttpCallbacks)]
 public class HttpCallbacks(HttpServer _httpServer, ApplicationContext _applicationContext) : IOnLoad
diff --git a/Libraries/Core/Callbacks/InraidCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/InraidCallbacks.cs
similarity index 89%
rename from Libraries/Core/Callbacks/InraidCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/InraidCallbacks.cs
index 7e6cd748..3a94eb62 100644
--- a/Libraries/Core/Callbacks/InraidCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/InraidCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.InRaid;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.InRaid;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class InraidCallbacks(
diff --git a/Libraries/Core/Callbacks/InsuranceCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/InsuranceCallbacks.cs
similarity index 79%
rename from Libraries/Core/Callbacks/InsuranceCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/InsuranceCallbacks.cs
index edd3b516..05834796 100644
--- a/Libraries/Core/Callbacks/InsuranceCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/InsuranceCallbacks.cs
@@ -1,15 +1,15 @@
-using Core.Controllers;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Insurance;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Insurance;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.InsuranceCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(InsuranceCallbacks))]
diff --git a/Libraries/Core/Callbacks/InventoryCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/InventoryCallbacks.cs
similarity index 97%
rename from Libraries/Core/Callbacks/InventoryCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/InventoryCallbacks.cs
index 36b584c9..5cd0380e 100644
--- a/Libraries/Core/Callbacks/InventoryCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/InventoryCallbacks.cs
@@ -1,11 +1,11 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Quests;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class InventoryCallbacks(
diff --git a/Libraries/Core/Callbacks/ItemEventCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/ItemEventCallbacks.cs
similarity index 87%
rename from Libraries/Core/Callbacks/ItemEventCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/ItemEventCallbacks.cs
index cc43520f..e5747540 100644
--- a/Libraries/Core/Callbacks/ItemEventCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/ItemEventCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using Core.Routers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class ItemEventCallbacks(HttpResponseUtil _httpResponseUtil, ItemEventRouter _itemEventRouter)
diff --git a/Libraries/Core/Callbacks/LauncherCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs
similarity index 89%
rename from Libraries/Core/Callbacks/LauncherCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs
index 47c677b7..9f7a2483 100644
--- a/Libraries/Core/Callbacks/LauncherCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherCallbacks.cs
@@ -1,11 +1,11 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Launcher;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class LauncherCallbacks(
diff --git a/Libraries/Core/Callbacks/LauncherV2Callbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs
similarity index 92%
rename from Libraries/Core/Callbacks/LauncherV2Callbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs
index 1ec008a7..0ea47b69 100644
--- a/Libraries/Core/Callbacks/LauncherV2Callbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/LauncherV2Callbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Launcher;
-using Core.Models.Spt.Launcher;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Spt.Launcher;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class LauncherV2Callbacks(
diff --git a/Libraries/Core/Callbacks/LocationCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/LocationCallbacks.cs
similarity index 74%
rename from Libraries/Core/Callbacks/LocationCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/LocationCallbacks.cs
index e68eb369..c943b68a 100644
--- a/Libraries/Core/Callbacks/LocationCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/LocationCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Location;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Location;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class LocationCallbacks(
diff --git a/Libraries/Core/Callbacks/MatchCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/MatchCallbacks.cs
similarity index 96%
rename from Libraries/Core/Callbacks/MatchCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/MatchCallbacks.cs
index 06ce807f..b7efc3bd 100644
--- a/Libraries/Core/Callbacks/MatchCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/MatchCallbacks.cs
@@ -1,12 +1,12 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Match;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using static Core.Services.MatchLocationService;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using static SPTarkov.Server.Core.Services.MatchLocationService;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class MatchCallbacks(
diff --git a/Libraries/Core/Callbacks/NoteCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/NoteCallbacks.cs
similarity index 85%
rename from Libraries/Core/Callbacks/NoteCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/NoteCallbacks.cs
index 389b0bb4..84faa854 100644
--- a/Libraries/Core/Callbacks/NoteCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/NoteCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Notes;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Notes;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class NoteCallbacks(NoteController _noteController)
diff --git a/Libraries/Core/Callbacks/NotifierCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/NotifierCallbacks.cs
similarity index 86%
rename from Libraries/Core/Callbacks/NotifierCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/NotifierCallbacks.cs
index 0e3a1f4e..86d8b2af 100644
--- a/Libraries/Core/Callbacks/NotifierCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/NotifierCallbacks.cs
@@ -1,13 +1,13 @@
-using Core.Controllers;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Notifier;
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Notifier;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(NotifierCallbacks))]
 public class NotifierCallbacks(
diff --git a/Libraries/Core/Callbacks/PresetCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/PresetCallbacks.cs
similarity index 70%
rename from Libraries/Core/Callbacks/PresetCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/PresetCallbacks.cs
index 282ad117..645aefd4 100644
--- a/Libraries/Core/Callbacks/PresetCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/PresetCallbacks.cs
@@ -1,8 +1,8 @@
-using Core.Controllers;
-using Core.DI;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.PresetCallbacks)]
 public class PresetCallbacks(PresetController _presetController) : IOnLoad
diff --git a/Libraries/Core/Callbacks/PrestigeCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/PrestigeCallbacks.cs
similarity index 80%
rename from Libraries/Core/Callbacks/PrestigeCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/PrestigeCallbacks.cs
index c0f870f4..150758e9 100644
--- a/Libraries/Core/Callbacks/PrestigeCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/PrestigeCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Prestige;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Prestige;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class PrestigeCallbacks(
diff --git a/Libraries/Core/Callbacks/ProfileCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/ProfileCallbacks.cs
similarity index 93%
rename from Libraries/Core/Callbacks/ProfileCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/ProfileCallbacks.cs
index 4c487585..053c436a 100644
--- a/Libraries/Core/Callbacks/ProfileCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/ProfileCallbacks.cs
@@ -1,13 +1,13 @@
-using Core.Controllers;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Launcher;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class ProfileCallbacks(
@@ -34,7 +34,7 @@ public class ProfileCallbacks(
 
     /// <summary>
     /// Handle client/game/profile/list
-    /// Get the complete player profile (scav + pmc character) 
+    /// Get the complete player profile (scav + pmc character)
     /// </summary>
     /// <returns></returns>
     public string GetProfileData(string url, EmptyRequestData _, string sessionID)
diff --git a/Libraries/Core/Callbacks/QuestCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/QuestCallbacks.cs
similarity index 91%
rename from Libraries/Core/Callbacks/QuestCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/QuestCallbacks.cs
index c8f723de..d2dfa1a8 100644
--- a/Libraries/Core/Callbacks/QuestCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/QuestCallbacks.cs
@@ -1,11 +1,11 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Quests;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class QuestCallbacks(
diff --git a/Libraries/Core/Callbacks/RagfairCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/RagfairCallbacks.cs
similarity index 92%
rename from Libraries/Core/Callbacks/RagfairCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/RagfairCallbacks.cs
index 447065cd..ec616cb7 100644
--- a/Libraries/Core/Callbacks/RagfairCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/RagfairCallbacks.cs
@@ -1,15 +1,15 @@
-using Core.Controllers;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.RagfairCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.RagfairCallbacks)]
diff --git a/Libraries/Core/Callbacks/RepairCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/RepairCallbacks.cs
similarity index 80%
rename from Libraries/Core/Callbacks/RepairCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/RepairCallbacks.cs
index 3c9b8069..7d971104 100644
--- a/Libraries/Core/Callbacks/RepairCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/RepairCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Repair;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Repair;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class RepairCallbacks(RepairController _repairController)
diff --git a/Libraries/Core/Callbacks/SaveCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/SaveCallbacks.cs
similarity index 79%
rename from Libraries/Core/Callbacks/SaveCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/SaveCallbacks.cs
index 1fca573a..abfcd228 100644
--- a/Libraries/Core/Callbacks/SaveCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/SaveCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.DI;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.SaveCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.SaveCallbacks)]
diff --git a/Libraries/Core/Callbacks/TradeCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/TradeCallbacks.cs
similarity index 85%
rename from Libraries/Core/Callbacks/TradeCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/TradeCallbacks.cs
index 20880cc4..de2b1a5e 100644
--- a/Libraries/Core/Callbacks/TradeCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/TradeCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Trade;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class TradeCallbacks(TradeController _tradeController)
diff --git a/Libraries/Core/Callbacks/TraderCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/TraderCallbacks.cs
similarity index 89%
rename from Libraries/Core/Callbacks/TraderCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/TraderCallbacks.cs
index 467ceaca..bcff7eb8 100644
--- a/Libraries/Core/Callbacks/TraderCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/TraderCallbacks.cs
@@ -1,12 +1,12 @@
-using Core.Controllers;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.TraderCallbacks)]
 [Injectable(InjectableTypeOverride = typeof(IOnUpdate), TypePriority = OnUpdateOrder.TraderCallbacks)]
diff --git a/Libraries/Core/Callbacks/WeatherCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/WeatherCallbacks.cs
similarity index 82%
rename from Libraries/Core/Callbacks/WeatherCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/WeatherCallbacks.cs
index e4b0ed5a..8bd3a1d8 100644
--- a/Libraries/Core/Callbacks/WeatherCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/WeatherCallbacks.cs
@@ -1,9 +1,9 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class WeatherCallbacks(
diff --git a/Libraries/Core/Callbacks/WishlistCallbacks.cs b/Libraries/SPTarkov.Server.Core/Callbacks/WishlistCallbacks.cs
similarity index 85%
rename from Libraries/Core/Callbacks/WishlistCallbacks.cs
rename to Libraries/SPTarkov.Server.Core/Callbacks/WishlistCallbacks.cs
index cd9c5e2b..3a4f7bce 100644
--- a/Libraries/Core/Callbacks/WishlistCallbacks.cs
+++ b/Libraries/SPTarkov.Server.Core/Callbacks/WishlistCallbacks.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Wishlist;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Wishlist;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Callbacks;
+namespace SPTarkov.Server.Core.Callbacks;
 
 [Injectable]
 public class WishlistCallbacks(WishlistController _wishlistController)
diff --git a/Libraries/Core/Context/ApplicationContext.cs b/Libraries/SPTarkov.Server.Core/Context/ApplicationContext.cs
similarity index 95%
rename from Libraries/Core/Context/ApplicationContext.cs
rename to Libraries/SPTarkov.Server.Core/Context/ApplicationContext.cs
index 93446032..626e7d75 100644
--- a/Libraries/Core/Context/ApplicationContext.cs
+++ b/Libraries/SPTarkov.Server.Core/Context/ApplicationContext.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Context;
+namespace SPTarkov.Server.Core.Context;
 
 [Injectable(InjectionType.Singleton)]
 public class ApplicationContext
diff --git a/Libraries/Core/Context/ContextVariable.cs b/Libraries/SPTarkov.Server.Core/Context/ContextVariable.cs
similarity index 90%
rename from Libraries/Core/Context/ContextVariable.cs
rename to Libraries/SPTarkov.Server.Core/Context/ContextVariable.cs
index 45765de4..d328ebe2 100644
--- a/Libraries/Core/Context/ContextVariable.cs
+++ b/Libraries/SPTarkov.Server.Core/Context/ContextVariable.cs
@@ -1,4 +1,4 @@
-namespace Core.Context;
+namespace SPTarkov.Server.Core.Context;
 
 public class ContextVariable(object value, ContextVariableType contextVariableInternalType)
 {
diff --git a/Libraries/Core/Context/ContextVariableType.cs b/Libraries/SPTarkov.Server.Core/Context/ContextVariableType.cs
similarity index 92%
rename from Libraries/Core/Context/ContextVariableType.cs
rename to Libraries/SPTarkov.Server.Core/Context/ContextVariableType.cs
index 4b2f447f..85b3d35b 100644
--- a/Libraries/Core/Context/ContextVariableType.cs
+++ b/Libraries/SPTarkov.Server.Core/Context/ContextVariableType.cs
@@ -1,4 +1,4 @@
-namespace Core.Context;
+namespace SPTarkov.Server.Core.Context;
 
 public enum ContextVariableType
 {
diff --git a/Libraries/Core/Controllers/AchievementController.cs b/Libraries/SPTarkov.Server.Core/Controllers/AchievementController.cs
similarity index 87%
rename from Libraries/Core/Controllers/AchievementController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/AchievementController.cs
index f2e0ae2a..d924c04b 100644
--- a/Libraries/Core/Controllers/AchievementController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/AchievementController.cs
@@ -1,11 +1,11 @@
-using Core.Helpers;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class AchievementController(
diff --git a/Libraries/Core/Controllers/BotController.cs b/Libraries/SPTarkov.Server.Core/Controllers/BotController.cs
similarity index 94%
rename from Libraries/Core/Controllers/BotController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/BotController.cs
index b3f155cf..0ddb9dd2 100644
--- a/Libraries/Core/Controllers/BotController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/BotController.cs
@@ -1,24 +1,24 @@
 using System.Diagnostics;
 using System.Text.Json.Serialization;
-using Core.Context;
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Bot;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Match;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Bot;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class BotController(
@@ -234,7 +234,7 @@ public class BotController(
         }
 
         var role = botGenerationDetails.EventRole ?? botGenerationDetails.Role;
-        
+
         if (_logger.IsLogEnabled(LogLevel.Debug))
         {
             _logger.Debug($"Generating wave of: {botGenerationDetails.BotCountToGenerate} bots of type: {role} {botGenerationDetails.BotDifficulty}");
diff --git a/Libraries/Core/Controllers/BuildController.cs b/Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs
similarity index 94%
rename from Libraries/Core/Controllers/BuildController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs
index 54d23fdf..35caf2a9 100644
--- a/Libraries/Core/Controllers/BuildController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/BuildController.cs
@@ -1,17 +1,17 @@
-using Core.Helpers;
-using Core.Models.Eft.Builds;
-using Core.Models.Eft.PresetBuild;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Builds;
+using SPTarkov.Server.Core.Models.Eft.PresetBuild;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class BuildController(
diff --git a/Libraries/Core/Controllers/ClientLogController.cs b/Libraries/SPTarkov.Server.Core/Controllers/ClientLogController.cs
similarity index 85%
rename from Libraries/Core/Controllers/ClientLogController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/ClientLogController.cs
index 7073c2bf..cd077a22 100644
--- a/Libraries/Core/Controllers/ClientLogController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/ClientLogController.cs
@@ -1,9 +1,9 @@
-using Core.Models.Spt.Logging;
-using Core.Models.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Spt.Logging;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class ClientLogController(
diff --git a/Libraries/Core/Controllers/CustomizationController.cs b/Libraries/SPTarkov.Server.Core/Controllers/CustomizationController.cs
similarity index 93%
rename from Libraries/Core/Controllers/CustomizationController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/CustomizationController.cs
index 29af8bbe..0ad314fa 100644
--- a/Libraries/Core/Controllers/CustomizationController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/CustomizationController.cs
@@ -1,20 +1,20 @@
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Customization;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Customization;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class CustomizationController(
diff --git a/Libraries/Core/Controllers/DialogueController.cs b/Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs
similarity index 97%
rename from Libraries/Core/Controllers/DialogueController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs
index 20458e22..50c35588 100644
--- a/Libraries/Core/Controllers/DialogueController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/DialogueController.cs
@@ -1,17 +1,17 @@
-using Core.Helpers;
-using Core.Helpers.Dialogue;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Models.Eft.Ws;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Helpers.Dialogue;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Ws;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class DialogueController(
diff --git a/Libraries/Core/Controllers/GameController.cs b/Libraries/SPTarkov.Server.Core/Controllers/GameController.cs
similarity index 96%
rename from Libraries/Core/Controllers/GameController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/GameController.cs
index 79acfdc2..ddee907d 100644
--- a/Libraries/Core/Controllers/GameController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/GameController.cs
@@ -1,23 +1,23 @@
-using Core.Context;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Game;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Json;
-using Server;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Game;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Server;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class GameController(
diff --git a/Libraries/Core/Controllers/HandBookController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HandBookController.cs
similarity index 62%
rename from Libraries/Core/Controllers/HandBookController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/HandBookController.cs
index 6189c34f..56599ce2 100644
--- a/Libraries/Core/Controllers/HandBookController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/HandBookController.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class HandBookController
diff --git a/Libraries/Core/Controllers/HealthController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HealthController.cs
similarity index 94%
rename from Libraries/Core/Controllers/HealthController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/HealthController.cs
index 219aeb9a..8ab8af08 100644
--- a/Libraries/Core/Controllers/HealthController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/HealthController.cs
@@ -1,19 +1,19 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Health;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Health;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class HealthController(
diff --git a/Libraries/Core/Controllers/HideoutController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs
similarity index 98%
rename from Libraries/Core/Controllers/HideoutController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs
index 216e61d6..3365ab05 100644
--- a/Libraries/Core/Controllers/HideoutController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs
@@ -1,23 +1,23 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using Core.Models.Enums.Hideout;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums.Hideout;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class HideoutController(
@@ -1056,7 +1056,7 @@ public class HideoutController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="recipe"></param>
     /// <returns></returns>
diff --git a/Libraries/Core/Controllers/InRaidController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InRaidController.cs
similarity index 89%
rename from Libraries/Core/Controllers/InRaidController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/InRaidController.cs
index da805879..040c8d11 100644
--- a/Libraries/Core/Controllers/InRaidController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/InRaidController.cs
@@ -1,12 +1,12 @@
-using Core.Context;
-using Core.Helpers;
-using Core.Models.Eft.InRaid;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.InRaid;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class InRaidController(
diff --git a/Libraries/Core/Controllers/InsuranceController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs
similarity index 97%
rename from Libraries/Core/Controllers/InsuranceController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs
index acc0b31b..d7e72aeb 100644
--- a/Libraries/Core/Controllers/InsuranceController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs
@@ -1,24 +1,24 @@
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Insurance;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Collections;
-using SptCommon.Annotations;
-using Insurance = Core.Models.Eft.Profile.Insurance;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Insurance;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Common.Annotations;
+using Insurance = SPTarkov.Server.Core.Models.Eft.Profile.Insurance;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class InsuranceController(
diff --git a/Libraries/Core/Controllers/InventoryController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs
similarity index 98%
rename from Libraries/Core/Controllers/InventoryController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs
index 03ef34ea..de2f13fc 100644
--- a/Libraries/Core/Controllers/InventoryController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs
@@ -1,20 +1,20 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class InventoryController(
diff --git a/Libraries/Core/Controllers/LauncherController.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs
similarity index 92%
rename from Libraries/Core/Controllers/LauncherController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs
index 227925a3..86a49f26 100644
--- a/Libraries/Core/Controllers/LauncherController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs
@@ -1,19 +1,19 @@
-using Core.Context;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Launcher;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using Info = Core.Models.Eft.Profile.Info;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using Info = SPTarkov.Server.Core.Models.Eft.Profile.Info;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class LauncherController(
@@ -80,7 +80,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="sessionId">Session/Player id</param>
     /// <returns></returns>
@@ -90,7 +90,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="info"></param>
     /// <returns></returns>
@@ -109,7 +109,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="info"></param>
     /// <returns></returns>
@@ -127,7 +127,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="info"></param>
     /// <returns></returns>
@@ -154,7 +154,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <returns></returns>
     protected string GenerateProfileId()
@@ -165,7 +165,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="timeStamp"></param>
     /// <param name="counter"></param>
@@ -179,7 +179,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="info"></param>
     /// <returns></returns>
@@ -196,7 +196,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="info"></param>
     /// <returns></returns>
@@ -237,7 +237,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <returns></returns>
     public string GetCompatibleTarkovVersion()
@@ -280,7 +280,7 @@ public class LauncherController(
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="profileMods"></param>
     /// <returns></returns>
diff --git a/Libraries/Core/Controllers/LauncherV2Controller.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs
similarity index 91%
rename from Libraries/Core/Controllers/LauncherV2Controller.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs
index 4b54365e..2bb8504d 100644
--- a/Libraries/Core/Controllers/LauncherV2Controller.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherV2Controller.cs
@@ -1,17 +1,17 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Launcher;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using Info = Core.Models.Eft.Profile.Info;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using Info = SPTarkov.Server.Core.Models.Eft.Profile.Info;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class LauncherV2Controller(
diff --git a/Libraries/Core/Controllers/LocationController.cs b/Libraries/SPTarkov.Server.Core/Controllers/LocationController.cs
similarity index 82%
rename from Libraries/Core/Controllers/LocationController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/LocationController.cs
index 1f0530cf..7aa30cdf 100644
--- a/Libraries/Core/Controllers/LocationController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/LocationController.cs
@@ -1,14 +1,14 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Location;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Location;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class LocationController(
diff --git a/Libraries/Core/Controllers/MatchController.cs b/Libraries/SPTarkov.Server.Core/Controllers/MatchController.cs
similarity index 91%
rename from Libraries/Core/Controllers/MatchController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/MatchController.cs
index cd3374b3..0c802079 100644
--- a/Libraries/Core/Controllers/MatchController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/MatchController.cs
@@ -1,14 +1,14 @@
-using Core.Context;
-using Core.Models.Eft.Match;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using static Core.Services.MatchLocationService;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using static SPTarkov.Server.Core.Services.MatchLocationService;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class MatchController(
diff --git a/Libraries/Core/Controllers/NoteController.cs b/Libraries/SPTarkov.Server.Core/Controllers/NoteController.cs
similarity index 88%
rename from Libraries/Core/Controllers/NoteController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/NoteController.cs
index 278ee990..85f83a90 100644
--- a/Libraries/Core/Controllers/NoteController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/NoteController.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Notes;
-using Core.Routers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Notes;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class NoteController(
diff --git a/Libraries/Core/Controllers/NotifierController.cs b/Libraries/SPTarkov.Server.Core/Controllers/NotifierController.cs
similarity index 90%
rename from Libraries/Core/Controllers/NotifierController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/NotifierController.cs
index f31ec000..6ddb9b11 100644
--- a/Libraries/Core/Controllers/NotifierController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/NotifierController.cs
@@ -1,10 +1,10 @@
-using Core.Helpers;
-using Core.Models.Eft.Notifier;
-using Core.Models.Eft.Ws;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Notifier;
+using SPTarkov.Server.Core.Models.Eft.Ws;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class NotifierController(
diff --git a/Libraries/Core/Controllers/PresetController.cs b/Libraries/SPTarkov.Server.Core/Controllers/PresetController.cs
similarity index 84%
rename from Libraries/Core/Controllers/PresetController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/PresetController.cs
index c5db5a86..38ec201e 100644
--- a/Libraries/Core/Controllers/PresetController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/PresetController.cs
@@ -1,10 +1,10 @@
-using Core.Helpers;
-using Core.Models.Spt.Presets;
-using Core.Models.Utils;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Spt.Presets;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class PresetController(
diff --git a/Libraries/Core/Controllers/PrestigeController.cs b/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs
similarity index 86%
rename from Libraries/Core/Controllers/PrestigeController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs
index 317b71c8..16726bc2 100644
--- a/Libraries/Core/Controllers/PrestigeController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/PrestigeController.cs
@@ -1,14 +1,14 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Prestige;
-using Core.Models.Eft.Profile;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Prestige;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class PrestigeController(
diff --git a/Libraries/Core/Controllers/ProfileController.cs b/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs
similarity index 95%
rename from Libraries/Core/Controllers/ProfileController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs
index 861b6700..347d3994 100644
--- a/Libraries/Core/Controllers/ProfileController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/ProfileController.cs
@@ -1,19 +1,19 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Launcher;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class ProfileController(
diff --git a/Libraries/Core/Controllers/QuestController.cs b/Libraries/SPTarkov.Server.Core/Controllers/QuestController.cs
similarity index 96%
rename from Libraries/Core/Controllers/QuestController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/QuestController.cs
index 154eafaa..246ae6e8 100644
--- a/Libraries/Core/Controllers/QuestController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/QuestController.cs
@@ -1,21 +1,21 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Quests;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class QuestController(
diff --git a/Libraries/Core/Controllers/RagfairController.cs b/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs
similarity index 98%
rename from Libraries/Core/Controllers/RagfairController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs
index 7b1bb03e..484ed57e 100644
--- a/Libraries/Core/Controllers/RagfairController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs
@@ -1,23 +1,23 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class RagfairController
diff --git a/Libraries/Core/Controllers/RepairController.cs b/Libraries/SPTarkov.Server.Core/Controllers/RepairController.cs
similarity index 89%
rename from Libraries/Core/Controllers/RepairController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/RepairController.cs
index c347c7cd..c306b585 100644
--- a/Libraries/Core/Controllers/RepairController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/RepairController.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Repair;
-using Core.Routers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Repair;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class RepairController(
diff --git a/Libraries/Core/Controllers/RepeatableQuestController.cs b/Libraries/SPTarkov.Server.Core/Controllers/RepeatableQuestController.cs
similarity index 97%
rename from Libraries/Core/Controllers/RepeatableQuestController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/RepeatableQuestController.cs
index bd99cf6e..f6588a02 100644
--- a/Libraries/Core/Controllers/RepeatableQuestController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/RepeatableQuestController.cs
@@ -1,25 +1,25 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Eft.Quests;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Quests;
-using Core.Models.Spt.Repeatable;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Collections;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Quests;
+using SPTarkov.Server.Core.Models.Spt.Repeatable;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class RepeatableQuestController(
@@ -185,7 +185,7 @@ public class RepeatableQuestController(
     /// <summary>
     /// Some accounts have access to free repeatable quest refreshes
     /// Track the usage of them inside players profile
-    /// 
+    ///
     /// </summary>
     /// <param name="fullProfile">Full player profile</param>
     /// <param name="repeatableSubType">Can be daily / weekly / scav repeatable</param>
@@ -310,7 +310,7 @@ public class RepeatableQuestController(
 
     /// <summary>
     /// Find a repeatable (daily/weekly/scav) from a players profile by its id
-    /// 
+    ///
     /// </summary>
     /// <param name="questId">Id of quest to find</param>
     /// <param name="pmcData">Profile that contains quests to look through</param>
diff --git a/Libraries/Core/Controllers/TradeController.cs b/Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs
similarity index 94%
rename from Libraries/Core/Controllers/TradeController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs
index 06169e1e..77e21be6 100644
--- a/Libraries/Core/Controllers/TradeController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs
@@ -1,20 +1,20 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class TradeController(
diff --git a/Libraries/Core/Controllers/TraderController.cs b/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs
similarity index 93%
rename from Libraries/Core/Controllers/TraderController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs
index 8898ba04..dab6cad9 100644
--- a/Libraries/Core/Controllers/TraderController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/TraderController.cs
@@ -1,17 +1,17 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Game;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Game;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class TraderController(
diff --git a/Libraries/Core/Controllers/WeatherController.cs b/Libraries/SPTarkov.Server.Core/Controllers/WeatherController.cs
similarity index 76%
rename from Libraries/Core/Controllers/WeatherController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/WeatherController.cs
index a3ec9e93..7433d8d5 100644
--- a/Libraries/Core/Controllers/WeatherController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/WeatherController.cs
@@ -1,15 +1,15 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Weather;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Weather;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Weather;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Weather;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class WeatherController(
diff --git a/Libraries/Core/Controllers/WishlistController.cs b/Libraries/SPTarkov.Server.Core/Controllers/WishlistController.cs
similarity index 87%
rename from Libraries/Core/Controllers/WishlistController.cs
rename to Libraries/SPTarkov.Server.Core/Controllers/WishlistController.cs
index 28001f29..25e8782e 100644
--- a/Libraries/Core/Controllers/WishlistController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/WishlistController.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Wishlist;
-using Core.Routers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Wishlist;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Controllers;
+namespace SPTarkov.Server.Core.Controllers;
 
 [Injectable]
 public class WishlistController(
diff --git a/Libraries/Core/DI/IOnLoad.cs b/Libraries/SPTarkov.Server.Core/DI/IOnLoad.cs
similarity index 67%
rename from Libraries/Core/DI/IOnLoad.cs
rename to Libraries/SPTarkov.Server.Core/DI/IOnLoad.cs
index 91ed2543..6763eaf4 100644
--- a/Libraries/Core/DI/IOnLoad.cs
+++ b/Libraries/SPTarkov.Server.Core/DI/IOnLoad.cs
@@ -1,4 +1,4 @@
-namespace Core.DI;
+namespace SPTarkov.Server.Core.DI;
 
 public interface IOnLoad
 {
diff --git a/Libraries/Core/DI/IOnUpdate.cs b/Libraries/SPTarkov.Server.Core/DI/IOnUpdate.cs
similarity index 73%
rename from Libraries/Core/DI/IOnUpdate.cs
rename to Libraries/SPTarkov.Server.Core/DI/IOnUpdate.cs
index 3a98186d..bcdc667a 100644
--- a/Libraries/Core/DI/IOnUpdate.cs
+++ b/Libraries/SPTarkov.Server.Core/DI/IOnUpdate.cs
@@ -1,4 +1,4 @@
-namespace Core.DI;
+namespace SPTarkov.Server.Core.DI;
 
 public interface IOnUpdate
 {
diff --git a/Libraries/Core/DI/ISerializer.cs b/Libraries/SPTarkov.Server.Core/DI/ISerializer.cs
similarity index 83%
rename from Libraries/Core/DI/ISerializer.cs
rename to Libraries/SPTarkov.Server.Core/DI/ISerializer.cs
index 578fe902..a65d3543 100644
--- a/Libraries/Core/DI/ISerializer.cs
+++ b/Libraries/SPTarkov.Server.Core/DI/ISerializer.cs
@@ -1,4 +1,4 @@
-namespace Core.DI;
+namespace SPTarkov.Server.Core.DI;
 
 public interface ISerializer
 {
diff --git a/Libraries/Core/DI/OnLoadOrder.cs b/Libraries/SPTarkov.Server.Core/DI/OnLoadOrder.cs
similarity index 94%
rename from Libraries/Core/DI/OnLoadOrder.cs
rename to Libraries/SPTarkov.Server.Core/DI/OnLoadOrder.cs
index ddd6f73a..d9cfcc4b 100644
--- a/Libraries/Core/DI/OnLoadOrder.cs
+++ b/Libraries/SPTarkov.Server.Core/DI/OnLoadOrder.cs
@@ -1,4 +1,4 @@
-namespace Core.DI;
+namespace SPTarkov.Server.Core.DI;
 
 public static class OnLoadOrder
 {
diff --git a/Libraries/Core/DI/OnUpdateOrder.cs b/Libraries/SPTarkov.Server.Core/DI/OnUpdateOrder.cs
similarity index 91%
rename from Libraries/Core/DI/OnUpdateOrder.cs
rename to Libraries/SPTarkov.Server.Core/DI/OnUpdateOrder.cs
index b338b5ad..d1df5a4f 100644
--- a/Libraries/Core/DI/OnUpdateOrder.cs
+++ b/Libraries/SPTarkov.Server.Core/DI/OnUpdateOrder.cs
@@ -1,4 +1,4 @@
-namespace Core.DI;
+namespace SPTarkov.Server.Core.DI;
 
 public static class OnUpdateOrder
 {
diff --git a/Libraries/Core/DI/Router.cs b/Libraries/SPTarkov.Server.Core/DI/Router.cs
similarity index 91%
rename from Libraries/Core/DI/Router.cs
rename to Libraries/SPTarkov.Server.Core/DI/Router.cs
index 98cda1a5..7bbc2bc6 100644
--- a/Libraries/Core/DI/Router.cs
+++ b/Libraries/SPTarkov.Server.Core/DI/Router.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Utils;
-using Core.Utils;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
 
-namespace Core.DI;
+namespace SPTarkov.Server.Core.DI;
 
 public abstract class Router
 {
diff --git a/Libraries/Core/Generators/BotEquipmentModGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs
similarity index 99%
rename from Libraries/Core/Generators/BotEquipmentModGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs
index 585d0cd3..9641d013 100644
--- a/Libraries/Core/Generators/BotEquipmentModGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotEquipmentModGenerator.cs
@@ -1,20 +1,20 @@
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Collections;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class BotEquipmentModGenerator(
diff --git a/Libraries/Core/Generators/BotGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs
similarity index 97%
rename from Libraries/Core/Generators/BotGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs
index 1203f1bd..6ea1b503 100644
--- a/Libraries/Core/Generators/BotGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs
@@ -1,21 +1,21 @@
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using BodyPart = Core.Models.Eft.Common.Tables.BodyPart;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using BodyPart = SPTarkov.Server.Core.Models.Eft.Common.Tables.BodyPart;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class BotGenerator(
diff --git a/Libraries/Core/Generators/BotInventoryGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs
similarity index 98%
rename from Libraries/Core/Generators/BotInventoryGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs
index 0ece9d96..1df78c38 100644
--- a/Libraries/Core/Generators/BotInventoryGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs
@@ -1,18 +1,18 @@
-using Core.Context;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Match;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class BotInventoryGenerator(
diff --git a/Libraries/Core/Generators/BotLevelGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotLevelGenerator.cs
similarity index 92%
rename from Libraries/Core/Generators/BotLevelGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/BotLevelGenerator.cs
index 47379392..3a7d166f 100644
--- a/Libraries/Core/Generators/BotLevelGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotLevelGenerator.cs
@@ -1,13 +1,13 @@
-using Core.Models.Common;
-using Core.Models.Eft.Bot;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Bots;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Bot;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class BotLevelGenerator(
diff --git a/Libraries/Core/Generators/BotLootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs
similarity index 98%
rename from Libraries/Core/Generators/BotLootGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs
index 8f827cef..3da889dc 100644
--- a/Libraries/Core/Generators/BotLootGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotLootGenerator.cs
@@ -1,17 +1,17 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class BotLootGenerator(
diff --git a/Libraries/Core/Generators/BotWeaponGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
similarity index 98%
rename from Libraries/Core/Generators/BotWeaponGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
index 4feb9203..a2891a41 100644
--- a/Libraries/Core/Generators/BotWeaponGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
@@ -1,19 +1,19 @@
-using Core.Generators.WeaponGen;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Generators.WeaponGen;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable(InjectionType.Singleton)]
 public class BotWeaponGenerator(
diff --git a/Libraries/Core/Generators/FenceBaseAssortGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/FenceBaseAssortGenerator.cs
similarity index 96%
rename from Libraries/Core/Generators/FenceBaseAssortGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/FenceBaseAssortGenerator.cs
index cc7ad362..4a32db6e 100644
--- a/Libraries/Core/Generators/FenceBaseAssortGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/FenceBaseAssortGenerator.cs
@@ -1,15 +1,15 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class FenceBaseAssortGenerator(
diff --git a/Libraries/Core/Generators/LocationLootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs
similarity index 98%
rename from Libraries/Core/Generators/LocationLootGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs
index 0530465b..1a813559 100644
--- a/Libraries/Core/Generators/LocationLootGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs
@@ -1,19 +1,19 @@
 using System.Text.Json.Serialization;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Collections;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class LocationLootGenerator(
diff --git a/Libraries/Core/Generators/LootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs
similarity index 97%
rename from Libraries/Core/Generators/LootGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs
index 5fe1f2f4..9c6bbe28 100644
--- a/Libraries/Core/Generators/LootGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs
@@ -1,19 +1,19 @@
 using System.Text.Json.Serialization;
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Services;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Services;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class LootGenerator(
diff --git a/Libraries/Core/Generators/PMCLootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/PMCLootGenerator.cs
similarity index 96%
rename from Libraries/Core/Generators/PMCLootGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/PMCLootGenerator.cs
index a923a028..71871e0e 100644
--- a/Libraries/Core/Generators/PMCLootGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/PMCLootGenerator.cs
@@ -1,13 +1,13 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class PMCLootGenerator
diff --git a/Libraries/Core/Generators/PlayerScavGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/PlayerScavGenerator.cs
similarity index 95%
rename from Libraries/Core/Generators/PlayerScavGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/PlayerScavGenerator.cs
index 539ff825..666694e6 100644
--- a/Libraries/Core/Generators/PlayerScavGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/PlayerScavGenerator.cs
@@ -1,20 +1,20 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Notes;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Json;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Notes;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class PlayerScavGenerator(
diff --git a/Libraries/Core/Generators/PmcWaveGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/PmcWaveGenerator.cs
similarity index 89%
rename from Libraries/Core/Generators/PmcWaveGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/PmcWaveGenerator.cs
index 4091c0bd..71ac47fd 100644
--- a/Libraries/Core/Generators/PmcWaveGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/PmcWaveGenerator.cs
@@ -1,12 +1,12 @@
-using Core.Models.Eft.Common;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators
+namespace SPTarkov.Server.Core.Generators
 {
     [Injectable]
     public class PmcWaveGenerator
diff --git a/Libraries/Core/Generators/RagfairAssortGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs
similarity index 91%
rename from Libraries/Core/Generators/RagfairAssortGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs
index 588247f8..b9c90249 100644
--- a/Libraries/Core/Generators/RagfairAssortGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs
@@ -1,15 +1,15 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class RagfairAssortGenerator(
diff --git a/Libraries/Core/Generators/RagfairOfferGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs
similarity index 98%
rename from Libraries/Core/Generators/RagfairOfferGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs
index 652af786..6e2968c7 100644
--- a/Libraries/Core/Generators/RagfairOfferGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/RagfairOfferGenerator.cs
@@ -1,20 +1,20 @@
 using System.Diagnostics;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Ragfair;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Ragfair;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class RagfairOfferGenerator(
diff --git a/Libraries/Core/Generators/RepeatableQuestGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs
similarity index 98%
rename from Libraries/Core/Generators/RepeatableQuestGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs
index 5f5c33e3..10f2f6d5 100644
--- a/Libraries/Core/Generators/RepeatableQuestGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs
@@ -1,19 +1,19 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Repeatable;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Collections;
-using Core.Utils.Json;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Repeatable;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class RepeatableQuestGenerator(
diff --git a/Libraries/Core/Generators/RepeatableQuestRewardGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestRewardGenerator.cs
similarity index 97%
rename from Libraries/Core/Generators/RepeatableQuestRewardGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestRewardGenerator.cs
index d27de4f5..0b402152 100644
--- a/Libraries/Core/Generators/RepeatableQuestRewardGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestRewardGenerator.cs
@@ -1,19 +1,19 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Repeatable;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Collections;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Repeatable;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class RepeatableQuestRewardGenerator(
diff --git a/Libraries/Core/Generators/ScavCaseRewardGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/ScavCaseRewardGenerator.cs
similarity index 96%
rename from Libraries/Core/Generators/ScavCaseRewardGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/ScavCaseRewardGenerator.cs
index 71df30a6..8432e10b 100644
--- a/Libraries/Core/Generators/ScavCaseRewardGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/ScavCaseRewardGenerator.cs
@@ -1,19 +1,19 @@
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Hideout;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Hideout;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Hideout;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class ScavCaseRewardGenerator(
diff --git a/Libraries/Core/Generators/WeaponGen/IInventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/IInventoryMagGen.cs
similarity index 78%
rename from Libraries/Core/Generators/WeaponGen/IInventoryMagGen.cs
rename to Libraries/SPTarkov.Server.Core/Generators/WeaponGen/IInventoryMagGen.cs
index bd40493a..97ea59ea 100644
--- a/Libraries/Core/Generators/WeaponGen/IInventoryMagGen.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/IInventoryMagGen.cs
@@ -1,4 +1,4 @@
-namespace Core.Generators.WeaponGen;
+namespace SPTarkov.Server.Core.Generators.WeaponGen;
 
 public interface IInventoryMagGen
 {
diff --git a/Libraries/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs
similarity index 86%
rename from Libraries/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs
rename to Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs
index 54bbf34e..db294349 100644
--- a/Libraries/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs
@@ -1,9 +1,9 @@
-using Core.Helpers;
-using Core.Models.Enums;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators.WeaponGen.Implementations;
+namespace SPTarkov.Server.Core.Generators.WeaponGen.Implementations;
 
 [Injectable]
 public class BarrelInvetoryMagGen(
diff --git a/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
similarity index 94%
rename from Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
rename to Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
index acc6c52d..2bbd5b70 100644
--- a/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
@@ -1,13 +1,13 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Generators.WeaponGen.Implementations;
+namespace SPTarkov.Server.Core.Generators.WeaponGen.Implementations;
 
 [Injectable]
 public class ExternalInventoryMagGen(
diff --git a/Libraries/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs
similarity index 82%
rename from Libraries/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs
rename to Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs
index c95ca57c..00e73f36 100644
--- a/Libraries/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs
@@ -1,8 +1,8 @@
-using Core.Helpers;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators.WeaponGen.Implementations;
+namespace SPTarkov.Server.Core.Generators.WeaponGen.Implementations;
 
 [Injectable]
 public class InternalMagazineInventoryMagGen(
diff --git a/Libraries/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
similarity index 82%
rename from Libraries/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
rename to Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
index faa06bbe..0b707e1d 100644
--- a/Libraries/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
@@ -1,8 +1,8 @@
-using Core.Helpers;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators.WeaponGen.Implementations;
+namespace SPTarkov.Server.Core.Generators.WeaponGen.Implementations;
 
 [Injectable]
 public class UbglExternalMagGen(
diff --git a/Libraries/Core/Generators/WeaponGen/InventoryMagGen.cs b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/InventoryMagGen.cs
similarity index 89%
rename from Libraries/Core/Generators/WeaponGen/InventoryMagGen.cs
rename to Libraries/SPTarkov.Server.Core/Generators/WeaponGen/InventoryMagGen.cs
index 8dee9775..4142d6a7 100644
--- a/Libraries/Core/Generators/WeaponGen/InventoryMagGen.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeaponGen/InventoryMagGen.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Common.Tables;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators.WeaponGen;
+namespace SPTarkov.Server.Core.Generators.WeaponGen;
 
 [Injectable]
 public class InventoryMagGen()
diff --git a/Libraries/Core/Generators/WeatherGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs
similarity index 94%
rename from Libraries/Core/Generators/WeatherGenerator.cs
rename to Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs
index 8ef160be..a55724d0 100644
--- a/Libraries/Core/Generators/WeatherGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/WeatherGenerator.cs
@@ -1,13 +1,13 @@
-using Core.Helpers;
-using Core.Models.Eft.Weather;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Weather;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Generators;
+namespace SPTarkov.Server.Core.Generators;
 
 [Injectable]
 public class WeatherGenerator(
diff --git a/Libraries/Core/Helpers/AssortHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/AssortHelper.cs
similarity index 94%
rename from Libraries/Core/Helpers/AssortHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/AssortHelper.cs
index 4e878ff1..ee8e454d 100644
--- a/Libraries/Core/Helpers/AssortHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/AssortHelper.cs
@@ -1,12 +1,12 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class AssortHelper(
diff --git a/Libraries/Core/Helpers/BotDifficultyHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotDifficultyHelper.cs
similarity index 90%
rename from Libraries/Core/Helpers/BotDifficultyHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/BotDifficultyHelper.cs
index f4eb248f..fb54ebc6 100644
--- a/Libraries/Core/Helpers/BotDifficultyHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/BotDifficultyHelper.cs
@@ -1,14 +1,14 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class BotDifficultyHelper(
diff --git a/Libraries/Core/Helpers/BotGeneratorHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs
similarity index 98%
rename from Libraries/Core/Helpers/BotGeneratorHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs
index 991fd3fe..e48d28f6 100644
--- a/Libraries/Core/Helpers/BotGeneratorHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs
@@ -1,17 +1,17 @@
-using Core.Context;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Match;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class BotGeneratorHelper(
diff --git a/Libraries/Core/Helpers/BotHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotHelper.cs
similarity index 95%
rename from Libraries/Core/Helpers/BotHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/BotHelper.cs
index 658b421c..95ee7cdc 100644
--- a/Libraries/Core/Helpers/BotHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/BotHelper.cs
@@ -1,12 +1,12 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class BotHelper(
diff --git a/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs
similarity index 94%
rename from Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs
index f90e2473..732ff30c 100644
--- a/Libraries/Core/Helpers/BotWeaponGeneratorHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/BotWeaponGeneratorHelper.cs
@@ -1,12 +1,12 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class BotWeaponGeneratorHelper(
diff --git a/Libraries/Core/Helpers/CertificateHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/CertificateHelper.cs
similarity index 97%
rename from Libraries/Core/Helpers/CertificateHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/CertificateHelper.cs
index 5fdb97e3..131035cd 100644
--- a/Libraries/Core/Helpers/CertificateHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/CertificateHelper.cs
@@ -1,11 +1,11 @@
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Cryptography;
-using SptCommon.Annotations;
-using Core.Models.Utils;
-using Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
 
-namespace Core.Helpers
+namespace SPTarkov.Server.Core.Helpers
 {
     [Injectable]
     public class CertificateHelper(ISptLogger<CertificateHelper> _logger, FileUtil _fileUtil)
diff --git a/Libraries/Core/Helpers/ContainerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ContainerHelper.cs
similarity index 98%
rename from Libraries/Core/Helpers/ContainerHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/ContainerHelper.cs
index 98ca55a6..eb521d22 100644
--- a/Libraries/Core/Helpers/ContainerHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/ContainerHelper.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class ContainerHelper
diff --git a/Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/AbstractDialogChatBot.cs
similarity index 91%
rename from Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/AbstractDialogChatBot.cs
index 798a05a1..9c15f735 100644
--- a/Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/AbstractDialogChatBot.cs
@@ -1,11 +1,11 @@
-using Core.Helpers.Dialog.Commando;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils.Callbacks;
+using SPTarkov.Server.Core.Helpers.Dialog.Commando;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Callbacks;
 
-namespace Core.Helpers.Dialogue;
+namespace SPTarkov.Server.Core.Helpers.Dialogue;
 
 public abstract class AbstractDialogChatBot(
     ISptLogger<AbstractDialogChatBot> _logger,
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/IChatCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/IChatCommand.cs
similarity index 65%
rename from Libraries/Core/Helpers/Dialogue/Commando/IChatCommand.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/IChatCommand.cs
index 568ce654..5619acdf 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/IChatCommand.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/IChatCommand.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Helpers.Dialog.Commando;
+namespace SPTarkov.Server.Core.Helpers.Dialog.Commando;
 
 public interface IChatCommand
 {
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
similarity index 84%
rename from Libraries/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
index e3ba4e7f..cc53955f 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommandoCommands.cs
@@ -1,12 +1,12 @@
-using Core.Helpers.Dialog.Commando.SptCommands;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialog.Commando;
+namespace SPTarkov.Server.Core.Helpers.Dialog.Commando;
 
 [Injectable]
 public class SptCommandoCommands : IChatCommand
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs
similarity index 95%
rename from Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs
index 0556ec6b..1deeba6b 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs
@@ -1,16 +1,16 @@
 using System.Text.RegularExpressions;
-using Core.Helpers.Dialog.Commando.SptCommands;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.Commando.SptCommands.GiveCommand;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando.SptCommands.GiveCommand;
 
 [Injectable]
 public class GiveSptCommand(
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs
similarity index 80%
rename from Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs
index 76a4d8aa..72a09d80 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.Commando.SptCommands.GiveCommand;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando.SptCommands.GiveCommand;
 
 [Injectable]
 public class SavedCommand
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/StringSimilarity.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/StringSimilarity.cs
similarity index 93%
rename from Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/StringSimilarity.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/StringSimilarity.cs
index a30f83eb..44ddb764 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/StringSimilarity.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/StringSimilarity.cs
@@ -1,4 +1,4 @@
-namespace Core.Helpers.Dialogue.Commando.SptCommands.GiveCommand;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando.SptCommands.GiveCommand;
 
 public static class StringSimilarity
 {
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs
similarity index 56%
rename from Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs
index 6438fc84..ae07d3ec 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ISptCommand.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Helpers.Dialog.Commando.SptCommands;
+namespace SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands;
 
 public interface ISptCommand
 {
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs
similarity index 91%
rename from Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs
index 63037f45..53a26ddd 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.cs
@@ -1,16 +1,16 @@
 using System.Text.RegularExpressions;
-using Core.Helpers.Dialog.Commando.SptCommands;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.Commando.SptCommands.ProfileCommand;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando.SptCommands.ProfileCommand;
 
 [Injectable]
 public class ProfileSptCommand(
diff --git a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs
similarity index 87%
rename from Libraries/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs
index 629ce12d..b37baacf 100644
--- a/Libraries/Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.cs
@@ -1,16 +1,16 @@
 using System.Text.RegularExpressions;
-using Core.Helpers.Dialog.Commando.SptCommands;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers.Dialog.Commando.SptCommands;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.Commando.SptCommands.TraderCommand;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.Commando.SptCommands.TraderCommand;
 
 [Injectable]
 public class TraderSptCommand(
diff --git a/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs
similarity index 73%
rename from Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs
index e0075566..6ce9deb6 100644
--- a/Libraries/Core/Helpers/Dialogue/CommandoDialogChatBot.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/CommandoDialogChatBot.cs
@@ -1,13 +1,13 @@
-using Core.Helpers.Dialog.Commando;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers.Dialog.Commando;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue;
+namespace SPTarkov.Server.Core.Helpers.Dialogue;
 
 [Injectable]
 public class CommandoDialogChatBot(
diff --git a/Libraries/Core/Helpers/Dialogue/IDialogueChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/IDialogueChatBot.cs
similarity index 52%
rename from Libraries/Core/Helpers/Dialogue/IDialogueChatBot.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/IDialogueChatBot.cs
index b4f221db..866d0b62 100644
--- a/Libraries/Core/Helpers/Dialogue/IDialogueChatBot.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/IDialogueChatBot.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Helpers.Dialogue;
+namespace SPTarkov.Server.Core.Helpers.Dialogue;
 
 public interface IDialogueChatBot
 {
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs
similarity index 71%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs
index 098a9ed8..a225129b 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/AreYouABotMessageHandler.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class AreYouABotMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs
similarity index 69%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs
index 15f98277..80f452d7 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/FishMessageHandler.cs
@@ -1,9 +1,9 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class FishMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs
similarity index 77%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs
index 859024bb..539b765b 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceChristmasMessageHandler.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class ForceChristmasMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs
similarity index 77%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs
index 1a769e46..17145bb1 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceHalloweenMessageHandler.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class ForceHalloweenMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs
similarity index 69%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs
index 947773e7..ad53a667 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSnowMessageHandler.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class ForceSnowMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs
similarity index 69%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs
index 257484dd..f0ada51f 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/ForceSummerMessageHandler.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class ForceSummerMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs
similarity index 75%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs
index cb805cd6..7990ac5e 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GarbageMessageHandler.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class GarbageMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs
similarity index 83%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs
index 44816ae3..ff8851ea 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/GiveMeSpaceMessageHandler.cs
@@ -1,12 +1,12 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class GiveMeSpaceMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs
similarity index 87%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs
index 82353c18..1bfe8c47 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/HelloMessageHandler.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class HelloMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs
similarity index 58%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs
index 1b0505b3..59e2fedb 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/IChatMessageHandler.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 public interface IChatMessageHandler
 {
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs
similarity index 76%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs
index 0a5b4f0c..b90e39d5 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/LoveYouChatMessageHandler.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class LoveYouChatMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs
similarity index 77%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs
index 56003e76..9e4676ed 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/NikitaMessageHandler.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class NikitaMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs
similarity index 83%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs
index 90543d7f..ac92ee9d 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SendGiftMessageHandler.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class SendGiftMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs
similarity index 70%
rename from Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs
index 908f9432..6a3ddff9 100644
--- a/Libraries/Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SPTFriend/Commands/SptMessageHandler.cs
@@ -1,10 +1,10 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue.SPTFriend.Commands;
+namespace SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
 
 [Injectable]
 public class SptMessageHandler(
diff --git a/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs
similarity index 88%
rename from Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs
index 852adb17..ff9892ce 100644
--- a/Libraries/Core/Helpers/Dialogue/SptDialogueChatBot.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/Dialogue/SptDialogueChatBot.cs
@@ -1,16 +1,16 @@
-using Core.Helpers.Dialog.Commando;
-using Core.Helpers.Dialogue.SPTFriend.Commands;
-using Core.Models.Eft.Dialog;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils.Callbacks;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers.Dialog.Commando;
+using SPTarkov.Server.Core.Helpers.Dialogue.SPTFriend.Commands;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Callbacks;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers.Dialogue;
+namespace SPTarkov.Server.Core.Helpers.Dialogue;
 
 [Injectable]
 public class SptDialogueChatBot(
diff --git a/Libraries/Core/Helpers/DialogueHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs
similarity index 92%
rename from Libraries/Core/Helpers/DialogueHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs
index aac1433a..fe201c08 100644
--- a/Libraries/Core/Helpers/DialogueHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs
@@ -1,12 +1,12 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class DialogueHelper(
diff --git a/Libraries/Core/Helpers/DurabilityLimitsHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/DurabilityLimitsHelper.cs
similarity index 97%
rename from Libraries/Core/Helpers/DurabilityLimitsHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/DurabilityLimitsHelper.cs
index 9aa3e8ae..5f0404fa 100644
--- a/Libraries/Core/Helpers/DurabilityLimitsHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/DurabilityLimitsHelper.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class DurabilityLimitsHelper(
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/GameEventHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/GameEventHelper.cs
new file mode 100644
index 00000000..fc145d3d
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Helpers/GameEventHelper.cs
@@ -0,0 +1,8 @@
+using SPTarkov.Common.Annotations;
+
+namespace SPTarkov.Server.Core.Helpers;
+
+[Injectable]
+public class GameEventHelper
+{
+}
diff --git a/Libraries/Core/Helpers/HandbookHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HandbookHelper.cs
similarity index 95%
rename from Libraries/Core/Helpers/HandbookHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/HandbookHelper.cs
index 672e2092..328629dc 100644
--- a/Libraries/Core/Helpers/HandbookHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/HandbookHelper.cs
@@ -1,12 +1,12 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable(InjectionType.Singleton)]
 public class HandbookHelper(
diff --git a/Libraries/Core/Helpers/HealthHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs
similarity index 95%
rename from Libraries/Core/Helpers/HealthHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs
index 64e3150a..c1fdc571 100644
--- a/Libraries/Core/Helpers/HealthHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs
@@ -1,16 +1,16 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using BodyPartHealth = Core.Models.Eft.Common.Tables.BodyPartHealth;
-using Vitality = Core.Models.Eft.Profile.Vitality;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using BodyPartHealth = SPTarkov.Server.Core.Models.Eft.Common.Tables.BodyPartHealth;
+using Vitality = SPTarkov.Server.Core.Models.Eft.Profile.Vitality;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class HealthHelper(
diff --git a/Libraries/Core/Helpers/HideoutHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs
similarity index 98%
rename from Libraries/Core/Helpers/HideoutHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs
index e88f2c51..1cb93fd7 100644
--- a/Libraries/Core/Helpers/HideoutHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/HideoutHelper.cs
@@ -1,20 +1,20 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class HideoutHelper(
diff --git a/Libraries/Core/Helpers/HttpServerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/HttpServerHelper.cs
similarity index 90%
rename from Libraries/Core/Helpers/HttpServerHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/HttpServerHelper.cs
index cfb94660..6d282c1b 100644
--- a/Libraries/Core/Helpers/HttpServerHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/HttpServerHelper.cs
@@ -1,8 +1,8 @@
-using Core.Models.Spt.Config;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable(InjectionType.Singleton)]
 public class HttpServerHelper(ConfigServer configServer)
diff --git a/Libraries/Core/Helpers/InRaidHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs
similarity index 96%
rename from Libraries/Core/Helpers/InRaidHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs
index 473db18a..c929001c 100644
--- a/Libraries/Core/Helpers/InRaidHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class InRaidHelper(
diff --git a/Libraries/Core/Helpers/InventoryHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/InventoryHelper.cs
similarity index 98%
rename from Libraries/Core/Helpers/InventoryHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/InventoryHelper.cs
index 11e84236..ed3141a2 100644
--- a/Libraries/Core/Helpers/InventoryHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/InventoryHelper.cs
@@ -1,23 +1,23 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Inventory;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Inventory;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class InventoryHelper(
diff --git a/Libraries/Core/Helpers/ItemHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
similarity index 99%
rename from Libraries/Core/Helpers/ItemHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
index be4d7027..e63f0156 100644
--- a/Libraries/Core/Helpers/ItemHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
@@ -1,16 +1,16 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using Core.Utils.Collections;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class ItemHelper(
@@ -1349,7 +1349,7 @@ public class ItemHelper(
 
     /**
      * Determines if an item is an attachment that is currently attached to its parent item.
-     * 
+     *
      * @param item The item to check.
      * @returns true if the item is attached attachment, otherwise false.
      */
@@ -1362,15 +1362,15 @@ public class ItemHelper(
 
     /**
      * Retrieves the equipment parent item for a given item.
-     * 
+     *
      * This method traverses up the hierarchy of items starting from a given `itemId`, until it finds the equipment
      * parent item. In other words, if you pass it an item id of a suppressor, it will traverse up the muzzle brake,
      * barrel, upper receiver, gun, nested backpack, and finally return the backpack Item that is equipped.
-     * 
+     *
      * It's important to note that traversal is expensive, so this method requires that you pass it a Dictionary of the items
      * to traverse, where the keys are the item IDs and the values are the corresponding Item objects. This alleviates
      * some of the performance concerns, as it allows for quick lookups of items by ID.
-     * 
+     *
      * @param itemId - The unique identifier of the item for which to find the equipment parent.
      * @param itemsMap - A Dictionary containing item IDs mapped to their corresponding Item objects for quick lookup.
      * @returns The Item object representing the equipment parent of the given item, or `null` if no such parent exists.
diff --git a/Libraries/Core/Helpers/ModHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ModHelper.cs
similarity index 91%
rename from Libraries/Core/Helpers/ModHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/ModHelper.cs
index d7cd78c4..d4c87864 100644
--- a/Libraries/Core/Helpers/ModHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/ModHelper.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers
+namespace SPTarkov.Server.Core.Helpers
 {
     [Injectable]
     public class ModHelper
diff --git a/Libraries/Core/Helpers/NotificationSendHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/NotificationSendHelper.cs
similarity index 91%
rename from Libraries/Core/Helpers/NotificationSendHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/NotificationSendHelper.cs
index f92ae7f4..cd61c5b2 100644
--- a/Libraries/Core/Helpers/NotificationSendHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/NotificationSendHelper.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Profile;
-using Core.Models.Eft.Ws;
-using Core.Models.Enums;
-using Core.Servers;
-using Core.Servers.Ws;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Ws;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Servers.Ws;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class NotificationSendHelper(
diff --git a/Libraries/Core/Helpers/NotifierHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/NotifierHelper.cs
similarity index 90%
rename from Libraries/Core/Helpers/NotifierHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/NotifierHelper.cs
index 9905234d..2456826d 100644
--- a/Libraries/Core/Helpers/NotifierHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/NotifierHelper.cs
@@ -1,8 +1,8 @@
-using Core.Models.Eft.Profile;
-using Core.Models.Eft.Ws;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Ws;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable(InjectionType.Singleton)]
 public class NotifierHelper(HttpServerHelper _httpServerHelper)
diff --git a/Libraries/Core/Helpers/PaymentHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PaymentHelper.cs
similarity index 86%
rename from Libraries/Core/Helpers/PaymentHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/PaymentHelper.cs
index 128bb6a2..cdd4ce1f 100644
--- a/Libraries/Core/Helpers/PaymentHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/PaymentHelper.cs
@@ -1,9 +1,9 @@
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class PaymentHelper(ConfigServer _configServer)
diff --git a/Libraries/Core/Helpers/PresetHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs
similarity index 95%
rename from Libraries/Core/Helpers/PresetHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs
index 4c0943e3..fd28fa3d 100644
--- a/Libraries/Core/Helpers/PresetHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common;
-using Core.Models.Enums;
-using Core.Models.Spt.Presets;
-using Core.Services;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Presets;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable(InjectionType.Singleton)]
 public class PresetHelper(
diff --git a/Libraries/Core/Helpers/PrestigeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
similarity index 94%
rename from Libraries/Core/Helpers/PrestigeHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
index c15fa02f..a3746be6 100644
--- a/Libraries/Core/Helpers/PrestigeHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs
@@ -1,14 +1,14 @@
 using System.Text.Json;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Helpers
+namespace SPTarkov.Server.Core.Helpers
 {
     [Injectable]
     public class PrestigeHelper
diff --git a/Libraries/Core/Helpers/ProbabilityHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ProbabilityHelper.cs
similarity index 78%
rename from Libraries/Core/Helpers/ProbabilityHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/ProbabilityHelper.cs
index 95229d4c..3d960dcb 100644
--- a/Libraries/Core/Helpers/ProbabilityHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/ProbabilityHelper.cs
@@ -1,8 +1,8 @@
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class ProbabilityHelper(
diff --git a/Libraries/Core/Helpers/ProfileHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs
similarity index 97%
rename from Libraries/Core/Helpers/ProfileHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs
index 61411611..b6f36bd2 100644
--- a/Libraries/Core/Helpers/ProfileHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/ProfileHelper.cs
@@ -1,17 +1,17 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class ProfileHelper(
diff --git a/Libraries/Core/Helpers/QuestConditionHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/QuestConditionHelper.cs
similarity index 93%
rename from Libraries/Core/Helpers/QuestConditionHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/QuestConditionHelper.cs
index a12afc75..31029d13 100644
--- a/Libraries/Core/Helpers/QuestConditionHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/QuestConditionHelper.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Common.Tables;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class QuestConditionHelper
diff --git a/Libraries/Core/Helpers/QuestHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs
similarity index 98%
rename from Libraries/Core/Helpers/QuestHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs
index 705986b7..eb7ae2f5 100644
--- a/Libraries/Core/Helpers/QuestHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs
@@ -1,20 +1,20 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Quests;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class QuestHelper(
@@ -123,7 +123,7 @@ public class QuestHelper(
     /// <param name="profileSkill">the skill experience is being added to</param>
     /// <param name="progressAmount">the amount of experience being added to the skill</param>
     /// <returns>the adjusted skill progress gain</returns>
-    public int AdjustSkillExpForLowLevels(Common profileSkill, int progressAmount)
+    public int AdjustSkillExpForLowLevels(Models.Eft.Common.Tables.Common profileSkill, int progressAmount)
     {
         var currentLevel = Math.Floor((double) (profileSkill.Progress / 100));
 
diff --git a/Libraries/Core/Helpers/QuestRewardHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/QuestRewardHelper.cs
similarity index 91%
rename from Libraries/Core/Helpers/QuestRewardHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/QuestRewardHelper.cs
index f4b5c26e..68bfa714 100644
--- a/Libraries/Core/Helpers/QuestRewardHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/QuestRewardHelper.cs
@@ -1,17 +1,17 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class QuestRewardHelper(
diff --git a/Libraries/Core/Helpers/RagfairHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairHelper.cs
similarity index 92%
rename from Libraries/Core/Helpers/RagfairHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RagfairHelper.cs
index 38caf8c3..edbe0927 100644
--- a/Libraries/Core/Helpers/RagfairHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairHelper.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Services;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RagfairHelper(
diff --git a/Libraries/Core/Helpers/RagfairOfferHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs
similarity index 98%
rename from Libraries/Core/Helpers/RagfairOfferHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs
index 24b39132..ba999e96 100644
--- a/Libraries/Core/Helpers/RagfairOfferHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs
@@ -1,19 +1,19 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RagfairOfferHelper(
diff --git a/Libraries/Core/Helpers/RagfairSellHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs
similarity index 93%
rename from Libraries/Core/Helpers/RagfairSellHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs
index 3841786f..ab2e3ce5 100644
--- a/Libraries/Core/Helpers/RagfairSellHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSellHelper.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Ragfair;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RagfairSellHelper(
diff --git a/Libraries/Core/Helpers/RagfairServerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs
similarity index 94%
rename from Libraries/Core/Helpers/RagfairServerHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs
index 0c67b7d1..0a99ca09 100644
--- a/Libraries/Core/Helpers/RagfairServerHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairServerHelper.cs
@@ -1,14 +1,14 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RagfairServerHelper(
diff --git a/Libraries/Core/Helpers/RagfairSortHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSortHelper.cs
similarity index 93%
rename from Libraries/Core/Helpers/RagfairSortHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RagfairSortHelper.cs
index f81d0180..d25b6d45 100644
--- a/Libraries/Core/Helpers/RagfairSortHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairSortHelper.cs
@@ -1,9 +1,9 @@
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RagfairSortHelper(
diff --git a/Libraries/Core/Helpers/RepairHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RepairHelper.cs
similarity index 93%
rename from Libraries/Core/Helpers/RepairHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RepairHelper.cs
index a92a7117..ea84c1c8 100644
--- a/Libraries/Core/Helpers/RepairHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RepairHelper.cs
@@ -1,15 +1,15 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RepairHelper(
diff --git a/Libraries/Core/Helpers/RepeatableQuestHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RepeatableQuestHelper.cs
similarity index 81%
rename from Libraries/Core/Helpers/RepeatableQuestHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RepeatableQuestHelper.cs
index ea579552..23d44801 100644
--- a/Libraries/Core/Helpers/RepeatableQuestHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RepeatableQuestHelper.cs
@@ -1,8 +1,8 @@
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RepeatableQuestHelper(
diff --git a/Libraries/Core/Helpers/RewardHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs
similarity index 97%
rename from Libraries/Core/Helpers/RewardHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs
index a701dc06..e124c905 100644
--- a/Libraries/Core/Helpers/RewardHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs
@@ -1,16 +1,16 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class RewardHelper(
@@ -400,7 +400,7 @@ public class RewardHelper(
     {
         // Add achievement id to profile with timestamp it was unlocked
         fullProfile.CharacterData.PmcData.Achievements.TryAdd(achievementId, _timeUtil.GetTimeStamp());
-        
+
 
         // Check for any customisation unlocks
         var achievementDataDb = _databaseService
diff --git a/Libraries/Core/Helpers/SecureContainerHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/SecureContainerHelper.cs
similarity index 87%
rename from Libraries/Core/Helpers/SecureContainerHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/SecureContainerHelper.cs
index bf95e26b..c01aebff 100644
--- a/Libraries/Core/Helpers/SecureContainerHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/SecureContainerHelper.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Common.Tables;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class SecureContainerHelper(ItemHelper _itemHelper)
diff --git a/Libraries/Core/Helpers/TradeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
similarity index 96%
rename from Libraries/Core/Helpers/TradeHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
index 7bafad6a..6b55fe3d 100644
--- a/Libraries/Core/Helpers/TradeHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
@@ -1,21 +1,21 @@
 using System.Text.RegularExpressions;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class TradeHelper(
diff --git a/Libraries/Core/Helpers/TraderAssortHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs
similarity index 94%
rename from Libraries/Core/Helpers/TraderAssortHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs
index 0d6dec22..06fb3621 100644
--- a/Libraries/Core/Helpers/TraderAssortHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/TraderAssortHelper.cs
@@ -1,16 +1,16 @@
-using Core.Generators;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable(InjectionType.Singleton)]
 public class TraderAssortHelper(
diff --git a/Libraries/Core/Helpers/TraderHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs
similarity index 97%
rename from Libraries/Core/Helpers/TraderHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs
index 34c7fa39..2fd55db9 100644
--- a/Libraries/Core/Helpers/TraderHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/TraderHelper.cs
@@ -1,19 +1,19 @@
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class TraderHelper(
diff --git a/Libraries/Core/Helpers/UtilityHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/UtilityHelper.cs
similarity index 78%
rename from Libraries/Core/Helpers/UtilityHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/UtilityHelper.cs
index e30f1d9c..7936ee4e 100644
--- a/Libraries/Core/Helpers/UtilityHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/UtilityHelper.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class UtilityHelper
diff --git a/Libraries/Core/Helpers/WeatherHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/WeatherHelper.cs
similarity index 86%
rename from Libraries/Core/Helpers/WeatherHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/WeatherHelper.cs
index edb60a81..4d6658a5 100644
--- a/Libraries/Core/Helpers/WeatherHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/WeatherHelper.cs
@@ -1,11 +1,11 @@
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class WeatherHelper(
diff --git a/Libraries/Core/Helpers/WeightedRandomHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/WeightedRandomHelper.cs
similarity index 96%
rename from Libraries/Core/Helpers/WeightedRandomHelper.cs
rename to Libraries/SPTarkov.Server.Core/Helpers/WeightedRandomHelper.cs
index d0def6b8..3e3313b6 100644
--- a/Libraries/Core/Helpers/WeightedRandomHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/WeightedRandomHelper.cs
@@ -1,9 +1,9 @@
-using Core.Models.Spt.Helper;
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Spt.Helper;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Helpers;
+namespace SPTarkov.Server.Core.Helpers;
 
 [Injectable]
 public class WeightedRandomHelper(
diff --git a/Libraries/Core/Loaders/BundleLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/BundleLoader.cs
similarity index 95%
rename from Libraries/Core/Loaders/BundleLoader.cs
rename to Libraries/SPTarkov.Server.Core/Loaders/BundleLoader.cs
index 3940090e..23734028 100644
--- a/Libraries/Core/Loaders/BundleLoader.cs
+++ b/Libraries/SPTarkov.Server.Core/Loaders/BundleLoader.cs
@@ -1,11 +1,11 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Loaders
+namespace SPTarkov.Server.Core.Loaders
 {
     /*
     {
diff --git a/Libraries/Core/Loaders/PostDBModLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs
similarity index 75%
rename from Libraries/Core/Loaders/PostDBModLoader.cs
rename to Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs
index d7954050..247c1538 100644
--- a/Libraries/Core/Loaders/PostDBModLoader.cs
+++ b/Libraries/SPTarkov.Server.Core/Loaders/PostDBModLoader.cs
@@ -1,9 +1,9 @@
-using Core.DI;
-using Core.Models.External;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.External;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Loaders;
+namespace SPTarkov.Server.Core.Loaders;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.PostDBModLoader)]
 public class PostDBModLoader(
diff --git a/Libraries/Core/Loaders/PostSptModLoader.cs b/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs
similarity index 75%
rename from Libraries/Core/Loaders/PostSptModLoader.cs
rename to Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs
index 6c105296..44a1c2f4 100644
--- a/Libraries/Core/Loaders/PostSptModLoader.cs
+++ b/Libraries/SPTarkov.Server.Core/Loaders/PostSptModLoader.cs
@@ -1,10 +1,10 @@
-using Core.DI;
-using Core.Models.External;
-using Core.Models.Utils;
-using Server;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.External;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Loaders;
+namespace SPTarkov.Server.Core.Loaders;
 
 [Injectable(InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.PostSptModLoader)]
 public class PostSptModLoader(
diff --git a/Libraries/Core/Models/Common/IdWithCount.cs b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs
similarity index 90%
rename from Libraries/Core/Models/Common/IdWithCount.cs
rename to Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs
index ff909791..78e6bf6e 100644
--- a/Libraries/Core/Models/Common/IdWithCount.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Common;
+namespace SPTarkov.Server.Core.Models.Common;
 
 public record IdWithCount
 {
diff --git a/Libraries/Core/Models/Common/MinMax.cs b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs
similarity index 91%
rename from Libraries/Core/Models/Common/MinMax.cs
rename to Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs
index 91a4c8ee..a5feaa06 100644
--- a/Libraries/Core/Models/Common/MinMax.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs
@@ -1,7 +1,7 @@
 using System.Numerics;
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Common;
+namespace SPTarkov.Server.Core.Models.Common;
 
 public record MinMax<T> where T : IMinMaxValue<T>
 {
diff --git a/Libraries/Core/Models/Eft/Bot/GenerateBotsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Bot/GenerateBotsRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs
index 133a6c52..d51b637d 100644
--- a/Libraries/Core/Models/Eft/Bot/GenerateBotsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Bot;
+namespace SPTarkov.Server.Core.Models.Eft.Bot;
 
 public record GenerateBotsRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Bot/RandomisedBotLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
index ff0321a6..99b332fd 100644
--- a/Libraries/Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Bot;
+namespace SPTarkov.Server.Core.Models.Eft.Bot;
 
 public record RandomisedBotLevelResult
 {
diff --git a/Libraries/Core/Models/Eft/Builds/SetMagazineRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
similarity index 83%
rename from Libraries/Core/Models/Eft/Builds/SetMagazineRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
index b5c7d222..ba8aa8f5 100644
--- a/Libraries/Core/Models/Eft/Builds/SetMagazineRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Profile;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Builds;
+namespace SPTarkov.Server.Core.Models.Eft.Builds;
 
 public record SetMagazineRequest : IRequestData
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs
new file mode 100644
index 00000000..86500302
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs
@@ -0,0 +1,7 @@
+using SPTarkov.Server.Core.Models.Utils;
+
+namespace SPTarkov.Server.Core.Models.Eft.Common;
+
+public record EmptyRequestData : IRequestData
+{
+}
diff --git a/Libraries/Core/Models/Eft/Common/Globals.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs
similarity index 99%
rename from Libraries/Core/Models/Eft/Common/Globals.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs
index f8fa6549..281e8def 100644
--- a/Libraries/Core/Models/Eft/Common/Globals.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Hideout;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record Globals
 {
diff --git a/Libraries/Core/Models/Eft/Common/Location.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Common/Location.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs
index 92fc33db..ff5e2f4f 100644
--- a/Libraries/Core/Models/Eft/Common/Location.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Utils.Json;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Utils.Json;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record Location
 {
diff --git a/Libraries/Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs
similarity index 99%
rename from Libraries/Core/Models/Eft/Common/LocationBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs
index 75c745e3..69bea739 100644
--- a/Libraries/Core/Models/Eft/Common/LocationBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs
@@ -1,10 +1,10 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Enums;
-using Core.Utils.Json;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record LocationBase
 {
diff --git a/Libraries/Core/Models/Eft/Common/LooseLoot.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Common/LooseLoot.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
index 8d1ed372..bfd2f4ec 100644
--- a/Libraries/Core/Models/Eft/Common/LooseLoot.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record LooseLoot
 {
diff --git a/Libraries/Core/Models/Eft/Common/MetricsTableData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs
similarity index 92%
rename from Libraries/Core/Models/Eft/Common/MetricsTableData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs
index 50988c9f..a44b16e3 100644
--- a/Libraries/Core/Models/Eft/Common/MetricsTableData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record MetricsTableData
 {
diff --git a/Libraries/Core/Models/Eft/Common/PmcData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs
similarity index 83%
rename from Libraries/Core/Models/Eft/Common/PmcData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs
index a31a327c..5118d7b3 100644
--- a/Libraries/Core/Models/Eft/Common/PmcData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record PmcData : BotBase
 {
diff --git a/Libraries/Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
similarity index 91%
rename from Libraries/Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
index f94174a0..770b9e89 100644
--- a/Libraries/Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Request;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Request;
 
 public record BaseInteractionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Common/Request/UIDRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs
similarity index 64%
rename from Libraries/Core/Models/Eft/Common/Request/UIDRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs
index 3066ea8e..2e06d5ab 100644
--- a/Libraries/Core/Models/Eft/Common/Request/UIDRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Common.Request;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Request;
 
 public record UIDRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Achievement.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Common/Tables/Achievement.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs
index 05946d86..bfb8d914 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Achievement.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record Achievement
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
similarity index 99%
rename from Libraries/Core/Models/Eft/Common/Tables/BotBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
index 0fb697fd..f25a510a 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
@@ -1,11 +1,11 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Notes;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Utils.Json;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Eft.Notes;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record BotBase
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/BotCore.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs
similarity index 99%
rename from Libraries/Core/Models/Eft/Common/Tables/BotCore.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs
index c24477f0..af6e48cc 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/BotCore.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record BotCore
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/BotType.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Common/Tables/BotType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs
index 08af098c..a18a4e1c 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/BotType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Enums;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record BotType
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/CustomisationStorage.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs
similarity index 96%
rename from Libraries/Core/Models/Eft/Common/Tables/CustomisationStorage.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs
index 9e874d87..7adaadb5 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/CustomisationStorage.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record CustomisationStorage
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/CustomizationItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Common/Tables/CustomizationItem.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
index fb76cd90..17584a45 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/CustomizationItem.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record CustomizationItem
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs
similarity index 100%
rename from Libraries/Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs
diff --git a/Libraries/Core/Models/Eft/Common/Tables/HandbookBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs
similarity index 95%
rename from Libraries/Core/Models/Eft/Common/Tables/HandbookBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs
index 71e35251..d1d39062 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/HandbookBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record HandbookBase
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Item.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Common/Tables/Item.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs
index 6fb57c6b..a1c08951 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Item.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record Item
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/LocationServices.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Common/Tables/LocationServices.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs
index cf1a1a22..0440f8f8 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/LocationServices.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record LocationServices
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/LocationsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs
similarity index 91%
rename from Libraries/Core/Models/Eft/Common/Tables/LocationsBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs
index c2f5a4fc..8f2a5e7d 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/LocationsBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record LocationsBase
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
similarity index 84%
rename from Libraries/Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
index 54643499..0c543da1 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record LocationsGenerateAllResponse
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Match.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Common/Tables/Match.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs
index b784c3fa..e54b8ac6 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Match.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record Match
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Prestige.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Common/Tables/Prestige.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs
index 523b6caf..889a2b2b 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Prestige.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record Prestige
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/ProfileTemplate.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Common/Tables/ProfileTemplate.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs
index 9c747d9c..b05c43d4 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/ProfileTemplate.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record ProfileTemplates
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Common/Tables/Quest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs
index a9c81fe1..26b8319d 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Quest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Utils.Json;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record Quest
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/RepeatableQuests.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs
similarity index 99%
rename from Libraries/Core/Models/Eft/Common/Tables/RepeatableQuests.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs
index 1f6f408e..caeb35d3 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/RepeatableQuests.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record RepeatableQuest : Quest
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Reward.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
similarity index 95%
rename from Libraries/Core/Models/Eft/Common/Tables/Reward.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
index 3e6f7986..a1634eb2 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Reward.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record Reward
 {
diff --git a/Libraries/Core/Models/Eft/Common/Tables/TemplateItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs
similarity index 99%
rename from Libraries/Core/Models/Eft/Common/Tables/TemplateItem.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs
index 26dae13b..e2ae1212 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/TemplateItem.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs
@@ -1,10 +1,10 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record TemplateItem
 {
@@ -3376,8 +3376,8 @@ public record Props
         set;
     }
 
-    //[JsonExtensionData] 
-    //public Dictionary<string, object> OtherProperties { get; set; } 
+    //[JsonExtensionData]
+    //public Dictionary<string, object> OtherProperties { get; set; }
 }
 
 public record WeaponRecoilSettings
diff --git a/Libraries/Core/Models/Eft/Common/Tables/Trader.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Common/Tables/Trader.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs
index 5f235015..4683166b 100644
--- a/Libraries/Core/Models/Eft/Common/Tables/Trader.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Spt.Services;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Services;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Eft.Common.Tables;
+namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
 public record Trader
 {
diff --git a/Libraries/Core/Models/Eft/Common/XY.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs
similarity index 82%
rename from Libraries/Core/Models/Eft/Common/XY.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs
index 9d6e4013..9181854e 100644
--- a/Libraries/Core/Models/Eft/Common/XY.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record XY
 {
diff --git a/Libraries/Core/Models/Eft/Common/XYZ.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/Common/XYZ.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs
index 84722c22..d01a60bf 100644
--- a/Libraries/Core/Models/Eft/Common/XYZ.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Common;
+namespace SPTarkov.Server.Core.Models.Eft.Common;
 
 public record XYZ
 {
diff --git a/Libraries/Core/Models/Eft/Customization/BuyClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Customization/BuyClothingRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs
index 61256349..c3dd4a70 100644
--- a/Libraries/Core/Models/Eft/Customization/BuyClothingRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Customization;
+namespace SPTarkov.Server.Core.Models.Eft.Customization;
 
 public record BuyClothingRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Customization/CustomizationSetRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs
similarity index 84%
rename from Libraries/Core/Models/Eft/Customization/CustomizationSetRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs
index 9e9a2852..1f738dcf 100644
--- a/Libraries/Core/Models/Eft/Customization/CustomizationSetRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Customization;
+namespace SPTarkov.Server.Core.Models.Eft.Customization;
 
 public record CustomizationSetRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs
new file mode 100644
index 00000000..4a572f28
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs
@@ -0,0 +1,5 @@
+namespace SPTarkov.Server.Core.Models.Eft.Customization;
+
+public record WearClothingRequestData
+{
+}
diff --git a/Libraries/Core/Models/Eft/Dialog/AcceptFriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
similarity index 80%
rename from Libraries/Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
index e9256dfd..bf8305b5 100644
--- a/Libraries/Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record AcceptFriendRequestData : BaseFriendRequest
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
index ac33aaf6..e986bd62 100644
--- a/Libraries/Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record AddUserGroupMailRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
index 7fa8c413..af7558a2 100644
--- a/Libraries/Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record ChangeGroupMailOwnerRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/ChatServer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs
similarity index 96%
rename from Libraries/Core/Models/Eft/Dialog/ChatServer.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs
index cab520b6..aed655b6 100644
--- a/Libraries/Core/Models/Eft/Dialog/ChatServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record ChatServer
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/ClearMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
index 81aea926..581c2266 100644
--- a/Libraries/Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record ClearMailMessageRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/CreateGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
index f1d04317..534e7135 100644
--- a/Libraries/Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record CreateGroupMailRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/DeleteFriendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Dialog/DeleteFriendRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs
index 66eb0edb..19366197 100644
--- a/Libraries/Core/Models/Eft/Dialog/DeleteFriendRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record DeleteFriendRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/FriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs
similarity index 84%
rename from Libraries/Core/Models/Eft/Dialog/FriendRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs
index b22abe6b..9ad583b1 100644
--- a/Libraries/Core/Models/Eft/Dialog/FriendRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record FriendRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/FriendRequestSendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
index 3bc053da..33ce9f07 100644
--- a/Libraries/Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record FriendRequestSendResponse
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
index 87096f04..eb895758 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetAllAttachmentsRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
similarity index 82%
rename from Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
index b643a3af..f358c120 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetAllAttachmentsResponse
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetChatServerListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
index 3f512914..0adfccd7 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetChatServerListRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetFriendListDataResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
index a9b09ed7..bf3dc4b6 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetFriendListDataResponse
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
index 6316f16b..1ee73d27 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetMailDialogInfoRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
index 43430177..26fe7fb8 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetMailDialogListRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
index 3919cf53..972d29a3 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetMailDialogViewRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
similarity index 82%
rename from Libraries/Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
index e61dd194..cee3bd1b 100644
--- a/Libraries/Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record GetMailDialogViewResponseData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/PinDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Dialog/PinDialogRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs
index 23c0a0f0..0bee88e3 100644
--- a/Libraries/Core/Models/Eft/Dialog/PinDialogRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record PinDialogRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/RemoveDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
index 0239d578..3f450232 100644
--- a/Libraries/Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record RemoveDialogRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
index a5115b80..02ee835e 100644
--- a/Libraries/Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record RemoveMailMessageRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
index f4d85d64..af074954 100644
--- a/Libraries/Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record RemoveUserGroupMailRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/SendMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs
similarity index 78%
rename from Libraries/Core/Models/Eft/Dialog/SendMessageRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs
index 06f991b4..2d9aaf17 100644
--- a/Libraries/Core/Models/Eft/Dialog/SendMessageRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record SendMessageRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Dialog/SetDialogReadRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
index 9c4de057..6e9a73da 100644
--- a/Libraries/Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Dialog;
+namespace SPTarkov.Server.Core.Models.Eft.Dialog;
 
 public record SetDialogReadRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Game/CheckVersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Game/CheckVersionResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs
index 76388392..869be752 100644
--- a/Libraries/Core/Models/Eft/Game/CheckVersionResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record CheckVersionResponse
 {
diff --git a/Libraries/Core/Models/Eft/Game/CurrentGroupResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Game/CurrentGroupResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs
index 45e86447..dda034c8 100644
--- a/Libraries/Core/Models/Eft/Game/CurrentGroupResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record CurrentGroupResponse
 {
diff --git a/Libraries/Core/Models/Eft/Game/GameConfigResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Game/GameConfigResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs
index 8a56cd8e..4cc80109 100644
--- a/Libraries/Core/Models/Eft/Game/GameConfigResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GameConfigResponse
 {
diff --git a/Libraries/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
similarity index 67%
rename from Libraries/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
index d09aa178..e86be86c 100644
--- a/Libraries/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GameEmptyCrcRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Game/GameKeepAliveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Game/GameKeepAliveResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs
index 56d7f68f..9aa4692c 100644
--- a/Libraries/Core/Models/Eft/Game/GameKeepAliveResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GameKeepAliveResponse
 {
diff --git a/Libraries/Core/Models/Eft/Game/GameLogoutResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Game/GameLogoutResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs
index b18adcd7..f5f9746d 100644
--- a/Libraries/Core/Models/Eft/Game/GameLogoutResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GameLogoutResponseData
 {
diff --git a/Libraries/Core/Models/Eft/Game/GameModeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Game/GameModeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs
index ecbc1773..7b6631c5 100644
--- a/Libraries/Core/Models/Eft/Game/GameModeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GameModeRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Game/GameModeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Game/GameModeResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs
index 6a5d6380..85942769 100644
--- a/Libraries/Core/Models/Eft/Game/GameModeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public enum SessionMode
 {
diff --git a/Libraries/Core/Models/Eft/Game/GameStartResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs
similarity index 78%
rename from Libraries/Core/Models/Eft/Game/GameStartResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs
index 3284686a..4c00a70d 100644
--- a/Libraries/Core/Models/Eft/Game/GameStartResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GameStartResponse
 {
diff --git a/Libraries/Core/Models/Eft/Game/GetItemPricesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs
similarity index 90%
rename from Libraries/Core/Models/Eft/Game/GetItemPricesResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs
index 2966d3f5..9d4cba4e 100644
--- a/Libraries/Core/Models/Eft/Game/GetItemPricesResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GetItemPricesResponse
 {
diff --git a/Libraries/Core/Models/Eft/Game/GetRaidTimeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Game/GetRaidTimeRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs
index ed04e3e9..8141d794 100644
--- a/Libraries/Core/Models/Eft/Game/GetRaidTimeRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GetRaidTimeRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Game/GetRaidTimeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Game/GetRaidTimeResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs
index 88b1ee8f..85f1900f 100644
--- a/Libraries/Core/Models/Eft/Game/GetRaidTimeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record GetRaidTimeResponse
 {
diff --git a/Libraries/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
similarity index 89%
rename from Libraries/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
index 5ddeffb2..2376830c 100644
--- a/Libraries/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record SendSurveyOpinionRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Game/ServerDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs
similarity index 84%
rename from Libraries/Core/Models/Eft/Game/ServerDetails.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs
index 8c73df1c..2218a999 100644
--- a/Libraries/Core/Models/Eft/Game/ServerDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record ServerDetails
 {
diff --git a/Libraries/Core/Models/Eft/Game/SurveyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Game/SurveyResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs
index 50d9a2c8..11c14a48 100644
--- a/Libraries/Core/Models/Eft/Game/SurveyResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record SurveyResponseData
 {
diff --git a/Libraries/Core/Models/Eft/Game/VersionValidateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs
similarity index 90%
rename from Libraries/Core/Models/Eft/Game/VersionValidateRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs
index 5e9b136c..4eb6a8e2 100644
--- a/Libraries/Core/Models/Eft/Game/VersionValidateRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Game;
+namespace SPTarkov.Server.Core.Models.Eft.Game;
 
 public record VersionValidateRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Health/Effect.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/Effect.cs
similarity index 70%
rename from Libraries/Core/Models/Eft/Health/Effect.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Health/Effect.cs
index c134ed7f..3e18a739 100644
--- a/Libraries/Core/Models/Eft/Health/Effect.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/Effect.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Eft.Health;
+namespace SPTarkov.Server.Core.Models.Eft.Health;
 
 public enum Effect
 {
diff --git a/Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs
index 77a37202..8d5f8f7a 100644
--- a/Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Health;
+namespace SPTarkov.Server.Core.Models.Eft.Health;
 
 public record HealthTreatmentRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs
index bfbb1933..728ecea5 100644
--- a/Libraries/Core/Models/Eft/Health/OffraidEatRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Health;
+namespace SPTarkov.Server.Core.Models.Eft.Health;
 
 public record OffraidEatRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs
index 839aa100..5785d960 100644
--- a/Libraries/Core/Models/Eft/Health/OffraidHealRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Health;
+namespace SPTarkov.Server.Core.Models.Eft.Health;
 
 public record OffraidHealRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Health/SyncHealthRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Health/SyncHealthRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs
index 048adcee..0de8414d 100644
--- a/Libraries/Core/Models/Eft/Health/SyncHealthRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Health;
+namespace SPTarkov.Server.Core.Models.Eft.Health;
 
 public record SyncHealthRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Health/WorkoutData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
similarity index 74%
rename from Libraries/Core/Models/Eft/Health/WorkoutData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
index 857368d9..a857fdcf 100644
--- a/Libraries/Core/Models/Eft/Health/WorkoutData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Utils;
-using Mastering = Core.Models.Eft.Common.Mastering;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Utils;
+using Mastering = SPTarkov.Server.Core.Models.Eft.Common.Mastering;
 
-namespace Core.Models.Eft.Health;
+namespace SPTarkov.Server.Core.Models.Eft.Health;
 
 public class WorkoutData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
index 785aa064..332f277d 100644
--- a/Libraries/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HandleQTEEventRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutArea.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Hideout/HideoutArea.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs
index 892873c0..cc7ba41a 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutArea.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutArea
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs
index 51a61cb0..601396ed 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutCancelProductionRequestData : BaseInteractionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
similarity index 70%
rename from Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
index b6d5699b..a56f0187 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutCircleOfCultistProductionStartRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
index bd5a78e8..6cada336 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutContinuousProductionStartRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCustomisation.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs
similarity index 94%
rename from Libraries/Core/Models/Eft/Hideout/HideoutCustomisation.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs
index 165e64d2..90bdbb98 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutCustomisation.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutCustomisation
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
index 98a4d3df..34c176da 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutCustomizationApplyRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
similarity index 77%
rename from Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
index 59f4f76b..75b24770 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutCustomizationSetMannequinPoseRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
index 5c40a7bf..7be7f9b1 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutDeleteProductionRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
index fa5415dd..0556887a 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Inventory;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutImproveAreaRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs
similarity index 96%
rename from Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs
index 7db175de..0fb5e73e 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutProductionData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
similarity index 71%
rename from Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
index b3491afc..02d79eae 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Inventory;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutPutItemInRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
index 8e5779ee..9e4f6a59 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutScavCaseStartRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutSettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Hideout/HideoutSettingsBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs
index b9e25b96..e1cc79c7 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutSettingsBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutSettingsBase
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
index 8d77b84a..0fe61279 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutSingleProductionStartRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
index 1c05d260..19477ac2 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutTakeItemOutRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
index 3050be10..fdc38b36 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutTakeProductionRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
index 00d30cd1..0f5f43dc 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutToggleAreaRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
similarity index 70%
rename from Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
index 1262a302..949bde47 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutUpgradeCompleteRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
index 6196dcbc..f92ad6e6 100644
--- a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Inventory;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record HideoutUpgradeRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/QteData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Hideout/QteData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs
index e6aad743..a48df035 100644
--- a/Libraries/Core/Models/Eft/Hideout/QteData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Health;
-using Core.Models.Enums;
-using Core.Models.Enums.Hideout;
+using SPTarkov.Server.Core.Models.Eft.Health;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums.Hideout;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record QteData
 {
diff --git a/Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
index d8b7f24d..d0b76187 100644
--- a/Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Hideout;
+namespace SPTarkov.Server.Core.Models.Eft.Hideout;
 
 public record RecordShootingRangePoints : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
index 2fb2e9ff..6070e5e0 100644
--- a/Libraries/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.HttpResponse;
+namespace SPTarkov.Server.Core.Models.Eft.HttpResponse;
 
 public record GetBodyResponseData<T>
 {
diff --git a/Libraries/Core/Models/Eft/HttpResponse/NullResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/HttpResponse/NullResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs
index beae5e72..8ba61c6e 100644
--- a/Libraries/Core/Models/Eft/HttpResponse/NullResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.HttpResponse;
+namespace SPTarkov.Server.Core.Models.Eft.HttpResponse;
 
 public record NullResponseData
 {
diff --git a/Libraries/Core/Models/Eft/InRaid/InsuredItemsData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs
similarity index 92%
rename from Libraries/Core/Models/Eft/InRaid/InsuredItemsData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs
index c89ccddb..f5380673 100644
--- a/Libraries/Core/Models/Eft/InRaid/InsuredItemsData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.InRaid;
+namespace SPTarkov.Server.Core.Models.Eft.InRaid;
 
 public record InsuredItemsData
 {
diff --git a/Libraries/Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
similarity index 73%
rename from Libraries/Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
index 4485419a..763a5474 100644
--- a/Libraries/Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.InRaid;
+namespace SPTarkov.Server.Core.Models.Eft.InRaid;
 
 public record ItemDeliveryRequestData
 {
diff --git a/Libraries/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
index e4f6064b..6fedab44 100644
--- a/Libraries/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.InRaid;
+namespace SPTarkov.Server.Core.Models.Eft.InRaid;
 
 public record RegisterPlayerRequestData : IRequestData
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ScavSaveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ScavSaveRequestData.cs
new file mode 100644
index 00000000..9b6a39fc
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ScavSaveRequestData.cs
@@ -0,0 +1,8 @@
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Utils;
+
+namespace SPTarkov.Server.Core.Models.Eft.InRaid;
+
+public record ScavSaveRequestData : PostRaidPmcData, IRequestData
+{
+}
diff --git a/Libraries/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
index b68ab59e..23f94505 100644
--- a/Libraries/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Insurance;
+namespace SPTarkov.Server.Core.Models.Eft.Insurance;
 
 public record GetInsuranceCostRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs
similarity index 63%
rename from Libraries/Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs
index 2dc75c2e..933c34d9 100644
--- a/Libraries/Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Eft.Insurance;
+namespace SPTarkov.Server.Core.Models.Eft.Insurance;
 
 public class GetInsuranceCostResponseData : Dictionary<string, Dictionary<string, double>>
 {
diff --git a/Libraries/Core/Models/Eft/Insurance/InsureRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Insurance/InsureRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs
index 15f57665..47e66650 100644
--- a/Libraries/Core/Models/Eft/Insurance/InsureRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Insurance;
+namespace SPTarkov.Server.Core.Models.Eft.Insurance;
 
 public record InsureRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs
index 41d2aee5..40bc9dc5 100644
--- a/Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record AddItemDirectRequest
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/AddItemRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs
similarity index 92%
rename from Libraries/Core/Models/Eft/Inventory/AddItemRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs
index f31c0691..ad38660e 100644
--- a/Libraries/Core/Models/Eft/Inventory/AddItemRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record AddItemRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/AddItemTempObject.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Inventory/AddItemTempObject.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs
index 55f279cb..2acab7f1 100644
--- a/Libraries/Core/Models/Eft/Inventory/AddItemTempObject.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record AddItemTempObject
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/AddItemsDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
index 221fedbf..f67b11ac 100644
--- a/Libraries/Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record AddItemsDirectRequest
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryAddRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/InventoryAddRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs
index ad036402..088587fc 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryAddRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryAddRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
index 4f60795e..15106419 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public abstract record InventoryBaseActionRequestData : BaseInteractionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryBindRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/InventoryBindRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs
index 3a17dc27..edac6228 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryBindRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryBindRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
index 230cddb6..b0a13221 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryCreateMarkerRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
index 929c6f70..a3f36a5e 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryDeleteMarkerRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
similarity index 82%
rename from Libraries/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
index 7af84934..687c9ed4 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryEditMarkerRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
similarity index 80%
rename from Libraries/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
index 81f55fe8..fac5409f 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryExamineRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
index 7f215fc5..b3ae4949 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryFoldRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
index 04546243..61f677cb 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryMergeRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
similarity index 84%
rename from Libraries/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
index b82d9989..43c7c6cb 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryMoveRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
similarity index 80%
rename from Libraries/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
index dd00798c..512d7ee9 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
similarity index 80%
rename from Libraries/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
index 2c6d20df..19f99b69 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryRemoveRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventorySortRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Inventory/InventorySortRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs
index f0db994d..7b2e9b7d 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventorySortRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventorySortRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventorySplitRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Inventory/InventorySplitRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs
index 8c5e5426..326bbb81 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventorySplitRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventorySplitRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventorySwapRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/Inventory/InventorySwapRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs
index b415a232..06f8517b 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventorySwapRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventorySwapRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryTagRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Inventory/InventoryTagRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs
index 582b4945..1af1260a 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryTagRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryTagRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
index d85f6255..ebc0b53a 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryToggleRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
index ddd2d805..220d594e 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryTransferRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
index 1e3cfa67..485c4b3c 100644
--- a/Libraries/Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record InventoryUnbindRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
index ce1881fa..8c464a65 100644
--- a/Libraries/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record OpenRandomLootContainerRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
similarity index 82%
rename from Libraries/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
index 36c2cd85..9f1dae03 100644
--- a/Libraries/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record PinOrLockItemRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
similarity index 90%
rename from Libraries/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
index 43f913f8..73fbc9f1 100644
--- a/Libraries/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record RedeemProfileRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Inventory/SetFavoriteItems.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs
similarity index 85%
rename from Libraries/Core/Models/Eft/Inventory/SetFavoriteItems.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs
index d1f9af94..d94bd70d 100644
--- a/Libraries/Core/Models/Eft/Inventory/SetFavoriteItems.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Inventory;
+namespace SPTarkov.Server.Core.Models.Eft.Inventory;
 
 public record SetFavoriteItems : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
index d16acce7..8b54e7e4 100644
--- a/Libraries/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.ItemEvent;
+namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 
 public record EmptyItemEventRouterResponse : ItemEventRouterBase
 {
diff --git a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
similarity index 96%
rename from Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
index ffbe0ed5..976b5e4d 100644
--- a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.ItemEvent;
+namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 
 public record ItemEventRouterBase
 {
diff --git a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
similarity index 91%
rename from Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
index 22b57afc..0afaa3f9 100644
--- a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.ItemEvent;
+namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 
 public record ItemEventRouterRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
index c81ed6a2..2963ae0c 100644
--- a/Libraries/Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Eft.ItemEvent;
+namespace SPTarkov.Server.Core.Models.Eft.ItemEvent;
 /// <summary>
 /// An object sent back to the game client that contains alterations the client must make to ensure server/client are in sync
 /// </summary>
diff --git a/Libraries/Core/Models/Eft/Launcher/ChangeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/ChangeRequestData.cs
similarity index 78%
rename from Libraries/Core/Models/Eft/Launcher/ChangeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/ChangeRequestData.cs
index 82495b99..eb454b71 100644
--- a/Libraries/Core/Models/Eft/Launcher/ChangeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/ChangeRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Launcher;
+namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 
 public record ChangeRequestData : LoginRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
index 2c452f47..1b60fae8 100644
--- a/Libraries/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Launcher;
+namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 
 public record GetMiniProfileRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Launcher/LoginRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Launcher/LoginRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs
index 44129b4b..e03ba980 100644
--- a/Libraries/Core/Models/Eft/Launcher/LoginRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Launcher;
+namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 
 public record LoginRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Launcher/MiniProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs
similarity index 96%
rename from Libraries/Core/Models/Eft/Launcher/MiniProfile.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs
index a6405d34..14411ba5 100644
--- a/Libraries/Core/Models/Eft/Launcher/MiniProfile.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Launcher;
+namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 
 public record MiniProfile
 {
diff --git a/Libraries/Core/Models/Eft/Launcher/RegisterData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RegisterData.cs
similarity index 78%
rename from Libraries/Core/Models/Eft/Launcher/RegisterData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RegisterData.cs
index bc615316..92bb7045 100644
--- a/Libraries/Core/Models/Eft/Launcher/RegisterData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RegisterData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Launcher;
+namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 
 public record RegisterData : LoginRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Launcher/RemoveProfileData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RemoveProfileData.cs
similarity index 50%
rename from Libraries/Core/Models/Eft/Launcher/RemoveProfileData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RemoveProfileData.cs
index 98fb4f00..92f3828c 100644
--- a/Libraries/Core/Models/Eft/Launcher/RemoveProfileData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RemoveProfileData.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Eft.Launcher;
+namespace SPTarkov.Server.Core.Models.Eft.Launcher;
 
 public record RemoveProfileData : LoginRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Location/AirdropLootResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs
similarity index 73%
rename from Libraries/Core/Models/Eft/Location/AirdropLootResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs
index 57f12db4..6c105d79 100644
--- a/Libraries/Core/Models/Eft/Location/AirdropLootResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Spt.Services;
+using SPTarkov.Server.Core.Models.Spt.Services;
 
-namespace Core.Models.Eft.Location;
+namespace SPTarkov.Server.Core.Models.Eft.Location;
 
 public record AirdropLootResult
 {
diff --git a/Libraries/Core/Models/Eft/Location/GetAirdropLootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Location/GetAirdropLootRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs
index 9a2c8c63..0586f2df 100644
--- a/Libraries/Core/Models/Eft/Location/GetAirdropLootRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Location;
+namespace SPTarkov.Server.Core.Models.Eft.Location;
 
 public record GetAirdropLootRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Location/GetAirdropLootResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs
similarity index 71%
rename from Libraries/Core/Models/Eft/Location/GetAirdropLootResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs
index e76e5cf1..a423236f 100644
--- a/Libraries/Core/Models/Eft/Location/GetAirdropLootResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Location;
+namespace SPTarkov.Server.Core.Models.Eft.Location;
 
 public record GetAirdropLootResponse
 {
diff --git a/Libraries/Core/Models/Eft/Location/GetLocationRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Location/GetLocationRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs
index 6564784f..de4c0524 100644
--- a/Libraries/Core/Models/Eft/Location/GetLocationRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Location;
+namespace SPTarkov.Server.Core.Models.Eft.Location;
 
 public record GetLocationRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs
similarity index 94%
rename from Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs
index e0f1db4d..3fcd7681 100644
--- a/Libraries/Core/Models/Eft/Match/EndLocalRaidRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs
@@ -1,10 +1,10 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record EndLocalRaidRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/EndOfflineRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
similarity index 90%
rename from Libraries/Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
index 66336956..a181856f 100644
--- a/Libraries/Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record EndOfflineRaidRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs
index d850eed7..8546eadb 100644
--- a/Libraries/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record GetRaidConfigurationRequestData : RaidSettings, IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/GroupCharacter.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs
similarity index 95%
rename from Libraries/Core/Models/Eft/Match/GroupCharacter.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs
index 7c4b1413..cbb14071 100644
--- a/Libraries/Core/Models/Eft/Match/GroupCharacter.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record GroupCharacter
 {
diff --git a/Libraries/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
similarity index 80%
rename from Libraries/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
index 81aae79a..da40a67e 100644
--- a/Libraries/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record MatchGroupCurrentResponse
 {
diff --git a/Libraries/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
index 77bd3056..ce00641e 100644
--- a/Libraries/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record MatchGroupInviteSendRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
index ca09f844..cdc2f299 100644
--- a/Libraries/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record MatchGroupPlayerRemoveRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
similarity index 77%
rename from Libraries/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
index 9fb384c5..3a33d19c 100644
--- a/Libraries/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record MatchGroupStartGameRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/MatchGroupStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs
similarity index 84%
rename from Libraries/Core/Models/Eft/Match/MatchGroupStatusRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs
index fdb2fa10..3056ba2a 100644
--- a/Libraries/Core/Models/Eft/Match/MatchGroupStatusRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record MatchGroupStatusRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/MatchGroupStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/Match/MatchGroupStatusResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs
index 3d86e757..090e2650 100644
--- a/Libraries/Core/Models/Eft/Match/MatchGroupStatusResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record MatchGroupStatusResponse
 {
diff --git a/Libraries/Core/Models/Eft/Match/MatchGroupTransferRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Match/MatchGroupTransferRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs
index 60c58617..b76f3f0b 100644
--- a/Libraries/Core/Models/Eft/Match/MatchGroupTransferRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record MatchGroupTransferRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/ProfileStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs
similarity index 78%
rename from Libraries/Core/Models/Eft/Match/ProfileStatusRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs
index ee69ab61..ee7e0d38 100644
--- a/Libraries/Core/Models/Eft/Match/ProfileStatusRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record ProfileStatusRequest
 {
diff --git a/Libraries/Core/Models/Eft/Match/ProfileStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/Match/ProfileStatusResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs
index dee7886b..8a1c56e4 100644
--- a/Libraries/Core/Models/Eft/Match/ProfileStatusResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record ProfileStatusResponse
 {
diff --git a/Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs
index 55127365..3c0a8804 100644
--- a/Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record PutMetricsRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/RaidSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs
similarity index 94%
rename from Libraries/Core/Models/Eft/Match/RaidSettings.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs
index c58d19e4..181b8a91 100644
--- a/Libraries/Core/Models/Eft/Match/RaidSettings.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Enums.RaidSettings;
-using Core.Models.Enums.RaidSettings.TimeAndWeather;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums.RaidSettings;
+using SPTarkov.Server.Core.Models.Enums.RaidSettings.TimeAndWeather;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record RaidSettings
 {
diff --git a/Libraries/Core/Models/Eft/Match/RequestIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Match/RequestIdRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs
index 879bfbb1..0f3d61e7 100644
--- a/Libraries/Core/Models/Eft/Match/RequestIdRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record RequestIdRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/Server.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Match/Server.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs
index 4a2dafeb..ff658ece 100644
--- a/Libraries/Core/Models/Eft/Match/Server.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record Server
 {
diff --git a/Libraries/Core/Models/Eft/Match/SessionStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs
similarity index 96%
rename from Libraries/Core/Models/Eft/Match/SessionStatus.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs
index 09c17fc1..b1e8d8fc 100644
--- a/Libraries/Core/Models/Eft/Match/SessionStatus.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record SessionStatus
 {
diff --git a/Libraries/Core/Models/Eft/Match/StartLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs
similarity index 89%
rename from Libraries/Core/Models/Eft/Match/StartLocalRaidRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs
index 292a72a4..fc09bdd9 100644
--- a/Libraries/Core/Models/Eft/Match/StartLocalRaidRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record StartLocalRaidRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Match/StartLocalRaidResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Match/StartLocalRaidResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs
index 944345ad..1549749f 100644
--- a/Libraries/Core/Models/Eft/Match/StartLocalRaidResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record StartLocalRaidResponseData
 {
diff --git a/Libraries/Core/Models/Eft/Match/UpdatePingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Match/UpdatePingRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs
index 1b2cbe2a..fbd1172e 100644
--- a/Libraries/Core/Models/Eft/Match/UpdatePingRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Match;
+namespace SPTarkov.Server.Core.Models.Eft.Match;
 
 public record UpdatePingRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Notes/NoteActionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs
similarity index 82%
rename from Libraries/Core/Models/Eft/Notes/NoteActionRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs
index 074b80e0..809505fe 100644
--- a/Libraries/Core/Models/Eft/Notes/NoteActionRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
 
-namespace Core.Models.Eft.Notes;
+namespace SPTarkov.Server.Core.Models.Eft.Notes;
 
 public record NoteActionRequest : BaseInteractionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Notifier/Notifier.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs
similarity index 91%
rename from Libraries/Core/Models/Eft/Notifier/Notifier.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs
index 3d6566f1..48514bf2 100644
--- a/Libraries/Core/Models/Eft/Notifier/Notifier.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Notifier;
+namespace SPTarkov.Server.Core.Models.Eft.Notifier;
 
 public record NotifierChannel
 {
diff --git a/Libraries/Core/Models/Eft/Notifier/SelectProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs
similarity index 77%
rename from Libraries/Core/Models/Eft/Notifier/SelectProfileResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs
index 6d56527d..075a7ac4 100644
--- a/Libraries/Core/Models/Eft/Notifier/SelectProfileResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Notifier;
+namespace SPTarkov.Server.Core.Models.Eft.Notifier;
 
 public record SelectProfileResponse
 {
diff --git a/Libraries/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
index f4255e60..f6792407 100644
--- a/Libraries/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Player;
+namespace SPTarkov.Server.Core.Models.Eft.Player;
 
 public record PlayerIncrementSkillLevelRequestData
 {
diff --git a/Libraries/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
index 8685d332..f399c9dd 100644
--- a/Libraries/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.PresetBuild;
+namespace SPTarkov.Server.Core.Models.Eft.PresetBuild;
 
 public record PresetBuildActionRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
similarity index 66%
rename from Libraries/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
index fa0a7bb3..c907cc2c 100644
--- a/Libraries/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.PresetBuild;
+namespace SPTarkov.Server.Core.Models.Eft.PresetBuild;
 
 public record RemoveBuildRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Prestige/GetPrestigeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Prestige/GetPrestigeResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs
index 4d3c1909..3dc20f83 100644
--- a/Libraries/Core/Models/Eft/Prestige/GetPrestigeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Prestige;
+namespace SPTarkov.Server.Core.Models.Eft.Prestige;
 
 public record GetPrestigeResponse
 {
diff --git a/Libraries/Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
index 2f36fc6a..3f832220 100644
--- a/Libraries/Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Prestige;
+namespace SPTarkov.Server.Core.Models.Eft.Prestige;
 
 public class ObtainPrestigeRequestList : List<ObtainPrestigeRequest>, IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
similarity index 80%
rename from Libraries/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
index 18e7f7b5..16a4e6eb 100644
--- a/Libraries/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record CompletedAchievementsResponse
 {
diff --git a/Libraries/Core/Models/Eft/Profile/ConnectResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs
similarity index 91%
rename from Libraries/Core/Models/Eft/Profile/ConnectResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs
index 2fe66f7f..c6130dcd 100644
--- a/Libraries/Core/Models/Eft/Profile/ConnectResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record ConnectResponse
 {
diff --git a/Libraries/Core/Models/Eft/Profile/CreateProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs
similarity index 77%
rename from Libraries/Core/Models/Eft/Profile/CreateProfileResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs
index ed306fb0..bcebde66 100644
--- a/Libraries/Core/Models/Eft/Profile/CreateProfileResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record CreateProfileResponse
 {
diff --git a/Libraries/Core/Models/Eft/Profile/GetAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs
similarity index 65%
rename from Libraries/Core/Models/Eft/Profile/GetAchievementsResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs
index e646a230..72327510 100644
--- a/Libraries/Core/Models/Eft/Profile/GetAchievementsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record GetAchievementsResponse
 {
diff --git a/Libraries/Core/Models/Eft/Profile/GetOtherProfileRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Profile/GetOtherProfileRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs
index 1bcef518..0725f323 100644
--- a/Libraries/Core/Models/Eft/Profile/GetOtherProfileRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record GetOtherProfileRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/GetOtherProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Profile/GetOtherProfileResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs
index 38e60cf8..5e969c7e 100644
--- a/Libraries/Core/Models/Eft/Profile/GetOtherProfileResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record GetOtherProfileResponse
 {
diff --git a/Libraries/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
similarity index 82%
rename from Libraries/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
index 69d2d3c8..570ec75d 100644
--- a/Libraries/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record GetProfileSettingsRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
similarity index 96%
rename from Libraries/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
index f1161c9f..fed2b92c 100644
--- a/Libraries/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record GetProfileStatusResponseData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/MessageContentRagfair.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Profile/MessageContentRagfair.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs
index d5b8d576..eaa29948 100644
--- a/Libraries/Core/Models/Eft/Profile/MessageContentRagfair.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record MessageContentRagfair
 {
diff --git a/Libraries/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
index 59b3fd44..1937981d 100644
--- a/Libraries/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record ProfileChangeNicknameRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
index d3250f66..970acab4 100644
--- a/Libraries/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record ProfileChangeVoiceRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/ProfileCreateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Profile/ProfileCreateRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs
index c4eb99cb..00c400ac 100644
--- a/Libraries/Core/Models/Eft/Profile/ProfileCreateRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record ProfileCreateRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/SearchFriendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs
similarity index 89%
rename from Libraries/Core/Models/Eft/Profile/SearchFriendResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs
index b3051725..349cf9fc 100644
--- a/Libraries/Core/Models/Eft/Profile/SearchFriendResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 /// <summary>
 ///     Identical to `UserDialogInfo`
diff --git a/Libraries/Core/Models/Eft/Profile/SearchProfilesRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Profile/SearchProfilesRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs
index 9aae3191..a8d6dfce 100644
--- a/Libraries/Core/Models/Eft/Profile/SearchProfilesRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record SearchProfilesRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/SptProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs
similarity index 98%
rename from Libraries/Core/Models/Eft/Profile/SptProfile.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs
index a62bdf84..7647084f 100644
--- a/Libraries/Core/Models/Eft/Profile/SptProfile.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs
@@ -1,11 +1,11 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Prestige;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Prestige;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record SptProfile
 {
diff --git a/Libraries/Core/Models/Eft/Profile/SystemData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs
similarity index 92%
rename from Libraries/Core/Models/Eft/Profile/SystemData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs
index 2c441a10..9790f24e 100644
--- a/Libraries/Core/Models/Eft/Profile/SystemData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record SystemData
 {
diff --git a/Libraries/Core/Models/Eft/Profile/UserDialogInfo.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs
similarity index 91%
rename from Libraries/Core/Models/Eft/Profile/UserDialogInfo.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs
index 7507c2ea..7c9793a6 100644
--- a/Libraries/Core/Models/Eft/Profile/UserDialogInfo.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record UserDialogInfo
 {
diff --git a/Libraries/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
index 893b31a6..8d9a3110 100644
--- a/Libraries/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Profile;
+namespace SPTarkov.Server.Core.Models.Eft.Profile;
 
 public record ValidateNicknameRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Quests/AcceptQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Quests/AcceptQuestRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs
index 088966f3..7735108d 100644
--- a/Libraries/Core/Models/Eft/Quests/AcceptQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Quests;
+namespace SPTarkov.Server.Core.Models.Eft.Quests;
 
 public record AcceptQuestRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Quests/CompleteQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Quests/CompleteQuestRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs
index 3ca773ae..c7de6c3a 100644
--- a/Libraries/Core/Models/Eft/Quests/CompleteQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Quests;
+namespace SPTarkov.Server.Core.Models.Eft.Quests;
 
 public record CompleteQuestRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Quests/FailQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Quests/FailQuestRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs
index 7d2af9ab..1c9ed3fa 100644
--- a/Libraries/Core/Models/Eft/Quests/FailQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Quests;
+namespace SPTarkov.Server.Core.Models.Eft.Quests;
 
 public record FailQuestRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs
index 0f3cf9fa..6d28e657 100644
--- a/Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Quests;
+namespace SPTarkov.Server.Core.Models.Eft.Quests;
 
 public record HandoverQuestRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Quests/ListQuestsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Quests/ListQuestsRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs
index 4586721f..6c08ecaf 100644
--- a/Libraries/Core/Models/Eft/Quests/ListQuestsRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Quests;
+namespace SPTarkov.Server.Core.Models.Eft.Quests;
 
 public record ListQuestsRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
index e5f2cb27..11c5e475 100644
--- a/Libraries/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Quests;
+namespace SPTarkov.Server.Core.Models.Eft.Quests;
 
 public record RepeatableQuestChangeRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
similarity index 90%
rename from Libraries/Core/Models/Eft/Ragfair/AddOfferRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
index 9bf2e5b4..4de4ec5f 100644
--- a/Libraries/Core/Models/Eft/Ragfair/AddOfferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record AddOfferRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
index cb9de052..98367090 100644
--- a/Libraries/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record ExtendOfferRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/GetItemPriceResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetItemPriceResult.cs
similarity index 66%
rename from Libraries/Core/Models/Eft/Ragfair/GetItemPriceResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetItemPriceResult.cs
index 468d9ac1..999ba34a 100644
--- a/Libraries/Core/Models/Eft/Ragfair/GetItemPriceResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetItemPriceResult.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
+using SPTarkov.Server.Core.Models.Common;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record GetItemPriceResult : MinMax<double>
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
index 994e8787..42ccc838 100644
--- a/Libraries/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record GetMarketPriceRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/GetOffersResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs
similarity index 91%
rename from Libraries/Core/Models/Eft/Ragfair/GetOffersResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs
index e1406c52..d5b1aa00 100644
--- a/Libraries/Core/Models/Eft/Ragfair/GetOffersResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record GetOffersResult
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
similarity index 77%
rename from Libraries/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
index 87d38ed1..bdfb9ee6 100644
--- a/Libraries/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record GetRagfairOfferByIdRequest
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/RagfairOffer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs
similarity index 97%
rename from Libraries/Core/Models/Eft/Ragfair/RagfairOffer.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs
index 00434fac..94ab081a 100644
--- a/Libraries/Core/Models/Eft/Ragfair/RagfairOffer.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record RagfairOffer
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
index deeaa7c3..db18b414 100644
--- a/Libraries/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record RemoveOfferRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/SearchRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs
similarity index 95%
rename from Libraries/Core/Models/Eft/Ragfair/SearchRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs
index cd6ee2d9..3b17d22d 100644
--- a/Libraries/Core/Models/Eft/Ragfair/SearchRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record SearchRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
similarity index 78%
rename from Libraries/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
index 1d4d718a..94967364 100644
--- a/Libraries/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record SendRagfairReportRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
similarity index 83%
rename from Libraries/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
index b8ea111a..a6b7a6f0 100644
--- a/Libraries/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Eft.Ragfair;
+namespace SPTarkov.Server.Core.Models.Eft.Ragfair;
 
 public record StorePlayerOfferTaxAmountRequestData : IRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
similarity index 78%
rename from Libraries/Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
index ed3dc6ae..cc66815f 100644
--- a/Libraries/Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Repair;
+namespace SPTarkov.Server.Core.Models.Eft.Repair;
 
 public record BaseRepairActionDataRequest
 {
diff --git a/Libraries/Core/Models/Eft/Repair/RepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Repair/RepairActionDataRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs
index 3970d3e9..de6b7bc9 100644
--- a/Libraries/Core/Models/Eft/Repair/RepairActionDataRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Repair;
+namespace SPTarkov.Server.Core.Models.Eft.Repair;
 
 public record RepairActionDataRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
similarity index 84%
rename from Libraries/Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
index 428c841d..b465b1a9 100644
--- a/Libraries/Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Repair;
+namespace SPTarkov.Server.Core.Models.Eft.Repair;
 
 public record TraderRepairActionDataRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
similarity index 76%
rename from Libraries/Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
index 2edbc729..ae513176 100644
--- a/Libraries/Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Trade;
+namespace SPTarkov.Server.Core.Models.Eft.Trade;
 
 public record ProcessBaseTradeRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs
similarity index 87%
rename from Libraries/Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs
index 0c2190d1..937101ad 100644
--- a/Libraries/Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBuyTradeRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
+using SPTarkov.Server.Core.Models.Common;
 
-namespace Core.Models.Eft.Trade;
+namespace SPTarkov.Server.Core.Models.Eft.Trade;
 
 public record ProcessBuyTradeRequestData : ProcessBaseTradeRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
index baa92f3e..e82d883e 100644
--- a/Libraries/Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Trade;
+namespace SPTarkov.Server.Core.Models.Eft.Trade;
 
 public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
similarity index 92%
rename from Libraries/Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
index 6fe78bf6..5c2eea00 100644
--- a/Libraries/Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Trade;
+namespace SPTarkov.Server.Core.Models.Eft.Trade;
 
 public record ProcessSellTradeRequestData : ProcessBaseTradeRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
index 18133f18..8a5a15e8 100644
--- a/Libraries/Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Trade;
+namespace SPTarkov.Server.Core.Models.Eft.Trade;
 
 public record SellScavItemsToFenceRequestData : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Weather/WeatherData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs
similarity index 95%
rename from Libraries/Core/Models/Eft/Weather/WeatherData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs
index e375cb0b..792328c7 100644
--- a/Libraries/Core/Models/Eft/Weather/WeatherData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Weather;
+namespace SPTarkov.Server.Core.Models.Eft.Weather;
 
 public record WeatherData
 {
diff --git a/Libraries/Core/Models/Eft/Wishlist/AddToWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
index 555e8d08..4c116ad3 100644
--- a/Libraries/Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Wishlist;
+namespace SPTarkov.Server.Core.Models.Eft.Wishlist;
 
 public record AddToWishlistRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
index b7b214d3..5d2aae44 100644
--- a/Libraries/Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Wishlist;
+namespace SPTarkov.Server.Core.Models.Eft.Wishlist;
 
 public record ChangeWishlistItemCategoryRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
similarity index 68%
rename from Libraries/Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
index 60ae6831..8aa923f4 100644
--- a/Libraries/Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
 
-namespace Core.Models.Eft.Wishlist;
+namespace SPTarkov.Server.Core.Models.Eft.Wishlist;
 
 public record RemoveFromWishlistRequest : InventoryBaseActionRequestData
 {
diff --git a/Libraries/Core/Models/Eft/Ws/NotificationEventType.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/NotificationEventType.cs
similarity index 95%
rename from Libraries/Core/Models/Eft/Ws/NotificationEventType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/NotificationEventType.cs
index b90196bf..3b323637 100644
--- a/Libraries/Core/Models/Eft/Ws/NotificationEventType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/NotificationEventType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public enum NotificationEventType
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsAid.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsAid.cs
similarity index 79%
rename from Libraries/Core/Models/Eft/Ws/WsAid.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsAid.cs
index 76fbc440..6a24fc20 100644
--- a/Libraries/Core/Models/Eft/Ws/WsAid.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsAid.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsAid : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsAidNickname.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsAidNickname.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/Ws/WsAidNickname.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsAidNickname.cs
index 688fdb77..f60ec53a 100644
--- a/Libraries/Core/Models/Eft/Ws/WsAidNickname.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsAidNickname.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsAidNickname : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsChatMessageReceived.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsChatMessageReceived.cs
similarity index 75%
rename from Libraries/Core/Models/Eft/Ws/WsChatMessageReceived.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsChatMessageReceived.cs
index 3e1333af..513bac36 100644
--- a/Libraries/Core/Models/Eft/Ws/WsChatMessageReceived.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsChatMessageReceived.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Match;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsChatMessageReceived : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsFriendListAccept.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsFriendListAccept.cs
similarity index 69%
rename from Libraries/Core/Models/Eft/Ws/WsFriendListAccept.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsFriendListAccept.cs
index 1183f918..801bd8be 100644
--- a/Libraries/Core/Models/Eft/Ws/WsFriendListAccept.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsFriendListAccept.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsFriendsListAccept : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsGroupId.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupId.cs
similarity index 80%
rename from Libraries/Core/Models/Eft/Ws/WsGroupId.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupId.cs
index b30cede4..d60783d1 100644
--- a/Libraries/Core/Models/Eft/Ws/WsGroupId.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupId.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsGroupId : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs
similarity index 92%
rename from Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs
index 54df6654..ab1eb93b 100644
--- a/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteAccept.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Eft.Match;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsGroupMatchInviteAccept : WsNotificationEvent // TODO: trying to inherit multiTypes
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs
similarity index 86%
rename from Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs
index b08b571c..1198107b 100644
--- a/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteDecline.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsGroupMatchInviteDecline : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs
index a3fa4f45..214b6c9a 100644
--- a/Libraries/Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchInviteSend.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Eft.Match;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsGroupMatchInviteSend : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs
similarity index 81%
rename from Libraries/Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs
index f985c067..59df9f82 100644
--- a/Libraries/Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchLeaderChanged.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsGroupMatchLeaderChanged : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs
similarity index 71%
rename from Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs
index e8b07bf8..31ff270c 100644
--- a/Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchRaidReady.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Eft.Match;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsGroupMatchRaidReady : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs
similarity index 70%
rename from Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs
index d94380d1..3227b72c 100644
--- a/Libraries/Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsGroupMatchRaidSettings.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Eft.Match;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsGroupMatchRaidSettings : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsNotificationEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs
similarity index 88%
rename from Libraries/Core/Models/Eft/Ws/WsNotificationEvent.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs
index 5741a16c..dda7ed42 100644
--- a/Libraries/Core/Models/Eft/Ws/WsNotificationEvent.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsPing.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsPing.cs
similarity index 77%
rename from Libraries/Core/Models/Eft/Ws/WsPing.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsPing.cs
index 9e07bb9f..c2dbb531 100644
--- a/Libraries/Core/Models/Eft/Ws/WsPing.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsPing.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsPing : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsRagfairOfferSold.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsRagfairOfferSold.cs
similarity index 89%
rename from Libraries/Core/Models/Eft/Ws/WsRagfairOfferSold.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsRagfairOfferSold.cs
index b223e16a..e7d93b3f 100644
--- a/Libraries/Core/Models/Eft/Ws/WsRagfairOfferSold.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsRagfairOfferSold.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsRagfairOfferSold : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Eft/Ws/WsUserConfirmed.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsUserConfirmed.cs
similarity index 93%
rename from Libraries/Core/Models/Eft/Ws/WsUserConfirmed.cs
rename to Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsUserConfirmed.cs
index 41a57079..be7c9cf3 100644
--- a/Libraries/Core/Models/Eft/Ws/WsUserConfirmed.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsUserConfirmed.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Eft.Ws;
+namespace SPTarkov.Server.Core.Models.Eft.Ws;
 
 public record WsUserConfirmed : WsNotificationEvent
 {
diff --git a/Libraries/Core/Models/Enums/AccountTypes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs
similarity index 64%
rename from Libraries/Core/Models/Enums/AccountTypes.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs
index a529115c..c04580e0 100644
--- a/Libraries/Core/Models/Enums/AccountTypes.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public record AccountTypes
 {
diff --git a/Libraries/Core/Models/Enums/AirdropType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs
similarity index 80%
rename from Libraries/Core/Models/Enums/AirdropType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs
index 471e12fc..eecf4942 100644
--- a/Libraries/Core/Models/Enums/AirdropType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/AirdropType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum AirdropTypeEnum
 {
diff --git a/Libraries/Core/Models/Enums/ArmorMaterial.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs
similarity index 75%
rename from Libraries/Core/Models/Enums/ArmorMaterial.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs
index fa661979..c22ff34f 100644
--- a/Libraries/Core/Models/Enums/ArmorMaterial.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ArmorMaterial.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ArmorMaterial
 {
diff --git a/Libraries/Core/Models/Enums/BackendErrorCodes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BackendErrorCodes.cs
similarity index 98%
rename from Libraries/Core/Models/Enums/BackendErrorCodes.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/BackendErrorCodes.cs
index b06ef368..9361d621 100644
--- a/Libraries/Core/Models/Enums/BackendErrorCodes.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BackendErrorCodes.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum BackendErrorCodes
 {
diff --git a/Libraries/Core/Models/Enums/BaseClasses.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BaseClasses.cs
similarity index 99%
rename from Libraries/Core/Models/Enums/BaseClasses.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/BaseClasses.cs
index 454a8aaf..89132efc 100644
--- a/Libraries/Core/Models/Enums/BaseClasses.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BaseClasses.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public static class BaseClasses
 {
diff --git a/Libraries/Core/Models/Enums/BonusSkillType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs
similarity index 66%
rename from Libraries/Core/Models/Enums/BonusSkillType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs
index eeb20db9..bb12c118 100644
--- a/Libraries/Core/Models/Enums/BonusSkillType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BonusSkillType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum BonusSkillType
 {
diff --git a/Libraries/Core/Models/Enums/BonusType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/BonusType.cs
similarity index 93%
rename from Libraries/Core/Models/Enums/BonusType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/BonusType.cs
index 6007db0d..3c5a9610 100644
--- a/Libraries/Core/Models/Enums/BonusType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/BonusType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum BonusType
 {
diff --git a/Libraries/Core/Models/Enums/ConfigTypes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ConfigTypes.cs
similarity index 97%
rename from Libraries/Core/Models/Enums/ConfigTypes.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ConfigTypes.cs
index bbab7fe9..0bfbcaff 100644
--- a/Libraries/Core/Models/Enums/ConfigTypes.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ConfigTypes.cs
@@ -1,6 +1,6 @@
-using Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Config;
 
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public static class ConfigTypesExtension
 {
diff --git a/Libraries/Core/Models/Enums/CurrencyType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs
similarity index 58%
rename from Libraries/Core/Models/Enums/CurrencyType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs
index e04d71be..5d70b69d 100644
--- a/Libraries/Core/Models/Enums/CurrencyType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/CurrencyType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum CurrencyType
 {
diff --git a/Libraries/Core/Models/Enums/DamageEffectType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs
similarity index 80%
rename from Libraries/Core/Models/Enums/DamageEffectType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs
index df59c700..4864b9d1 100644
--- a/Libraries/Core/Models/Enums/DamageEffectType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DamageEffectType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum DamageEffectType
 {
diff --git a/Libraries/Core/Models/Enums/DateTimeEnum.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs
similarity index 50%
rename from Libraries/Core/Models/Enums/DateTimeEnum.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs
index 33bc8792..ca50af8f 100644
--- a/Libraries/Core/Models/Enums/DateTimeEnum.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DateTimeEnum.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum DateTimeEnum
 {
diff --git a/Libraries/Core/Models/Enums/DogtagExchangeSide.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DogtagExchangeSide.cs
similarity index 57%
rename from Libraries/Core/Models/Enums/DogtagExchangeSide.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/DogtagExchangeSide.cs
index 1832841c..71e8342c 100644
--- a/Libraries/Core/Models/Enums/DogtagExchangeSide.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DogtagExchangeSide.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum DogtagExchangeSide
 {
diff --git a/Libraries/Core/Models/Enums/ELocationName.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ELocationName.cs
similarity index 81%
rename from Libraries/Core/Models/Enums/ELocationName.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ELocationName.cs
index 6f30e8a4..3926cac4 100644
--- a/Libraries/Core/Models/Enums/ELocationName.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ELocationName.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ELocationName
 {
diff --git a/Libraries/Core/Models/Enums/EquipmentBuildType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentBuildType.cs
similarity index 60%
rename from Libraries/Core/Models/Enums/EquipmentBuildType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentBuildType.cs
index 36dd56de..7f509d4c 100644
--- a/Libraries/Core/Models/Enums/EquipmentBuildType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentBuildType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum EquipmentBuildType
 {
diff --git a/Libraries/Core/Models/Enums/EquipmentSlots.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs
similarity index 85%
rename from Libraries/Core/Models/Enums/EquipmentSlots.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs
index c8d5d33d..f5c71914 100644
--- a/Libraries/Core/Models/Enums/EquipmentSlots.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/EquipmentSlots.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum EquipmentSlots
 {
diff --git a/Libraries/Core/Models/Enums/EventType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs
similarity index 67%
rename from Libraries/Core/Models/Enums/EventType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs
index 321bd63a..578b88f2 100644
--- a/Libraries/Core/Models/Enums/EventType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/EventType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum EventType
 {
diff --git a/Libraries/Core/Models/Enums/ExfiltrationType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs
similarity index 63%
rename from Libraries/Core/Models/Enums/ExfiltrationType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs
index 4f324a6b..cffa17a6 100644
--- a/Libraries/Core/Models/Enums/ExfiltrationType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ExfiltrationType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ExfiltrationType
 {
diff --git a/Libraries/Core/Models/Enums/ExitStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs
similarity index 69%
rename from Libraries/Core/Models/Enums/ExitStatus.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs
index 6c106f66..8642ef73 100644
--- a/Libraries/Core/Models/Enums/ExitStatus.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ExitStatus.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ExitStatus
 {
diff --git a/Libraries/Core/Models/Enums/FleaOfferType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/FleaOfferType.cs
similarity index 67%
rename from Libraries/Core/Models/Enums/FleaOfferType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/FleaOfferType.cs
index 7ad43177..f524d44c 100644
--- a/Libraries/Core/Models/Enums/FleaOfferType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/FleaOfferType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum FleaOfferType
 {
diff --git a/Libraries/Core/Models/Enums/GameEditions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs
similarity index 88%
rename from Libraries/Core/Models/Enums/GameEditions.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs
index bae3889d..8ea68e08 100644
--- a/Libraries/Core/Models/Enums/GameEditions.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public record GameEditions
 {
diff --git a/Libraries/Core/Models/Enums/GiftSenderType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs
similarity index 59%
rename from Libraries/Core/Models/Enums/GiftSenderType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs
index 55021499..b9d3c69c 100644
--- a/Libraries/Core/Models/Enums/GiftSenderType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSenderType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum GiftSenderType
 {
diff --git a/Libraries/Core/Models/Enums/GiftSentResult.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSentResult.cs
similarity index 75%
rename from Libraries/Core/Models/Enums/GiftSentResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/GiftSentResult.cs
index 28efcc74..f1be3ae2 100644
--- a/Libraries/Core/Models/Enums/GiftSentResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GiftSentResult.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum GiftSentResult
 {
diff --git a/Libraries/Core/Models/Enums/HealthFactor.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HealthFactor.cs
similarity index 75%
rename from Libraries/Core/Models/Enums/HealthFactor.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/HealthFactor.cs
index e17eefe1..44398910 100644
--- a/Libraries/Core/Models/Enums/HealthFactor.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HealthFactor.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum HealthFactor
 {
diff --git a/Libraries/Core/Models/Enums/Hideout/CircleRewardType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/CircleRewardType.cs
similarity index 57%
rename from Libraries/Core/Models/Enums/Hideout/CircleRewardType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/CircleRewardType.cs
index f192fd23..5c39a1c4 100644
--- a/Libraries/Core/Models/Enums/Hideout/CircleRewardType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/CircleRewardType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.Hideout;
+namespace SPTarkov.Server.Core.Models.Enums.Hideout;
 
 public enum CircleRewardType
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteActivityType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteActivityType.cs
new file mode 100644
index 00000000..1756afa4
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteActivityType.cs
@@ -0,0 +1,6 @@
+namespace SPTarkov.Server.Core.Models.Enums.Hideout;
+
+public enum QteActivityType
+{
+    GYM = 0
+}
diff --git a/Libraries/Core/Models/Enums/Hideout/QteEffectType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteEffectType.cs
similarity index 64%
rename from Libraries/Core/Models/Enums/Hideout/QteEffectType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteEffectType.cs
index 19736f9e..5709d4d3 100644
--- a/Libraries/Core/Models/Enums/Hideout/QteEffectType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteEffectType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.Hideout;
+namespace SPTarkov.Server.Core.Models.Enums.Hideout;
 
 public enum QteEffectType
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteResultType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteResultType.cs
new file mode 100644
index 00000000..3926c8fe
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteResultType.cs
@@ -0,0 +1,7 @@
+namespace SPTarkov.Server.Core.Models.Enums.Hideout;
+
+public enum QteResultType
+{
+    None,
+    Exit
+}
diff --git a/Libraries/Core/Models/Enums/Hideout/QteRewardType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteRewardType.cs
similarity index 63%
rename from Libraries/Core/Models/Enums/Hideout/QteRewardType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteRewardType.cs
index bd3b4137..479a43c7 100644
--- a/Libraries/Core/Models/Enums/Hideout/QteRewardType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteRewardType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.Hideout;
+namespace SPTarkov.Server.Core.Models.Enums.Hideout;
 
 public enum QteRewardType
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteType.cs
new file mode 100644
index 00000000..ad8574ca
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/QteType.cs
@@ -0,0 +1,6 @@
+namespace SPTarkov.Server.Core.Models.Enums.Hideout;
+
+public enum QteType
+{
+    ShrinkingCircle
+}
diff --git a/Libraries/Core/Models/Enums/Hideout/RequirementType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/RequirementType.cs
similarity index 76%
rename from Libraries/Core/Models/Enums/Hideout/RequirementType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/RequirementType.cs
index f0552f2d..10f0b42b 100644
--- a/Libraries/Core/Models/Enums/Hideout/RequirementType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/RequirementType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.Hideout;
+namespace SPTarkov.Server.Core.Models.Enums.Hideout;
 
 public enum RequirementType
 {
diff --git a/Libraries/Core/Models/Enums/HideoutAreas.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutAreas.cs
similarity index 93%
rename from Libraries/Core/Models/Enums/HideoutAreas.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/HideoutAreas.cs
index 94fe223d..05e3a6a1 100644
--- a/Libraries/Core/Models/Enums/HideoutAreas.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutAreas.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum HideoutAreas
 {
diff --git a/Libraries/Core/Models/Enums/HideoutEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs
similarity index 96%
rename from Libraries/Core/Models/Enums/HideoutEventActions.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs
index 15cd958a..a5ed9683 100644
--- a/Libraries/Core/Models/Enums/HideoutEventActions.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public record HideoutEventActions
 {
diff --git a/Libraries/Core/Models/Enums/ItemAddedResult.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemAddedResult.cs
similarity index 73%
rename from Libraries/Core/Models/Enums/ItemAddedResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ItemAddedResult.cs
index 0c14751c..045db3c5 100644
--- a/Libraries/Core/Models/Enums/ItemAddedResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemAddedResult.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ItemAddedResult
 {
diff --git a/Libraries/Core/Models/Enums/ItemDropSoundType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemDropSoundType.cs
similarity index 65%
rename from Libraries/Core/Models/Enums/ItemDropSoundType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ItemDropSoundType.cs
index 6dc79461..35142248 100644
--- a/Libraries/Core/Models/Enums/ItemDropSoundType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemDropSoundType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ItemDropSoundType
 {
diff --git a/Libraries/Core/Models/Enums/ItemEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs
similarity index 98%
rename from Libraries/Core/Models/Enums/ItemEventActions.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs
index eb4338fa..95b9dde1 100644
--- a/Libraries/Core/Models/Enums/ItemEventActions.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public record ItemEventActions
 {
diff --git a/Libraries/Core/Models/Enums/ItemTpl.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemTpl.cs
similarity index 100%
rename from Libraries/Core/Models/Enums/ItemTpl.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ItemTpl.cs
diff --git a/Libraries/Core/Models/Enums/LootRarity.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/LootRarity.cs
similarity index 65%
rename from Libraries/Core/Models/Enums/LootRarity.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/LootRarity.cs
index 2686247b..7a26f4c3 100644
--- a/Libraries/Core/Models/Enums/LootRarity.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/LootRarity.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum LootRarity
 {
diff --git a/Libraries/Core/Models/Enums/MemberCategory.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/MemberCategory.cs
similarity index 85%
rename from Libraries/Core/Models/Enums/MemberCategory.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/MemberCategory.cs
index bbdf683c..7a69da93 100644
--- a/Libraries/Core/Models/Enums/MemberCategory.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/MemberCategory.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum MemberCategory
 {
diff --git a/Libraries/Core/Models/Enums/MessageType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/MessageType.cs
similarity index 89%
rename from Libraries/Core/Models/Enums/MessageType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/MessageType.cs
index 97a996f2..4fa29464 100644
--- a/Libraries/Core/Models/Enums/MessageType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/MessageType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum MessageType
 {
diff --git a/Libraries/Core/Models/Enums/ModSpawn.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ModSpawn.cs
similarity index 84%
rename from Libraries/Core/Models/Enums/ModSpawn.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ModSpawn.cs
index 24635c1b..c8420e68 100644
--- a/Libraries/Core/Models/Enums/ModSpawn.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ModSpawn.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ModSpawn
 {
diff --git a/Libraries/Core/Models/Enums/Money.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs
similarity index 89%
rename from Libraries/Core/Models/Enums/Money.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs
index 6e293d53..1e872634 100644
--- a/Libraries/Core/Models/Enums/Money.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public record Money
 {
diff --git a/Libraries/Core/Models/Enums/PlayerSideMask.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs
similarity index 66%
rename from Libraries/Core/Models/Enums/PlayerSideMask.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs
index 6a826f9b..fccf8116 100644
--- a/Libraries/Core/Models/Enums/PlayerSideMask.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum PlayerSideMask
 {
diff --git a/Libraries/Core/Models/Enums/PlayersSpawnPlace.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs
similarity index 65%
rename from Libraries/Core/Models/Enums/PlayersSpawnPlace.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs
index 84c537b6..566869f9 100644
--- a/Libraries/Core/Models/Enums/PlayersSpawnPlace.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/PlayersSpawnPlace.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum PlayersSpawnPlace
 {
diff --git a/Libraries/Core/Models/Enums/ProfileStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ProfileStatus.cs
similarity index 65%
rename from Libraries/Core/Models/Enums/ProfileStatus.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ProfileStatus.cs
index 99c08035..7d18d697 100644
--- a/Libraries/Core/Models/Enums/ProfileStatus.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ProfileStatus.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ProfileStatus
 {
diff --git a/Libraries/Core/Models/Enums/QuestStatusEnum.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs
similarity index 83%
rename from Libraries/Core/Models/Enums/QuestStatusEnum.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs
index c241d559..c0d1a536 100644
--- a/Libraries/Core/Models/Enums/QuestStatusEnum.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestStatusEnum.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum QuestStatusEnum
 {
diff --git a/Libraries/Core/Models/Enums/QuestTypeEnum.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs
similarity index 82%
rename from Libraries/Core/Models/Enums/QuestTypeEnum.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs
index f620d6b5..923f53c2 100644
--- a/Libraries/Core/Models/Enums/QuestTypeEnum.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum QuestTypeEnum
 {
diff --git a/Libraries/Core/Models/Enums/RagfairSort.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RagfairSort.cs
similarity index 72%
rename from Libraries/Core/Models/Enums/RagfairSort.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RagfairSort.cs
index 48bb3e80..86652433 100644
--- a/Libraries/Core/Models/Enums/RagfairSort.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RagfairSort.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum RagfairSort
 {
diff --git a/Libraries/Core/Models/Enums/RaidMode.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidMode.cs
similarity index 54%
rename from Libraries/Core/Models/Enums/RaidMode.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidMode.cs
index c3c3792a..af0b062f 100644
--- a/Libraries/Core/Models/Enums/RaidMode.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidMode.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum RaidMode
 {
diff --git a/Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/BotAmount.cs
similarity index 60%
rename from Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/BotAmount.cs
index 4233b9d9..203b8f1d 100644
--- a/Libraries/Core/Models/Enums/RaidSettings/BotAmount.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/BotAmount.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.RaidSettings;
+namespace SPTarkov.Server.Core.Models.Enums.RaidSettings;
 
 public enum BotAmount
 {
diff --git a/Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/BotDifficulty.cs
similarity index 63%
rename from Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/BotDifficulty.cs
index 5c1f8bd9..b987d1f6 100644
--- a/Libraries/Core/Models/Enums/RaidSettings/BotDifficulty.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/BotDifficulty.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.RaidSettings;
+namespace SPTarkov.Server.Core.Models.Enums.RaidSettings;
 
 public enum BotDifficulty
 {
diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs
similarity index 64%
rename from Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs
index d3643ed5..3d04a1b4 100644
--- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/CloudinessType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.RaidSettings.TimeAndWeather;
+namespace SPTarkov.Server.Core.Models.Enums.RaidSettings.TimeAndWeather;
 
 public enum CloudinessType
 {
diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs
similarity index 51%
rename from Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs
index e86e4549..3cb9103e 100644
--- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/FogType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.RaidSettings.TimeAndWeather;
+namespace SPTarkov.Server.Core.Models.Enums.RaidSettings.TimeAndWeather;
 
 public enum FogType
 {
diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs
similarity index 52%
rename from Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs
index f38de375..630207fa 100644
--- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/RainType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.RaidSettings.TimeAndWeather;
+namespace SPTarkov.Server.Core.Models.Enums.RaidSettings.TimeAndWeather;
 
 public enum RainType
 {
diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs
similarity index 57%
rename from Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs
index b03fdcb7..2e050fb4 100644
--- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/TimeFlowType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.RaidSettings.TimeAndWeather;
+namespace SPTarkov.Server.Core.Models.Enums.RaidSettings.TimeAndWeather;
 
 public enum TimeFlowType
 {
diff --git a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs
similarity index 55%
rename from Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs
index 859a089e..69cf9313 100644
--- a/Libraries/Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidSettings/TimeAndWeather/WindSpeed.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums.RaidSettings.TimeAndWeather;
+namespace SPTarkov.Server.Core.Models.Enums.RaidSettings.TimeAndWeather;
 
 public enum WindSpeed
 {
diff --git a/Libraries/Core/Models/Enums/ReloadMode.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ReloadMode.cs
similarity index 74%
rename from Libraries/Core/Models/Enums/ReloadMode.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ReloadMode.cs
index 10ae8c5a..66dd41cf 100644
--- a/Libraries/Core/Models/Enums/ReloadMode.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ReloadMode.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ReloadMode
 {
diff --git a/Libraries/Core/Models/Enums/RepairStrategyType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs
similarity index 63%
rename from Libraries/Core/Models/Enums/RepairStrategyType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs
index 38b77b72..8466d71c 100644
--- a/Libraries/Core/Models/Enums/RepairStrategyType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RepairStrategyType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum RepairStrategyType
 {
diff --git a/Libraries/Core/Models/Enums/RequirementState.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RequirementState.cs
similarity index 84%
rename from Libraries/Core/Models/Enums/RequirementState.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RequirementState.cs
index 36f2ca7e..b251c5e0 100644
--- a/Libraries/Core/Models/Enums/RequirementState.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RequirementState.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum RequirementState
 {
diff --git a/Libraries/Core/Models/Enums/RewardType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs
similarity index 87%
rename from Libraries/Core/Models/Enums/RewardType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs
index 26b8d5df..65b01c06 100644
--- a/Libraries/Core/Models/Enums/RewardType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RewardType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum RewardType
 {
diff --git a/Libraries/Core/Models/Enums/Season.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Season.cs
similarity index 76%
rename from Libraries/Core/Models/Enums/Season.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Season.cs
index f4177c52..5fa0d231 100644
--- a/Libraries/Core/Models/Enums/Season.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Season.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum Season
 {
diff --git a/Libraries/Core/Models/Enums/SeasonalEventType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs
similarity index 71%
rename from Libraries/Core/Models/Enums/SeasonalEventType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs
index c8448542..587a85e2 100644
--- a/Libraries/Core/Models/Enums/SeasonalEventType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/SeasonalEventType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum SeasonalEventType
 {
diff --git a/Libraries/Core/Models/Enums/SideType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs
similarity index 56%
rename from Libraries/Core/Models/Enums/SideType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs
index 585b104f..fc167059 100644
--- a/Libraries/Core/Models/Enums/SideType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/SideType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum SideType
 {
diff --git a/Libraries/Core/Models/Enums/SkillTypes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/SkillTypes.cs
similarity index 96%
rename from Libraries/Core/Models/Enums/SkillTypes.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/SkillTypes.cs
index b31f9a6a..db498e06 100644
--- a/Libraries/Core/Models/Enums/SkillTypes.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/SkillTypes.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum SkillTypes
diff --git a/Libraries/Core/Models/Enums/ThrowWeapType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs
similarity index 77%
rename from Libraries/Core/Models/Enums/ThrowWeapType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs
index da1f2b94..c8bd9dc2 100644
--- a/Libraries/Core/Models/Enums/ThrowWeapType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ThrowWeapType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum ThrowWeapType
 {
diff --git a/Libraries/Core/Models/Enums/TraderServiceType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs
similarity index 78%
rename from Libraries/Core/Models/Enums/TraderServiceType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs
index 0bda5363..a027ce6c 100644
--- a/Libraries/Core/Models/Enums/TraderServiceType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/TraderServiceType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum TraderServiceType
 {
diff --git a/Libraries/Core/Models/Enums/Traders.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Traders.cs
similarity index 97%
rename from Libraries/Core/Models/Enums/Traders.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Traders.cs
index 89b37004..755cef91 100644
--- a/Libraries/Core/Models/Enums/Traders.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Traders.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public static class Traders
 {
diff --git a/Libraries/Core/Models/Enums/TransitionType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/TransitionType.cs
similarity index 61%
rename from Libraries/Core/Models/Enums/TransitionType.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/TransitionType.cs
index 97c4bf59..87c7b1a3 100644
--- a/Libraries/Core/Models/Enums/TransitionType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/TransitionType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum TransitionType
 {
diff --git a/Libraries/Core/Models/Enums/Weapons.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Weapons.cs
similarity index 100%
rename from Libraries/Core/Models/Enums/Weapons.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/Weapons.cs
diff --git a/Libraries/Core/Models/Enums/WindDirection.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/WindDirection.cs
similarity index 75%
rename from Libraries/Core/Models/Enums/WindDirection.cs
rename to Libraries/SPTarkov.Server.Core/Models/Enums/WindDirection.cs
index 6b44b1eb..1d8589de 100644
--- a/Libraries/Core/Models/Enums/WindDirection.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Enums/WindDirection.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Enums;
+namespace SPTarkov.Server.Core.Models.Enums;
 
 public enum WindDirection
 {
diff --git a/Libraries/Core/Models/External/IPostDBLoadMod.cs b/Libraries/SPTarkov.Server.Core/Models/External/IPostDBLoadMod.cs
similarity index 55%
rename from Libraries/Core/Models/External/IPostDBLoadMod.cs
rename to Libraries/SPTarkov.Server.Core/Models/External/IPostDBLoadMod.cs
index c0c2adfc..fed88749 100644
--- a/Libraries/Core/Models/External/IPostDBLoadMod.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/External/IPostDBLoadMod.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.External;
+namespace SPTarkov.Server.Core.Models.External;
 
 public interface IPostDBLoadMod
 {
diff --git a/Libraries/Core/Models/External/IPostSptLoadMod.cs b/Libraries/SPTarkov.Server.Core/Models/External/IPostSptLoadMod.cs
similarity index 56%
rename from Libraries/Core/Models/External/IPostSptLoadMod.cs
rename to Libraries/SPTarkov.Server.Core/Models/External/IPostSptLoadMod.cs
index dbd05e7f..69371f41 100644
--- a/Libraries/Core/Models/External/IPostSptLoadMod.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/External/IPostSptLoadMod.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.External;
+namespace SPTarkov.Server.Core.Models.External;
 
 public interface IPostSptLoadMod
 {
diff --git a/Libraries/Core/Models/External/IPreSptLoadMod.cs b/Libraries/SPTarkov.Server.Core/Models/External/IPreSptLoadMod.cs
similarity index 55%
rename from Libraries/Core/Models/External/IPreSptLoadMod.cs
rename to Libraries/SPTarkov.Server.Core/Models/External/IPreSptLoadMod.cs
index f237299a..75781ffa 100644
--- a/Libraries/Core/Models/External/IPreSptLoadMod.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/External/IPreSptLoadMod.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.External;
+namespace SPTarkov.Server.Core.Models.External;
 
 public interface IPreSptLoadMod
 {
diff --git a/Libraries/Core/Models/Logging/LogBackgroundColor.cs b/Libraries/SPTarkov.Server.Core/Models/Logging/LogBackgroundColor.cs
similarity index 76%
rename from Libraries/Core/Models/Logging/LogBackgroundColor.cs
rename to Libraries/SPTarkov.Server.Core/Models/Logging/LogBackgroundColor.cs
index 1076ad81..fa1b6f72 100644
--- a/Libraries/Core/Models/Logging/LogBackgroundColor.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Logging/LogBackgroundColor.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Logging;
+namespace SPTarkov.Server.Core.Models.Logging;
 
 public enum LogBackgroundColor
 {
diff --git a/Libraries/Core/Models/Logging/LogTextColor.cs b/Libraries/SPTarkov.Server.Core/Models/Logging/LogTextColor.cs
similarity index 75%
rename from Libraries/Core/Models/Logging/LogTextColor.cs
rename to Libraries/SPTarkov.Server.Core/Models/Logging/LogTextColor.cs
index d5fc2505..2659a8e0 100644
--- a/Libraries/Core/Models/Logging/LogTextColor.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Logging/LogTextColor.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Logging;
+namespace SPTarkov.Server.Core.Models.Logging;
 
 public enum LogTextColor
 {
diff --git a/Libraries/Core/Models/RadioStationType.cs b/Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs
similarity index 80%
rename from Libraries/Core/Models/RadioStationType.cs
rename to Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs
index e8c33c07..d81709d7 100644
--- a/Libraries/Core/Models/RadioStationType.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/RadioStationType.cs
@@ -1,4 +1,4 @@
-namespace Core.Models;
+namespace SPTarkov.Server.Core.Models;
 
 public enum RadioStationType
 {
diff --git a/Libraries/Core/Models/Spt/Bots/BotGenerationDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs
similarity index 96%
rename from Libraries/Core/Models/Spt/Bots/BotGenerationDetails.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs
index f18227d6..753e00c1 100644
--- a/Libraries/Core/Models/Spt/Bots/BotGenerationDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
+using SPTarkov.Server.Core.Models.Common;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record BotGenerationDetails
 {
diff --git a/Libraries/Core/Models/Spt/Bots/BotLootCache.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Bots/BotLootCache.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs
index 7cab55c0..e807f4e5 100644
--- a/Libraries/Core/Models/Spt/Bots/BotLootCache.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record BotLootCache
 {
diff --git a/Libraries/Core/Models/Spt/Bots/Bots.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs
similarity index 79%
rename from Libraries/Core/Models/Spt/Bots/Bots.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs
index b6d867a2..cf191e1b 100644
--- a/Libraries/Core/Models/Spt/Bots/Bots.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record Bots
 {
diff --git a/Libraries/Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
similarity index 92%
rename from Libraries/Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
index d946d00c..904b3b73 100644
--- a/Libraries/Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record ChooseRandomCompatibleModResult
 {
diff --git a/Libraries/Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
similarity index 90%
rename from Libraries/Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
index c2c81a5c..9d9fc060 100644
--- a/Libraries/Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record FilterPlateModsForSlotByLevelResult
 {
diff --git a/Libraries/Core/Models/Spt/Bots/GenerateEquipmentProperties.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
similarity index 90%
rename from Libraries/Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
index 787d9601..67820444 100644
--- a/Libraries/Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record GenerateEquipmentProperties
 {
diff --git a/Libraries/Core/Models/Spt/Bots/GenerateWeaponRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Bots/GenerateWeaponRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs
index 6d295ba3..374a9b43 100644
--- a/Libraries/Core/Models/Spt/Bots/GenerateWeaponRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record GenerateWeaponRequest
 {
diff --git a/Libraries/Core/Models/Spt/Bots/GenerateWeaponResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs
similarity index 86%
rename from Libraries/Core/Models/Spt/Bots/GenerateWeaponResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs
index 804b04d1..bae6697f 100644
--- a/Libraries/Core/Models/Spt/Bots/GenerateWeaponResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record GenerateWeaponResult
 {
diff --git a/Libraries/Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
similarity index 87%
rename from Libraries/Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
index a82c9814..e1d1fc69 100644
--- a/Libraries/Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record ItemSpawnLimitSettings
 {
diff --git a/Libraries/Core/Models/Spt/Bots/ModToSpawnRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs
similarity index 93%
rename from Libraries/Core/Models/Spt/Bots/ModToSpawnRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs
index 4bcd7c8b..7a846ba9 100644
--- a/Libraries/Core/Models/Spt/Bots/ModToSpawnRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
 
-namespace Core.Models.Spt.Bots;
+namespace SPTarkov.Server.Core.Models.Spt.Bots;
 
 public record ModToSpawnRequest
 {
diff --git a/Libraries/Core/Models/Spt/Config/AirdropConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Config/AirdropConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs
index a61cff40..ff945489 100644
--- a/Libraries/Core/Models/Spt/Config/AirdropConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record AirdropConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/BackupConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs
similarity index 94%
rename from Libraries/Core/Models/Spt/Config/BackupConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs
index 53e412dd..3846946c 100644
--- a/Libraries/Core/Models/Spt/Config/BackupConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record BackupConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/BaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs
similarity index 88%
rename from Libraries/Core/Models/Spt/Config/BaseConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs
index d2f1ebaa..01073bcd 100644
--- a/Libraries/Core/Models/Spt/Config/BaseConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/BotConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
similarity index 99%
rename from Libraries/Core/Models/Spt/Config/BotConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
index 5c4ee115..a31f00ca 100644
--- a/Libraries/Core/Models/Spt/Config/BotConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record BotConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/BotDurability.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Config/BotDurability.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs
index 886d4033..18fc4750 100644
--- a/Libraries/Core/Models/Spt/Config/BotDurability.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record BotDurability
 {
diff --git a/Libraries/Core/Models/Spt/Config/CoreConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Config/CoreConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs
index 6579a2bb..0016033f 100644
--- a/Libraries/Core/Models/Spt/Config/CoreConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Game;
+using SPTarkov.Server.Core.Models.Eft.Game;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record CoreConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/GiftsConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs
similarity index 91%
rename from Libraries/Core/Models/Spt/Config/GiftsConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs
index de2c665a..cdb5bba7 100644
--- a/Libraries/Core/Models/Spt/Config/GiftsConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs
@@ -1,10 +1,10 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record GiftsConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/HealthConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs
similarity index 94%
rename from Libraries/Core/Models/Spt/Config/HealthConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs
index fe9a5ff6..9d9e2e31 100644
--- a/Libraries/Core/Models/Spt/Config/HealthConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record HealthConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Config/HideoutConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs
index aee98144..01692a22 100644
--- a/Libraries/Core/Models/Spt/Config/HideoutConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record HideoutConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/HttpConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs
similarity index 96%
rename from Libraries/Core/Models/Spt/Config/HttpConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs
index 472bd33f..2eae5bc0 100644
--- a/Libraries/Core/Models/Spt/Config/HttpConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record HttpConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/InRaidConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Config/InRaidConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs
index 3a83b57f..d693ad5c 100644
--- a/Libraries/Core/Models/Spt/Config/InRaidConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record InRaidConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/InsuranceConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Config/InsuranceConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs
index ef42b5ee..6e911a56 100644
--- a/Libraries/Core/Models/Spt/Config/InsuranceConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record InsuranceConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Config/InventoryConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs
index d392c6e4..b1822d44 100644
--- a/Libraries/Core/Models/Spt/Config/InventoryConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
+using SPTarkov.Server.Core.Models.Common;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record InventoryConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/ItemConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs
similarity index 95%
rename from Libraries/Core/Models/Spt/Config/ItemConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs
index 6377c968..4792ee98 100644
--- a/Libraries/Core/Models/Spt/Config/ItemConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record ItemConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/LocaleConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocaleConfig.cs
similarity index 95%
rename from Libraries/Core/Models/Spt/Config/LocaleConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocaleConfig.cs
index 09f1cca7..cf693861 100644
--- a/Libraries/Core/Models/Spt/Config/LocaleConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocaleConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record LocaleConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/LocationConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Config/LocationConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs
index 8952738f..f127f7ec 100644
--- a/Libraries/Core/Models/Spt/Config/LocationConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record LocationConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/LootConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LootConfig.cs
similarity index 87%
rename from Libraries/Core/Models/Spt/Config/LootConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/LootConfig.cs
index 10212b4d..18b7c87f 100644
--- a/Libraries/Core/Models/Spt/Config/LootConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LootConfig.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record LootConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/LostOnDeathConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Config/LostOnDeathConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs
index f4bc8f72..ced78ebd 100644
--- a/Libraries/Core/Models/Spt/Config/LostOnDeathConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record LostOnDeathConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/MatchConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs
similarity index 89%
rename from Libraries/Core/Models/Spt/Config/MatchConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs
index 3e6021ba..34b2c6ca 100644
--- a/Libraries/Core/Models/Spt/Config/MatchConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record MatchConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/PlayerScavConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs
similarity index 93%
rename from Libraries/Core/Models/Spt/Config/PlayerScavConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs
index b3eb1cbd..7843dd1c 100644
--- a/Libraries/Core/Models/Spt/Config/PlayerScavConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record PlayerScavConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/PmcChatResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs
similarity index 95%
rename from Libraries/Core/Models/Spt/Config/PmcChatResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs
index 86611bd2..1aac93b2 100644
--- a/Libraries/Core/Models/Spt/Config/PmcChatResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record PmcChatResponse : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/PmcConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Config/PmcConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs
index ca2d3db0..dd52b3aa 100644
--- a/Libraries/Core/Models/Spt/Config/PmcConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record PmcConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/QuestConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Config/QuestConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs
index bcbfb286..c544e06e 100644
--- a/Libraries/Core/Models/Spt/Config/QuestConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs
@@ -1,10 +1,10 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Enums;
-using Core.Utils.Collections;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Collections;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record QuestConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs
similarity index 99%
rename from Libraries/Core/Models/Spt/Config/RagfairConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs
index d61a8888..1e9de8fa 100644
--- a/Libraries/Core/Models/Spt/Config/RagfairConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
+using SPTarkov.Server.Core.Models.Common;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record RagfairConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/RepairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs
similarity index 96%
rename from Libraries/Core/Models/Spt/Config/RepairConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs
index 75507091..5ae2862a 100644
--- a/Libraries/Core/Models/Spt/Config/RepairConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record RepairConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/ScavCaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs
similarity index 96%
rename from Libraries/Core/Models/Spt/Config/ScavCaseConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs
index c2d30ac1..8511aca5 100644
--- a/Libraries/Core/Models/Spt/Config/ScavCaseConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
+using SPTarkov.Server.Core.Models.Common;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record ScavCaseConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/SeasonalEventConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Config/SeasonalEventConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs
index d4f2ea7b..094dbb00 100644
--- a/Libraries/Core/Models/Spt/Config/SeasonalEventConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
-using Core.Models.Enums;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record SeasonalEventConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/TraderConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Config/TraderConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs
index 72a734dd..95def618 100644
--- a/Libraries/Core/Models/Spt/Config/TraderConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Spt.Services;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Spt.Services;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record TraderConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Config/WeatherConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs
similarity index 95%
rename from Libraries/Core/Models/Spt/Config/WeatherConfig.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs
index f9e37ee9..2b41df1d 100644
--- a/Libraries/Core/Models/Spt/Config/WeatherConfig.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Enums;
-using Core.Utils.Json.Converters;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils.Json.Converters;
 
-namespace Core.Models.Spt.Config;
+namespace SPTarkov.Server.Core.Models.Spt.Config;
 
 public record WeatherConfig : BaseConfig
 {
diff --git a/Libraries/Core/Models/Spt/Dialog/SendMessageDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs
similarity index 94%
rename from Libraries/Core/Models/Spt/Dialog/SendMessageDetails.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs
index 23b48c3d..8f997ee1 100644
--- a/Libraries/Core/Models/Spt/Dialog/SendMessageDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs
@@ -1,9 +1,9 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Dialog;
+namespace SPTarkov.Server.Core.Models.Spt.Dialog;
 
 public record SendMessageDetails
 {
diff --git a/Libraries/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
similarity index 82%
rename from Libraries/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
index b99b6b2e..69f9c429 100644
--- a/Libraries/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Fence;
+namespace SPTarkov.Server.Core.Models.Spt.Fence;
 
 public record CreateFenceAssortsResult
 {
diff --git a/Libraries/Core/Models/Spt/Fence/FenceAssortGenerationValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
similarity index 93%
rename from Libraries/Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
index f0958b84..e0389391 100644
--- a/Libraries/Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Fence;
+namespace SPTarkov.Server.Core.Models.Spt.Fence;
 
 public record FenceAssortGenerationValues
 {
diff --git a/Libraries/Core/Models/Spt/Helper/WeightedRandomResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs
similarity index 76%
rename from Libraries/Core/Models/Spt/Helper/WeightedRandomResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs
index ceb9b9e9..26063fb1 100644
--- a/Libraries/Core/Models/Spt/Helper/WeightedRandomResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Spt.Helper;
+namespace SPTarkov.Server.Core.Models.Spt.Helper;
 
 public record WeightedRandomResult<T>
 {
diff --git a/Libraries/Core/Models/Spt/Hideout/CircleCraftDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs
similarity index 78%
rename from Libraries/Core/Models/Spt/Hideout/CircleCraftDetails.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs
index bdb6b486..556ca796 100644
--- a/Libraries/Core/Models/Spt/Hideout/CircleCraftDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums.Hideout;
-using Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Enums.Hideout;
+using SPTarkov.Server.Core.Models.Spt.Config;
 
-namespace Core.Models.Spt.Hideout;
+namespace SPTarkov.Server.Core.Models.Spt.Hideout;
 
 public record CircleCraftDetails
 {
diff --git a/Libraries/Core/Models/Spt/Hideout/Hideout.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs
similarity index 86%
rename from Libraries/Core/Models/Spt/Hideout/Hideout.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs
index e001a9d0..d7face28 100644
--- a/Libraries/Core/Models/Spt/Hideout/Hideout.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
 
-namespace Core.Models.Spt.Hideout;
+namespace SPTarkov.Server.Core.Models.Spt.Hideout;
 
 public record Hideout
 {
diff --git a/Libraries/Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
similarity index 94%
rename from Libraries/Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
index 0f0fe789..feb67c16 100644
--- a/Libraries/Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Hideout;
+namespace SPTarkov.Server.Core.Models.Spt.Hideout;
 
 public record ScavCaseRewardCountsAndPrices
 {
diff --git a/Libraries/Core/Models/Spt/Inventory/OwnerInventoryItems.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs
similarity index 85%
rename from Libraries/Core/Models/Spt/Inventory/OwnerInventoryItems.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs
index dd39d6d1..286b6ddc 100644
--- a/Libraries/Core/Models/Spt/Inventory/OwnerInventoryItems.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Inventory;
+namespace SPTarkov.Server.Core.Models.Spt.Inventory;
 
 public record OwnerInventoryItems
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
similarity index 69%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
index d7168722..fba801e2 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs
@@ -1,6 +1,6 @@
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2CompatibleVersion : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
similarity index 57%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
index 8e27c9d2..f4daae4a 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs
@@ -1,6 +1,6 @@
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2LoginResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
similarity index 53%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
index a4ae5bb3..152baffc 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs
@@ -1,7 +1,7 @@
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2ModsResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
similarity index 60%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
index d679e4b3..4902c3e4 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Launcher;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2PasswordChangeResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2PingResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
similarity index 57%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
index 44347a05..aedbf1c0 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs
@@ -1,6 +1,6 @@
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2PingResponse : IRequestData
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs
new file mode 100644
index 00000000..c3244069
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs
@@ -0,0 +1,13 @@
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Utils;
+
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
+
+public class LauncherV2ProfileResponse : IRequestData
+{
+    public SptProfile Response
+    {
+        get;
+        set;
+    }
+}
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
similarity index 50%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
index d0b7358f..68aa449a 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Launcher;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2ProfilesResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
similarity index 60%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
index 77fbc80a..c1651bf9 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Launcher;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2RegisterResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
similarity index 60%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
index 5fb56cdd..055b9bdd 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Launcher;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2RemoveResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
similarity index 61%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
index 5c6fe441..5a73c43a 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs
@@ -1,6 +1,6 @@
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public class LauncherV2TypesResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
similarity index 61%
rename from Libraries/Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
index 9a802578..9976e944 100644
--- a/Libraries/Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs
@@ -1,6 +1,6 @@
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Launcher;
+namespace SPTarkov.Server.Core.Models.Spt.Launcher;
 
 public record LauncherV2VersionResponse : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Location/RaidChanges.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs
similarity index 97%
rename from Libraries/Core/Models/Spt/Location/RaidChanges.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs
index 73ef765c..6d8b0436 100644
--- a/Libraries/Core/Models/Spt/Location/RaidChanges.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Location;
+namespace SPTarkov.Server.Core.Models.Spt.Location;
 
 public record RaidChanges
 {
diff --git a/Libraries/Core/Models/Spt/Logging/ClientLogRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs
similarity index 89%
rename from Libraries/Core/Models/Spt/Logging/ClientLogRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs
index a8f4e25c..32f963bc 100644
--- a/Libraries/Core/Models/Spt/Logging/ClientLogRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Utils;
 
-namespace Core.Models.Spt.Logging;
+namespace SPTarkov.Server.Core.Models.Spt.Logging;
 
 public record ClientLogRequest : IRequestData
 {
diff --git a/Libraries/Core/Models/Spt/Logging/LogBackgroundColor.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogBackgroundColor.cs
similarity index 90%
rename from Libraries/Core/Models/Spt/Logging/LogBackgroundColor.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogBackgroundColor.cs
index f45f58a4..56950580 100644
--- a/Libraries/Core/Models/Spt/Logging/LogBackgroundColor.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogBackgroundColor.cs
@@ -1,4 +1,4 @@
-// namespace Core.Models.Spt.Logging;
+// namespace SPTarkov.Server.Core.Models.Spt.Logging;
 //
 // public record LogBackgroundColor
 // {
diff --git a/Libraries/Core/Models/Spt/Logging/LogLevel.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogLevel.cs
similarity index 74%
rename from Libraries/Core/Models/Spt/Logging/LogLevel.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogLevel.cs
index 08def7b5..2c8a83c6 100644
--- a/Libraries/Core/Models/Spt/Logging/LogLevel.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogLevel.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Spt.Logging;
+namespace SPTarkov.Server.Core.Models.Spt.Logging;
 
 public enum LogLevel
 {
diff --git a/Libraries/Core/Models/Spt/Logging/LogTextColor.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogTextColor.cs
similarity index 90%
rename from Libraries/Core/Models/Spt/Logging/LogTextColor.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogTextColor.cs
index 8b2b7d8c..47986014 100644
--- a/Libraries/Core/Models/Spt/Logging/LogTextColor.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogTextColor.cs
@@ -1,4 +1,4 @@
-// namespace Core.Models.Spt.Logging;
+// namespace SPTarkov.Server.Core.Models.Spt.Logging;
 //
 // public record LogTextColor
 // {
diff --git a/Libraries/Core/Models/Spt/Logging/SptLogger.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs
similarity index 92%
rename from Libraries/Core/Models/Spt/Logging/SptLogger.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs
index 378af013..f0d66bfe 100644
--- a/Libraries/Core/Models/Spt/Logging/SptLogger.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Spt.Logging;
+namespace SPTarkov.Server.Core.Models.Spt.Logging;
 
 public record SptLogger
 {
diff --git a/Libraries/Core/Models/Spt/Mod/ModOrder.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs
similarity index 78%
rename from Libraries/Core/Models/Spt/Mod/ModOrder.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs
index 89548cf6..62538646 100644
--- a/Libraries/Core/Models/Spt/Mod/ModOrder.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Mod;
+namespace SPTarkov.Server.Core.Models.Spt.Mod;
 
 public class ModOrder
 {
diff --git a/Libraries/Core/Models/Spt/Mod/NewItemDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs
similarity index 96%
rename from Libraries/Core/Models/Spt/Mod/NewItemDetails.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs
index 836e446b..ca2269c7 100644
--- a/Libraries/Core/Models/Spt/Mod/NewItemDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Mod;
+namespace SPTarkov.Server.Core.Models.Spt.Mod;
 
 public record NewItemDetails : NewItemDetailsBase
 {
diff --git a/Libraries/Core/Models/Spt/Mod/PackageJsonData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/PackageJsonData.cs
similarity index 96%
rename from Libraries/Core/Models/Spt/Mod/PackageJsonData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Mod/PackageJsonData.cs
index 73706fdb..0444706b 100644
--- a/Libraries/Core/Models/Spt/Mod/PackageJsonData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/PackageJsonData.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Mod;
+namespace SPTarkov.Server.Core.Models.Spt.Mod;
 
 public record PackageJsonData
 {
diff --git a/Libraries/Core/Models/Spt/Mod/SptMod.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs
similarity index 90%
rename from Libraries/Core/Models/Spt/Mod/SptMod.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs
index cd82da89..515e66b0 100644
--- a/Libraries/Core/Models/Spt/Mod/SptMod.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Mod;
+namespace SPTarkov.Server.Core.Models.Spt.Mod;
 
 public class SptMod
 {
diff --git a/Libraries/Core/Models/Spt/Presets/PresetCacheDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
similarity index 85%
rename from Libraries/Core/Models/Spt/Presets/PresetCacheDetails.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
index fcb6182b..13edcedc 100644
--- a/Libraries/Core/Models/Spt/Presets/PresetCacheDetails.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs
@@ -1,4 +1,4 @@
-namespace Core.Models.Spt.Presets
+namespace SPTarkov.Server.Core.Models.Spt.Presets
 {
     public record PresetCacheDetails
     {
diff --git a/Libraries/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
similarity index 75%
rename from Libraries/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
index a0367c54..029a9dcc 100644
--- a/Libraries/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Quests;
+namespace SPTarkov.Server.Core.Models.Spt.Quests;
 
 public record GetRepeatableByIdResult
 {
diff --git a/Libraries/Core/Models/Spt/Ragfair/RagfairServerPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs
similarity index 86%
rename from Libraries/Core/Models/Spt/Ragfair/RagfairServerPrices.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs
index f01dd4a3..8591cab9 100644
--- a/Libraries/Core/Models/Spt/Ragfair/RagfairServerPrices.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Ragfair;
+namespace SPTarkov.Server.Core.Models.Spt.Ragfair;
 
 public record RagfairServerPrices
 {
diff --git a/Libraries/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
similarity index 86%
rename from Libraries/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
index b32b81fb..53539941 100644
--- a/Libraries/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Ragfair;
+namespace SPTarkov.Server.Core.Models.Spt.Ragfair;
 
 public record TplWithFleaPrice
 {
diff --git a/Libraries/Core/Models/Spt/Repeatable/QuestRewardValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs
similarity index 94%
rename from Libraries/Core/Models/Spt/Repeatable/QuestRewardValues.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs
index 31056c8c..1de0483e 100644
--- a/Libraries/Core/Models/Spt/Repeatable/QuestRewardValues.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Repeatable;
+namespace SPTarkov.Server.Core.Models.Spt.Repeatable;
 
 public record QuestRewardValues
 {
diff --git a/Libraries/Core/Models/Spt/Repeatable/QuestTypePool.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs
similarity index 92%
rename from Libraries/Core/Models/Spt/Repeatable/QuestTypePool.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs
index c9a7680a..33dc7da0 100644
--- a/Libraries/Core/Models/Spt/Repeatable/QuestTypePool.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Repeatable;
+namespace SPTarkov.Server.Core.Models.Spt.Repeatable;
 
 public record QuestTypePool
 {
diff --git a/Libraries/Core/Models/Spt/Server/DatabaseTables.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs
similarity index 83%
rename from Libraries/Core/Models/Spt/Server/DatabaseTables.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs
index 71e80411..e1fc558d 100644
--- a/Libraries/Core/Models/Spt/Server/DatabaseTables.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Server;
+namespace SPTarkov.Server.Core.Models.Spt.Server;
 
 public record DatabaseTables
 {
diff --git a/Libraries/Core/Models/Spt/Server/LocaleBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs
similarity index 84%
rename from Libraries/Core/Models/Spt/Server/LocaleBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs
index 9580c1dc..dc13319f 100644
--- a/Libraries/Core/Models/Spt/Server/LocaleBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Utils.Json;
+using SPTarkov.Server.Core.Utils.Json;
 
-namespace Core.Models.Spt.Server;
+namespace SPTarkov.Server.Core.Models.Spt.Server;
 
 public record LocaleBase
 {
diff --git a/Libraries/Core/Models/Spt/Server/Locations.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs
similarity index 98%
rename from Libraries/Core/Models/Spt/Server/Locations.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs
index 85286f3d..6054cb0a 100644
--- a/Libraries/Core/Models/Spt/Server/Locations.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Server;
+namespace SPTarkov.Server.Core.Models.Spt.Server;
 
 public record Locations
 {
diff --git a/Libraries/Core/Models/Spt/Server/ServerBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs
similarity index 83%
rename from Libraries/Core/Models/Spt/Server/ServerBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs
index 22a9aa30..f41de231 100644
--- a/Libraries/Core/Models/Spt/Server/ServerBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Server;
+namespace SPTarkov.Server.Core.Models.Spt.Server;
 
 public record ServerBase
 {
diff --git a/Libraries/Core/Models/Spt/Server/SettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs
similarity index 99%
rename from Libraries/Core/Models/Spt/Server/SettingsBase.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs
index 2bae61bf..3f19e748 100644
--- a/Libraries/Core/Models/Spt/Server/SettingsBase.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Server;
+namespace SPTarkov.Server.Core.Models.Spt.Server;
 
 public record SettingsBase
 {
diff --git a/Libraries/Core/Models/Spt/Services/InsuranceEquipmentPkg.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
similarity index 77%
rename from Libraries/Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
index bc095bb8..3bebc2bb 100644
--- a/Libraries/Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 
-namespace Core.Models.Spt.Services;
+namespace SPTarkov.Server.Core.Models.Spt.Services;
 
 public record InsuranceEquipmentPkg
 {
diff --git a/Libraries/Core/Models/Spt/Services/LootItem.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs
similarity index 89%
rename from Libraries/Core/Models/Spt/Services/LootItem.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs
index c9a763e2..896f69c6 100644
--- a/Libraries/Core/Models/Spt/Services/LootItem.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Core.Models.Spt.Services;
+namespace SPTarkov.Server.Core.Models.Spt.Services;
 
 public record LootItem
 {
diff --git a/Libraries/Core/Models/Spt/Services/LootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs
similarity index 95%
rename from Libraries/Core/Models/Spt/Services/LootRequest.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs
index 3b54c64a..d42dfe6a 100644
--- a/Libraries/Core/Models/Spt/Services/LootRequest.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Common;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Services;
+namespace SPTarkov.Server.Core.Models.Spt.Services;
 
 public record LootRequest
 {
diff --git a/Libraries/Core/Models/Spt/Services/TraderServiceModel.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs
similarity index 91%
rename from Libraries/Core/Models/Spt/Services/TraderServiceModel.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs
index 37b3b0d7..4e7fffb1 100644
--- a/Libraries/Core/Models/Spt/Services/TraderServiceModel.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Services;
+namespace SPTarkov.Server.Core.Models.Spt.Services;
 
 public record TraderServiceModel
 {
diff --git a/Libraries/Core/Models/Spt/Templates/Templates.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
similarity index 93%
rename from Libraries/Core/Models/Spt/Templates/Templates.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
index cd4e31c2..f588c21a 100644
--- a/Libraries/Core/Models/Spt/Templates/Templates.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
 
-namespace Core.Models.Spt.Templates;
+namespace SPTarkov.Server.Core.Models.Spt.Templates;
 
 public record Templates
 {
diff --git a/Libraries/Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
similarity index 76%
rename from Libraries/Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
rename to Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
index cdec4da1..6985eeb2 100644
--- a/Libraries/Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Models.Spt.Weather;
+namespace SPTarkov.Server.Core.Models.Spt.Weather;
 
 public record GetLocalWeatherResponseData
 {
diff --git a/Libraries/SPTarkov.Server.Core/Models/Utils/IRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Utils/IRequestData.cs
new file mode 100644
index 00000000..aba984fa
--- /dev/null
+++ b/Libraries/SPTarkov.Server.Core/Models/Utils/IRequestData.cs
@@ -0,0 +1,5 @@
+namespace SPTarkov.Server.Core.Models.Utils;
+
+public interface IRequestData
+{
+}
diff --git a/Libraries/Core/Models/Utils/ISptLogger.cs b/Libraries/SPTarkov.Server.Core/Models/Utils/ISptLogger.cs
similarity index 82%
rename from Libraries/Core/Models/Utils/ISptLogger.cs
rename to Libraries/SPTarkov.Server.Core/Models/Utils/ISptLogger.cs
index 53c5534d..4453e43e 100644
--- a/Libraries/Core/Models/Utils/ISptLogger.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Utils/ISptLogger.cs
@@ -1,7 +1,7 @@
-using Core.Models.Logging;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Logging;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Models.Utils;
+namespace SPTarkov.Server.Core.Models.Utils;
 
 public interface ISptLogger<T>
 {
diff --git a/Libraries/Core/Routers/Dynamic/BotDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BotDynamicRouter.cs
similarity index 88%
rename from Libraries/Core/Routers/Dynamic/BotDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/BotDynamicRouter.cs
index c7977538..9b949df8 100644
--- a/Libraries/Core/Routers/Dynamic/BotDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BotDynamicRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class BotDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/BundleDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BundleDynamicRouter.cs
similarity index 71%
rename from Libraries/Core/Routers/Dynamic/BundleDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/BundleDynamicRouter.cs
index 537a1f75..5caca9a1 100644
--- a/Libraries/Core/Routers/Dynamic/BundleDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/BundleDynamicRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class BundleDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/CustomizationDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/CustomizationDynamicRouter.cs
similarity index 72%
rename from Libraries/Core/Routers/Dynamic/CustomizationDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/CustomizationDynamicRouter.cs
index 4974a2d1..fca2888e 100644
--- a/Libraries/Core/Routers/Dynamic/CustomizationDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/CustomizationDynamicRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class CustomizationDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/DataDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/DataDynamicRouter.cs
similarity index 83%
rename from Libraries/Core/Routers/Dynamic/DataDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/DataDynamicRouter.cs
index b8429a8e..bdddeae1 100644
--- a/Libraries/Core/Routers/Dynamic/DataDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/DataDynamicRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class DataDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/HttpDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/HttpDynamicRouter.cs
similarity index 76%
rename from Libraries/Core/Routers/Dynamic/HttpDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/HttpDynamicRouter.cs
index 2884521d..7f25a725 100644
--- a/Libraries/Core/Routers/Dynamic/HttpDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/HttpDynamicRouter.cs
@@ -1,8 +1,8 @@
-using Core.DI;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class HttpDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/InraidDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/InraidDynamicRouter.cs
similarity index 75%
rename from Libraries/Core/Routers/Dynamic/InraidDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/InraidDynamicRouter.cs
index e54d1313..976b03a9 100644
--- a/Libraries/Core/Routers/Dynamic/InraidDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/InraidDynamicRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.InRaid;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.InRaid;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class InraidDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/LocationDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/LocationDynamicRouter.cs
similarity index 68%
rename from Libraries/Core/Routers/Dynamic/LocationDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/LocationDynamicRouter.cs
index 267411a7..a1386796 100644
--- a/Libraries/Core/Routers/Dynamic/LocationDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/LocationDynamicRouter.cs
@@ -1,8 +1,8 @@
-using Core.DI;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class LocationDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/NotifierDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/NotifierDynamicRouter.cs
similarity index 87%
rename from Libraries/Core/Routers/Dynamic/NotifierDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/NotifierDynamicRouter.cs
index 6d22836d..128c5cbe 100644
--- a/Libraries/Core/Routers/Dynamic/NotifierDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/NotifierDynamicRouter.cs
@@ -1,9 +1,9 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class NotifierDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/Dynamic/TraderDynamicRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/TraderDynamicRouter.cs
similarity index 79%
rename from Libraries/Core/Routers/Dynamic/TraderDynamicRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Dynamic/TraderDynamicRouter.cs
index f0196470..c7defd5c 100644
--- a/Libraries/Core/Routers/Dynamic/TraderDynamicRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Dynamic/TraderDynamicRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Dynamic;
+namespace SPTarkov.Server.Core.Routers.Dynamic;
 
 [Injectable(InjectableTypeOverride = typeof(DynamicRouter))]
 public class TraderDynamicRouter : DynamicRouter
diff --git a/Libraries/Core/Routers/EventOutputHolder.cs b/Libraries/SPTarkov.Server.Core/Routers/EventOutputHolder.cs
similarity index 96%
rename from Libraries/Core/Routers/EventOutputHolder.cs
rename to Libraries/SPTarkov.Server.Core/Routers/EventOutputHolder.cs
index bcf95313..d4087c76 100644
--- a/Libraries/Core/Routers/EventOutputHolder.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/EventOutputHolder.cs
@@ -1,13 +1,13 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Utils;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers;
+namespace SPTarkov.Server.Core.Routers;
 
 [Injectable]
 public class EventOutputHolder
@@ -147,7 +147,7 @@ public class EventOutputHolder
             }
         }
     }
-    
+
     /// <summary>
     /// Return all hideout Improvements from player profile, adjust completed Improvements' completed property to be true
     /// </summary>
@@ -237,7 +237,7 @@ public class EventOutputHolder
             limit.RemainingLimit = limit.TotalLimit;
         }
     }
-    
+
     /// <summary>
     /// Convert the internal trader data object into an object we can send to the client
     /// </summary>
diff --git a/Libraries/Core/Routers/HttpRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/HttpRouter.cs
similarity index 95%
rename from Libraries/Core/Routers/HttpRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/HttpRouter.cs
index b952601f..c6e9d5f5 100644
--- a/Libraries/Core/Routers/HttpRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/HttpRouter.cs
@@ -1,7 +1,7 @@
-using Core.DI;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers;
+namespace SPTarkov.Server.Core.Routers;
 
 [Injectable]
 public class HttpRouter
diff --git a/Libraries/Core/Routers/ImageRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ImageRouter.cs
similarity index 87%
rename from Libraries/Core/Routers/ImageRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ImageRouter.cs
index 365cd7fa..3cb756ea 100644
--- a/Libraries/Core/Routers/ImageRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ImageRouter.cs
@@ -1,8 +1,8 @@
-using Core.Services.Image;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Services.Image;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers;
+namespace SPTarkov.Server.Core.Routers;
 
 [Injectable]
 public class ImageRouter
diff --git a/Libraries/Core/Routers/ItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEventRouter.cs
similarity index 86%
rename from Libraries/Core/Routers/ItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEventRouter.cs
index 4443cef9..6117f3e4 100644
--- a/Libraries/Core/Routers/ItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEventRouter.cs
@@ -1,14 +1,14 @@
-using Core.DI;
-using Core.Helpers;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Routers;
+namespace SPTarkov.Server.Core.Routers;
 
 [Injectable]
 public class ItemEventRouter
@@ -42,7 +42,7 @@ public class ItemEventRouter
         _itemEventRouters = itemEventRouters.ToList();
         _cloner = cloner;
     }
-    
+
     /// <summary>
     /// Handles ItemEventRouter Requests and processes them.
     /// </summary>
diff --git a/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/CustomizationItemEventRouter.cs
similarity index 77%
rename from Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/CustomizationItemEventRouter.cs
index f33cd90a..8720d13a 100644
--- a/Libraries/Core/Routers/ItemEvents/CustomizationItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/CustomizationItemEventRouter.cs
@@ -1,14 +1,14 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Customization;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Customization;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class CustomizationItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HealthItemEventRouter.cs
similarity index 78%
rename from Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HealthItemEventRouter.cs
index 017020c0..eed5c245 100644
--- a/Libraries/Core/Routers/ItemEvents/HealthItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HealthItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Health;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Health;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class HealthItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HideoutItemEventRouter.cs
similarity index 93%
rename from Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HideoutItemEventRouter.cs
index 423267a4..a2622b4b 100644
--- a/Libraries/Core/Routers/ItemEvents/HideoutItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/HideoutItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class HideoutItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InsuranceItemEventRouter.cs
similarity index 72%
rename from Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InsuranceItemEventRouter.cs
index 69c50e3f..959ac53b 100644
--- a/Libraries/Core/Routers/ItemEvents/InsuranceItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InsuranceItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Insurance;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Insurance;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class InsuranceItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InventoryItemEventRouter.cs
similarity index 92%
rename from Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InventoryItemEventRouter.cs
index 18d0c83e..7ae3b685 100644
--- a/Libraries/Core/Routers/ItemEvents/InventoryItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/InventoryItemEventRouter.cs
@@ -1,15 +1,15 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Quests;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class InventoryItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/NoteItemEventRouter.cs
similarity index 78%
rename from Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/NoteItemEventRouter.cs
index 5a7d9f49..02666802 100644
--- a/Libraries/Core/Routers/ItemEvents/NoteItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/NoteItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Notes;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Notes;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class NoteItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/QuestItemEventRouter.cs
similarity index 81%
rename from Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/QuestItemEventRouter.cs
index bd279c4d..3b326d83 100644
--- a/Libraries/Core/Routers/ItemEvents/QuestItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/QuestItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Quests;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class QuestItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RagfairItemEventRouter.cs
similarity index 79%
rename from Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RagfairItemEventRouter.cs
index 3d62a4b4..8fd4f067 100644
--- a/Libraries/Core/Routers/ItemEvents/RagfairItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RagfairItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class RagfairItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RepairItemEventRouter.cs
similarity index 75%
rename from Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RepairItemEventRouter.cs
index 089dc1f0..62d3a459 100644
--- a/Libraries/Core/Routers/ItemEvents/RepairItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/RepairItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Repair;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Repair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class RepairItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/TradeItemEventRouter.cs
similarity index 79%
rename from Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/TradeItemEventRouter.cs
index b025769e..a2e49cf3 100644
--- a/Libraries/Core/Routers/ItemEvents/TradeItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/TradeItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class TradeItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/WishlistItemEventRouter.cs
similarity index 79%
rename from Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/ItemEvents/WishlistItemEventRouter.cs
index 956dfefa..fc46e2d8 100644
--- a/Libraries/Core/Routers/ItemEvents/WishlistItemEventRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/ItemEvents/WishlistItemEventRouter.cs
@@ -1,13 +1,13 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Wishlist;
-using Core.Models.Enums;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Wishlist;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.ItemEvents;
+namespace SPTarkov.Server.Core.Routers.ItemEvents;
 
 [Injectable(InjectableTypeOverride = typeof(ItemEventRouterDefinition))]
 public class WishlistItemEventRouter : ItemEventRouterDefinition
diff --git a/Libraries/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/HealthSaveLoadRouter.cs
similarity index 93%
rename from Libraries/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/SaveLoad/HealthSaveLoadRouter.cs
index a8c67024..c188bd03 100644
--- a/Libraries/Core/Routers/SaveLoad/HealthSaveLoadRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/HealthSaveLoadRouter.cs
@@ -1,9 +1,9 @@
-using Core.DI;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.SaveLoad;
+namespace SPTarkov.Server.Core.Routers.SaveLoad;
 
 [Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))]
 public class HealthSaveLoadRouter : SaveLoadRouter
diff --git a/Libraries/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InraidSaveLoadRouter.cs
similarity index 77%
rename from Libraries/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InraidSaveLoadRouter.cs
index cf60ec6b..adf0d783 100644
--- a/Libraries/Core/Routers/SaveLoad/InraidSaveLoadRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InraidSaveLoadRouter.cs
@@ -1,8 +1,8 @@
-using Core.DI;
-using Core.Models.Eft.Profile;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.SaveLoad;
+namespace SPTarkov.Server.Core.Routers.SaveLoad;
 
 [Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))]
 public class InraidSaveLoadRouter : SaveLoadRouter
diff --git a/Libraries/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs
similarity index 74%
rename from Libraries/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs
index 8e078ba1..501c1b92 100644
--- a/Libraries/Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/InsuranceSaveLoadRouter.cs
@@ -1,8 +1,8 @@
-using Core.DI;
-using Core.Models.Eft.Profile;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.SaveLoad;
+namespace SPTarkov.Server.Core.Routers.SaveLoad;
 
 [Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))]
 public class InsuranceSaveLoadRouter : SaveLoadRouter
diff --git a/Libraries/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs
similarity index 73%
rename from Libraries/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs
index 29bb1099..861c9e76 100644
--- a/Libraries/Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/SaveLoad/ProfileSaveLoadRouter.cs
@@ -1,9 +1,9 @@
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.SaveLoad;
+namespace SPTarkov.Server.Core.Routers.SaveLoad;
 
 [Injectable(InjectableTypeOverride = typeof(SaveLoadRouter))]
 public class ProfileSaveLoadRouter : SaveLoadRouter
diff --git a/Libraries/Core/Routers/Serializers/BundleSerializer.cs b/Libraries/SPTarkov.Server.Core/Routers/Serializers/BundleSerializer.cs
similarity index 79%
rename from Libraries/Core/Routers/Serializers/BundleSerializer.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Serializers/BundleSerializer.cs
index 08568d62..dd8cb8cc 100644
--- a/Libraries/Core/Routers/Serializers/BundleSerializer.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Serializers/BundleSerializer.cs
@@ -1,10 +1,10 @@
-using Core.DI;
-using Core.Loaders;
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Loaders;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Serializers;
+namespace SPTarkov.Server.Core.Routers.Serializers;
 
 [Injectable]
 public class BundleSerializer(
diff --git a/Libraries/Core/Routers/Serializers/ImageSerializer.cs b/Libraries/SPTarkov.Server.Core/Routers/Serializers/ImageSerializer.cs
similarity index 79%
rename from Libraries/Core/Routers/Serializers/ImageSerializer.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Serializers/ImageSerializer.cs
index ac0f4a9c..ef910ceb 100644
--- a/Libraries/Core/Routers/Serializers/ImageSerializer.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Serializers/ImageSerializer.cs
@@ -1,7 +1,7 @@
-using Core.DI;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Serializers;
+namespace SPTarkov.Server.Core.Routers.Serializers;
 
 [Injectable]
 public class ImageSerializer : ISerializer
diff --git a/Libraries/Core/Routers/Serializers/NotifySerializer.cs b/Libraries/SPTarkov.Server.Core/Routers/Serializers/NotifySerializer.cs
similarity index 80%
rename from Libraries/Core/Routers/Serializers/NotifySerializer.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Serializers/NotifySerializer.cs
index 782793f3..6a0e33b9 100644
--- a/Libraries/Core/Routers/Serializers/NotifySerializer.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Serializers/NotifySerializer.cs
@@ -1,10 +1,10 @@
-using Core.Controllers;
-using Core.DI;
-using Core.Helpers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Controllers;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Serializers;
+namespace SPTarkov.Server.Core.Routers.Serializers;
 
 [Injectable]
 public class NotifySerializer(
diff --git a/Libraries/Core/Routers/Static/AchievementStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/AchievementStaticRouter.cs
similarity index 79%
rename from Libraries/Core/Routers/Static/AchievementStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/AchievementStaticRouter.cs
index e07a0dba..66751986 100644
--- a/Libraries/Core/Routers/Static/AchievementStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/AchievementStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class AchievementStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/BotStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/BotStaticRouter.cs
similarity index 73%
rename from Libraries/Core/Routers/Static/BotStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/BotStaticRouter.cs
index 4119dbd7..d9092db8 100644
--- a/Libraries/Core/Routers/Static/BotStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/BotStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Bot;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Bot;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class BotStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/BuildStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/BuildStaticRouter.cs
similarity index 86%
rename from Libraries/Core/Routers/Static/BuildStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/BuildStaticRouter.cs
index 2c747feb..f7ccc51c 100644
--- a/Libraries/Core/Routers/Static/BuildStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/BuildStaticRouter.cs
@@ -1,12 +1,12 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Builds;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.PresetBuild;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Builds;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.PresetBuild;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class BuildStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/BundleStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/BundleStaticRouter.cs
similarity index 71%
rename from Libraries/Core/Routers/Static/BundleStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/BundleStaticRouter.cs
index 212ed46d..6c93e18c 100644
--- a/Libraries/Core/Routers/Static/BundleStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/BundleStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class BundleStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/ClientLogStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/ClientLogStaticRouter.cs
similarity index 83%
rename from Libraries/Core/Routers/Static/ClientLogStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/ClientLogStaticRouter.cs
index 3d5e7367..cb45fcc5 100644
--- a/Libraries/Core/Routers/Static/ClientLogStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/ClientLogStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Spt.Logging;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Spt.Logging;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class ClientLogStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/CustomizationStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/CustomizationStaticRouter.cs
similarity index 84%
rename from Libraries/Core/Routers/Static/CustomizationStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/CustomizationStaticRouter.cs
index 1cdf397c..0a1bc1b4 100644
--- a/Libraries/Core/Routers/Static/CustomizationStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/CustomizationStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class CustomizationStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/DataStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/DataStaticRouter.cs
similarity index 93%
rename from Libraries/Core/Routers/Static/DataStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/DataStaticRouter.cs
index 1c853d43..4309917a 100644
--- a/Libraries/Core/Routers/Static/DataStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/DataStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class DataStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/DialogStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/DialogStaticRouter.cs
similarity index 96%
rename from Libraries/Core/Routers/Static/DialogStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/DialogStaticRouter.cs
index 5a9905ff..10f346c1 100644
--- a/Libraries/Core/Routers/Static/DialogStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/DialogStaticRouter.cs
@@ -1,12 +1,12 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Dialog;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Dialog;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class DialogStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/GameStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/GameStaticRouter.cs
similarity index 94%
rename from Libraries/Core/Routers/Static/GameStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/GameStaticRouter.cs
index 2f425048..a446eb5a 100644
--- a/Libraries/Core/Routers/Static/GameStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/GameStaticRouter.cs
@@ -1,12 +1,12 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Game;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Game;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class GameStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/HealthStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/HealthStaticRouter.cs
similarity index 73%
rename from Libraries/Core/Routers/Static/HealthStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/HealthStaticRouter.cs
index e9f285b2..d7bd6d0a 100644
--- a/Libraries/Core/Routers/Static/HealthStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/HealthStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Health;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Health;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class HealthStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/InraidStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/InraidStaticRouter.cs
similarity index 84%
rename from Libraries/Core/Routers/Static/InraidStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/InraidStaticRouter.cs
index 1c691819..c88b710b 100644
--- a/Libraries/Core/Routers/Static/InraidStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/InraidStaticRouter.cs
@@ -1,11 +1,11 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.InRaid;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.InRaid;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class InraidStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/InsuranceStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/InsuranceStaticRouter.cs
similarity index 74%
rename from Libraries/Core/Routers/Static/InsuranceStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/InsuranceStaticRouter.cs
index e3bfd9dc..1e3f2712 100644
--- a/Libraries/Core/Routers/Static/InsuranceStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/InsuranceStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Insurance;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Insurance;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class InsuranceStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/ItemEventStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/ItemEventStaticRouter.cs
similarity index 73%
rename from Libraries/Core/Routers/Static/ItemEventStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/ItemEventStaticRouter.cs
index 31b61972..b318ff59 100644
--- a/Libraries/Core/Routers/Static/ItemEventStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/ItemEventStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.ItemEvent;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class ItemEventStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/LauncherStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs
similarity index 91%
rename from Libraries/Core/Routers/Static/LauncherStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs
index bd7b473d..44b45bc5 100644
--- a/Libraries/Core/Routers/Static/LauncherStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherStaticRouter.cs
@@ -1,11 +1,11 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Launcher;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class LauncherStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/LauncherV2StaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs
similarity index 89%
rename from Libraries/Core/Routers/Static/LauncherV2StaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs
index 626d8166..72608460 100644
--- a/Libraries/Core/Routers/Static/LauncherV2StaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LauncherV2StaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Launcher;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class LauncherV2StaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/LocationStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/LocationStaticRouter.cs
similarity index 77%
rename from Libraries/Core/Routers/Static/LocationStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/LocationStaticRouter.cs
index 23274b0c..6cef9fc7 100644
--- a/Libraries/Core/Routers/Static/LocationStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/LocationStaticRouter.cs
@@ -1,11 +1,11 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Location;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Location;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class LocationStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/MatchStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/MatchStaticRouter.cs
similarity index 96%
rename from Libraries/Core/Routers/Static/MatchStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/MatchStaticRouter.cs
index f34cd76c..55684193 100644
--- a/Libraries/Core/Routers/Static/MatchStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/MatchStaticRouter.cs
@@ -1,12 +1,12 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Match;
-using Core.Utils;
-using SptCommon.Annotations;
-using static Core.Services.MatchLocationService;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using static SPTarkov.Server.Core.Services.MatchLocationService;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class MatchStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/NotifierStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/NotifierStaticRouter.cs
similarity index 76%
rename from Libraries/Core/Routers/Static/NotifierStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/NotifierStaticRouter.cs
index d0684023..85e6759b 100644
--- a/Libraries/Core/Routers/Static/NotifierStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/NotifierStaticRouter.cs
@@ -1,11 +1,11 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Request;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class NotifierStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/PrestigeStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/PrestigeStaticRouter.cs
similarity index 77%
rename from Libraries/Core/Routers/Static/PrestigeStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/PrestigeStaticRouter.cs
index cb11bfe2..87432880 100644
--- a/Libraries/Core/Routers/Static/PrestigeStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/PrestigeStaticRouter.cs
@@ -1,11 +1,11 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Prestige;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Prestige;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class PrestigeStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/ProfileStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/ProfileStaticRouter.cs
similarity index 93%
rename from Libraries/Core/Routers/Static/ProfileStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/ProfileStaticRouter.cs
index 4c910d43..199ad625 100644
--- a/Libraries/Core/Routers/Static/ProfileStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/ProfileStaticRouter.cs
@@ -1,12 +1,12 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Launcher;
-using Core.Models.Eft.Profile;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Launcher;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class ProfileStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/QuestStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/QuestStaticRouter.cs
similarity index 77%
rename from Libraries/Core/Routers/Static/QuestStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/QuestStaticRouter.cs
index ab656a10..4010e6c5 100644
--- a/Libraries/Core/Routers/Static/QuestStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/QuestStaticRouter.cs
@@ -1,11 +1,11 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Quests;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class QuestStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/RagfairStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/RagfairStaticRouter.cs
similarity index 90%
rename from Libraries/Core/Routers/Static/RagfairStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/RagfairStaticRouter.cs
index dc9bcafe..cd05974b 100644
--- a/Libraries/Core/Routers/Static/RagfairStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/RagfairStaticRouter.cs
@@ -1,11 +1,11 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Ragfair;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class RagfairStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/TraderStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/TraderStaticRouter.cs
similarity index 79%
rename from Libraries/Core/Routers/Static/TraderStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/TraderStaticRouter.cs
index 4c311808..a650fb85 100644
--- a/Libraries/Core/Routers/Static/TraderStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/TraderStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class TraderStaticRouter : StaticRouter
diff --git a/Libraries/Core/Routers/Static/WeatherStaticRouter.cs b/Libraries/SPTarkov.Server.Core/Routers/Static/WeatherStaticRouter.cs
similarity index 79%
rename from Libraries/Core/Routers/Static/WeatherStaticRouter.cs
rename to Libraries/SPTarkov.Server.Core/Routers/Static/WeatherStaticRouter.cs
index c73e7c14..438b8532 100644
--- a/Libraries/Core/Routers/Static/WeatherStaticRouter.cs
+++ b/Libraries/SPTarkov.Server.Core/Routers/Static/WeatherStaticRouter.cs
@@ -1,10 +1,10 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Routers.Static;
+namespace SPTarkov.Server.Core.Routers.Static;
 
 [Injectable(InjectableTypeOverride = typeof(StaticRouter))]
 public class WeatherStaticRouter : StaticRouter
diff --git a/Libraries/Core/Core.csproj b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
similarity index 92%
rename from Libraries/Core/Core.csproj
rename to Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
index ee09f938..af747ddf 100644
--- a/Libraries/Core/Core.csproj
+++ b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SptDependencyInjection\SptDependencyInjection.csproj"/>
+    <ProjectReference Include="..\SPTarkov.DI\SPTarkov.DI.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Libraries/Core/Servers/ConfigServer.cs b/Libraries/SPTarkov.Server.Core/Servers/ConfigServer.cs
similarity index 90%
rename from Libraries/Core/Servers/ConfigServer.cs
rename to Libraries/SPTarkov.Server.Core/Servers/ConfigServer.cs
index 38a534db..16004c7a 100644
--- a/Libraries/Core/Servers/ConfigServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/ConfigServer.cs
@@ -1,11 +1,11 @@
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Servers;
+namespace SPTarkov.Server.Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class ConfigServer
diff --git a/Libraries/Core/Servers/DatabaseServer.cs b/Libraries/SPTarkov.Server.Core/Servers/DatabaseServer.cs
similarity index 69%
rename from Libraries/Core/Servers/DatabaseServer.cs
rename to Libraries/SPTarkov.Server.Core/Servers/DatabaseServer.cs
index 6c1d66ae..09c0faba 100644
--- a/Libraries/Core/Servers/DatabaseServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/DatabaseServer.cs
@@ -1,7 +1,7 @@
-using Core.Models.Spt.Server;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Spt.Server;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Servers;
+namespace SPTarkov.Server.Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class DatabaseServer
diff --git a/Libraries/Core/Servers/Http/IHttpListener.cs b/Libraries/SPTarkov.Server.Core/Servers/Http/IHttpListener.cs
similarity index 77%
rename from Libraries/Core/Servers/Http/IHttpListener.cs
rename to Libraries/SPTarkov.Server.Core/Servers/Http/IHttpListener.cs
index e392f74b..6e1586d2 100644
--- a/Libraries/Core/Servers/Http/IHttpListener.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/Http/IHttpListener.cs
@@ -1,4 +1,4 @@
-namespace Core.Servers.Http;
+namespace SPTarkov.Server.Core.Servers.Http;
 
 public interface IHttpListener
 {
diff --git a/Libraries/Core/Servers/Http/RequestLogger.cs b/Libraries/SPTarkov.Server.Core/Servers/Http/RequestLogger.cs
similarity index 70%
rename from Libraries/Core/Servers/Http/RequestLogger.cs
rename to Libraries/SPTarkov.Server.Core/Servers/Http/RequestLogger.cs
index d4361d3f..ff1a7e43 100644
--- a/Libraries/Core/Servers/Http/RequestLogger.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/Http/RequestLogger.cs
@@ -1,4 +1,4 @@
-namespace Core.Servers.Http;
+namespace SPTarkov.Server.Core.Servers.Http;
 
 // This is a dummy class to use for SourceContext in Serilog, do not remove!
 public class RequestLogger
diff --git a/Libraries/Core/Servers/Http/SptHttpListener.cs b/Libraries/SPTarkov.Server.Core/Servers/Http/SptHttpListener.cs
similarity index 96%
rename from Libraries/Core/Servers/Http/SptHttpListener.cs
rename to Libraries/SPTarkov.Server.Core/Servers/Http/SptHttpListener.cs
index 1c1a6d76..d28e0ddd 100644
--- a/Libraries/Core/Servers/Http/SptHttpListener.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/Http/SptHttpListener.cs
@@ -1,17 +1,17 @@
 using System.Collections.Immutable;
 using System.IO.Compression;
 using System.Text;
-using Core.DI;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Services;
-using Core.Utils;
-using Server;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Servers.Http;
+namespace SPTarkov.Server.Core.Servers.Http;
 
 [Injectable]
 public class SptHttpListener : IHttpListener
diff --git a/Libraries/Core/Servers/HttpServer.cs b/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs
similarity index 94%
rename from Libraries/Core/Servers/HttpServer.cs
rename to Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs
index 6c13e120..62045914 100644
--- a/Libraries/Core/Servers/HttpServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs
@@ -1,16 +1,16 @@
 using System.Net;
 using System.Security.Authentication;
-using Core.Context;
-using Core.Helpers;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers.Http;
-using Core.Services;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers.Http;
+using SPTarkov.Server.Core.Services;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.Primitives;
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Servers;
+namespace SPTarkov.Server.Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class HttpServer(
diff --git a/Libraries/Core/Servers/RagfairServer.cs b/Libraries/SPTarkov.Server.Core/Servers/RagfairServer.cs
similarity index 90%
rename from Libraries/Core/Servers/RagfairServer.cs
rename to Libraries/SPTarkov.Server.Core/Servers/RagfairServer.cs
index 2f913268..ed3dc070 100644
--- a/Libraries/Core/Servers/RagfairServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/RagfairServer.cs
@@ -1,13 +1,13 @@
-using Core.Generators;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Servers;
+namespace SPTarkov.Server.Core.Servers;
 
 [Injectable]
 public class RagfairServer(
diff --git a/Libraries/Core/Servers/SaveServer.cs b/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs
similarity index 95%
rename from Libraries/Core/Servers/SaveServer.cs
rename to Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs
index 5cebd68d..8a9b248a 100644
--- a/Libraries/Core/Servers/SaveServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs
@@ -1,17 +1,17 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Core.DI;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Servers;
+namespace SPTarkov.Server.Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class SaveServer(
diff --git a/Libraries/Core/Servers/WebSocketServer.cs b/Libraries/SPTarkov.Server.Core/Servers/WebSocketServer.cs
similarity index 94%
rename from Libraries/Core/Servers/WebSocketServer.cs
rename to Libraries/SPTarkov.Server.Core/Servers/WebSocketServer.cs
index be054f4a..e1ac0192 100644
--- a/Libraries/Core/Servers/WebSocketServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/WebSocketServer.cs
@@ -1,9 +1,9 @@
 using System.Net.WebSockets;
-using Core.Models.Utils;
-using Core.Servers.Ws;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers.Ws;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Servers;
+namespace SPTarkov.Server.Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class WebSocketServer(
@@ -50,7 +50,7 @@ public class WebSocketServer(
             {
                 var messageBuffer = new byte[1024 * 4];
                 var isEndOfMessage = false;
-                
+
                 while (!isEndOfMessage)
                 {
                     var buffer = new ArraySegment<byte>(messageBuffer);
diff --git a/Libraries/Core/Servers/Ws/IWebSocketConnectionHandler.cs b/Libraries/SPTarkov.Server.Core/Servers/Ws/IWebSocketConnectionHandler.cs
similarity index 88%
rename from Libraries/Core/Servers/Ws/IWebSocketConnectionHandler.cs
rename to Libraries/SPTarkov.Server.Core/Servers/Ws/IWebSocketConnectionHandler.cs
index 374d4c11..cf002305 100644
--- a/Libraries/Core/Servers/Ws/IWebSocketConnectionHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/Ws/IWebSocketConnectionHandler.cs
@@ -1,6 +1,6 @@
 using System.Net.WebSockets;
 
-namespace Core.Servers.Ws;
+namespace SPTarkov.Server.Core.Servers.Ws;
 
 public interface IWebSocketConnectionHandler
 {
diff --git a/Libraries/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs
similarity index 75%
rename from Libraries/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs
index 8f0d69b4..548a0566 100644
--- a/Libraries/Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/DefaultSptWebSocketMessageHandler.cs
@@ -1,9 +1,9 @@
 using System.Net.WebSockets;
 using System.Text;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Servers.Ws.Message;
+namespace SPTarkov.Server.Core.Servers.Ws.Message;
 
 [Injectable]
 public class DefaultSptWebSocketMessageHandler(
diff --git a/Libraries/Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs b/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs
similarity index 75%
rename from Libraries/Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs
rename to Libraries/SPTarkov.Server.Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs
index 6ca4a2e9..da9906ea 100644
--- a/Libraries/Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/Ws/Message/ISptWebSocketMessageHandler.cs
@@ -1,6 +1,6 @@
 using System.Net.WebSockets;
 
-namespace Core.Servers.Ws.Message;
+namespace SPTarkov.Server.Core.Servers.Ws.Message;
 
 public interface ISptWebSocketMessageHandler
 {
diff --git a/Libraries/Core/Servers/Ws/SptWebSocketConnectionHandler.cs b/Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs
similarity index 90%
rename from Libraries/Core/Servers/Ws/SptWebSocketConnectionHandler.cs
rename to Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs
index cf7c3f83..08a7244e 100644
--- a/Libraries/Core/Servers/Ws/SptWebSocketConnectionHandler.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/Ws/SptWebSocketConnectionHandler.cs
@@ -1,15 +1,15 @@
 using System.Net.WebSockets;
 using System.Text;
-using Core.Helpers;
-using Core.Models.Eft.Ws;
-using Core.Models.Utils;
-using Core.Servers.Ws.Message;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Ws;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers.Ws.Message;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Servers.Ws;
+namespace SPTarkov.Server.Core.Servers.Ws;
 
 [Injectable(InjectionType.Singleton)]
 public class SptWebSocketConnectionHandler(
diff --git a/Libraries/Core/Services/AirdropService.cs b/Libraries/SPTarkov.Server.Core/Services/AirdropService.cs
similarity index 93%
rename from Libraries/Core/Services/AirdropService.cs
rename to Libraries/SPTarkov.Server.Core/Services/AirdropService.cs
index 660784ce..6ff1c524 100644
--- a/Libraries/Core/Services/AirdropService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/AirdropService.cs
@@ -1,17 +1,17 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Location;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Services;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Location;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Services;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable]
 public class AirdropService(
diff --git a/Libraries/Core/Services/BackupService.cs b/Libraries/SPTarkov.Server.Core/Services/BackupService.cs
similarity index 95%
rename from Libraries/Core/Services/BackupService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BackupService.cs
index c4d9273a..47ebf65f 100644
--- a/Libraries/Core/Services/BackupService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BackupService.cs
@@ -1,13 +1,13 @@
-using Core.Context;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BackupService
@@ -77,10 +77,10 @@ public class BackupService
 
     /**
      * Initializes the backup process.
-     * 
+     *
      * This method orchestrates the profile backup service. Handles copying profiles to a backup directory and cleaning
      * up old backups if the number exceeds the configured maximum.
-     * 
+     *
      * @returns A promise that resolves when the backup process is complete.
      */
     public void Init()
@@ -148,7 +148,7 @@ public class BackupService
 
     /**
      * Check to see if the backup service is enabled via the config.
-     * 
+     *
      * @returns True if enabled, false otherwise.
      */
     protected bool IsEnabled()
@@ -169,7 +169,7 @@ public class BackupService
     /**
      * Generates the target directory path for the backup. The directory path is constructed using the `directory` from
      * the configuration and the current backup date.
-     * 
+     *
      * @returns The target directory path for the backup.
      */
     protected string GenerateBackupTargetDir()
@@ -180,7 +180,7 @@ public class BackupService
 
     /**
      * Generates a formatted backup date string in the format `YYYY-MM-DD_hh-mm-ss`.
-     * 
+     *
      * @returns The formatted backup date string.
      */
     protected string GenerateBackupDate()
@@ -192,10 +192,10 @@ public class BackupService
 
     /**
      * Cleans up old backups in the backup directory.
-     * 
+     *
      * This method reads the backup directory, and sorts backups by modification time. If the number of backups exceeds
      * the configured maximum, it deletes the oldest backups.
-     * 
+     *
      * @returns A promise that resolves when the cleanup is complete.
      */
     protected void CleanBackups()
@@ -232,7 +232,7 @@ public class BackupService
 
     /**
      * Retrieves and sorts the backup file paths from the specified directory.
-     * 
+     *
      * @param dir - The directory to search for backup files.
      * @returns A promise that resolves to a List of sorted backup file paths.
      */
@@ -246,7 +246,7 @@ public class BackupService
 
     /**
      * Compares two backup folder names based on their extracted dates.
-     * 
+     *
      * @param a - The name of the first backup folder.
      * @param b - The name of the second backup folder.
      * @returns The difference in time between the two dates in milliseconds, or `null` if either date is invalid.
@@ -266,7 +266,7 @@ public class BackupService
 
     /**
      * Extracts a date from a folder name string formatted as `YYYY-MM-DD_hh-mm-ss`.
-     * 
+     *
      * @param folderName - The name of the folder from which to extract the date.
      * @returns A DateTime object if the folder name is in the correct format, otherwise null.
      */
@@ -292,7 +292,7 @@ public class BackupService
 
     /**
      * Removes excess backups from the backup directory.
-     * 
+     *
      * @param backups - A List of backup file names to be removed.
      * @returns A promise that resolves when all specified backups have been removed.
      */
@@ -312,7 +312,7 @@ public class BackupService
 
     /**
      * Get a List of active server mod details.
-     * 
+     *
      * @returns A List of mod names.
      */
     protected List<string> GetActiveServerMods()
diff --git a/Libraries/Core/Services/BotEquipmentFilterService.cs b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
similarity index 97%
rename from Libraries/Core/Services/BotEquipmentFilterService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
index 5f8abccc..cf79f298 100644
--- a/Libraries/Core/Services/BotEquipmentFilterService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
@@ -1,15 +1,15 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BotEquipmentFilterService
diff --git a/Libraries/Core/Services/BotEquipmentModPoolService.cs b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs
similarity index 96%
rename from Libraries/Core/Services/BotEquipmentModPoolService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs
index 2fe027bc..c65b429d 100644
--- a/Libraries/Core/Services/BotEquipmentModPoolService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs
@@ -1,13 +1,13 @@
 using System.Collections.Concurrent;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BotEquipmentModPoolService
diff --git a/Libraries/Core/Services/BotGenerationCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/BotGenerationCacheService.cs
similarity index 93%
rename from Libraries/Core/Services/BotGenerationCacheService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BotGenerationCacheService.cs
index d813404b..08fc3a50 100644
--- a/Libraries/Core/Services/BotGenerationCacheService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BotGenerationCacheService.cs
@@ -1,10 +1,10 @@
 using System.Collections.Concurrent;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BotGenerationCacheService(
diff --git a/Libraries/Core/Services/BotLootCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs
similarity index 98%
rename from Libraries/Core/Services/BotLootCacheService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs
index 3469f029..ad8ef662 100644
--- a/Libraries/Core/Services/BotLootCacheService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs
@@ -1,14 +1,14 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BotLootCacheService(
diff --git a/Libraries/Core/Services/BotNameService.cs b/Libraries/SPTarkov.Server.Core/Services/BotNameService.cs
similarity index 92%
rename from Libraries/Core/Services/BotNameService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BotNameService.cs
index 22b9eb25..43e580e2 100644
--- a/Libraries/Core/Services/BotNameService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BotNameService.cs
@@ -1,14 +1,14 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BotNameService(
diff --git a/Libraries/Core/Services/BotWeaponModLimitService.cs b/Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs
similarity index 93%
rename from Libraries/Core/Services/BotWeaponModLimitService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs
index d7a37788..3f28ae59 100644
--- a/Libraries/Core/Services/BotWeaponModLimitService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs
@@ -1,14 +1,14 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class BotWeaponModLimitService(
diff --git a/Libraries/Core/Services/BundleHashCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/BundleHashCacheService.cs
similarity index 93%
rename from Libraries/Core/Services/BundleHashCacheService.cs
rename to Libraries/SPTarkov.Server.Core/Services/BundleHashCacheService.cs
index 762b9eb0..8af8b7f5 100644
--- a/Libraries/Core/Services/BundleHashCacheService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BundleHashCacheService.cs
@@ -1,8 +1,8 @@
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services
+namespace SPTarkov.Server.Core.Services
 {
     [Injectable(InjectionType.Singleton)]
     public class BundleHashCacheService
diff --git a/Libraries/Core/Services/Cache/BundleHashCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/Cache/BundleHashCacheService.cs
similarity index 86%
rename from Libraries/Core/Services/Cache/BundleHashCacheService.cs
rename to Libraries/SPTarkov.Server.Core/Services/Cache/BundleHashCacheService.cs
index 2870dbcd..eba45a9d 100644
--- a/Libraries/Core/Services/Cache/BundleHashCacheService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/Cache/BundleHashCacheService.cs
@@ -1,9 +1,9 @@
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services.Cache;
+namespace SPTarkov.Server.Core.Services.Cache;
 
 [Injectable]
 public class BundleHashCacheService(
diff --git a/Libraries/Core/Services/Cache/ModHashCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/Cache/ModHashCacheService.cs
similarity index 85%
rename from Libraries/Core/Services/Cache/ModHashCacheService.cs
rename to Libraries/SPTarkov.Server.Core/Services/Cache/ModHashCacheService.cs
index 3c1fe336..e5c8e969 100644
--- a/Libraries/Core/Services/Cache/ModHashCacheService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/Cache/ModHashCacheService.cs
@@ -1,9 +1,9 @@
-using Core.Models.Utils;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services.Cache;
+namespace SPTarkov.Server.Core.Services.Cache;
 
 [Injectable]
 public class ModHashCacheService(
diff --git a/Libraries/Core/Services/CircleOfCultistService.cs b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs
similarity index 97%
rename from Libraries/Core/Services/CircleOfCultistService.cs
rename to Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs
index 71d2d98a..6bb61015 100644
--- a/Libraries/Core/Services/CircleOfCultistService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs
@@ -1,24 +1,24 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Enums.Hideout;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Hideout;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using Hideout = Core.Models.Spt.Hideout.Hideout;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Enums.Hideout;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Hideout;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using Hideout = SPTarkov.Server.Core.Models.Spt.Hideout.Hideout;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class CircleOfCultistService(
diff --git a/Libraries/Core/Services/CreateProfileService.cs b/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs
similarity index 96%
rename from Libraries/Core/Services/CreateProfileService.cs
rename to Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs
index 145449bc..5596d1ea 100644
--- a/Libraries/Core/Services/CreateProfileService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/CreateProfileService.cs
@@ -1,22 +1,22 @@
 using System.Security.Cryptography;
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using Vitality = Core.Models.Eft.Profile.Vitality;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using Vitality = SPTarkov.Server.Core.Models.Eft.Profile.Vitality;
 
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable]
 public class CreateProfileService(
diff --git a/Libraries/Core/Services/CustomLocaleService.cs b/Libraries/SPTarkov.Server.Core/Services/CustomLocaleService.cs
similarity index 96%
rename from Libraries/Core/Services/CustomLocaleService.cs
rename to Libraries/SPTarkov.Server.Core/Services/CustomLocaleService.cs
index 2df4f1b4..38ea1fdc 100644
--- a/Libraries/Core/Services/CustomLocaleService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/CustomLocaleService.cs
@@ -1,7 +1,7 @@
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class CustomLocaleService(
diff --git a/Libraries/Core/Services/CustomLocationWaveService.cs b/Libraries/SPTarkov.Server.Core/Services/CustomLocationWaveService.cs
similarity index 92%
rename from Libraries/Core/Services/CustomLocationWaveService.cs
rename to Libraries/SPTarkov.Server.Core/Services/CustomLocationWaveService.cs
index c14ad9fc..90555d13 100644
--- a/Libraries/Core/Services/CustomLocationWaveService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/CustomLocationWaveService.cs
@@ -1,11 +1,11 @@
-using Core.Models.Eft.Common;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class CustomLocationWaveService(
diff --git a/Libraries/Core/Services/DatabaseService.cs b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
similarity index 94%
rename from Libraries/Core/Services/DatabaseService.cs
rename to Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
index 686b44ee..7c361239 100644
--- a/Libraries/Core/Services/DatabaseService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
@@ -1,19 +1,19 @@
 using System.Diagnostics;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Bots;
-using Core.Models.Spt.Server;
-using Core.Models.Spt.Templates;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using Hideout = Core.Models.Spt.Hideout.Hideout;
-using Locations = Core.Models.Spt.Server.Locations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Bots;
+using SPTarkov.Server.Core.Models.Spt.Server;
+using SPTarkov.Server.Core.Models.Spt.Templates;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using Hideout = SPTarkov.Server.Core.Models.Spt.Hideout.Hideout;
+using Locations = SPTarkov.Server.Core.Models.Spt.Server.Locations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class DatabaseService(
diff --git a/Libraries/Core/Services/FenceService.cs b/Libraries/SPTarkov.Server.Core/Services/FenceService.cs
similarity index 99%
rename from Libraries/Core/Services/FenceService.cs
rename to Libraries/SPTarkov.Server.Core/Services/FenceService.cs
index d4e8b129..d1865d0c 100644
--- a/Libraries/Core/Services/FenceService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/FenceService.cs
@@ -1,18 +1,18 @@
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Fence;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Fence;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class FenceService(
diff --git a/Libraries/Core/Services/GiftService.cs b/Libraries/SPTarkov.Server.Core/Services/GiftService.cs
similarity index 94%
rename from Libraries/Core/Services/GiftService.cs
rename to Libraries/SPTarkov.Server.Core/Services/GiftService.cs
index c7a8fe27..4ac9a521 100644
--- a/Libraries/Core/Services/GiftService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/GiftService.cs
@@ -1,15 +1,15 @@
-using Core.Helpers;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Dialog;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class GiftService(
diff --git a/Libraries/Core/Services/I18nService.cs b/Libraries/SPTarkov.Server.Core/Services/I18nService.cs
similarity index 96%
rename from Libraries/Core/Services/I18nService.cs
rename to Libraries/SPTarkov.Server.Core/Services/I18nService.cs
index 751f9ded..fdfa4cc0 100644
--- a/Libraries/Core/Services/I18nService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/I18nService.cs
@@ -1,8 +1,8 @@
-using Core.Utils;
-using Core.Utils.Json;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 public class I18nService
 {
diff --git a/Libraries/Core/Services/Image/ImageRouterService.cs b/Libraries/SPTarkov.Server.Core/Services/Image/ImageRouterService.cs
similarity index 83%
rename from Libraries/Core/Services/Image/ImageRouterService.cs
rename to Libraries/SPTarkov.Server.Core/Services/Image/ImageRouterService.cs
index 7f9de9f9..f703f0b7 100644
--- a/Libraries/Core/Services/Image/ImageRouterService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/Image/ImageRouterService.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services.Image;
+namespace SPTarkov.Server.Core.Services.Image;
 
 [Injectable(InjectionType.Singleton)]
 public class ImageRouterService
diff --git a/Libraries/Core/Services/InMemoryCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/InMemoryCacheService.cs
similarity index 90%
rename from Libraries/Core/Services/InMemoryCacheService.cs
rename to Libraries/SPTarkov.Server.Core/Services/InMemoryCacheService.cs
index 2ac9e015..221ee262 100644
--- a/Libraries/Core/Services/InMemoryCacheService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/InMemoryCacheService.cs
@@ -1,7 +1,7 @@
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class InMemoryCacheService(
diff --git a/Libraries/Core/Services/InsuranceService.cs b/Libraries/SPTarkov.Server.Core/Services/InsuranceService.cs
similarity index 95%
rename from Libraries/Core/Services/InsuranceService.cs
rename to Libraries/SPTarkov.Server.Core/Services/InsuranceService.cs
index e73d1282..121df8cc 100644
--- a/Libraries/Core/Services/InsuranceService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/InsuranceService.cs
@@ -1,19 +1,19 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Services;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using Insurance = Core.Models.Eft.Profile.Insurance;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Services;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using Insurance = SPTarkov.Server.Core.Models.Eft.Profile.Insurance;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class InsuranceService(
diff --git a/Libraries/Core/Services/ItemBaseClassService.cs b/Libraries/SPTarkov.Server.Core/Services/ItemBaseClassService.cs
similarity index 94%
rename from Libraries/Core/Services/ItemBaseClassService.cs
rename to Libraries/SPTarkov.Server.Core/Services/ItemBaseClassService.cs
index 55f48020..f28f6c6b 100644
--- a/Libraries/Core/Services/ItemBaseClassService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/ItemBaseClassService.cs
@@ -1,9 +1,9 @@
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class ItemBaseClassService(
diff --git a/Libraries/Core/Services/ItemFilterService.cs b/Libraries/SPTarkov.Server.Core/Services/ItemFilterService.cs
similarity index 94%
rename from Libraries/Core/Services/ItemFilterService.cs
rename to Libraries/SPTarkov.Server.Core/Services/ItemFilterService.cs
index 3a3067be..c28a316c 100644
--- a/Libraries/Core/Services/ItemFilterService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/ItemFilterService.cs
@@ -1,10 +1,10 @@
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class ItemFilterService(
diff --git a/Libraries/Core/Services/LocaleService.cs b/Libraries/SPTarkov.Server.Core/Services/LocaleService.cs
similarity index 96%
rename from Libraries/Core/Services/LocaleService.cs
rename to Libraries/SPTarkov.Server.Core/Services/LocaleService.cs
index da8aa29a..f2eae3c9 100644
--- a/Libraries/Core/Services/LocaleService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/LocaleService.cs
@@ -1,10 +1,10 @@
 using System.Globalization;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class LocaleService(
diff --git a/Libraries/Core/Services/LocalisationService.cs b/Libraries/SPTarkov.Server.Core/Services/LocalisationService.cs
similarity index 90%
rename from Libraries/Core/Services/LocalisationService.cs
rename to Libraries/SPTarkov.Server.Core/Services/LocalisationService.cs
index 4003b617..8c991f4f 100644
--- a/Libraries/Core/Services/LocalisationService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/LocalisationService.cs
@@ -1,9 +1,9 @@
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class LocalisationService
diff --git a/Libraries/Core/Services/LocationLifecycleService.cs b/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
similarity index 98%
rename from Libraries/Core/Services/LocationLifecycleService.cs
rename to Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
index 1e1c87bd..cbc0bf0d 100644
--- a/Libraries/Core/Services/LocationLifecycleService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
@@ -1,22 +1,22 @@
-using Core.Context;
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Match;
-using Core.Models.Eft.Profile;
-using Core.Models.Eft.Quests;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Location;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Match;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Location;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class LocationLifecycleService
diff --git a/Libraries/Core/Services/MailSendService.cs b/Libraries/SPTarkov.Server.Core/Services/MailSendService.cs
similarity index 97%
rename from Libraries/Core/Services/MailSendService.cs
rename to Libraries/SPTarkov.Server.Core/Services/MailSendService.cs
index b87640da..e4bcf3fc 100644
--- a/Libraries/Core/Services/MailSendService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/MailSendService.cs
@@ -1,15 +1,15 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable]
 public class MailSendService(
diff --git a/Libraries/Core/Services/MapMarkerService.cs b/Libraries/SPTarkov.Server.Core/Services/MapMarkerService.cs
similarity index 92%
rename from Libraries/Core/Services/MapMarkerService.cs
rename to Libraries/SPTarkov.Server.Core/Services/MapMarkerService.cs
index ee682cc4..2c950407 100644
--- a/Libraries/Core/Services/MapMarkerService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/MapMarkerService.cs
@@ -1,11 +1,11 @@
 using System.Text.RegularExpressions;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Inventory;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable]
 public class MapMarkerService(
diff --git a/Libraries/Core/Services/MatchBotDetailsCacheService.cs b/Libraries/SPTarkov.Server.Core/Services/MatchBotDetailsCacheService.cs
similarity index 88%
rename from Libraries/Core/Services/MatchBotDetailsCacheService.cs
rename to Libraries/SPTarkov.Server.Core/Services/MatchBotDetailsCacheService.cs
index f0803bc0..7fbf6e4f 100644
--- a/Libraries/Core/Services/MatchBotDetailsCacheService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/MatchBotDetailsCacheService.cs
@@ -1,9 +1,9 @@
 using System.Collections.Concurrent;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class MatchBotDetailsCacheService(
diff --git a/Libraries/Core/Services/MatchLocationService.cs b/Libraries/SPTarkov.Server.Core/Services/MatchLocationService.cs
similarity index 93%
rename from Libraries/Core/Services/MatchLocationService.cs
rename to Libraries/SPTarkov.Server.Core/Services/MatchLocationService.cs
index df2089d8..491d34a0 100644
--- a/Libraries/Core/Services/MatchLocationService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/MatchLocationService.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class MatchLocationService
diff --git a/Libraries/Core/Services/Mod/CustomItemService.cs b/Libraries/SPTarkov.Server.Core/Services/Mod/CustomItemService.cs
similarity index 96%
rename from Libraries/Core/Services/Mod/CustomItemService.cs
rename to Libraries/SPTarkov.Server.Core/Services/Mod/CustomItemService.cs
index f87bfd16..d6e74c39 100644
--- a/Libraries/Core/Services/Mod/CustomItemService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/Mod/CustomItemService.cs
@@ -1,14 +1,14 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Services.Mod;
+namespace SPTarkov.Server.Core.Services.Mod;
 
 [Injectable]
 public class CustomItemService(
diff --git a/Libraries/Core/Services/NotificationService.cs b/Libraries/SPTarkov.Server.Core/Services/NotificationService.cs
similarity index 93%
rename from Libraries/Core/Services/NotificationService.cs
rename to Libraries/SPTarkov.Server.Core/Services/NotificationService.cs
index c4acb587..e3c1bfaf 100644
--- a/Libraries/Core/Services/NotificationService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/NotificationService.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Ws;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Ws;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class NotificationService
diff --git a/Libraries/Core/Services/OpenZoneService.cs b/Libraries/SPTarkov.Server.Core/Services/OpenZoneService.cs
similarity index 90%
rename from Libraries/Core/Services/OpenZoneService.cs
rename to Libraries/SPTarkov.Server.Core/Services/OpenZoneService.cs
index 38ecfe24..a18d75e3 100644
--- a/Libraries/Core/Services/OpenZoneService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/OpenZoneService.cs
@@ -1,9 +1,9 @@
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class OpenZoneService(
diff --git a/Libraries/Core/Services/PaymentService.cs b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
similarity index 96%
rename from Libraries/Core/Services/PaymentService.cs
rename to Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
index babe1ac7..377a80b3 100644
--- a/Libraries/Core/Services/PaymentService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
@@ -1,18 +1,18 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class PaymentService(
diff --git a/Libraries/Core/Services/PlayerService.cs b/Libraries/SPTarkov.Server.Core/Services/PlayerService.cs
similarity index 85%
rename from Libraries/Core/Services/PlayerService.cs
rename to Libraries/SPTarkov.Server.Core/Services/PlayerService.cs
index 8a58a826..1a5a1123 100644
--- a/Libraries/Core/Services/PlayerService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/PlayerService.cs
@@ -1,7 +1,7 @@
-using Core.Models.Eft.Common;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class PlayerService(
diff --git a/Libraries/Core/Services/PmcChatResponseService.cs b/Libraries/SPTarkov.Server.Core/Services/PmcChatResponseService.cs
similarity index 95%
rename from Libraries/Core/Services/PmcChatResponseService.cs
rename to Libraries/SPTarkov.Server.Core/Services/PmcChatResponseService.cs
index 539be482..db31f750 100644
--- a/Libraries/Core/Services/PmcChatResponseService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/PmcChatResponseService.cs
@@ -1,16 +1,16 @@
 using System.Text.RegularExpressions;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class PmcChatResponseService(
diff --git a/Libraries/Core/Services/PostDbLoadService.cs b/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs
similarity index 98%
rename from Libraries/Core/Services/PostDbLoadService.cs
rename to Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs
index f6db63ed..554be59c 100644
--- a/Libraries/Core/Services/PostDbLoadService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs
@@ -1,13 +1,13 @@
-using Core.Models.Eft.Common;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class PostDbLoadService(
diff --git a/Libraries/Core/Services/ProfileActivityService.cs b/Libraries/SPTarkov.Server.Core/Services/ProfileActivityService.cs
similarity index 94%
rename from Libraries/Core/Services/ProfileActivityService.cs
rename to Libraries/SPTarkov.Server.Core/Services/ProfileActivityService.cs
index c0fd9933..557ea943 100644
--- a/Libraries/Core/Services/ProfileActivityService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/ProfileActivityService.cs
@@ -1,7 +1,7 @@
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class ProfileActivityService(
diff --git a/Libraries/Core/Services/ProfileFixerService.cs b/Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs
similarity index 98%
rename from Libraries/Core/Services/ProfileFixerService.cs
rename to Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs
index 8b586d60..f3923282 100644
--- a/Libraries/Core/Services/ProfileFixerService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/ProfileFixerService.cs
@@ -1,17 +1,17 @@
 using System.Text.RegularExpressions;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Profile;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class ProfileFixerService(
diff --git a/Libraries/Core/Services/RagfairCategoriesService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs
similarity index 91%
rename from Libraries/Core/Services/RagfairCategoriesService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs
index 654bd845..82640ce2 100644
--- a/Libraries/Core/Services/RagfairCategoriesService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs
@@ -1,10 +1,10 @@
-using Core.Helpers;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RagfairCategoriesService(
diff --git a/Libraries/Core/Services/RagfairLinkedItemService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs
similarity index 95%
rename from Libraries/Core/Services/RagfairLinkedItemService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs
index d51e30f3..aaedf6ac 100644
--- a/Libraries/Core/Services/RagfairLinkedItemService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs
@@ -1,10 +1,10 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RagfairLinkedItemService(
diff --git a/Libraries/Core/Services/RagfairOfferService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs
similarity index 95%
rename from Libraries/Core/Services/RagfairOfferService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs
index 1c4bfc7d..a88a294d 100644
--- a/Libraries/Core/Services/RagfairOfferService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs
@@ -1,15 +1,15 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RagfairOfferService(
diff --git a/Libraries/Core/Services/RagfairPriceService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs
similarity index 97%
rename from Libraries/Core/Services/RagfairPriceService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs
index 145fbaa6..1e7b6887 100644
--- a/Libraries/Core/Services/RagfairPriceService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairPriceService.cs
@@ -1,16 +1,16 @@
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RagfairPriceService(
diff --git a/Libraries/Core/Services/RagfairRequiredItemsService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairRequiredItemsService.cs
similarity index 87%
rename from Libraries/Core/Services/RagfairRequiredItemsService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RagfairRequiredItemsService.cs
index 18123dc1..94b59881 100644
--- a/Libraries/Core/Services/RagfairRequiredItemsService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairRequiredItemsService.cs
@@ -1,9 +1,9 @@
 using System.Collections.Concurrent;
-using Core.Helpers;
-using Core.Models.Eft.Ragfair;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RagfairRequiredItemsService(
diff --git a/Libraries/Core/Services/RagfairTaxService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs
similarity index 94%
rename from Libraries/Core/Services/RagfairTaxService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs
index e682c2eb..17e7fc1a 100644
--- a/Libraries/Core/Services/RagfairTaxService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs
@@ -1,14 +1,14 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RagfairTaxService(
diff --git a/Libraries/Core/Services/RaidTimeAdjustmentService.cs b/Libraries/SPTarkov.Server.Core/Services/RaidTimeAdjustmentService.cs
similarity index 96%
rename from Libraries/Core/Services/RaidTimeAdjustmentService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RaidTimeAdjustmentService.cs
index 675b0a90..cab8f65b 100644
--- a/Libraries/Core/Services/RaidTimeAdjustmentService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RaidTimeAdjustmentService.cs
@@ -1,16 +1,16 @@
-using Core.Context;
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Game;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Location;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Game;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Location;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RaidTimeAdjustmentService(
diff --git a/Libraries/Core/Services/RaidWeatherService.cs b/Libraries/SPTarkov.Server.Core/Services/RaidWeatherService.cs
similarity index 90%
rename from Libraries/Core/Services/RaidWeatherService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RaidWeatherService.cs
index a044caf7..34055626 100644
--- a/Libraries/Core/Services/RaidWeatherService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RaidWeatherService.cs
@@ -1,13 +1,13 @@
-using Core.Generators;
-using Core.Helpers;
-using Core.Models.Eft.Weather;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Generators;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Weather;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RaidWeatherService(
diff --git a/Libraries/Core/Services/RepairService.cs b/Libraries/SPTarkov.Server.Core/Services/RepairService.cs
similarity index 97%
rename from Libraries/Core/Services/RepairService.cs
rename to Libraries/SPTarkov.Server.Core/Services/RepairService.cs
index 0dc9aad1..81e5bf31 100644
--- a/Libraries/Core/Services/RepairService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RepairService.cs
@@ -1,22 +1,22 @@
 using System.Text.Json.Serialization;
-using Core.Helpers;
-using Core.Models.Common;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Eft.Repair;
-using Core.Models.Eft.Trade;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
-using BonusSettings = Core.Models.Spt.Config.BonusSettings;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Common;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Eft.Repair;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
+using BonusSettings = SPTarkov.Server.Core.Models.Spt.Config.BonusSettings;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class RepairService(
diff --git a/Libraries/Core/Services/SeasonalEventService.cs b/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs
similarity index 98%
rename from Libraries/Core/Services/SeasonalEventService.cs
rename to Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs
index 599da281..919155a9 100644
--- a/Libraries/Core/Services/SeasonalEventService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/SeasonalEventService.cs
@@ -1,15 +1,15 @@
-using Core.Helpers;
-using Core.Models.Eft.Common;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class SeasonalEventService(
diff --git a/Libraries/Core/Services/TraderAssortService.cs b/Libraries/SPTarkov.Server.Core/Services/TraderAssortService.cs
similarity index 83%
rename from Libraries/Core/Services/TraderAssortService.cs
rename to Libraries/SPTarkov.Server.Core/Services/TraderAssortService.cs
index 4087385a..4dad7472 100644
--- a/Libraries/Core/Services/TraderAssortService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/TraderAssortService.cs
@@ -1,8 +1,8 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class TraderAssortService(
diff --git a/Libraries/Core/Services/TraderPurchasePersisterService.cs b/Libraries/SPTarkov.Server.Core/Services/TraderPurchasePersisterService.cs
similarity index 94%
rename from Libraries/Core/Services/TraderPurchasePersisterService.cs
rename to Libraries/SPTarkov.Server.Core/Services/TraderPurchasePersisterService.cs
index 60d48b8e..21bfb2e6 100644
--- a/Libraries/Core/Services/TraderPurchasePersisterService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/TraderPurchasePersisterService.cs
@@ -1,12 +1,12 @@
-using Core.Helpers;
-using Core.Models.Eft.Profile;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Profile;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Services;
+namespace SPTarkov.Server.Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class TraderPurchasePersisterService(
diff --git a/Libraries/Core/Utils/App.cs b/Libraries/SPTarkov.Server.Core/Utils/App.cs
similarity index 93%
rename from Libraries/Core/Utils/App.cs
rename to Libraries/SPTarkov.Server.Core/Utils/App.cs
index 5dad0e0a..94a3d326 100644
--- a/Libraries/Core/Utils/App.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/App.cs
@@ -1,13 +1,13 @@
-using Core.DI;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Server;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class App
diff --git a/Libraries/Core/Utils/Callbacks/TimeoutCallback.cs b/Libraries/SPTarkov.Server.Core/Utils/Callbacks/TimeoutCallback.cs
similarity index 85%
rename from Libraries/Core/Utils/Callbacks/TimeoutCallback.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Callbacks/TimeoutCallback.cs
index 60a9e13a..7d92de93 100644
--- a/Libraries/Core/Utils/Callbacks/TimeoutCallback.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Callbacks/TimeoutCallback.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils.Callbacks;
+namespace SPTarkov.Server.Core.Utils.Callbacks;
 
 public static class TimeoutCallback
 {
diff --git a/Libraries/Core/Utils/Cloners/FastCloner.cs b/Libraries/SPTarkov.Server.Core/Utils/Cloners/FastCloner.cs
similarity index 65%
rename from Libraries/Core/Utils/Cloners/FastCloner.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Cloners/FastCloner.cs
index 2d1095d2..ac292753 100644
--- a/Libraries/Core/Utils/Cloners/FastCloner.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Cloners/FastCloner.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils.Cloners;
+namespace SPTarkov.Server.Core.Utils.Cloners;
 
 [Injectable]
 public class FastCloner : ICloner
diff --git a/Libraries/Core/Utils/Cloners/ICloner.cs b/Libraries/SPTarkov.Server.Core/Utils/Cloners/ICloner.cs
similarity index 57%
rename from Libraries/Core/Utils/Cloners/ICloner.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Cloners/ICloner.cs
index 8c4fc691..ee0145db 100644
--- a/Libraries/Core/Utils/Cloners/ICloner.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Cloners/ICloner.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils.Cloners;
+namespace SPTarkov.Server.Core.Utils.Cloners;
 
 public interface ICloner
 {
diff --git a/Libraries/Core/Utils/Cloners/JsonCloner.cs b/Libraries/SPTarkov.Server.Core/Utils/Cloners/JsonCloner.cs
similarity index 89%
rename from Libraries/Core/Utils/Cloners/JsonCloner.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Cloners/JsonCloner.cs
index 87aa0ed8..3e82948e 100644
--- a/Libraries/Core/Utils/Cloners/JsonCloner.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Cloners/JsonCloner.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils.Cloners;
+namespace SPTarkov.Server.Core.Utils.Cloners;
 
 /// <summary>
 /// Disabled as FastCloner library is 15% faster and consumes less memory than Json serialization
diff --git a/Libraries/Core/Utils/Cloners/ReflectionsCloner.cs b/Libraries/SPTarkov.Server.Core/Utils/Cloners/ReflectionsCloner.cs
similarity index 96%
rename from Libraries/Core/Utils/Cloners/ReflectionsCloner.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Cloners/ReflectionsCloner.cs
index 472fcf87..e158e0a0 100644
--- a/Libraries/Core/Utils/Cloners/ReflectionsCloner.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Cloners/ReflectionsCloner.cs
@@ -1,11 +1,11 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Reflection;
-using Core.Models.Utils;
-using Core.Utils.Json;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils.Json;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Utils.Cloners;
+namespace SPTarkov.Server.Core.Utils.Cloners;
 
 /// <summary>
 /// Not in use at the moment
diff --git a/Libraries/Core/Utils/Collections/ExhaustableArray.cs b/Libraries/SPTarkov.Server.Core/Utils/Collections/ExhaustableArray.cs
similarity index 94%
rename from Libraries/Core/Utils/Collections/ExhaustableArray.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Collections/ExhaustableArray.cs
index 2ad3400c..ff25ba96 100644
--- a/Libraries/Core/Utils/Collections/ExhaustableArray.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Collections/ExhaustableArray.cs
@@ -1,6 +1,6 @@
-using Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Cloners;
 
-namespace Core.Utils.Collections;
+namespace SPTarkov.Server.Core.Utils.Collections;
 
 public record ExhaustableArray<T> : IExhaustableArray<T>
 {
diff --git a/Libraries/Core/Utils/Collections/ProbabilityObjectArray.cs b/Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs
similarity index 98%
rename from Libraries/Core/Utils/Collections/ProbabilityObjectArray.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs
index ce989d8c..b9387000 100644
--- a/Libraries/Core/Utils/Collections/ProbabilityObjectArray.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils.Cloners;
 
-namespace Core.Utils.Collections;
+namespace SPTarkov.Server.Core.Utils.Collections;
 
 /// <summary>
 ///     Array of ProbabilityObjectArray which allow to randomly draw of the contained objects
@@ -122,11 +122,11 @@ public class ProbabilityObjectArray<K, V> : List<ProbabilityObject<K, V>>
 
     /**
      * Get the maximum relative probability out of a ProbabilityObjectArray
-     * 
+     *
      * Example:
      * po = new ProbabilityObjectArray(new ProbabilityObject("a", 5), new ProbabilityObject("b", 1))
      * po.maxProbability() // returns 5
-     * 
+     *
      * @return      {number}                                                the maximum value of all relative probabilities in this ProbabilityObjectArray
      */
     public double MaxProbability()
diff --git a/Libraries/Core/Utils/DatabaseImporter.cs b/Libraries/SPTarkov.Server.Core/Utils/DatabaseImporter.cs
similarity index 94%
rename from Libraries/Core/Utils/DatabaseImporter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/DatabaseImporter.cs
index e50828ba..ac52d55c 100644
--- a/Libraries/Core/Utils/DatabaseImporter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/DatabaseImporter.cs
@@ -1,16 +1,16 @@
 using System.Diagnostics;
-using Core.DI;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Server;
-using Core.Models.Utils;
-using Core.Routers;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Server;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Routers;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton, InjectableTypeOverride = typeof(IOnLoad), TypePriority = OnLoadOrder.Database)]
 public class DatabaseImporter : IOnLoad
diff --git a/Libraries/Core/Utils/EncodingUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/EncodingUtil.cs
similarity index 96%
rename from Libraries/Core/Utils/EncodingUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/EncodingUtil.cs
index 56927a9f..4d5d31fe 100644
--- a/Libraries/Core/Utils/EncodingUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/EncodingUtil.cs
@@ -1,7 +1,7 @@
 using System.Text;
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class EncodingUtil
diff --git a/Libraries/Core/Utils/FileUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs
similarity index 96%
rename from Libraries/Core/Utils/FileUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs
index faab0178..938de3c6 100644
--- a/Libraries/Core/Utils/FileUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs
@@ -1,7 +1,7 @@
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable]
 public class FileUtil(
diff --git a/Libraries/Core/Utils/HashUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/HashUtil.cs
similarity index 98%
rename from Libraries/Core/Utils/HashUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/HashUtil.cs
index 8854067f..7340a019 100644
--- a/Libraries/Core/Utils/HashUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/HashUtil.cs
@@ -2,9 +2,9 @@ using System.IO.Hashing;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public partial class HashUtil(RandomUtil _randomUtil)
diff --git a/Libraries/Core/Utils/HttpFileUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/HttpFileUtil.cs
similarity index 85%
rename from Libraries/Core/Utils/HttpFileUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/HttpFileUtil.cs
index bf579d93..d2c5b314 100644
--- a/Libraries/Core/Utils/HttpFileUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/HttpFileUtil.cs
@@ -1,7 +1,7 @@
-using Core.Helpers;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable]
 public class HttpFileUtil
diff --git a/Libraries/Core/Utils/HttpResponseUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/HttpResponseUtil.cs
similarity index 92%
rename from Libraries/Core/Utils/HttpResponseUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/HttpResponseUtil.cs
index 3c0e9879..63e0e11c 100644
--- a/Libraries/Core/Utils/HttpResponseUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/HttpResponseUtil.cs
@@ -1,12 +1,12 @@
 using System.Collections.Immutable;
 using System.Text.RegularExpressions;
-using Core.Models.Eft.HttpResponse;
-using Core.Models.Eft.ItemEvent;
-using Core.Models.Enums;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Eft.HttpResponse;
+using SPTarkov.Server.Core.Models.Eft.ItemEvent;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable]
 public class HttpResponseUtil
diff --git a/Libraries/Core/Utils/ImporterUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs
similarity index 97%
rename from Libraries/Core/Utils/ImporterUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs
index adb9343f..cbcea964 100644
--- a/Libraries/Core/Utils/ImporterUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/ImporterUtil.cs
@@ -1,11 +1,11 @@
 using System.Collections.Concurrent;
 using System.Linq.Expressions;
 using System.Reflection;
-using Core.Models.Utils;
-using Core.Utils.Json;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils.Json;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class ImporterUtil
diff --git a/Libraries/Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs
similarity index 96%
rename from Libraries/Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs
index 2a024d69..70bea49d 100644
--- a/Libraries/Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/ArrayToObjectFactoryConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class ArrayToObjectFactoryConverter : JsonConverterFactory
 {
diff --git a/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
similarity index 94%
rename from Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
index d265be4c..b8d56b66 100644
--- a/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
@@ -1,20 +1,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Core.Models.Eft.Common.Request;
-using Core.Models.Eft.Customization;
-using Core.Models.Eft.Health;
-using Core.Models.Eft.Hideout;
-using Core.Models.Eft.Insurance;
-using Core.Models.Eft.Inventory;
-using Core.Models.Eft.Notes;
-using Core.Models.Eft.Quests;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Eft.Repair;
-using Core.Models.Eft.Trade;
-using Core.Models.Eft.Wishlist;
-using Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Eft.Common.Request;
+using SPTarkov.Server.Core.Models.Eft.Customization;
+using SPTarkov.Server.Core.Models.Eft.Health;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Eft.Insurance;
+using SPTarkov.Server.Core.Models.Eft.Inventory;
+using SPTarkov.Server.Core.Models.Eft.Notes;
+using SPTarkov.Server.Core.Models.Eft.Quests;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Eft.Repair;
+using SPTarkov.Server.Core.Models.Eft.Trade;
+using SPTarkov.Server.Core.Models.Eft.Wishlist;
+using SPTarkov.Server.Core.Models.Enums;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteractionRequestData>
 {
diff --git a/Libraries/Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs
similarity index 96%
rename from Libraries/Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs
index 166822cf..cc2d2d04 100644
--- a/Libraries/Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/DictionaryOfListOrTConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class DictionaryOfListOrTConverter : JsonConverterFactory
 {
diff --git a/Libraries/Core/Utils/Json/Converters/DictionaryOrListConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/DictionaryOrListConverter.cs
similarity index 97%
rename from Libraries/Core/Utils/Json/Converters/DictionaryOrListConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/DictionaryOrListConverter.cs
index 05fc6a90..8c409e01 100644
--- a/Libraries/Core/Utils/Json/Converters/DictionaryOrListConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/DictionaryOrListConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class DictionaryOrListConverter : JsonConverterFactory
 {
diff --git a/Libraries/Core/Utils/Json/Converters/EftEnumConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs
similarity index 98%
rename from Libraries/Core/Utils/Json/Converters/EftEnumConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs
index 0e0cff48..4cbbeeed 100644
--- a/Libraries/Core/Utils/Json/Converters/EftEnumConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class EftEnumConverter<T> : JsonConverter<T>
 {
diff --git a/Libraries/Core/Utils/Json/Converters/EftListEnumConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs
similarity index 94%
rename from Libraries/Core/Utils/Json/Converters/EftListEnumConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs
index fbc6ad77..0470e1c4 100644
--- a/Libraries/Core/Utils/Json/Converters/EftListEnumConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class EftListEnumConverter<T> : JsonConverter<List<T>>
 {
diff --git a/Libraries/Core/Utils/Json/Converters/ListOrTConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/ListOrTConverter.cs
similarity index 97%
rename from Libraries/Core/Utils/Json/Converters/ListOrTConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/ListOrTConverter.cs
index c5350384..c41479ca 100644
--- a/Libraries/Core/Utils/Json/Converters/ListOrTConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/ListOrTConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class ListOrTConverterFactory : JsonConverterFactory
 {
diff --git a/Libraries/Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs
similarity index 97%
rename from Libraries/Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs
index eca9d2e0..4335d891 100644
--- a/Libraries/Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToNumberFactoryConverter.cs
@@ -3,7 +3,7 @@ using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class StringToNumberFactoryConverter : JsonConverterFactory
 {
@@ -55,7 +55,7 @@ public class StringToNumberFactoryConverter : JsonConverterFactory
                 {
                     Debug.WriteLine($"Failed to parse '{value}' into {typeToConvert.Name}, returning null.");
                     return default;
-                }             
+                }
             }
 
             switch (reader.TokenType)
diff --git a/Libraries/Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
similarity index 96%
rename from Libraries/Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
index f9590a6f..75d68cd0 100644
--- a/Libraries/Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Core.Utils.Json.Converters;
+namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class StringToObjectFactoryConverter : JsonConverterFactory
 {
diff --git a/Libraries/Core/Utils/Json/DictionaryOrList.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/DictionaryOrList.cs
similarity index 91%
rename from Libraries/Core/Utils/Json/DictionaryOrList.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/DictionaryOrList.cs
index c1e13776..c5602743 100644
--- a/Libraries/Core/Utils/Json/DictionaryOrList.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/DictionaryOrList.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils.Json;
+namespace SPTarkov.Server.Core.Utils.Json;
 
 public class DictionaryOrList<K, V>(Dictionary<K, V>? dictionary, List<V>? list)
 {
diff --git a/Libraries/Core/Utils/Json/LazyLoad.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/LazyLoad.cs
similarity index 95%
rename from Libraries/Core/Utils/Json/LazyLoad.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/LazyLoad.cs
index c6a25bd1..162d6d7c 100644
--- a/Libraries/Core/Utils/Json/LazyLoad.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/LazyLoad.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils.Json;
+namespace SPTarkov.Server.Core.Utils.Json;
 
 public class LazyLoad<T>(Func<T> deserialize)
 {
diff --git a/Libraries/Core/Utils/Json/ListOrT.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/ListOrT.cs
similarity index 94%
rename from Libraries/Core/Utils/Json/ListOrT.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Json/ListOrT.cs
index 74d90a6b..746efeb9 100644
--- a/Libraries/Core/Utils/Json/ListOrT.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/ListOrT.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils.Json;
+namespace SPTarkov.Server.Core.Utils.Json;
 
 public class ListOrT<T>(List<T>? list, T? item)
 {
diff --git a/Libraries/Core/Utils/JsonUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs
similarity index 94%
rename from Libraries/Core/Utils/JsonUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs
index ac16c71d..a310bddb 100644
--- a/Libraries/Core/Utils/JsonUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/JsonUtil.cs
@@ -1,15 +1,15 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Core.Models;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Ws;
-using Core.Models.Enums;
-using Core.Models.Spt.Dialog;
-using Core.Utils.Json.Converters;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Ws;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Spt.Dialog;
+using SPTarkov.Server.Core.Utils.Json.Converters;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class JsonUtil
diff --git a/Libraries/Core/Utils/Logger/FileLogger.cs b/Libraries/SPTarkov.Server.Core/Utils/Logger/FileLogger.cs
similarity index 70%
rename from Libraries/Core/Utils/Logger/FileLogger.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Logger/FileLogger.cs
index 027fcb1c..d3a00f84 100644
--- a/Libraries/Core/Utils/Logger/FileLogger.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Logger/FileLogger.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils.Logger;
+namespace SPTarkov.Server.Core.Utils.Logger;
 
 // This is a dummy class to use for SourceContext in Serilog, do not remove!
 public class FileLogger
diff --git a/Libraries/Core/Utils/MathUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/MathUtil.cs
similarity index 98%
rename from Libraries/Core/Utils/MathUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/MathUtil.cs
index 958312e6..3d91a113 100644
--- a/Libraries/Core/Utils/MathUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/MathUtil.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class MathUtil
diff --git a/Libraries/Core/Utils/ProgramStatics.cs b/Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs
similarity index 98%
rename from Libraries/Core/Utils/ProgramStatics.cs
rename to Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs
index f7f87c64..6f105352 100644
--- a/Libraries/Core/Utils/ProgramStatics.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs
@@ -1,4 +1,4 @@
-namespace Server;
+namespace SPTarkov.Server.Core.Utils;
 
 public static class ProgramStatics
 {
diff --git a/Libraries/Core/Utils/ProgressWriter.cs b/Libraries/SPTarkov.Server.Core/Utils/ProgressWriter.cs
similarity index 94%
rename from Libraries/Core/Utils/ProgressWriter.cs
rename to Libraries/SPTarkov.Server.Core/Utils/ProgressWriter.cs
index 9142b127..4ffc11e5 100644
--- a/Libraries/Core/Utils/ProgressWriter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/ProgressWriter.cs
@@ -1,4 +1,4 @@
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 public class ProgressWriter
 {
diff --git a/Libraries/Core/Utils/RagfairOfferHolder.cs b/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs
similarity index 96%
rename from Libraries/Core/Utils/RagfairOfferHolder.cs
rename to Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs
index bb837635..adfebe43 100644
--- a/Libraries/Core/Utils/RagfairOfferHolder.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs
@@ -1,13 +1,13 @@
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Ragfair;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Ragfair;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class RagfairOfferHolder(
diff --git a/Libraries/Core/Utils/RandomUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/RandomUtil.cs
similarity index 98%
rename from Libraries/Core/Utils/RandomUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/RandomUtil.cs
index 39be2e39..2cb64fed 100644
--- a/Libraries/Core/Utils/RandomUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/RandomUtil.cs
@@ -1,10 +1,10 @@
 using System;
-using Core.Models.Utils;
-using Core.Utils.Cloners;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 // TODO: Finish porting this class
 [Injectable(InjectionType.Singleton)]
diff --git a/Libraries/Core/Utils/TimeUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/TimeUtil.cs
similarity index 98%
rename from Libraries/Core/Utils/TimeUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/TimeUtil.cs
index b3ec3bf5..7ac9d926 100644
--- a/Libraries/Core/Utils/TimeUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/TimeUtil.cs
@@ -1,6 +1,6 @@
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class TimeUtil
diff --git a/Libraries/Core/Utils/TimerUtil.cs b/Libraries/SPTarkov.Server.Core/Utils/TimerUtil.cs
similarity index 87%
rename from Libraries/Core/Utils/TimerUtil.cs
rename to Libraries/SPTarkov.Server.Core/Utils/TimerUtil.cs
index cb72ab46..51f14bf2 100644
--- a/Libraries/Core/Utils/TimerUtil.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/TimerUtil.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
-using SptCommon.Annotations;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable]
 public class TimerUtil
diff --git a/Libraries/Core/Utils/Watermark.cs b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs
similarity index 95%
rename from Libraries/Core/Utils/Watermark.cs
rename to Libraries/SPTarkov.Server.Core/Utils/Watermark.cs
index 15dc1d73..30483ba8 100644
--- a/Libraries/Core/Utils/Watermark.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs
@@ -1,12 +1,12 @@
-using Core.Models.Logging;
-using Core.Models.Spt.Config;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Server;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Logging;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server;
+using SPTarkov.Common.Annotations;
 
-namespace Core.Utils;
+namespace SPTarkov.Server.Core.Utils;
 
 [Injectable]
 public class WatermarkLocale
diff --git a/Server/Logger/AbstractFormatter.cs b/SPTarkov.Server/Logger/AbstractFormatter.cs
similarity index 96%
rename from Server/Logger/AbstractFormatter.cs
rename to SPTarkov.Server/Logger/AbstractFormatter.cs
index e8a26864..d39107bb 100644
--- a/Server/Logger/AbstractFormatter.cs
+++ b/SPTarkov.Server/Logger/AbstractFormatter.cs
@@ -1,7 +1,7 @@
 using Serilog.Events;
 using Serilog.Formatting;
 
-namespace Server.Logger;
+namespace SPTarkov.Server.Logger;
 
 public abstract class AbstractFormatter : ITextFormatter
 {
diff --git a/Server/Logger/ConsoleFormatter.cs b/SPTarkov.Server/Logger/ConsoleFormatter.cs
similarity index 91%
rename from Server/Logger/ConsoleFormatter.cs
rename to SPTarkov.Server/Logger/ConsoleFormatter.cs
index 596d8bbd..77d0bb6b 100644
--- a/Server/Logger/ConsoleFormatter.cs
+++ b/SPTarkov.Server/Logger/ConsoleFormatter.cs
@@ -1,4 +1,4 @@
-namespace Server.Logger;
+namespace SPTarkov.Server.Logger;
 
 public class ConsoleFormatter : AbstractFormatter
 {
diff --git a/Server/Logger/FileFormatter.cs b/SPTarkov.Server/Logger/FileFormatter.cs
similarity index 92%
rename from Server/Logger/FileFormatter.cs
rename to SPTarkov.Server/Logger/FileFormatter.cs
index 02556d25..55d2a4c2 100644
--- a/Server/Logger/FileFormatter.cs
+++ b/SPTarkov.Server/Logger/FileFormatter.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Server.Logger;
+namespace SPTarkov.Server.Logger;
 
 public class FileFormatter : AbstractFormatter
 {
diff --git a/Server/Logger/WebApplicationLogger.cs b/SPTarkov.Server/Logger/WebApplicationLogger.cs
similarity index 92%
rename from Server/Logger/WebApplicationLogger.cs
rename to SPTarkov.Server/Logger/WebApplicationLogger.cs
index fdab3bee..76c3ff1f 100644
--- a/Server/Logger/WebApplicationLogger.cs
+++ b/SPTarkov.Server/Logger/WebApplicationLogger.cs
@@ -1,10 +1,10 @@
-using Core.Models.Logging;
-using Core.Models.Utils;
-using Core.Utils.Logger;
-using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Logging;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils.Logger;
+using SPTarkov.Common.Annotations;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Server.Logger;
+namespace SPTarkov.Server.Logger;
 
 [Injectable]
 public class SptWebApplicationLogger<T> : ISptLogger<T>
diff --git a/Server/Modding/HarmonyBootstrapper.cs b/SPTarkov.Server/Modding/HarmonyBootstrapper.cs
similarity index 92%
rename from Server/Modding/HarmonyBootstrapper.cs
rename to SPTarkov.Server/Modding/HarmonyBootstrapper.cs
index 22d22de8..0a84f170 100644
--- a/Server/Modding/HarmonyBootstrapper.cs
+++ b/SPTarkov.Server/Modding/HarmonyBootstrapper.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using HarmonyLib;
 
-namespace Server.Modding;
+namespace SPTarkov.Server.Modding;
 
 public class HarmonyBootstrapper
 {
diff --git a/Server/Modding/ModDllLoader.cs b/SPTarkov.Server/Modding/ModDllLoader.cs
similarity index 97%
rename from Server/Modding/ModDllLoader.cs
rename to SPTarkov.Server/Modding/ModDllLoader.cs
index 1423eaa1..5f149c5b 100644
--- a/Server/Modding/ModDllLoader.cs
+++ b/SPTarkov.Server/Modding/ModDllLoader.cs
@@ -1,9 +1,9 @@
 using System.Reflection;
 using System.Runtime.Loader;
 using System.Text.Json;
-using Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Spt.Mod;
 
-namespace Server.Modding;
+namespace SPTarkov.Server.Modding;
 
 public class ModDllLoader
 {
diff --git a/Server/Modding/ModLoadOrder.cs b/SPTarkov.Server/Modding/ModLoadOrder.cs
similarity index 96%
rename from Server/Modding/ModLoadOrder.cs
rename to SPTarkov.Server/Modding/ModLoadOrder.cs
index 71b5a344..51040520 100644
--- a/Server/Modding/ModLoadOrder.cs
+++ b/SPTarkov.Server/Modding/ModLoadOrder.cs
@@ -1,7 +1,7 @@
-using Core.Models.Spt.Mod;
-using Core.Utils.Cloners;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Utils.Cloners;
 
-namespace Server.Modding;
+namespace SPTarkov.Server.Modding;
 
 public class ModLoadOrder(ICloner cloner)
 {
diff --git a/Server/Modding/ModValidator.cs b/SPTarkov.Server/Modding/ModValidator.cs
similarity index 97%
rename from Server/Modding/ModValidator.cs
rename to SPTarkov.Server/Modding/ModValidator.cs
index 1b94b452..ce1cc6b1 100644
--- a/Server/Modding/ModValidator.cs
+++ b/SPTarkov.Server/Modding/ModValidator.cs
@@ -1,13 +1,13 @@
-using Core.Models.Spt.Config;
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Semver;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
+using SPTarkov.Server.Core.Models.Spt.Config;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Semver;
+using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel;
 
-namespace Server.Modding;
+namespace SPTarkov.Server.Modding;
 
 public class ModValidator(
     ISptLogger<ModValidator> logger,
@@ -390,7 +390,7 @@ public class ModValidator(
             logger.Error(localisationService.GetText("modloader-is_client_mod", modName));
             return false;
         }
-        
+
         if (containsJs || containsTs)
         {
             // TODO: needs new localisation!
diff --git a/Server/Program.cs b/SPTarkov.Server/Program.cs
similarity index 92%
rename from Server/Program.cs
rename to SPTarkov.Server/Program.cs
index 25516ecb..85f678e5 100644
--- a/Server/Program.cs
+++ b/SPTarkov.Server/Program.cs
@@ -1,21 +1,21 @@
 using System.Runtime;
-using Core.Context;
-using Core.Helpers;
-using Core.Models.External;
-using Core.Models.Spt.Mod;
-using Core.Models.Utils;
-using Core.Utils;
+using SPTarkov.Server.Core.Context;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.External;
+using SPTarkov.Server.Core.Models.Spt.Mod;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Utils;
 using Serilog;
 using Serilog.Events;
 using Serilog.Exceptions;
 using Serilog.Extensions.Logging;
-using Server.Logger;
-using Server.Modding;
-using SptCommon.Semver;
-using SptCommon.Semver.Implementations;
-using SptDependencyInjection;
+using SPTarkov.Common.Semver;
+using SPTarkov.Common.Semver.Implementations;
+using SPTarkov.Server.Logger;
+using SPTarkov.Server.Modding;
+using SPTarkov.DI;
 
-namespace Server;
+namespace SPTarkov.Server;
 
 public static class Program
 {
diff --git a/Server/Server.csproj b/SPTarkov.Server/SPTarkov.Server.csproj
similarity index 91%
rename from Server/Server.csproj
rename to SPTarkov.Server/SPTarkov.Server.csproj
index b2fd2a38..d6cd1ce8 100644
--- a/Server/Server.csproj
+++ b/SPTarkov.Server/SPTarkov.Server.csproj
@@ -20,8 +20,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Libraries\Core\Core.csproj" />
-    <ProjectReference Include="..\Libraries\SptAssets\SptAssets.csproj" />
+    <ProjectReference Include="..\Libraries\SPTarkov.Server.Core\SPTarkov.Server.Core.csproj" />
+    <ProjectReference Include="..\Libraries\SPTarkov.Server.Assets\SPTarkov.Server.Assets.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Server/appsettings.json b/SPTarkov.Server/appsettings.json
similarity index 100%
rename from Server/appsettings.json
rename to SPTarkov.Server/appsettings.json
diff --git a/Server/Properties/launchSettings.json b/Server/Properties/launchSettings.json
deleted file mode 100644
index 88fa70a7..00000000
--- a/Server/Properties/launchSettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "profiles": {
-        "Spt Server Debug": {
-            "commandName": "Project",
-            "hotReloadEnabled": false,
-            "workingDirectory": "$(OutputPath)"
-        }
-    }
-}
diff --git a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs
index b037cf40..bf7fedd5 100644
--- a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs
+++ b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.cs
@@ -1,13 +1,13 @@
-using Core.DI;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Eft.Hideout;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Eft.Hideout;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
 using Path = System.IO.Path;
 
 namespace HideoutCraftQuestIdGenerator;
@@ -53,7 +53,7 @@ public class HideoutCraftQuestIdGenerator(
 
         // Figure out our source and target directories
         var projectDir = Directory.GetParent("./").Parent.Parent.Parent.Parent.Parent;
-        var productionPath = "Libraries\\SptAssets\\Assets\\database\\hideout\\production.json";
+        var productionPath = "Libraries\\SPTarkov.Server.Assets\\Assets\\database\\hideout\\production.json";
         var productionFilePath = Path.Combine(projectDir.FullName, productionPath);
 
         var updatedProductionJson = _jsonUtil.Serialize(_databaseServer.GetTables().Hideout.Production, true);
diff --git a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj
index 4a19a3c9..19d8dc66 100644
--- a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj
+++ b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGenerator.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\Core\Core.csproj" />
-    <ProjectReference Include="..\..\Libraries\SptAssets\SptAssets.csproj" />
-    <ProjectReference Include="..\..\Libraries\SptCommon\SptCommon.csproj" />
-    <ProjectReference Include="..\..\Libraries\SptDependencyInjection\SptDependencyInjection.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.Server.Core\SPTarkov.Server.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.Server.Assets\SPTarkov.Server.Assets.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.Common\SPTarkov.Common.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.DI\SPTarkov.DI.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs
index 2788222b..af289818 100644
--- a/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs
+++ b/Tools/HideoutCraftQuestIdGenerator/HideoutCraftQuestIdGeneratorLauncher.cs
@@ -1,6 +1,6 @@
-using Core.Utils;
+using SPTarkov.Server.Core.Utils;
 using Microsoft.Extensions.DependencyInjection;
-using SptDependencyInjection;
+using SPTarkov.DI;
 
 namespace HideoutCraftQuestIdGenerator;
 
diff --git a/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs b/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs
index d3586304..5a53f0d9 100644
--- a/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs
+++ b/Tools/HideoutCraftQuestIdGenerator/SptBasicLogger.cs
@@ -1,7 +1,7 @@
-using Core.Models.Logging;
-using Core.Models.Spt.Logging;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Logging;
+using SPTarkov.Server.Core.Models.Spt.Logging;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
 namespace HideoutCraftQuestIdGenerator;
 
diff --git a/Tools/ItemTplGenerator/ItemTplGenerator.cs b/Tools/ItemTplGenerator/ItemTplGenerator.cs
index bbfe234d..9b778b60 100644
--- a/Tools/ItemTplGenerator/ItemTplGenerator.cs
+++ b/Tools/ItemTplGenerator/ItemTplGenerator.cs
@@ -1,14 +1,14 @@
-using Core.Callbacks;
-using Core.DI;
-using Core.Helpers;
-using Core.Models.Eft.Common.Tables;
-using Core.Models.Enums;
-using Core.Models.Utils;
-using Core.Servers;
-using Core.Services;
-using Core.Utils;
-using SptCommon.Annotations;
-using SptCommon.Extensions;
+using SPTarkov.Server.Core.Callbacks;
+using SPTarkov.Server.Core.DI;
+using SPTarkov.Server.Core.Helpers;
+using SPTarkov.Server.Core.Models.Eft.Common.Tables;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Server.Core.Servers;
+using SPTarkov.Server.Core.Services;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Common.Annotations;
+using SPTarkov.Common.Extensions;
 using Path = System.IO.Path;
 
 namespace ItemTplGenerator;
@@ -44,7 +44,7 @@ public class ItemTplGenerator(
 
         // Figure out our source and target directories
         var projectDir = Directory.GetParent("./").Parent.Parent.Parent.Parent.Parent;
-        enumDir = Path.Combine(projectDir.FullName, "Libraries", "Core", "Models", "Enums");
+        enumDir = Path.Combine(projectDir.FullName, "Libraries", "SPTarkov.Server.Core", "Models", "Enums");
         items = _databaseServer.GetTables().Templates.Items;
 
         // Generate an object containing all item name to ID associations
diff --git a/Tools/ItemTplGenerator/ItemTplGenerator.csproj b/Tools/ItemTplGenerator/ItemTplGenerator.csproj
index 676a5697..eab26873 100644
--- a/Tools/ItemTplGenerator/ItemTplGenerator.csproj
+++ b/Tools/ItemTplGenerator/ItemTplGenerator.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\Core\Core.csproj" />
-    <ProjectReference Include="..\..\Libraries\SptAssets\SptAssets.csproj" />
-    <ProjectReference Include="..\..\Libraries\SptCommon\SptCommon.csproj" />
-    <ProjectReference Include="..\..\Libraries\SptDependencyInjection\SptDependencyInjection.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.Server.Core\SPTarkov.Server.Core.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.Server.Assets\SPTarkov.Server.Assets.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.Common\SPTarkov.Common.csproj" />
+    <ProjectReference Include="..\..\Libraries\SPTarkov.DI\SPTarkov.DI.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs b/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs
index c797f0c6..9d9ce0c9 100644
--- a/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs
+++ b/Tools/ItemTplGenerator/ItemTplGeneratorLauncher.cs
@@ -1,6 +1,6 @@
-using Core.Utils;
+using SPTarkov.Server.Core.Utils;
 using Microsoft.Extensions.DependencyInjection;
-using SptDependencyInjection;
+using SPTarkov.DI;
 
 namespace ItemTplGenerator;
 
diff --git a/Tools/ItemTplGenerator/SptBasicLogger.cs b/Tools/ItemTplGenerator/SptBasicLogger.cs
index 51cb34af..346ec495 100644
--- a/Tools/ItemTplGenerator/SptBasicLogger.cs
+++ b/Tools/ItemTplGenerator/SptBasicLogger.cs
@@ -1,7 +1,7 @@
-using Core.Models.Logging;
-using Core.Models.Spt.Logging;
-using Core.Models.Utils;
-using SptCommon.Annotations;
+using SPTarkov.Server.Core.Models.Logging;
+using SPTarkov.Server.Core.Models.Spt.Logging;
+using SPTarkov.Server.Core.Models.Utils;
+using SPTarkov.Common.Annotations;
 
 namespace ItemTplGenerator;
 
diff --git a/UnitTests/Mock/MockLogger.cs b/UnitTests/Mock/MockLogger.cs
index 1d7776fd..a5fe96f5 100644
--- a/UnitTests/Mock/MockLogger.cs
+++ b/UnitTests/Mock/MockLogger.cs
@@ -1,6 +1,6 @@
-using Core.Models.Logging;
-using Core.Models.Spt.Logging;
-using Core.Models.Utils;
+using SPTarkov.Server.Core.Models.Logging;
+using SPTarkov.Server.Core.Models.Spt.Logging;
+using SPTarkov.Server.Core.Models.Utils;
 
 namespace UnitTests.Mock;
 
diff --git a/UnitTests/Tests/Test.cs b/UnitTests/Tests/Test.cs
index 37375c71..d50e4716 100644
--- a/UnitTests/Tests/Test.cs
+++ b/UnitTests/Tests/Test.cs
@@ -1,5 +1,5 @@
-using Core.Models.Spt.Templates;
-using Core.Utils;
+using SPTarkov.Server.Core.Models.Spt.Templates;
+using SPTarkov.Server.Core.Utils;
 using UnitTests.Mock;
 
 namespace UnitTests.Tests;
diff --git a/UnitTests/Tests/Utils/ClonerTest.cs b/UnitTests/Tests/Utils/ClonerTest.cs
index 6475c38e..b09e6858 100644
--- a/UnitTests/Tests/Utils/ClonerTest.cs
+++ b/UnitTests/Tests/Utils/ClonerTest.cs
@@ -1,6 +1,6 @@
-using Core.Models.Spt.Templates;
-using Core.Utils;
-using Core.Utils.Cloners;
+using SPTarkov.Server.Core.Models.Spt.Templates;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
 using UnitTests.Mock;
 
 namespace UnitTests.Tests.Utils;
@@ -26,7 +26,7 @@ public class ClonerTest
         _templates = loadTask.Result;
         _jsonCloner = new JsonCloner(_jsonUtil);
         _reflectionsCloner = new ReflectionsCloner(new MockLogger<ReflectionsCloner>());
-        _fastCloner = new Core.Utils.Cloners.FastCloner();
+        _fastCloner = new SPTarkov.Server.Core.Utils.Cloners.FastCloner();
     }
 
     [TestMethod]
diff --git a/UnitTests/Tests/Utils/HashUtilTests.cs b/UnitTests/Tests/Utils/HashUtilTests.cs
index b7611a06..219cfcd8 100644
--- a/UnitTests/Tests/Utils/HashUtilTests.cs
+++ b/UnitTests/Tests/Utils/HashUtilTests.cs
@@ -1,5 +1,5 @@
-using Core.Utils;
-using Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
 using UnitTests.Mock;
 
 namespace UnitTests.Tests.Utils;
diff --git a/UnitTests/Tests/Utils/JsonUtilTests.cs b/UnitTests/Tests/Utils/JsonUtilTests.cs
index 888e4864..a64c6d9b 100644
--- a/UnitTests/Tests/Utils/JsonUtilTests.cs
+++ b/UnitTests/Tests/Utils/JsonUtilTests.cs
@@ -1,5 +1,5 @@
-using Core.Models.Enums;
-using Core.Utils;
+using SPTarkov.Server.Core.Models.Enums;
+using SPTarkov.Server.Core.Utils;
 
 namespace UnitTests.Tests.Utils;
 
diff --git a/UnitTests/Tests/Utils/MathUtilTests.cs b/UnitTests/Tests/Utils/MathUtilTests.cs
index e22fb88c..4bcde051 100644
--- a/UnitTests/Tests/Utils/MathUtilTests.cs
+++ b/UnitTests/Tests/Utils/MathUtilTests.cs
@@ -1,4 +1,4 @@
-using Core.Utils;
+using SPTarkov.Server.Core.Utils;
 
 namespace UnitTests.Tests.Utils;
 
diff --git a/UnitTests/Tests/Utils/RandomUtilTests.cs b/UnitTests/Tests/Utils/RandomUtilTests.cs
index f052e2e8..abdfed13 100644
--- a/UnitTests/Tests/Utils/RandomUtilTests.cs
+++ b/UnitTests/Tests/Utils/RandomUtilTests.cs
@@ -1,5 +1,5 @@
-using Core.Utils;
-using Core.Utils.Cloners;
+using SPTarkov.Server.Core.Utils;
+using SPTarkov.Server.Core.Utils.Cloners;
 using UnitTests.Mock;
 
 namespace UnitTests.Tests.Utils;
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 98c21143..0af96adb 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Libraries\Core\Core.csproj"/>
-    <ProjectReference Include="..\Libraries\SptDependencyInjection\SptDependencyInjection.csproj"/>
-    <ProjectReference Include="..\Libraries\SptCommon\SptCommon.csproj"/>
+    <ProjectReference Include="..\Libraries\SPTarkov.Server.Core\SPTarkov.Server.Core.csproj" />
+    <ProjectReference Include="..\Libraries\SPTarkov.DI\SPTarkov.DI.csproj" />
+    <ProjectReference Include="..\Libraries\SPTarkov.Common\SPTarkov.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/server-csharp.sln b/server-csharp.sln
index 8936edb4..55de31ea 100644
--- a/server-csharp.sln
+++ b/server-csharp.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.12.35527.113 d17.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{1F5ED9C6-8B1F-4776-85AB-B387CBBC5557}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPTarkov.Server", "SPTarkov.Server\SPTarkov.Server.csproj", "{1F5ED9C6-8B1F-4776-85AB-B387CBBC5557}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Libraries\Core\Core.csproj", "{AC8643DC-8779-4B4A-BBDA-2D4CC466F765}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPTarkov.Server.Core", "Libraries\SPTarkov.Server.Core\SPTarkov.Server.Core.csproj", "{AC8643DC-8779-4B4A-BBDA-2D4CC466F765}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{6C0681F9-4013-4579-82DA-0A9297984FD3}"
 EndProject
@@ -13,13 +13,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{587959C2-5AFA-4B77-B327-566610F9A289}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SptDependencyInjection", "Libraries\SptDependencyInjection\SptDependencyInjection.csproj", "{4B4AF50D-B2C6-47D1-B567-EA4560D8CBA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPTarkov.DI", "Libraries\SPTarkov.DI\SPTarkov.DI.csproj", "{4B4AF50D-B2C6-47D1-B567-EA4560D8CBA1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ItemTplGenerator", "Tools\ItemTplGenerator\ItemTplGenerator.csproj", "{00897F10-1AB3-4DC7-8DF9-5EA1D0289ACF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SptCommon", "Libraries\SptCommon\SptCommon.csproj", "{DB049C81-DEC0-490D-AC06-7AF4DC8C0571}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPTarkov.Common", "Libraries\SPTarkov.Common\SPTarkov.Common.csproj", "{DB049C81-DEC0-490D-AC06-7AF4DC8C0571}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SptAssets", "Libraries\SptAssets\SptAssets.csproj", "{4B973AC0-0C60-4853-9AF7-7CB69127473E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPTarkov.Server.Assets", "Libraries\SPTarkov.Server.Assets\SPTarkov.Server.Assets.csproj", "{4B973AC0-0C60-4853-9AF7-7CB69127473E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HideoutCraftQuestIdGenerator", "Tools\HideoutCraftQuestIdGenerator\HideoutCraftQuestIdGenerator.csproj", "{C24B1FEB-F8AC-434E-998D-5DA4D1687295}"
 EndProject