diff --git a/PSO2SERVER.sln b/PSO2SERVER.sln
index e027062..738fd07 100644
--- a/PSO2SERVER.sln
+++ b/PSO2SERVER.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34728.123
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PSO2SERVER", "PSO2SERVER\PSO2SERVER.csproj", "{E54FC88C-B212-4F47-B2F1-927D39EE3DBA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{E54FC88C-B212-4F47-B2F1-927D39EE3DBA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{18D5BEEA-6AF2-411C-BBCE-508B066FB339}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/PSO2SERVER/Client.cs b/Server/Client.cs
similarity index 100%
rename from PSO2SERVER/Client.cs
rename to Server/Client.cs
diff --git a/PSO2SERVER/Config.cs b/Server/Config.cs
similarity index 100%
rename from PSO2SERVER/Config.cs
rename to Server/Config.cs
diff --git a/PSO2SERVER/ConsoleSystem.cs b/Server/ConsoleSystem.cs
similarity index 100%
rename from PSO2SERVER/ConsoleSystem.cs
rename to Server/ConsoleSystem.cs
diff --git a/PSO2SERVER/Crypto/ARC4Managed.cs b/Server/Crypto/ARC4Managed.cs
similarity index 100%
rename from PSO2SERVER/Crypto/ARC4Managed.cs
rename to Server/Crypto/ARC4Managed.cs
diff --git a/PSO2SERVER/Crypto/RC4.cs b/Server/Crypto/RC4.cs
similarity index 100%
rename from PSO2SERVER/Crypto/RC4.cs
rename to Server/Crypto/RC4.cs
diff --git a/PSO2SERVER/Database/ServerEf.cs b/Server/Database/ServerEf.cs
similarity index 100%
rename from PSO2SERVER/Database/ServerEf.cs
rename to Server/Database/ServerEf.cs
diff --git a/PSO2SERVER/Helper.cs b/Server/Helper.cs
similarity index 100%
rename from PSO2SERVER/Helper.cs
rename to Server/Helper.cs
diff --git a/PSO2SERVER/Logger.cs b/Server/Logger.cs
similarity index 100%
rename from PSO2SERVER/Logger.cs
rename to Server/Logger.cs
diff --git a/PSO2SERVER/Models/Character.cs b/Server/Models/Character.cs
similarity index 100%
rename from PSO2SERVER/Models/Character.cs
rename to Server/Models/Character.cs
diff --git a/PSO2SERVER/Models/FixedPackets.cs b/Server/Models/FixedPackets.cs
similarity index 100%
rename from PSO2SERVER/Models/FixedPackets.cs
rename to Server/Models/FixedPackets.cs
diff --git a/PSO2SERVER/Models/PSO2Item.cs b/Server/Models/PSO2Item.cs
similarity index 100%
rename from PSO2SERVER/Models/PSO2Item.cs
rename to Server/Models/PSO2Item.cs
diff --git a/PSO2SERVER/Models/PSOData.cs b/Server/Models/PSOData.cs
similarity index 100%
rename from PSO2SERVER/Models/PSOData.cs
rename to Server/Models/PSOData.cs
diff --git a/PSO2SERVER/Models/PSOObject.cs b/Server/Models/PSOObject.cs
similarity index 100%
rename from PSO2SERVER/Models/PSOObject.cs
rename to Server/Models/PSOObject.cs
diff --git a/PSO2SERVER/Models/Quest.cs b/Server/Models/Quest.cs
similarity index 100%
rename from PSO2SERVER/Models/Quest.cs
rename to Server/Models/Quest.cs
diff --git a/PSO2SERVER/Models/ShipData.cs b/Server/Models/ShipData.cs
similarity index 100%
rename from PSO2SERVER/Models/ShipData.cs
rename to Server/Models/ShipData.cs
diff --git a/PSO2SERVER/Network/SocketClient.cs b/Server/Network/SocketClient.cs
similarity index 100%
rename from PSO2SERVER/Network/SocketClient.cs
rename to Server/Network/SocketClient.cs
diff --git a/PSO2SERVER/Network/SocketServer.cs b/Server/Network/SocketServer.cs
similarity index 100%
rename from PSO2SERVER/Network/SocketServer.cs
rename to Server/Network/SocketServer.cs
diff --git a/PSO2SERVER/Object/ObjectManager.cs b/Server/Object/ObjectManager.cs
similarity index 100%
rename from PSO2SERVER/Object/ObjectManager.cs
rename to Server/Object/ObjectManager.cs
diff --git a/PSO2SERVER/Packets/Handlers/CampshipTeleport.cs b/Server/Packets/Handlers/CampshipTeleport.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/CampshipTeleport.cs
rename to Server/Packets/Handlers/CampshipTeleport.cs
diff --git a/PSO2SERVER/Packets/Handlers/CasinoTeleportHandler.cs b/Server/Packets/Handlers/CasinoTeleportHandler.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/CasinoTeleportHandler.cs
rename to Server/Packets/Handlers/CasinoTeleportHandler.cs
diff --git a/PSO2SERVER/Packets/Handlers/CharacterCreate.cs b/Server/Packets/Handlers/CharacterCreate.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/CharacterCreate.cs
rename to Server/Packets/Handlers/CharacterCreate.cs
diff --git a/PSO2SERVER/Packets/Handlers/CharacterList.cs b/Server/Packets/Handlers/CharacterList.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/CharacterList.cs
rename to Server/Packets/Handlers/CharacterList.cs
diff --git a/PSO2SERVER/Packets/Handlers/CharacterSpawn.cs b/Server/Packets/Handlers/CharacterSpawn.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/CharacterSpawn.cs
rename to Server/Packets/Handlers/CharacterSpawn.cs
diff --git a/PSO2SERVER/Packets/Handlers/ChatHandler.cs b/Server/Packets/Handlers/ChatHandler.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/ChatHandler.cs
rename to Server/Packets/Handlers/ChatHandler.cs
diff --git a/PSO2SERVER/Packets/Handlers/KeyExchange.cs b/Server/Packets/Handlers/KeyExchange.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/KeyExchange.cs
rename to Server/Packets/Handlers/KeyExchange.cs
diff --git a/PSO2SERVER/Packets/Handlers/Login.cs b/Server/Packets/Handlers/Login.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/Login.cs
rename to Server/Packets/Handlers/Login.cs
diff --git a/PSO2SERVER/Packets/Handlers/MovementHandlers.cs b/Server/Packets/Handlers/MovementHandlers.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/MovementHandlers.cs
rename to Server/Packets/Handlers/MovementHandlers.cs
diff --git a/PSO2SERVER/Packets/Handlers/ObjectInteract.cs b/Server/Packets/Handlers/ObjectInteract.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/ObjectInteract.cs
rename to Server/Packets/Handlers/ObjectInteract.cs
diff --git a/PSO2SERVER/Packets/Handlers/PacketHandler.cs b/Server/Packets/Handlers/PacketHandler.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/PacketHandler.cs
rename to Server/Packets/Handlers/PacketHandler.cs
diff --git a/PSO2SERVER/Packets/Handlers/QuestCounterHandler.cs b/Server/Packets/Handlers/QuestCounterHandler.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/QuestCounterHandler.cs
rename to Server/Packets/Handlers/QuestCounterHandler.cs
diff --git a/PSO2SERVER/Packets/Handlers/ReturnToLobbyHandler.cs b/Server/Packets/Handlers/ReturnToLobbyHandler.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/ReturnToLobbyHandler.cs
rename to Server/Packets/Handlers/ReturnToLobbyHandler.cs
diff --git a/PSO2SERVER/Packets/Handlers/SimplePackets.cs b/Server/Packets/Handlers/SimplePackets.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/SimplePackets.cs
rename to Server/Packets/Handlers/SimplePackets.cs
diff --git a/PSO2SERVER/Packets/Handlers/StartGame.cs b/Server/Packets/Handlers/StartGame.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/StartGame.cs
rename to Server/Packets/Handlers/StartGame.cs
diff --git a/PSO2SERVER/Packets/Handlers/SymbolArtHandler.cs b/Server/Packets/Handlers/SymbolArtHandler.cs
similarity index 100%
rename from PSO2SERVER/Packets/Handlers/SymbolArtHandler.cs
rename to Server/Packets/Handlers/SymbolArtHandler.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/CharacterSpawnPacket.cs b/Server/Packets/PSOPackets/CharacterSpawnPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/CharacterSpawnPacket.cs
rename to Server/Packets/PSOPackets/CharacterSpawnPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/GuildInfoPacket.cs b/Server/Packets/PSOPackets/GuildInfoPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/GuildInfoPacket.cs
rename to Server/Packets/PSOPackets/GuildInfoPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/LoginDataPacket.cs b/Server/Packets/PSOPackets/LoginDataPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/LoginDataPacket.cs
rename to Server/Packets/PSOPackets/LoginDataPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/MovementPacket.cs b/Server/Packets/PSOPackets/MovementPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/MovementPacket.cs
rename to Server/Packets/PSOPackets/MovementPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/NoPayloadPacket.cs b/Server/Packets/PSOPackets/NoPayloadPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/NoPayloadPacket.cs
rename to Server/Packets/PSOPackets/NoPayloadPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/ObjectActionPacket.cs b/Server/Packets/PSOPackets/ObjectActionPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/ObjectActionPacket.cs
rename to Server/Packets/PSOPackets/ObjectActionPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/PalettePacket.cs b/Server/Packets/PSOPackets/PalettePacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/PalettePacket.cs
rename to Server/Packets/PSOPackets/PalettePacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/PartyInitPacket.cs b/Server/Packets/PSOPackets/PartyInitPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/PartyInitPacket.cs
rename to Server/Packets/PSOPackets/PartyInitPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/QuestAvailablePacket.cs b/Server/Packets/PSOPackets/QuestAvailablePacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/QuestAvailablePacket.cs
rename to Server/Packets/PSOPackets/QuestAvailablePacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/QuestDifficultyPacket.cs b/Server/Packets/PSOPackets/QuestDifficultyPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/QuestDifficultyPacket.cs
rename to Server/Packets/PSOPackets/QuestDifficultyPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/QuestListPacket.cs b/Server/Packets/PSOPackets/QuestListPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/QuestListPacket.cs
rename to Server/Packets/PSOPackets/QuestListPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/QuestStartPacket.cs b/Server/Packets/PSOPackets/QuestStartPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/QuestStartPacket.cs
rename to Server/Packets/PSOPackets/QuestStartPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/SetCurrencyPacket.cs b/Server/Packets/PSOPackets/SetCurrencyPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/SetCurrencyPacket.cs
rename to Server/Packets/PSOPackets/SetCurrencyPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/SetMesetaPacket.cs b/Server/Packets/PSOPackets/SetMesetaPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/SetMesetaPacket.cs
rename to Server/Packets/PSOPackets/SetMesetaPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/SetQuestPacket.cs b/Server/Packets/PSOPackets/SetQuestPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/SetQuestPacket.cs
rename to Server/Packets/PSOPackets/SetQuestPacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/SetScenePacket.cs b/Server/Packets/PSOPackets/SetScenePacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/SetScenePacket.cs
rename to Server/Packets/PSOPackets/SetScenePacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/SymbolArtList.cs b/Server/Packets/PSOPackets/SymbolArtList.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/SymbolArtList.cs
rename to Server/Packets/PSOPackets/SymbolArtList.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/SystemMessagePacket.cs b/Server/Packets/PSOPackets/SystemMessagePacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/SystemMessagePacket.cs
rename to Server/Packets/PSOPackets/SystemMessagePacket.cs
diff --git a/PSO2SERVER/Packets/PSOPackets/TeleportTransferPacket.cs b/Server/Packets/PSOPackets/TeleportTransferPacket.cs
similarity index 100%
rename from PSO2SERVER/Packets/PSOPackets/TeleportTransferPacket.cs
rename to Server/Packets/PSOPackets/TeleportTransferPacket.cs
diff --git a/PSO2SERVER/Packets/Packet.cs b/Server/Packets/Packet.cs
similarity index 100%
rename from PSO2SERVER/Packets/Packet.cs
rename to Server/Packets/Packet.cs
diff --git a/PSO2SERVER/Packets/PacketReader.cs b/Server/Packets/PacketReader.cs
similarity index 100%
rename from PSO2SERVER/Packets/PacketReader.cs
rename to Server/Packets/PacketReader.cs
diff --git a/PSO2SERVER/Packets/PacketWriter.cs b/Server/Packets/PacketWriter.cs
similarity index 100%
rename from PSO2SERVER/Packets/PacketWriter.cs
rename to Server/Packets/PacketWriter.cs
diff --git a/PSO2SERVER/Party/Party.cs b/Server/Party/Party.cs
similarity index 100%
rename from PSO2SERVER/Party/Party.cs
rename to Server/Party/Party.cs
diff --git a/PSO2SERVER/Party/PartyManager.cs b/Server/Party/PartyManager.cs
similarity index 100%
rename from PSO2SERVER/Party/PartyManager.cs
rename to Server/Party/PartyManager.cs
diff --git a/PSO2SERVER/Program.cs b/Server/Program.cs
similarity index 100%
rename from PSO2SERVER/Program.cs
rename to Server/Program.cs
diff --git a/PSO2SERVER/Properties/AssemblyInfo.cs b/Server/Properties/AssemblyInfo.cs
similarity index 100%
rename from PSO2SERVER/Properties/AssemblyInfo.cs
rename to Server/Properties/AssemblyInfo.cs
diff --git a/PSO2SERVER/QueryServer.cs b/Server/QueryServer.cs
similarity index 100%
rename from PSO2SERVER/QueryServer.cs
rename to Server/QueryServer.cs
diff --git a/PSO2SERVER/Resources/objects/README.txt b/Server/Resources/objects/README.txt
similarity index 100%
rename from PSO2SERVER/Resources/objects/README.txt
rename to Server/Resources/objects/README.txt
diff --git a/PSO2SERVER/Resources/quests/arks_010120.bin b/Server/Resources/quests/arks_010120.bin
similarity index 100%
rename from PSO2SERVER/Resources/quests/arks_010120.bin
rename to Server/Resources/quests/arks_010120.bin
diff --git a/PSO2SERVER/Resources/quests/lobby.bin b/Server/Resources/quests/lobby.bin
similarity index 100%
rename from PSO2SERVER/Resources/quests/lobby.bin
rename to Server/Resources/quests/lobby.bin
diff --git a/PSO2SERVER/Resources/setMemoryPacket.bin b/Server/Resources/setMemoryPacket.bin
similarity index 100%
rename from PSO2SERVER/Resources/setMemoryPacket.bin
rename to Server/Resources/setMemoryPacket.bin
diff --git a/PSO2SERVER/Resources/settings.txt b/Server/Resources/settings.txt
similarity index 100%
rename from PSO2SERVER/Resources/settings.txt
rename to Server/Resources/settings.txt
diff --git a/PSO2SERVER/Resources/sql/scripts/1-setup-database.sql b/Server/Resources/sql/scripts/1-setup-database.sql
similarity index 100%
rename from PSO2SERVER/Resources/sql/scripts/1-setup-database.sql
rename to Server/Resources/sql/scripts/1-setup-database.sql
diff --git a/PSO2SERVER/Resources/sql/scripts/2-setup-table-structures.sql b/Server/Resources/sql/scripts/2-setup-table-structures.sql
similarity index 100%
rename from PSO2SERVER/Resources/sql/scripts/2-setup-table-structures.sql
rename to Server/Resources/sql/scripts/2-setup-table-structures.sql
diff --git a/PSO2SERVER/Resources/sql/scripts/3-setup-initial-data.sql b/Server/Resources/sql/scripts/3-setup-initial-data.sql
similarity index 100%
rename from PSO2SERVER/Resources/sql/scripts/3-setup-initial-data.sql
rename to Server/Resources/sql/scripts/3-setup-initial-data.sql
diff --git a/PSO2SERVER/Resources/sql/scripts/psoserver2 2024.9.9.sql b/Server/Resources/sql/scripts/psoserver2 2024.9.9.sql
similarity index 100%
rename from PSO2SERVER/Resources/sql/scripts/psoserver2 2024.9.9.sql
rename to Server/Resources/sql/scripts/psoserver2 2024.9.9.sql
diff --git a/PSO2SERVER/Server.cs b/Server/Server.cs
similarity index 100%
rename from PSO2SERVER/Server.cs
rename to Server/Server.cs
diff --git a/PSO2SERVER/PSO2SERVER.csproj b/Server/Server.csproj
similarity index 100%
rename from PSO2SERVER/PSO2SERVER.csproj
rename to Server/Server.csproj
diff --git a/PSO2SERVER/Zone/Map.cs b/Server/Zone/Map.cs
similarity index 100%
rename from PSO2SERVER/Zone/Map.cs
rename to Server/Zone/Map.cs
diff --git a/PSO2SERVER/Zone/ZoneManager.cs b/Server/Zone/ZoneManager.cs
similarity index 100%
rename from PSO2SERVER/Zone/ZoneManager.cs
rename to Server/Zone/ZoneManager.cs
diff --git a/PSO2SERVER/app.config b/Server/app.config
similarity index 100%
rename from PSO2SERVER/app.config
rename to Server/app.config
diff --git a/PSO2SERVER/packages.config b/Server/packages.config
similarity index 100%
rename from PSO2SERVER/packages.config
rename to Server/packages.config
diff --git a/ServerTest/ServerTest.csproj b/ServerTest/ServerTest.csproj
index a67e7ca..9b20ba1 100644
--- a/ServerTest/ServerTest.csproj
+++ b/ServerTest/ServerTest.csproj
@@ -69,9 +69,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\PSO2SERVER\PSO2SERVER.csproj">
+    <ProjectReference Include="..\Server\Server.csproj">
       <Project>{E54FC88C-B212-4F47-B2F1-927D39EE3DBA}</Project>
-      <Name>PSO2SERVER</Name>
+      <Name>Server</Name>
     </ProjectReference>
   </ItemGroup>
   <ProjectExtensions>