diff --git a/src/servers/Server_Common/CMakeLists.txt b/src/servers/Server_Common/CMakeLists.txt
index db70187d..eab0f1b3 100644
--- a/src/servers/Server_Common/CMakeLists.txt
+++ b/src/servers/Server_Common/CMakeLists.txt
@@ -49,7 +49,18 @@ set(Boost_USE_STATIC_LIBS ON)
 
 
 file(GLOB UTILS_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
-file(GLOB UTILS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.cpp")
+file(GLOB UTILS_SOURCE_FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Crypt/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Database/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Exd/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Logging/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Network/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Network/PacketDef/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp")
+
 
 find_package(Boost ${SAPPHIRE_BOOST_VER} COMPONENTS log log_setup thread date_time filesystem system)
 include_directories(${Boost_INCLUDE_DIR})
diff --git a/src/servers/Server_Common/XMLConfig.cpp b/src/servers/Server_Common/Config/XMLConfig.cpp
similarity index 100%
rename from src/servers/Server_Common/XMLConfig.cpp
rename to src/servers/Server_Common/Config/XMLConfig.cpp
diff --git a/src/servers/Server_Common/XMLConfig.h b/src/servers/Server_Common/Config/XMLConfig.h
similarity index 100%
rename from src/servers/Server_Common/XMLConfig.h
rename to src/servers/Server_Common/Config/XMLConfig.h
diff --git a/src/servers/Server_Common/base64.cpp b/src/servers/Server_Common/Crypt/base64.cpp
similarity index 100%
rename from src/servers/Server_Common/base64.cpp
rename to src/servers/Server_Common/Crypt/base64.cpp
diff --git a/src/servers/Server_Common/base64.h b/src/servers/Server_Common/Crypt/base64.h
similarity index 100%
rename from src/servers/Server_Common/base64.h
rename to src/servers/Server_Common/Crypt/base64.h
diff --git a/src/servers/Server_Lobby/blowfish.cpp b/src/servers/Server_Common/Crypt/blowfish.cpp
similarity index 100%
rename from src/servers/Server_Lobby/blowfish.cpp
rename to src/servers/Server_Common/Crypt/blowfish.cpp
diff --git a/src/servers/Server_Lobby/blowfish.h b/src/servers/Server_Common/Crypt/blowfish.h
similarity index 100%
rename from src/servers/Server_Lobby/blowfish.h
rename to src/servers/Server_Common/Crypt/blowfish.h
diff --git a/src/servers/Server_Lobby/blowfish.h2 b/src/servers/Server_Common/Crypt/blowfish.h2
similarity index 100%
rename from src/servers/Server_Lobby/blowfish.h2
rename to src/servers/Server_Common/Crypt/blowfish.h2
diff --git a/src/servers/Server_Common/md5.cpp b/src/servers/Server_Common/Crypt/md5.cpp
similarity index 100%
rename from src/servers/Server_Common/md5.cpp
rename to src/servers/Server_Common/Crypt/md5.cpp
diff --git a/src/servers/Server_Common/md5.h b/src/servers/Server_Common/Crypt/md5.h
similarity index 100%
rename from src/servers/Server_Common/md5.h
rename to src/servers/Server_Common/Crypt/md5.h
diff --git a/src/servers/Server_Common/Database.cpp b/src/servers/Server_Common/Database/Database.cpp
similarity index 99%
rename from src/servers/Server_Common/Database.cpp
rename to src/servers/Server_Common/Database/Database.cpp
index f43789bd..5eccded6 100644
--- a/src/servers/Server_Common/Database.cpp
+++ b/src/servers/Server_Common/Database/Database.cpp
@@ -7,7 +7,7 @@
 #include <chrono>
 #include <sstream>
 
-#include "Logger.h"
+#include "src/servers/Server_Common/Logging/Logger.h"
 
 extern Core::Logger g_log;
 
diff --git a/src/servers/Server_Common/Database.h b/src/servers/Server_Common/Database/Database.h
similarity index 100%
rename from src/servers/Server_Common/Database.h
rename to src/servers/Server_Common/Database/Database.h
diff --git a/src/servers/Server_Common/ExdData.cpp b/src/servers/Server_Common/Exd/ExdData.cpp
similarity index 100%
rename from src/servers/Server_Common/ExdData.cpp
rename to src/servers/Server_Common/Exd/ExdData.cpp
diff --git a/src/servers/Server_Common/ExdData.h b/src/servers/Server_Common/Exd/ExdData.h
similarity index 100%
rename from src/servers/Server_Common/ExdData.h
rename to src/servers/Server_Common/Exd/ExdData.h
diff --git a/src/servers/Server_Common/Logger.cpp b/src/servers/Server_Common/Logging/Logger.cpp
similarity index 100%
rename from src/servers/Server_Common/Logger.cpp
rename to src/servers/Server_Common/Logging/Logger.cpp
diff --git a/src/servers/Server_Common/Logger.h b/src/servers/Server_Common/Logging/Logger.h
similarity index 100%
rename from src/servers/Server_Common/Logger.h
rename to src/servers/Server_Common/Logging/Logger.h
diff --git a/src/servers/Server_Common/Acceptor.cpp b/src/servers/Server_Common/Network/Acceptor.cpp
similarity index 96%
rename from src/servers/Server_Common/Acceptor.cpp
rename to src/servers/Server_Common/Network/Acceptor.cpp
index 2720d904..0d89bad4 100644
--- a/src/servers/Server_Common/Acceptor.cpp
+++ b/src/servers/Server_Common/Network/Acceptor.cpp
@@ -1,6 +1,6 @@
-#include "Hive.h"
+#include "src/servers/Server_Common/Network/Hive.h"
 #include "Acceptor.h"
-#include "Connection.h"
+#include "src/servers/Server_Common/Network/Connection.h"
 #include <boost/interprocess/detail/atomic.hpp>
 #include <boost/bind.hpp>
 
diff --git a/src/servers/Server_Common/Acceptor.h b/src/servers/Server_Common/Network/Acceptor.h
similarity index 98%
rename from src/servers/Server_Common/Acceptor.h
rename to src/servers/Server_Common/Network/Acceptor.h
index 638ea7b8..e7b69880 100644
--- a/src/servers/Server_Common/Acceptor.h
+++ b/src/servers/Server_Common/Network/Acceptor.h
@@ -5,7 +5,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
-#include "Forwards.h"
+#include "src/servers/Server_Common/Forwards.h"
 
 namespace Core 
 {
diff --git a/src/servers/Server_Common/CommonNetwork.h b/src/servers/Server_Common/Network/CommonNetwork.h
similarity index 100%
rename from src/servers/Server_Common/CommonNetwork.h
rename to src/servers/Server_Common/Network/CommonNetwork.h
diff --git a/src/servers/Server_Common/Connection.cpp b/src/servers/Server_Common/Network/Connection.cpp
similarity index 100%
rename from src/servers/Server_Common/Connection.cpp
rename to src/servers/Server_Common/Network/Connection.cpp
diff --git a/src/servers/Server_Common/Connection.h b/src/servers/Server_Common/Network/Connection.h
similarity index 99%
rename from src/servers/Server_Common/Connection.h
rename to src/servers/Server_Common/Network/Connection.h
index 14e229fc..194aea5a 100644
--- a/src/servers/Server_Common/Connection.h
+++ b/src/servers/Server_Common/Network/Connection.h
@@ -9,7 +9,7 @@
 #include <list>
 #include <boost/cstdint.hpp>
 
-#include "Forwards.h"
+#include "src/servers/Server_Common/Forwards.h"
 #include "Acceptor.h"
 
 
diff --git a/src/servers/Server_Common/GamePacket.cpp b/src/servers/Server_Common/Network/GamePacket.cpp
similarity index 100%
rename from src/servers/Server_Common/GamePacket.cpp
rename to src/servers/Server_Common/Network/GamePacket.cpp
diff --git a/src/servers/Server_Common/GamePacket.h b/src/servers/Server_Common/Network/GamePacket.h
similarity index 97%
rename from src/servers/Server_Common/GamePacket.h
rename to src/servers/Server_Common/Network/GamePacket.h
index f74ef798..340be1a3 100644
--- a/src/servers/Server_Common/GamePacket.h
+++ b/src/servers/Server_Common/Network/GamePacket.h
@@ -2,7 +2,7 @@
 #define _GAMEPACKET_H_
 
 #include "CommonNetwork.h"
-#include "Forwards.h"
+#include "src/servers/Server_Common/Forwards.h"
 #include <stdint.h>
 #include <string.h>
 
diff --git a/src/servers/Server_Common/GamePacketNew.h b/src/servers/Server_Common/Network/GamePacketNew.h
similarity index 100%
rename from src/servers/Server_Common/GamePacketNew.h
rename to src/servers/Server_Common/Network/GamePacketNew.h
diff --git a/src/servers/Server_Common/Hive.cpp b/src/servers/Server_Common/Network/Hive.cpp
similarity index 100%
rename from src/servers/Server_Common/Hive.cpp
rename to src/servers/Server_Common/Network/Hive.cpp
diff --git a/src/servers/Server_Common/Hive.h b/src/servers/Server_Common/Network/Hive.h
similarity index 100%
rename from src/servers/Server_Common/Hive.h
rename to src/servers/Server_Common/Network/Hive.h
diff --git a/src/servers/Server_Common/PacketContainer.cpp b/src/servers/Server_Common/Network/PacketContainer.cpp
similarity index 97%
rename from src/servers/Server_Common/PacketContainer.cpp
rename to src/servers/Server_Common/Network/PacketContainer.cpp
index 9c192eae..17ebc817 100644
--- a/src/servers/Server_Common/PacketContainer.cpp
+++ b/src/servers/Server_Common/Network/PacketContainer.cpp
@@ -1,6 +1,6 @@
 #include "PacketContainer.h"
 #include "GamePacket.h"
-#include "Common.h"
+#include "src/servers/Server_Common/Common.h"
 
 #include <boost/format.hpp>
 
diff --git a/src/servers/Server_Common/PacketContainer.h b/src/servers/Server_Common/Network/PacketContainer.h
similarity index 91%
rename from src/servers/Server_Common/PacketContainer.h
rename to src/servers/Server_Common/Network/PacketContainer.h
index a00e0b88..8bab92a4 100644
--- a/src/servers/Server_Common/PacketContainer.h
+++ b/src/servers/Server_Common/Network/PacketContainer.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "Common.h"
+#include "src/servers/Server_Common/Common.h"
 #include "CommonNetwork.h"
 #include "GamePacket.h"
 
diff --git a/src/servers/Server_Common/ServerPacketDef.h b/src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h
similarity index 99%
rename from src/servers/Server_Common/ServerPacketDef.h
rename to src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h
index 76772db2..d02a27b5 100644
--- a/src/servers/Server_Common/ServerPacketDef.h
+++ b/src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h
@@ -7,8 +7,8 @@
 #ifndef _CORE_NETWORK_PACKETS_SERVER_IPC_H
 #define _CORE_NETWORK_PACKETS_SERVER_IPC_H
 
-#include "Common.h"
-#include "CommonNetwork.h"
+#include "src/servers/Server_Common/Common.h"
+#include "src/servers/Server_Common/Network/CommonNetwork.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Common/ChaiscriptStdLib.cpp b/src/servers/Server_Common/Script/ChaiscriptStdLib.cpp
similarity index 100%
rename from src/servers/Server_Common/ChaiscriptStdLib.cpp
rename to src/servers/Server_Common/Script/ChaiscriptStdLib.cpp
diff --git a/src/servers/Server_Common/ChaiscriptStdLib.h b/src/servers/Server_Common/Script/ChaiscriptStdLib.h
similarity index 100%
rename from src/servers/Server_Common/ChaiscriptStdLib.h
rename to src/servers/Server_Common/Script/ChaiscriptStdLib.h
diff --git a/src/servers/Server_Common/LockedQueue.h b/src/servers/Server_Common/Util/LockedQueue.h
similarity index 100%
rename from src/servers/Server_Common/LockedQueue.h
rename to src/servers/Server_Common/Util/LockedQueue.h
diff --git a/src/servers/Server_Common/Util.cpp b/src/servers/Server_Common/Util/Util.cpp
similarity index 100%
rename from src/servers/Server_Common/Util.cpp
rename to src/servers/Server_Common/Util/Util.cpp
diff --git a/src/servers/Server_Common/Util.h b/src/servers/Server_Common/Util/Util.h
similarity index 100%
rename from src/servers/Server_Common/Util.h
rename to src/servers/Server_Common/Util/Util.h
diff --git a/src/servers/Server_Common/UtilMath.cpp b/src/servers/Server_Common/Util/UtilMath.cpp
similarity index 100%
rename from src/servers/Server_Common/UtilMath.cpp
rename to src/servers/Server_Common/Util/UtilMath.cpp
diff --git a/src/servers/Server_Common/UtilMath.h b/src/servers/Server_Common/Util/UtilMath.h
similarity index 94%
rename from src/servers/Server_Common/UtilMath.h
rename to src/servers/Server_Common/Util/UtilMath.h
index 68feeabe..7c37ed42 100644
--- a/src/servers/Server_Common/UtilMath.h
+++ b/src/servers/Server_Common/Util/UtilMath.h
@@ -1,7 +1,7 @@
 #ifndef _UTILMATH_H
 #define _UTILMATH_H
 
-#include "Common.h"
+#include "src/servers/Server_Common/Common.h"
 
 #define PI 3.14159265358979323846f
 
diff --git a/src/servers/Server_Common/UtilNetwork.cpp b/src/servers/Server_Common/Util/UtilNetwork.cpp
similarity index 100%
rename from src/servers/Server_Common/UtilNetwork.cpp
rename to src/servers/Server_Common/Util/UtilNetwork.cpp
diff --git a/src/servers/Server_Common/UtilNetwork.h b/src/servers/Server_Common/Util/UtilNetwork.h
similarity index 84%
rename from src/servers/Server_Common/UtilNetwork.h
rename to src/servers/Server_Common/Util/UtilNetwork.h
index 8b7d7748..2244e730 100644
--- a/src/servers/Server_Common/UtilNetwork.h
+++ b/src/servers/Server_Common/Util/UtilNetwork.h
@@ -1,7 +1,7 @@
 #ifndef _UTILNETWORK_H
 #define _UTILNETWORK_H
 
-#include "CommonNetwork.h"
+#include "src/servers/Server_Common/Network/CommonNetwork.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Lobby/GameConnection.cpp b/src/servers/Server_Lobby/GameConnection.cpp
index a515f7db..d3264d3b 100644
--- a/src/servers/Server_Lobby/GameConnection.cpp
+++ b/src/servers/Server_Lobby/GameConnection.cpp
@@ -1,12 +1,12 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilNetwork.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/md5.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilNetwork.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
+#include <src/servers/Server_Common/Crypt/md5.h>
 
 #include <boost/format.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -21,7 +21,7 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 #include "Forwards.h"
-#include "blowfish.h"
+#include "src/servers/Server_Common/Crypt/blowfish.h"
 
 
 
diff --git a/src/servers/Server_Lobby/GameConnection.h b/src/servers/Server_Lobby/GameConnection.h
index a8b73bdb..f62fef2e 100644
--- a/src/servers/Server_Lobby/GameConnection.h
+++ b/src/servers/Server_Lobby/GameConnection.h
@@ -1,16 +1,16 @@
 #ifndef GAMECONNECTION_H
 #define GAMECONNECTION_H
 
-#include <Server_Common/Connection.h>
-#include <Server_Common/Acceptor.h>
-#include <Server_Common/CommonNetwork.h>
+#include <src/servers/Server_Common/Network/Connection.h>
+#include <src/servers/Server_Common/Network/Acceptor.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
 
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 #include "LobbyPacketContainer.h"
 
 
-#include <Server_Common/LockedQueue.h>
+#include <src/servers/Server_Common/Util/LockedQueue.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.cpp b/src/servers/Server_Lobby/LobbyPacketContainer.cpp
index 3b70a67b..052e92c3 100644
--- a/src/servers/Server_Lobby/LobbyPacketContainer.cpp
+++ b/src/servers/Server_Lobby/LobbyPacketContainer.cpp
@@ -1,8 +1,7 @@
 #include "LobbyPacketContainer.h"
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/GamePacketNew.h>
-
-#include "blowfish.h"
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Crypt/blowfish.h>
 
 namespace Core {
    namespace Network {
diff --git a/src/servers/Server_Lobby/LobbyPacketContainer.h b/src/servers/Server_Lobby/LobbyPacketContainer.h
index cc17e55d..970cef15 100644
--- a/src/servers/Server_Lobby/LobbyPacketContainer.h
+++ b/src/servers/Server_Lobby/LobbyPacketContainer.h
@@ -1,13 +1,11 @@
-#pragma once
-
 #ifndef _LobbyPacketContainer_H_
 #define _LobbyPacketContainer_H_
 
 #include <vector>
 #include <string.h>
 
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/Util.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Util/Util.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/Server_Lobby/RestConnector.cpp b/src/servers/Server_Lobby/RestConnector.cpp
index 8e233f7f..995e5b82 100644
--- a/src/servers/Server_Lobby/RestConnector.cpp
+++ b/src/servers/Server_Lobby/RestConnector.cpp
@@ -1,9 +1,9 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 #include "ServerLobby.h"
-#include <Server_Common/Database.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/base64.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Crypt/base64.h>
 #include <time.h>
 #include <iomanip>
 
diff --git a/src/servers/Server_Lobby/ServerLobby.cpp b/src/servers/Server_Lobby/ServerLobby.cpp
index 1adbe99a..1e6e22a5 100644
--- a/src/servers/Server_Lobby/ServerLobby.cpp
+++ b/src/servers/Server_Lobby/ServerLobby.cpp
@@ -3,11 +3,11 @@
 #include <time.h>
 #include <map>
 
-#include <Server_Common/Hive.h>
-#include <Server_Common/Acceptor.h>
+#include <src/servers/Server_Common/Network/Hive.h>
+#include <src/servers/Server_Common/Network/Acceptor.h>
 
-#include <Server_Common/Logger.h>
-#include <Server_Common/XMLConfig.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Config/XMLConfig.h>
 
 //#include "LobbySession.h"
 
diff --git a/src/servers/Server_Lobby/ServerLobby.h b/src/servers/Server_Lobby/ServerLobby.h
index 29031ac4..9b5caeb2 100644
--- a/src/servers/Server_Lobby/ServerLobby.h
+++ b/src/servers/Server_Lobby/ServerLobby.h
@@ -6,7 +6,7 @@
 #include <map>
 
 #include <boost/shared_ptr.hpp>
-#include <Server_Common/XMLConfig.h>
+#include <src/servers/Server_Common/Config/XMLConfig.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/Server_REST/PlayerMinimal.cpp
index 5f57fe05..3ae784a5 100644
--- a/src/servers/Server_REST/PlayerMinimal.cpp
+++ b/src/servers/Server_REST/PlayerMinimal.cpp
@@ -1,10 +1,10 @@
 #include "PlayerMinimal.h"
 
 //#include "Core/Server_Game/CServerGame.h"
-#include <Server_Common/Util.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/Common.h>
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 
 
 extern Core::Db::Database g_database;
diff --git a/src/servers/Server_REST/SapphireAPI.cpp b/src/servers/Server_REST/SapphireAPI.cpp
index 3ea460d0..f45900d2 100644
--- a/src/servers/Server_REST/SapphireAPI.cpp
+++ b/src/servers/Server_REST/SapphireAPI.cpp
@@ -1,8 +1,8 @@
 #include "SapphireAPI.h"
-#include <Server_Common/base64.h>
+#include <src/servers/Server_Common/Crypt/base64.h>
 #include "Session.h"
 #include "PlayerMinimal.h"
-#include <Server_Common/Database.h>
+#include <src/servers/Server_Common/Database/Database.h>
 #include <time.h>
 
 #define BOOST_SPIRIT_THREADSAFE
diff --git a/src/servers/Server_REST/main.cpp b/src/servers/Server_REST/main.cpp
index fffe5e96..df383565 100644
--- a/src/servers/Server_REST/main.cpp
+++ b/src/servers/Server_REST/main.cpp
@@ -6,16 +6,16 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include <Server_Common/Logger.h>
-#include <Server_Common/XMLConfig.h>
-#include <Server_Common/Database.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Config/XMLConfig.h>
+#include <src/servers/Server_Common/Database/Database.h>
 
-#include <Server_Common/Connection.h>
-#include <Server_Common/Hive.h>
-#include <Server_Common/Acceptor.h>
+#include <src/servers/Server_Common/Network/Connection.h>
+#include <src/servers/Server_Common/Network/Hive.h>
+#include <src/servers/Server_Common/Network/Acceptor.h>
 
-#include <Server_Common/ExdData.h>
-#include <Server_Common/base64.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Crypt/base64.h>
 
 //Added for the default_resource example
 #include <fstream>
diff --git a/src/servers/Server_Zone/Action/Action.cpp b/src/servers/Server_Zone/Action/Action.cpp
index 2cdf945b..ed1ee052 100644
--- a/src/servers/Server_Zone/Action/Action.cpp
+++ b/src/servers/Server_Zone/Action/Action.cpp
@@ -1,6 +1,6 @@
 #include "Action.h"
 
-#include <Server_Common/Util.h>
+#include <src/servers/Server_Common/Util/Util.h>
 
 
 Core::Action::Action::Action()
diff --git a/src/servers/Server_Zone/Action/Action.h b/src/servers/Server_Zone/Action/Action.h
index 4980f890..496fe309 100644
--- a/src/servers/Server_Zone/Action/Action.h
+++ b/src/servers/Server_Zone/Action/Action.h
@@ -1,7 +1,7 @@
 #ifndef _ACTION_H_
 #define _ACTION_H_
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core { namespace Action {
diff --git a/src/servers/Server_Zone/Action/ActionCast.cpp b/src/servers/Server_Zone/Action/ActionCast.cpp
index 961975ff..90b6cc0e 100644
--- a/src/servers/Server_Zone/Action/ActionCast.cpp
+++ b/src/servers/Server_Zone/Action/ActionCast.cpp
@@ -1,10 +1,10 @@
 #include "ActionCast.h"
 
-#include <Server_Common/Common.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilMath.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/Logger.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
 
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/Server_Zone/Action/ActionTeleport.cpp b/src/servers/Server_Zone/Action/ActionTeleport.cpp
index 3b0479b1..b30409fd 100644
--- a/src/servers/Server_Zone/Action/ActionTeleport.cpp
+++ b/src/servers/Server_Zone/Action/ActionTeleport.cpp
@@ -1,8 +1,8 @@
 #include "ActionTeleport.h"
 
-#include <Server_Common/Util.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/Logger.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
 
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/Server_Zone/Action/EventAction.cpp b/src/servers/Server_Zone/Action/EventAction.cpp
index 8bac2862..a5caa8a8 100644
--- a/src/servers/Server_Zone/Action/EventAction.cpp
+++ b/src/servers/Server_Zone/Action/EventAction.cpp
@@ -1,6 +1,6 @@
-#include <Server_Common/Util.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 
 #include "EventAction.h"
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
diff --git a/src/servers/Server_Zone/Action/EventAction.h b/src/servers/Server_Zone/Action/EventAction.h
index 4c8f9d21..038d9c99 100644
--- a/src/servers/Server_Zone/Action/EventAction.h
+++ b/src/servers/Server_Zone/Action/EventAction.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTACTION_H_
 #define _EVENTACTION_H_
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 #include "src/servers/Server_Zone/Forwards.h"
 #include "src/servers/Server_Zone/Action/Action.h"
diff --git a/src/servers/Server_Zone/Action/EventItemAction.cpp b/src/servers/Server_Zone/Action/EventItemAction.cpp
index a7f65bbc..6ada2ab1 100644
--- a/src/servers/Server_Zone/Action/EventItemAction.cpp
+++ b/src/servers/Server_Zone/Action/EventItemAction.cpp
@@ -1,8 +1,8 @@
 #include "EventItemAction.h"
 
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilMath.h>
-#include <Server_Common/Logger.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
 
 #include <string.h>
 
diff --git a/src/servers/Server_Zone/Actor/Actor.cpp b/src/servers/Server_Zone/Actor/Actor.cpp
index d2613b70..fe1c6e34 100644
--- a/src/servers/Server_Zone/Actor/Actor.cpp
+++ b/src/servers/Server_Zone/Actor/Actor.cpp
@@ -1,12 +1,12 @@
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilMath.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include "src/servers/Server_Zone/Forwards.h"
 #include "src/servers/Server_Zone/Action/Action.h"
 #include "Actor.h"
 #include "src/servers/Server_Zone/Zone/Zone.h"
-#include <Server_Common/GamePacket.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
 #include "src/servers/Server_Zone/Network/GameConnection.h"
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/Server_Zone/Actor/Actor.h b/src/servers/Server_Zone/Actor/Actor.h
index 79652e4f..a3809cce 100644
--- a/src/servers/Server_Zone/Actor/Actor.h
+++ b/src/servers/Server_Zone/Actor/Actor.h
@@ -1,7 +1,7 @@
 #ifndef _ACTOR_H_
 #define _ACTOR_H_
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
 #include "src/servers/Server_Zone/Forwards.h"
diff --git a/src/servers/Server_Zone/Actor/BattleNpc.cpp b/src/servers/Server_Zone/Actor/BattleNpc.cpp
index cc8bda3d..7fad0f84 100644
--- a/src/servers/Server_Zone/Actor/BattleNpc.cpp
+++ b/src/servers/Server_Zone/Actor/BattleNpc.cpp
@@ -3,11 +3,11 @@
 #include <time.h>
 #include <stdint.h>
 
-#include <Server_Common/Database.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilMath.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
 
 #include "Player.h"
 #include "BattleNpc.h"
diff --git a/src/servers/Server_Zone/Actor/Player.cpp b/src/servers/Server_Zone/Actor/Player.cpp
index c6bfcf67..345a4b99 100644
--- a/src/servers/Server_Zone/Actor/Player.cpp
+++ b/src/servers/Server_Zone/Actor/Player.cpp
@@ -1,12 +1,12 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilMath.h>
-#include <Server_Common/XMLConfig.h>
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
+#include <src/servers/Server_Common/Config/XMLConfig.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include "src/servers/Server_Zone/Session.h"
 #include "Player.h"
diff --git a/src/servers/Server_Zone/Actor/Player.h b/src/servers/Server_Zone/Actor/Player.h
index e79fd209..6e3d459a 100644
--- a/src/servers/Server_Zone/Actor/Player.h
+++ b/src/servers/Server_Zone/Actor/Player.h
@@ -3,7 +3,7 @@
 
 #include "src/servers/Server_Zone/Forwards.h"
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 #include "Actor.h"
 #include "src/servers/Server_Zone/Inventory/Inventory.h"
diff --git a/src/servers/Server_Zone/Actor/PlayerEvent.cpp b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
index da7721d0..d0a3613f 100644
--- a/src/servers/Server_Zone/Actor/PlayerEvent.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
@@ -1,7 +1,7 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include "Player.h"
 
diff --git a/src/servers/Server_Zone/Actor/PlayerInventory.cpp b/src/servers/Server_Zone/Actor/PlayerInventory.cpp
index 0d448d11..9084792e 100644
--- a/src/servers/Server_Zone/Actor/PlayerInventory.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerInventory.cpp
@@ -1,11 +1,11 @@
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 #include "Player.h"
 
 #include "src/servers/Server_Zone/Zone/ZoneMgr.h"
 #include "src/servers/Server_Zone/Zone/Zone.h"
 
-#include <Server_Common/GamePacket.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
 
 #include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
 
diff --git a/src/servers/Server_Zone/Actor/PlayerQuest.cpp b/src/servers/Server_Zone/Actor/PlayerQuest.cpp
index 1991c5b2..f94395bf 100644
--- a/src/servers/Server_Zone/Actor/PlayerQuest.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerQuest.cpp
@@ -1,9 +1,9 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include "src/servers/Server_Zone/Network/GameConnection.h"
 
diff --git a/src/servers/Server_Zone/Actor/PlayerSql.cpp b/src/servers/Server_Zone/Actor/PlayerSql.cpp
index 0294c02d..1de2d549 100644
--- a/src/servers/Server_Zone/Actor/PlayerSql.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerSql.cpp
@@ -1,12 +1,12 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilMath.h>
-#include <Server_Common/XMLConfig.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
+#include <src/servers/Server_Common/Config/XMLConfig.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include <set>
 #include <stdio.h>
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommand.h b/src/servers/Server_Zone/DebugCommand/DebugCommand.h
index ac8c0df6..a35e72f1 100644
--- a/src/servers/Server_Zone/DebugCommand/DebugCommand.h
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommand.h
@@ -1,7 +1,7 @@
 #ifndef _GAMECOMMAND_H_
 #define _GAMECOMMAND_H_
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 #include "src/servers/Server_Zone/Actor/Player.h"
 #include "src/servers/Server_Zone/Forwards.h"
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
index b89ccb33..fac2c3e3 100644
--- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
@@ -1,13 +1,13 @@
 #include <boost/lexical_cast.hpp>
 
-#include <Server_Common/Common.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/UtilMath.h>
-#include <Server_Common/PacketContainer.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 
 #include "DebugCommand.h"
 #include "DebugCommandHandler.h"
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
index 6f65548d..4ea8647a 100644
--- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
@@ -4,7 +4,7 @@
 #include <map>
 
 #include "DebugCommand.h"
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
diff --git a/src/servers/Server_Zone/Event/EventHelper.cpp b/src/servers/Server_Zone/Event/EventHelper.cpp
index b91a0e96..18308399 100644
--- a/src/servers/Server_Zone/Event/EventHelper.cpp
+++ b/src/servers/Server_Zone/Event/EventHelper.cpp
@@ -1,8 +1,8 @@
 #include "EventHelper.h"
 #include "Event.h"
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 
 extern Core::Data::ExdData g_exdData;
 
diff --git a/src/servers/Server_Zone/Inventory/Inventory.cpp b/src/servers/Server_Zone/Inventory/Inventory.cpp
index 98adb561..14579e23 100644
--- a/src/servers/Server_Zone/Inventory/Inventory.cpp
+++ b/src/servers/Server_Zone/Inventory/Inventory.cpp
@@ -1,8 +1,8 @@
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/Common.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/Logger.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
 
 #include "Inventory.h"
 
diff --git a/src/servers/Server_Zone/Inventory/Inventory.h b/src/servers/Server_Zone/Inventory/Inventory.h
index 089f85d6..adc99715 100644
--- a/src/servers/Server_Zone/Inventory/Inventory.h
+++ b/src/servers/Server_Zone/Inventory/Inventory.h
@@ -1,7 +1,7 @@
 #ifndef INVENTORY_H_
 #define INVENTORY_H_
 #include <map>
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core
diff --git a/src/servers/Server_Zone/Inventory/Item.cpp b/src/servers/Server_Zone/Inventory/Item.cpp
index 70bef0af..8c165493 100644
--- a/src/servers/Server_Zone/Inventory/Item.cpp
+++ b/src/servers/Server_Zone/Inventory/Item.cpp
@@ -1,5 +1,5 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 #include "Item.h"
 
 extern Core::Data::ExdData g_exdData;
diff --git a/src/servers/Server_Zone/Inventory/Item.h b/src/servers/Server_Zone/Inventory/Item.h
index f98b8331..f082ca0e 100644
--- a/src/servers/Server_Zone/Inventory/Item.h
+++ b/src/servers/Server_Zone/Inventory/Item.h
@@ -1,7 +1,7 @@
 #ifndef _ITEM_H_
 #define _ITEM_H_
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 namespace Core {
 
diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.cpp b/src/servers/Server_Zone/Inventory/ItemContainer.cpp
index 7d4d6625..4c25f339 100644
--- a/src/servers/Server_Zone/Inventory/ItemContainer.cpp
+++ b/src/servers/Server_Zone/Inventory/ItemContainer.cpp
@@ -1,9 +1,9 @@
 #include "src/servers/Server_Zone/Forwards.h"
 #include "ItemContainer.h"
 
-#include <Server_Common/Common.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/Database.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Database/Database.h>
 
 #include "src/servers/Server_Zone/Actor/Player.h"
 
diff --git a/src/servers/Server_Zone/Inventory/ItemContainer.h b/src/servers/Server_Zone/Inventory/ItemContainer.h
index a2ac9962..745e8c7b 100644
--- a/src/servers/Server_Zone/Inventory/ItemContainer.h
+++ b/src/servers/Server_Zone/Inventory/ItemContainer.h
@@ -4,7 +4,7 @@
 
 #include <map>
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 #include "../Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/GameConnection.cpp b/src/servers/Server_Zone/Network/GameConnection.cpp
index 637e4ec7..78ed9073 100644
--- a/src/servers/Server_Zone/Network/GameConnection.cpp
+++ b/src/servers/Server_Zone/Network/GameConnection.cpp
@@ -1,10 +1,10 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilNetwork.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilNetwork.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 #include <boost/format.hpp>
 
 #include "GameConnection.h"
diff --git a/src/servers/Server_Zone/Network/GameConnection.h b/src/servers/Server_Zone/Network/GameConnection.h
index b00fb7e0..855a4f52 100644
--- a/src/servers/Server_Zone/Network/GameConnection.h
+++ b/src/servers/Server_Zone/Network/GameConnection.h
@@ -2,13 +2,13 @@
 #ifndef GAMECONNECTION_H
 #define GAMECONNECTION_H
 
-#include <Server_Common/Connection.h>
-#include <Server_Common/Acceptor.h>
-#include <Server_Common/CommonNetwork.h>
+#include <src/servers/Server_Common/Network/Connection.h>
+#include <src/servers/Server_Common/Network/Acceptor.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
 
-#include <Server_Common/GamePacket.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
 
-#include <Server_Common/LockedQueue.h>
+#include <src/servers/Server_Common/Util/LockedQueue.h>
 
 #include "src/servers/Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
index 4466bb27..3bf560d5 100644
--- a/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
@@ -1,10 +1,10 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
index 9b033dec..62efce32 100644
--- a/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
@@ -1,8 +1,8 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include "src/servers/Server_Zone/Network/GameConnection.h"
 #include "src/servers/Server_Zone/Session.h"
diff --git a/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
index 9ec36e02..0c41ece8 100644
--- a/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
@@ -1,7 +1,7 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
index b8bcfaed..b23a47b0 100644
--- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
@@ -1,10 +1,10 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
index 8229df26..b48f0630 100644
--- a/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
@@ -1,10 +1,10 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
index 781d5420..98279386 100644
--- a/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
@@ -1,10 +1,10 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp b/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
index a3026855..d08b6db0 100644
--- a/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
@@ -1,9 +1,9 @@
-#include <Server_Common/Common.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/PacketContainer.h>
-#include <Server_Common/Logger.h>
+#include <src/servers/Server_Common/Common.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
 
 #include <boost/format.hpp>
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
index 737a79e1..7b7083e7 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL142_H
 #define _ACTORCONTROL142_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
index 95250060..cdbf97cc 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL143_H
 #define _ACTORCONTROL143_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h
index 819003f2..8e9f9543 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h
@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL144_H
 #define _ACTORCONTROL144_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
index f97add96..8056f113 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
@@ -1,8 +1,8 @@
 #ifndef _ACTORSPAWN_H
 #define _ACTORSPAWN_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/UtilMath.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
 #include "src/servers/Server_Zone/Actor/Player.h"
 #include "src/servers/Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
index e4958ad5..c61af223 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
@@ -1,8 +1,8 @@
 #ifndef _CHATPACKET_H
 #define _CHATPACKET_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h
index 5dd6f520..4ec9a593 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTFINISH_H
 #define _EVENTFINISH_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
index 73f39605..f2e8e4dc 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTPLAY_H
 #define _EVENTPLAY_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
index f6dbb7a4..6b591792 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTSTART_H
 #define _EVENTSTART_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
index 3f8d8671..11e7634a 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
@@ -1,8 +1,8 @@
 #ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H
 #define _CORE_NETWORK_PACKETS_INITUIPACKET_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
 #include "Server_Zone/Actor/Player.h"
 #include "Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
index 928129ad..c2634381 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
@@ -1,7 +1,7 @@
 #ifndef _MODELEQUIPPACKET_H
 #define _MODELEQUIPPACKET_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include "src/servers/Server_Zone/Actor/Player.h"
 #include "src/servers/Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
index 172c7e39..0e685716 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
@@ -1,9 +1,9 @@
 #ifndef _MOVEACTORPACKET_H
 #define _MOVEACTORPACKET_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/UtilMath.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
 #include "src/servers/Server_Zone/Actor/Player.h"
 #include "src/servers/Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
index e7088360..08cc271e 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
@@ -1,7 +1,7 @@
 #ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H
 #define _CORE_NETWORK_PACKETS_PINGPACKET_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 
 #include "src/servers/Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
index 891a3d3a..28a26b11 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -1,9 +1,9 @@
 #ifndef _PLAYERSPAWN_H
 #define _PLAYERSPAWN_H
 
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/UtilMath.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
 #include "src/servers/Server_Zone/Actor/Player.h"
 #include "src/servers/Server_Zone/Forwards.h"
 #include "src/servers/Server_Zone/Inventory/Inventory.h"
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
index de2858f9..b0017871 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERSTATE_H
 #define _PLAYERSTATE_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include "src/servers/Server_Zone/Actor/Player.h"
 #include "src/servers/Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
index 019621c7..ada4f313 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
@@ -1,7 +1,7 @@
 #ifndef _QUESTMESSAGE_H
 #define _QUESTMESSAGE_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include "src/servers/Server_Zone/Actor/Player.h"
 #include "src/servers/Server_Zone/Forwards.h"
 
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
index 5e4fbbc3..7106eb92 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
@@ -1,8 +1,8 @@
 #ifndef _SERVERNOTICEPACKET_H
 #define _SERVERNOTICEPACKET_H
 
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
index 0fbb4e1c..f1969799 100644
--- a/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
@@ -1,7 +1,7 @@
 #ifndef _UPDATEHPMPTP_H
 #define _UPDATEHPMPTP_H
 
-#include <Server_Common/GamePacketNew.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
 #include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
diff --git a/src/servers/Server_Zone/Script/ScriptManager.cpp b/src/servers/Server_Zone/Script/ScriptManager.cpp
index 1779ebef..3a71c367 100644
--- a/src/servers/Server_Zone/Script/ScriptManager.cpp
+++ b/src/servers/Server_Zone/Script/ScriptManager.cpp
@@ -1,8 +1,8 @@
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 #include <chaiscript/chaiscript.hpp>
 
-#include <Server_Common/ChaiscriptStdLib.h>
+#include <src/servers/Server_Common/Script/ChaiscriptStdLib.h>
 
 #include "src/servers/Server_Zone/Zone/Zone.h"
 #include "src/servers/Server_Zone/Actor/Player.h"
diff --git a/src/servers/Server_Zone/Script/ScriptManager.h b/src/servers/Server_Zone/Script/ScriptManager.h
index bbdd6c27..4c5b6b20 100644
--- a/src/servers/Server_Zone/Script/ScriptManager.h
+++ b/src/servers/Server_Zone/Script/ScriptManager.h
@@ -5,7 +5,7 @@
 #include <mutex>
 #include <set>
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 #include "../Forwards.h"
 
 
diff --git a/src/servers/Server_Zone/Script/ScriptManagerInit.cpp b/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
index 64a80d9d..c66565d1 100644
--- a/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
+++ b/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
@@ -1,7 +1,7 @@
-#include <Server_Common/Logger.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
 #include <chaiscript/chaiscript.hpp>
 
-#include <Server_Common/ChaiscriptStdLib.h>
+#include <src/servers/Server_Common/Script/ChaiscriptStdLib.h>
 
 #include "src/servers/Server_Zone/Script/ScriptManager.h"
 
diff --git a/src/servers/Server_Zone/ServerZone.cpp b/src/servers/Server_Zone/ServerZone.cpp
index 09c20e64..6300ecf0 100644
--- a/src/servers/Server_Zone/ServerZone.cpp
+++ b/src/servers/Server_Zone/ServerZone.cpp
@@ -4,16 +4,16 @@
 
 #include "ServerZone.h"
 
-#include <Server_Common/Logger.h>
-#include <Server_Common/XMLConfig.h>
-#include <Server_Common/Database.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Config/XMLConfig.h>
+#include <src/servers/Server_Common/Database/Database.h>
 
-#include <Server_Common/Connection.h>
-#include <Server_Common/Hive.h>
-#include <Server_Common/Acceptor.h>
+#include <src/servers/Server_Common/Network/Connection.h>
+#include <src/servers/Server_Common/Network/Hive.h>
+#include <src/servers/Server_Common/Network/Acceptor.h>
 
-#include <Server_Common/ExdData.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include "src/servers/Server_Zone/Network/GameConnection.h"
 #include "Session.h"
diff --git a/src/servers/Server_Zone/ServerZone.h b/src/servers/Server_Zone/ServerZone.h
index ed939388..51e337f2 100644
--- a/src/servers/Server_Zone/ServerZone.h
+++ b/src/servers/Server_Zone/ServerZone.h
@@ -1,7 +1,7 @@
 #ifndef __GAMESERVER_H
 #define __GAMESERVER_H
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 #include <boost/shared_ptr.hpp>
 #include <mutex>
diff --git a/src/servers/Server_Zone/Session.cpp b/src/servers/Server_Zone/Session.cpp
index 8ffba9a7..2b316f4f 100644
--- a/src/servers/Server_Zone/Session.cpp
+++ b/src/servers/Server_Zone/Session.cpp
@@ -1,7 +1,7 @@
 #include <time.h>
 
-#include <Server_Common/Util.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 #include "src/servers/Server_Zone/Network/GameConnection.h"
 #include "Session.h"
 
diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
index 3a4e92fe..54fa4834 100644
--- a/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
@@ -1,8 +1,8 @@
-#include <Server_Common/ExdData.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/Logger.h>
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
index e9f2a883..59e34b53 100644
--- a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
@@ -1,5 +1,5 @@
-#include <Server_Common/Util.h>
-#include <Server_Common/ServerPacketDef.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
 
 #include "src/servers/Server_Zone/Actor/Actor.h"
 #include "StatusEffect.h"
diff --git a/src/servers/Server_Zone/Zone/Zone.cpp b/src/servers/Server_Zone/Zone/Zone.cpp
index 0be50fb5..6c70a820 100644
--- a/src/servers/Server_Zone/Zone/Zone.cpp
+++ b/src/servers/Server_Zone/Zone/Zone.cpp
@@ -2,16 +2,16 @@
 #include <vector>
 
 
-#include <Server_Common/Logger.h>
-#include <Server_Common/Util.h>
-#include <Server_Common/UtilMath.h>
-#include <Server_Common/GamePacket.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/CommonNetwork.h>
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/PacketContainer.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Util/Util.h>
+#include <src/servers/Server_Common/Util/UtilMath.h>
+#include <src/servers/Server_Common/Network/GamePacket.h>
+#include <src/servers/Server_Common/Network/GamePacketNew.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Network/CommonNetwork.h>
+#include <src/servers/Server_Common/Network/PacketDef/ServerPacketDef.h>
+#include <src/servers/Server_Common/Network/PacketContainer.h>
 
 #include "Zone.h"
 #include "ZoneMgr.h"
diff --git a/src/servers/Server_Zone/Zone/Zone.h b/src/servers/Server_Zone/Zone/Zone.h
index 0f339761..baeb65b7 100644
--- a/src/servers/Server_Zone/Zone/Zone.h
+++ b/src/servers/Server_Zone/Zone/Zone.h
@@ -2,7 +2,7 @@
 #define _ZONE_H
 
 #include <unordered_map>
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 #include "Cell.h"
 #include "CellHandler.h"
diff --git a/src/servers/Server_Zone/Zone/ZoneMgr.cpp b/src/servers/Server_Zone/Zone/ZoneMgr.cpp
index 26364edf..4bca2cfa 100644
--- a/src/servers/Server_Zone/Zone/ZoneMgr.cpp
+++ b/src/servers/Server_Zone/Zone/ZoneMgr.cpp
@@ -1,6 +1,6 @@
-#include <Server_Common/Logger.h>
-#include <Server_Common/Database.h>
-#include <Server_Common/ExdData.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
+#include <src/servers/Server_Common/Database/Database.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
 #include <boost/lexical_cast.hpp>
 
 #include "ZoneMgr.h"
diff --git a/src/servers/Server_Zone/Zone/ZonePosition.h b/src/servers/Server_Zone/Zone/ZonePosition.h
index 0b4cad7c..73efeb63 100644
--- a/src/servers/Server_Zone/Zone/ZonePosition.h
+++ b/src/servers/Server_Zone/Zone/ZonePosition.h
@@ -1,7 +1,7 @@
 #ifndef _ZONELINE_H
 #define _ZONELINE_H
 
-#include <Server_Common/Common.h>
+#include <src/servers/Server_Common/Common.h>
 
 namespace Core {
 
diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp
index 7c76b2ce..d1ac6ca1 100644
--- a/src/tools/quest_parser/main.cpp
+++ b/src/tools/quest_parser/main.cpp
@@ -7,8 +7,8 @@
 #include <Exd.h>
 #include <iostream>
 #include <set>
-#include <Server_Common/ExdData.h>
-#include <Server_Common/Logger.h>
+#include <src/servers/Server_Common/Exd/ExdData.h>
+#include <src/servers/Server_Common/Logging/Logger.h>
 
 #include <fstream>