more restructuring

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})

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;
 

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>
 

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 
 {

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"
 
 

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>
 

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>
 

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"
 

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 {

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
 

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 {

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"
 
 
 

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"
 

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 {

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"
 

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>
 

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"
 

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"
 

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;

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

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>

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()

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 {

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"

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"

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"

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"

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>
 

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"

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"

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"

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"

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"

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"
 

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"
 

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"
 

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>

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"

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"

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 {

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;
 

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"
 

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

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;

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 {
 

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"
 

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"
 

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"

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"
 

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>
 

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"

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>
 

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>
 

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>
 

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>
 

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>
 

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 {

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"
 
 

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 {

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"
 

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"
 
 

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 {

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 {

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 {

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"
 

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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 {

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 {