diff --git a/Server/PacketHandlers/CharacterCreationHandler.cs b/Server/PacketHandlers/CharacterCreationHandler.cs
index c2ea731..85f2a26 100644
--- a/Server/PacketHandlers/CharacterCreationHandler.cs
+++ b/Server/PacketHandlers/CharacterCreationHandler.cs
@@ -4,6 +4,7 @@ using Server.DB;
 using Server.DB.Documents;
 using Server.Services;
 using Wonderking.Game.Data.Character;
+using Wonderking.Game.Mapping;
 using Wonderking.Packets.Incoming;
 using Wonderking.Packets.Outgoing;
 using Wonderking.Packets.Outgoing.Data;
diff --git a/Server/Program.cs b/Server/Program.cs
index 5d2892b..e203b3b 100644
--- a/Server/Program.cs
+++ b/Server/Program.cs
@@ -8,8 +8,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Server.DB;
-using Server.PacketHandlers;
 using Server.Services;
+using Wonderking.Game.Mapping;
 
 var builder = Host.CreateApplicationBuilder();
 #if DEBUG
diff --git a/Server/PacketHandlers/CharacterStatsMappingConfiguration.cs b/Wonderking/Game/Mapping/CharacterStatsMappingConfiguration.cs
similarity index 93%
rename from Server/PacketHandlers/CharacterStatsMappingConfiguration.cs
rename to Wonderking/Game/Mapping/CharacterStatsMappingConfiguration.cs
index 5e02715..5851db2 100644
--- a/Server/PacketHandlers/CharacterStatsMappingConfiguration.cs
+++ b/Wonderking/Game/Mapping/CharacterStatsMappingConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Server.PacketHandlers;
+namespace Wonderking.Game.Mapping;
 
 public class CharacterStatsMappingConfiguration
 {
diff --git a/Server/PacketHandlers/DefaultCharacterMapping.cs b/Wonderking/Game/Mapping/DefaultCharacterMapping.cs
similarity index 81%
rename from Server/PacketHandlers/DefaultCharacterMapping.cs
rename to Wonderking/Game/Mapping/DefaultCharacterMapping.cs
index 22c267f..38c1e8c 100644
--- a/Server/PacketHandlers/DefaultCharacterMapping.cs
+++ b/Wonderking/Game/Mapping/DefaultCharacterMapping.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Server.PacketHandlers;
+namespace Wonderking.Game.Mapping;
 
 public class DefaultCharacterMapping
 {
diff --git a/Server/PacketHandlers/DynamicStats.cs b/Wonderking/Game/Mapping/DynamicStats.cs
similarity index 97%
rename from Server/PacketHandlers/DynamicStats.cs
rename to Wonderking/Game/Mapping/DynamicStats.cs
index 09d62e4..e68880e 100644
--- a/Server/PacketHandlers/DynamicStats.cs
+++ b/Wonderking/Game/Mapping/DynamicStats.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Server.PacketHandlers;
+namespace Wonderking.Game.Mapping;
 
 public class DynamicStats
 {
diff --git a/Server/PacketHandlers/Item.cs b/Wonderking/Game/Mapping/Item.cs
similarity index 85%
rename from Server/PacketHandlers/Item.cs
rename to Wonderking/Game/Mapping/Item.cs
index 259ef5c..79e2eab 100644
--- a/Server/PacketHandlers/Item.cs
+++ b/Wonderking/Game/Mapping/Item.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Server.PacketHandlers;
+namespace Wonderking.Game.Mapping;
 
 public class Item
 {
diff --git a/Server/PacketHandlers/JobSpecificMapping.cs b/Wonderking/Game/Mapping/JobSpecificMapping.cs
similarity index 91%
rename from Server/PacketHandlers/JobSpecificMapping.cs
rename to Wonderking/Game/Mapping/JobSpecificMapping.cs
index 03afe7e..2dabc00 100644
--- a/Server/PacketHandlers/JobSpecificMapping.cs
+++ b/Wonderking/Game/Mapping/JobSpecificMapping.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
 using Wonderking.Packets.Outgoing.Data;
 
-namespace Server.PacketHandlers;
+namespace Wonderking.Game.Mapping;
 
 public class JobSpecificMapping
 {