diff --git a/CMakeLists.txt b/CMakeLists.txt
index acb43b44..1284d86b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_policy(SET CMP0014 NEW)
 cmake_minimum_required(VERSION 2.6)
 project (Sapphire)
 
diff --git a/src/servers/Server_Zone/Action.cpp b/src/servers/Server_Zone/Action/Action.cpp
similarity index 100%
rename from src/servers/Server_Zone/Action.cpp
rename to src/servers/Server_Zone/Action/Action.cpp
diff --git a/src/servers/Server_Zone/Action.h b/src/servers/Server_Zone/Action/Action.h
similarity index 95%
rename from src/servers/Server_Zone/Action.h
rename to src/servers/Server_Zone/Action/Action.h
index 8a004bf4..4980f890 100644
--- a/src/servers/Server_Zone/Action.h
+++ b/src/servers/Server_Zone/Action/Action.h
@@ -2,7 +2,7 @@
 #define _ACTION_H_
 
 #include <Server_Common/Common.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core { namespace Action {
 
diff --git a/src/servers/Server_Zone/ActionCast.cpp b/src/servers/Server_Zone/Action/ActionCast.cpp
similarity index 89%
rename from src/servers/Server_Zone/ActionCast.cpp
rename to src/servers/Server_Zone/Action/ActionCast.cpp
index 98a78290..961975ff 100644
--- a/src/servers/Server_Zone/ActionCast.cpp
+++ b/src/servers/Server_Zone/Action/ActionCast.cpp
@@ -6,10 +6,10 @@
 #include <Server_Common/ExdData.h>
 #include <Server_Common/Logger.h>
 
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "Player.h"
-#include "ScriptManager.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
 using namespace Core::Common;
 using namespace Core::Network;
diff --git a/src/servers/Server_Zone/ActionCast.h b/src/servers/Server_Zone/Action/ActionCast.h
similarity index 90%
rename from src/servers/Server_Zone/ActionCast.h
rename to src/servers/Server_Zone/Action/ActionCast.h
index ce69da18..9cff002c 100644
--- a/src/servers/Server_Zone/ActionCast.h
+++ b/src/servers/Server_Zone/Action/ActionCast.h
@@ -1,7 +1,7 @@
 #ifndef _ACTIONCAST_H_
 #define _ACTIONCAST_H_
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 #include "Action.h"
 
 namespace Core { namespace Action {
diff --git a/src/servers/Server_Zone/ActionTeleport.cpp b/src/servers/Server_Zone/Action/ActionTeleport.cpp
similarity index 93%
rename from src/servers/Server_Zone/ActionTeleport.cpp
rename to src/servers/Server_Zone/Action/ActionTeleport.cpp
index 1d5b0d8e..3b0479b1 100644
--- a/src/servers/Server_Zone/ActionTeleport.cpp
+++ b/src/servers/Server_Zone/Action/ActionTeleport.cpp
@@ -4,9 +4,9 @@
 #include <Server_Common/ExdData.h>
 #include <Server_Common/Logger.h>
 
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "Player.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
 
 using namespace Core::Common;
 using namespace Core::Network;
diff --git a/src/servers/Server_Zone/ActionTeleport.h b/src/servers/Server_Zone/Action/ActionTeleport.h
similarity index 91%
rename from src/servers/Server_Zone/ActionTeleport.h
rename to src/servers/Server_Zone/Action/ActionTeleport.h
index e8d16b68..8cb83ec1 100644
--- a/src/servers/Server_Zone/ActionTeleport.h
+++ b/src/servers/Server_Zone/Action/ActionTeleport.h
@@ -1,7 +1,7 @@
 #ifndef _ACTIONTELEPORT_H_
 #define _ACTIONTELEPORT_H_
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 #include "Action.h"
 
 namespace Core { namespace Action {
diff --git a/src/servers/Server_Zone/EventAction.cpp b/src/servers/Server_Zone/Action/EventAction.cpp
similarity index 93%
rename from src/servers/Server_Zone/EventAction.cpp
rename to src/servers/Server_Zone/Action/EventAction.cpp
index 7833c86b..8bac2862 100644
--- a/src/servers/Server_Zone/EventAction.cpp
+++ b/src/servers/Server_Zone/Action/EventAction.cpp
@@ -3,10 +3,10 @@
 #include <Server_Common/ExdData.h>
 
 #include "EventAction.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "Player.h"
-#include "Event.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Event/Event.h"
 
 extern Core::Logger g_log;
 extern Core::Data::ExdData g_exdData;
diff --git a/src/servers/Server_Zone/EventAction.h b/src/servers/Server_Zone/Action/EventAction.h
similarity index 87%
rename from src/servers/Server_Zone/EventAction.h
rename to src/servers/Server_Zone/Action/EventAction.h
index 7e956d93..4c8f9d21 100644
--- a/src/servers/Server_Zone/EventAction.h
+++ b/src/servers/Server_Zone/Action/EventAction.h
@@ -3,8 +3,8 @@
 
 #include <Server_Common/Common.h>
 
-#include "Forwards.h"
-#include "Action.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Action/Action.h"
 
 namespace Core { namespace Action {
 
diff --git a/src/servers/Server_Zone/EventItemAction.cpp b/src/servers/Server_Zone/Action/EventItemAction.cpp
similarity index 94%
rename from src/servers/Server_Zone/EventItemAction.cpp
rename to src/servers/Server_Zone/Action/EventItemAction.cpp
index 12ac1e14..a7f65bbc 100644
--- a/src/servers/Server_Zone/EventItemAction.cpp
+++ b/src/servers/Server_Zone/Action/EventItemAction.cpp
@@ -1,11 +1,14 @@
 #include "EventItemAction.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
+
 #include <Server_Common/Util.h>
 #include <Server_Common/UtilMath.h>
 #include <Server_Common/Logger.h>
+
 #include <string.h>
-#include "Player.h"
+
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
 
 extern Core::Logger g_log;
 
diff --git a/src/servers/Server_Zone/EventItemAction.h b/src/servers/Server_Zone/Action/EventItemAction.h
similarity index 87%
rename from src/servers/Server_Zone/EventItemAction.h
rename to src/servers/Server_Zone/Action/EventItemAction.h
index c367c13f..c3c92b50 100644
--- a/src/servers/Server_Zone/EventItemAction.h
+++ b/src/servers/Server_Zone/Action/EventItemAction.h
@@ -1,8 +1,8 @@
 #ifndef _EVENTITEMACTION_H_
 #define _EVENTITEMACTION_H_
 
-#include "Forwards.h"
-#include "Action.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Action/Action.h"
 
 namespace Core { namespace Action {
 
diff --git a/src/servers/Server_Zone/Actor.cpp b/src/servers/Server_Zone/Actor/Actor.cpp
similarity index 95%
rename from src/servers/Server_Zone/Actor.cpp
rename to src/servers/Server_Zone/Actor/Actor.cpp
index efcf3d6e..d2613b70 100644
--- a/src/servers/Server_Zone/Actor.cpp
+++ b/src/servers/Server_Zone/Actor/Actor.cpp
@@ -2,21 +2,21 @@
 #include <Server_Common/UtilMath.h>
 #include <Server_Common/PacketContainer.h>
 
-#include "Forwards.h"
-#include "Action.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Action/Action.h"
 #include "Actor.h"
-#include "Zone.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
 #include <Server_Common/GamePacket.h>
-#include "GameConnection.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
-#include "UpdateHpMpTpPacket.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"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h"
 
-#include "StatusEffectContainer.h"
-#include "StatusEffect.h"
-#include "ServerZone.h"
-#include "Session.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Session.h"
 #include "Player.h"
 
 extern Core::ServerZone g_serverZone;
diff --git a/src/servers/Server_Zone/Actor.h b/src/servers/Server_Zone/Actor/Actor.h
similarity index 99%
rename from src/servers/Server_Zone/Actor.h
rename to src/servers/Server_Zone/Actor/Actor.h
index 6c7d1df9..79652e4f 100644
--- a/src/servers/Server_Zone/Actor.h
+++ b/src/servers/Server_Zone/Actor/Actor.h
@@ -4,7 +4,7 @@
 #include <Server_Common/Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 #include <set>
 #include <map>
 
diff --git a/src/servers/Server_Zone/BattleNpc.cpp b/src/servers/Server_Zone/Actor/BattleNpc.cpp
similarity index 98%
rename from src/servers/Server_Zone/BattleNpc.cpp
rename to src/servers/Server_Zone/Actor/BattleNpc.cpp
index c1fae02f..cc8bda3d 100644
--- a/src/servers/Server_Zone/BattleNpc.cpp
+++ b/src/servers/Server_Zone/Actor/BattleNpc.cpp
@@ -12,10 +12,10 @@
 #include "Player.h"
 #include "BattleNpc.h"
 
-#include "MoveActorPacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "StatusEffectContainer.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/Server_Zone/BattleNpc.h b/src/servers/Server_Zone/Actor/BattleNpc.h
similarity index 100%
rename from src/servers/Server_Zone/BattleNpc.h
rename to src/servers/Server_Zone/Actor/BattleNpc.h
diff --git a/src/servers/Server_Zone/BattleNpcTemplate.cpp b/src/servers/Server_Zone/Actor/BattleNpcTemplate.cpp
similarity index 100%
rename from src/servers/Server_Zone/BattleNpcTemplate.cpp
rename to src/servers/Server_Zone/Actor/BattleNpcTemplate.cpp
diff --git a/src/servers/Server_Zone/BattleNpcTemplate.h b/src/servers/Server_Zone/Actor/BattleNpcTemplate.h
similarity index 100%
rename from src/servers/Server_Zone/BattleNpcTemplate.h
rename to src/servers/Server_Zone/Actor/BattleNpcTemplate.h
diff --git a/src/servers/Server_Zone/Player.cpp b/src/servers/Server_Zone/Actor/Player.cpp
similarity index 96%
rename from src/servers/Server_Zone/Player.cpp
rename to src/servers/Server_Zone/Actor/Player.cpp
index 8f931a11..c6bfcf67 100644
--- a/src/servers/Server_Zone/Player.cpp
+++ b/src/servers/Server_Zone/Actor/Player.cpp
@@ -8,42 +8,42 @@
 #include <Server_Common/ExdData.h>
 #include <Server_Common/PacketContainer.h>
 
-#include "Session.h"
+#include "src/servers/Server_Zone/Session.h"
 #include "Player.h"
 #include "BattleNpc.h"
 
 
-#include "ZoneMgr.h"
-#include "Zone.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
 
-#include "ServerZone.h"
+#include "src/servers/Server_Zone/ServerZone.h"
 
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "InitUIPacket.h"
-#include "ServerNoticePacket.h"
-#include "ChatPacket.h"
-#include "ModelEquipPacket.h"
-#include "ActorSpawnPacket.h"
-#include "UpdateHpMpTpPacket.h"
-#include "PlayerStateFlagsPacket.h"
-#include "PlayerSpawnPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h"
 
-#include "ScriptManager.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
-#include "StatusEffectContainer.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
 
-#include "Item.h"
+#include "src/servers/Server_Zone/Inventory/Item.h"
 
-#include "Inventory.h"
-#include "Event.h"
-#include "Action.h"
-#include "EventAction.h"
-#include "EventItemAction.h"
-#include "ZonePosition.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
+#include "src/servers/Server_Zone/Event/Event.h"
+#include "src/servers/Server_Zone/Action/Action.h"
+#include "src/servers/Server_Zone/Action/EventAction.h"
+#include "src/servers/Server_Zone/Action/EventItemAction.h"
+#include "src/servers/Server_Zone/Zone/ZonePosition.h"
 #include <boost/make_shared.hpp>
 
 extern Core::Logger g_log;
diff --git a/src/servers/Server_Zone/Player.h b/src/servers/Server_Zone/Actor/Player.h
similarity index 99%
rename from src/servers/Server_Zone/Player.h
rename to src/servers/Server_Zone/Actor/Player.h
index 8b3ccb6b..e79fd209 100644
--- a/src/servers/Server_Zone/Player.h
+++ b/src/servers/Server_Zone/Actor/Player.h
@@ -1,12 +1,12 @@
 #ifndef _PLAYER_H
 #define _PLAYER_H
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 #include <Server_Common/Common.h>
 
 #include "Actor.h"
-#include "Inventory.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
 #include <map>
 #include <queue>
 
diff --git a/src/servers/Server_Zone/PlayerEvent.cpp b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
similarity index 92%
rename from src/servers/Server_Zone/PlayerEvent.cpp
rename to src/servers/Server_Zone/Actor/PlayerEvent.cpp
index e9b0684d..da7721d0 100644
--- a/src/servers/Server_Zone/PlayerEvent.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerEvent.cpp
@@ -5,19 +5,19 @@
 
 #include "Player.h"
 
-#include "Zone.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
-#include "GameConnection.h"
-#include "ActorControlPacket142.h"
-#include "InitUIPacket.h"
-#include "ServerNoticePacket.h"
-#include "EventStartPacket.h"
-#include "EventPlayPacket.h"
-#include "EventFinishPacket.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/InitUIPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
 
-#include "Event.h"
+#include "src/servers/Server_Zone/Event/Event.h"
 
 extern Core::Logger g_log;
 
diff --git a/src/servers/Server_Zone/PlayerInventory.cpp b/src/servers/Server_Zone/Actor/PlayerInventory.cpp
similarity index 95%
rename from src/servers/Server_Zone/PlayerInventory.cpp
rename to src/servers/Server_Zone/Actor/PlayerInventory.cpp
index 05802442..0d448d11 100644
--- a/src/servers/Server_Zone/PlayerInventory.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerInventory.cpp
@@ -2,15 +2,15 @@
 
 #include "Player.h"
 
-#include "ZoneMgr.h"
-#include "Zone.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
 
 #include <Server_Common/GamePacket.h>
 
-#include "ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
 
-#include "Inventory.h"
-#include "Item.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
+#include "src/servers/Server_Zone/Inventory/Item.h"
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/Server_Zone/PlayerQuest.cpp b/src/servers/Server_Zone/Actor/PlayerQuest.cpp
similarity index 99%
rename from src/servers/Server_Zone/PlayerQuest.cpp
rename to src/servers/Server_Zone/Actor/PlayerQuest.cpp
index fd73091d..1991c5b2 100644
--- a/src/servers/Server_Zone/PlayerQuest.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerQuest.cpp
@@ -5,13 +5,13 @@
 #include <Server_Common/ExdData.h>
 #include <Server_Common/PacketContainer.h>
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 
-#include "QuestMessagePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h"
 
-#include "Session.h"
+#include "src/servers/Server_Zone/Session.h"
 #include "Player.h"
-#include "Inventory.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
 
 
 
diff --git a/src/servers/Server_Zone/PlayerSql.cpp b/src/servers/Server_Zone/Actor/PlayerSql.cpp
similarity index 97%
rename from src/servers/Server_Zone/PlayerSql.cpp
rename to src/servers/Server_Zone/Actor/PlayerSql.cpp
index 4ed113a9..0294c02d 100644
--- a/src/servers/Server_Zone/PlayerSql.cpp
+++ b/src/servers/Server_Zone/Actor/PlayerSql.cpp
@@ -15,17 +15,17 @@
 
 #include "Player.h"
 
-#include "ZoneMgr.h"
-#include "Zone.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
 
-#include "ServerZone.h"
+#include "src/servers/Server_Zone/ServerZone.h"
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
-#include "GameConnection.h"
-#include "InitUIPacket.h"
-#include "StatusEffectContainer.h"
-#include "Inventory.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
 
 extern Core::Logger g_log;
 extern Core::Db::Database g_database;
diff --git a/src/servers/Server_Zone/CMakeLists.txt b/src/servers/Server_Zone/CMakeLists.txt
index a948aaa4..1c490cdc 100644
--- a/src/servers/Server_Zone/CMakeLists.txt
+++ b/src/servers/Server_Zone/CMakeLists.txt
@@ -1,13 +1,27 @@
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(SET CMP0015 NEW)
+cmake_policy(SET CMP0014 OLD)
+
 project(Sapphire_Zone)
 
 include_directories("../../libraries/external/ChaiScript-6.0.0/include/")
 include_directories("../../libraries/sapphire/datReader/")
 include_directories("../")
 
-file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
-file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
+file(GLOB SERVER_PUBLIC_INCLUDE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/Script/*)
+file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+        *.c*
+        Actor/*.c*
+        Action/*.c*
+        DebugCommand/*.c*
+        Event/*.c*
+        Inventory/*.c*
+        Network/*.c*
+        Network/Handlers/*.c*
+        Network/PacketWrappers/*.c*
+        Script/*.c*
+        StatusEffect/*.c*
+        Zone/*.c*)
 
 set(SERVER_COMMON_DIR ../Server_Common)
 set(Boost_USE_STATIC_LIBS ON)
@@ -55,6 +69,7 @@ else()
   endif()
 endif()
 
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Script)
 
 include_directories(${Boost_INCLUDE_DIR})
 
diff --git a/src/servers/Server_Zone/GameCommand.h b/src/servers/Server_Zone/DebugCommand/DebugCommand.h
similarity index 72%
rename from src/servers/Server_Zone/GameCommand.h
rename to src/servers/Server_Zone/DebugCommand/DebugCommand.h
index 9f58f514..ac8c0df6 100644
--- a/src/servers/Server_Zone/GameCommand.h
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommand.h
@@ -3,21 +3,21 @@
 
 #include <Server_Common/Common.h>
 
-#include "Player.h"
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 
-   class GameCommandHandler;
+   class DebugCommandHandler;
 
    // CGameCommand is used to define in game text command callbacks
    // TODO it should probably be renamed to something more intuitive
    // TODO the command identifier, currently '@' should probably be defined in here aswell so it is easily replaced
-   class GameCommand 
+   class DebugCommand
    { 
    public:
 
-      typedef void (GameCommandHandler::*pFunc)(char *, Entity::PlayerPtr, boost::shared_ptr<GameCommand>);
+      typedef void ( DebugCommandHandler::*pFunc )( char *, Entity::PlayerPtr, boost::shared_ptr< DebugCommand > );
 
       // String for the command
       std::string m_commandName;
@@ -31,7 +31,7 @@ namespace Core {
       // userlevel needed to execute the command
       Common::UserLevel m_userLevel;
 
-      GameCommand(const std::string& n, pFunc functionPtr, const std::string& hText, Common::UserLevel uLevel)
+      DebugCommand( const std::string& n, pFunc functionPtr, const std::string& hText, Common::UserLevel uLevel )
       {
          m_commandName = n;
          m_pFunc = functionPtr;
@@ -39,7 +39,7 @@ namespace Core {
          m_userLevel = uLevel;
       }
 
-      ~GameCommand()
+      ~DebugCommand()
       {
 
       }
diff --git a/src/servers/Server_Zone/GameCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
similarity index 83%
rename from src/servers/Server_Zone/GameCommandHandler.cpp
rename to src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
index ad23260e..b89ccb33 100644
--- a/src/servers/Server_Zone/GameCommandHandler.cpp
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
@@ -9,25 +9,25 @@
 #include <Server_Common/Logger.h>
 #include <Server_Common/ExdData.h>
 
-#include "GameCommand.h"
-#include "GameCommandHandler.h"
+#include "DebugCommand.h"
+#include "DebugCommandHandler.h"
 
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "InitUIPacket.h"
-#include "GameConnection.h"
-#include "ScriptManager.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
-#include "Player.h"
-#include "BattleNpc.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Actor/BattleNpc.h"
 
-#include "Zone.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
 
-#include "ServerZone.h"
+#include "src/servers/Server_Zone/ServerZone.h"
 
-#include "StatusEffect.h"
-#include "Session.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
+#include "src/servers/Server_Zone/Session.h"
 #include <boost/make_shared.hpp>
 
 extern Core::Db::Database g_database;
@@ -37,40 +37,40 @@ extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 
 // instanciate and initialize commands
-Core::GameCommandHandler::GameCommandHandler()
+Core::DebugCommandHandler::DebugCommandHandler()
 {
 
    // Push all commands onto the register map
-   registerCommand( "set", &GameCommandHandler::set, "Loads and injects a premade Packet.", Common::UserLevel::all );
-   registerCommand( "get", &GameCommandHandler::get, "Loads and injects a premade Packet.", Common::UserLevel::all );
-   registerCommand( "add", &GameCommandHandler::add, "Loads and injects a premade Packet.", Common::UserLevel::all );
-   //registerCommand( "debug", &GameCommandHandler::debug, "Loads and injects a premade Packet.", Common::UserLevel::all );
-   registerCommand( "inject", &GameCommandHandler::injectPacket, "Loads and injects a premade Packet.", Common::UserLevel::all );
-   registerCommand( "script_reload", &GameCommandHandler::scriptReload, "Loads and injects a premade Packet.", Common::UserLevel::all );
-   registerCommand( "nudge", &GameCommandHandler::nudge, "Nudges you forward/up/down", Common::UserLevel::all );
+   registerCommand( "set", &DebugCommandHandler::set, "Loads and injects a premade Packet.", Common::UserLevel::all );
+   registerCommand( "get", &DebugCommandHandler::get, "Loads and injects a premade Packet.", Common::UserLevel::all );
+   registerCommand( "add", &DebugCommandHandler::add, "Loads and injects a premade Packet.", Common::UserLevel::all );
+   //registerCommand( "debug", &DebugCommandHandler::debug, "Loads and injects a premade Packet.", Common::UserLevel::all );
+   registerCommand( "inject", &DebugCommandHandler::injectPacket, "Loads and injects a premade Packet.", Common::UserLevel::all );
+   registerCommand( "script_reload", &DebugCommandHandler::scriptReload, "Loads and injects a premade Packet.", Common::UserLevel::all );
+   registerCommand( "nudge", &DebugCommandHandler::nudge, "Nudges you forward/up/down", Common::UserLevel::all );
 
 }
 
 // clear all loaded commands
-Core::GameCommandHandler::~GameCommandHandler()
+Core::DebugCommandHandler::~DebugCommandHandler()
 {
    for( auto it = m_commandMap.begin(); it != m_commandMap.end(); ++it )
       ( *it ).second.reset();
 }
 
 // add a command set to the register map
-void Core::GameCommandHandler::registerCommand( const std::string& n, Core::GameCommand::pFunc functionPtr,
+void Core::DebugCommandHandler::registerCommand( const std::string& n, Core::DebugCommand::pFunc functionPtr,
                                                 const std::string& hText, Core::Common::UserLevel uLevel )
 {
-   m_commandMap[std::string( n )] = boost::make_shared<GameCommand>( n, functionPtr, hText, uLevel );
+   m_commandMap[std::string( n )] = boost::make_shared<DebugCommand>( n, functionPtr, hText, uLevel );
 }
 
 // try to retrieve the command in question, execute if found
-void Core::GameCommandHandler::execCommand( char * data, Core::Entity::PlayerPtr pPlayer )
+void Core::DebugCommandHandler::execCommand( char * data, Core::Entity::PlayerPtr pPlayer )
 {
 
    // define callback pointer
-   void ( GameCommandHandler::*pf )( char *, Entity::PlayerPtr, boost::shared_ptr< GameCommand > );
+   void ( DebugCommandHandler::*pf )( char *, Entity::PlayerPtr, boost::shared_ptr< DebugCommand > );
 
    std::string commandString;
 
@@ -109,13 +109,13 @@ void Core::GameCommandHandler::execCommand( char * data, Core::Entity::PlayerPtr
 // Definition of the commands
 ///////////////////////////////////////////////////////////////////////////////////////
 
-void Core::GameCommandHandler::scriptReload( char * data, Core::Entity::PlayerPtr pPlayer,
-                                             boost::shared_ptr<Core::GameCommand> command )
+void Core::DebugCommandHandler::scriptReload( char * data, Core::Entity::PlayerPtr pPlayer,
+                                             boost::shared_ptr<Core::DebugCommand> command )
 {
    g_scriptMgr.reload();
 }
 
-void Core::GameCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::GameCommand> command )
+void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::DebugCommand> command )
 {
    std::string subCommand = "";
    std::string params = "";
@@ -285,7 +285,7 @@ void Core::GameCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlayer
 
 }
 
-void Core::GameCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::GameCommand> command )
+void Core::DebugCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::DebugCommand> command )
 {
    std::string subCommand;
    std::string params = "";
@@ -421,7 +421,7 @@ void Core::GameCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlayer
 
 }
 
-void Core::GameCommandHandler::get( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::GameCommand> command )
+void Core::DebugCommandHandler::get( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr<Core::DebugCommand> command )
 {
    std::string subCommand;
    std::string params = "";
@@ -461,14 +461,14 @@ void Core::GameCommandHandler::get( char * data, Core::Entity::PlayerPtr pPlayer
 
 }
 
-void Core::GameCommandHandler::injectPacket( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr< Core::GameCommand > command )
+void Core::DebugCommandHandler::injectPacket( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr< Core::DebugCommand > command )
 {
    auto pSession = g_serverZone.getSession( pPlayer->getId() );
    if( pSession )
       pSession->getZoneConnection()->injectPacket( data + 7, pPlayer );
 }
 
-void Core::GameCommandHandler::nudge( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command )
+void Core::DebugCommandHandler::nudge( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command )
 {
    std::string subCommand;
 
diff --git a/src/servers/Server_Zone/GameCommandHandler.h b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
similarity index 59%
rename from src/servers/Server_Zone/GameCommandHandler.h
rename to src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
index b4494fbc..6f65548d 100644
--- a/src/servers/Server_Zone/GameCommandHandler.h
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h
@@ -3,39 +3,39 @@
 
 #include <map>
 
-#include "GameCommand.h"
+#include "DebugCommand.h"
 #include <Server_Common/Common.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 
 
 // handler for in game commands
-class GameCommandHandler
+class DebugCommandHandler
 {
 private:
    // container mapping command string to command object
-   std::map<std::string, boost::shared_ptr<GameCommand> > m_commandMap;
+   std::map<std::string, boost::shared_ptr<DebugCommand> > m_commandMap;
 
 public:
-   GameCommandHandler();
-   ~GameCommandHandler();
+   DebugCommandHandler();
+   ~DebugCommandHandler();
 
    // register command to command map
-   void registerCommand( const std::string& n, GameCommand::pFunc, const std::string& hText, Common::UserLevel uLevel );
+   void registerCommand( const std::string& n, DebugCommand::pFunc, const std::string& hText, Common::UserLevel uLevel );
 
    // execute command if registered
    void execCommand( char * data, Entity::PlayerPtr pPlayer );
 
    // command handler callbacks
-   void set( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command );
-   void get( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command );
-   void add( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command );
-   //void debug( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command );
-   void scriptReload( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command );
+   void set( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
+   void get( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
+   void add( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
+   //void debug( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
+   void scriptReload( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
 
-   void injectPacket( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command );
-   void nudge( char* data, Entity::PlayerPtr pPlayer, boost::shared_ptr<GameCommand> command );
+   void injectPacket( char * data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
+   void nudge( char* data, Entity::PlayerPtr pPlayer, boost::shared_ptr<DebugCommand> command );
 
 };
 
diff --git a/src/servers/Server_Zone/Event.cpp b/src/servers/Server_Zone/Event/Event.cpp
similarity index 100%
rename from src/servers/Server_Zone/Event.cpp
rename to src/servers/Server_Zone/Event/Event.cpp
diff --git a/src/servers/Server_Zone/Event.h b/src/servers/Server_Zone/Event/Event.h
similarity index 98%
rename from src/servers/Server_Zone/Event.h
rename to src/servers/Server_Zone/Event/Event.h
index 184d4d71..8935cd22 100644
--- a/src/servers/Server_Zone/Event.h
+++ b/src/servers/Server_Zone/Event/Event.h
@@ -1,7 +1,7 @@
 #ifndef _EVENT_H
 #define _EVENT_H
 
-#include "Forwards.h"
+#include "../Forwards.h"
 
 namespace Core {
    namespace Event {
diff --git a/src/servers/Server_Zone/EventHelper.cpp b/src/servers/Server_Zone/Event/EventHelper.cpp
similarity index 100%
rename from src/servers/Server_Zone/EventHelper.cpp
rename to src/servers/Server_Zone/Event/EventHelper.cpp
diff --git a/src/servers/Server_Zone/EventHelper.h b/src/servers/Server_Zone/Event/EventHelper.h
similarity index 100%
rename from src/servers/Server_Zone/EventHelper.h
rename to src/servers/Server_Zone/Event/EventHelper.h
diff --git a/src/servers/Server_Zone/Inventory.cpp b/src/servers/Server_Zone/Inventory/Inventory.cpp
similarity index 99%
rename from src/servers/Server_Zone/Inventory.cpp
rename to src/servers/Server_Zone/Inventory/Inventory.cpp
index 1da5df7a..98adb561 100644
--- a/src/servers/Server_Zone/Inventory.cpp
+++ b/src/servers/Server_Zone/Inventory/Inventory.cpp
@@ -6,17 +6,17 @@
 
 #include "Inventory.h"
 
-#include "Player.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
 
 #include "ItemContainer.h"
 #include "Item.h"
 
-#include "ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
 
 #include <boost/lexical_cast.hpp>
 
-#include "Forwards.h"
-#include "ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
 
 extern Core::Logger g_log;
 extern Core::Db::Database g_database;
diff --git a/src/servers/Server_Zone/Inventory.h b/src/servers/Server_Zone/Inventory/Inventory.h
similarity index 99%
rename from src/servers/Server_Zone/Inventory.h
rename to src/servers/Server_Zone/Inventory/Inventory.h
index b7bf0044..089f85d6 100644
--- a/src/servers/Server_Zone/Inventory.h
+++ b/src/servers/Server_Zone/Inventory/Inventory.h
@@ -2,7 +2,7 @@
 #define INVENTORY_H_
 #include <map>
 #include <Server_Common/Common.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core
 {
diff --git a/src/servers/Server_Zone/Item.cpp b/src/servers/Server_Zone/Inventory/Item.cpp
similarity index 100%
rename from src/servers/Server_Zone/Item.cpp
rename to src/servers/Server_Zone/Inventory/Item.cpp
diff --git a/src/servers/Server_Zone/Item.h b/src/servers/Server_Zone/Inventory/Item.h
similarity index 100%
rename from src/servers/Server_Zone/Item.h
rename to src/servers/Server_Zone/Inventory/Item.h
diff --git a/src/servers/Server_Zone/ItemContainer.cpp b/src/servers/Server_Zone/Inventory/ItemContainer.cpp
similarity index 95%
rename from src/servers/Server_Zone/ItemContainer.cpp
rename to src/servers/Server_Zone/Inventory/ItemContainer.cpp
index 0685c0bd..7d4d6625 100644
--- a/src/servers/Server_Zone/ItemContainer.cpp
+++ b/src/servers/Server_Zone/Inventory/ItemContainer.cpp
@@ -1,11 +1,11 @@
-#include "Forwards.h"
+#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 "Player.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
 
 #include "Item.h"
 
diff --git a/src/servers/Server_Zone/ItemContainer.h b/src/servers/Server_Zone/Inventory/ItemContainer.h
similarity index 96%
rename from src/servers/Server_Zone/ItemContainer.h
rename to src/servers/Server_Zone/Inventory/ItemContainer.h
index 7fe8b7aa..a2ac9962 100644
--- a/src/servers/Server_Zone/ItemContainer.h
+++ b/src/servers/Server_Zone/Inventory/ItemContainer.h
@@ -6,7 +6,7 @@
 
 #include <Server_Common/Common.h>
 
-#include "Forwards.h"
+#include "../Forwards.h"
 
 namespace Core
 {
diff --git a/src/servers/Server_Zone/GameConnection.cpp b/src/servers/Server_Zone/Network/GameConnection.cpp
similarity index 97%
rename from src/servers/Server_Zone/GameConnection.cpp
rename to src/servers/Server_Zone/Network/GameConnection.cpp
index 66c6b11f..637e4ec7 100644
--- a/src/servers/Server_Zone/GameConnection.cpp
+++ b/src/servers/Server_Zone/Network/GameConnection.cpp
@@ -9,20 +9,15 @@
 
 #include "GameConnection.h"
 
-#include "ServerZone.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
+#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
-#include "Session.h"
-#include "Zone.h"
-
-#include "InitUIPacket.h"
-
-#include "GameCommandHandler.h"
-
-#include "Player.h"
-
-#include "Forwards.h"
-
-extern Core::GameCommandHandler g_gameCommandMgr;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 
diff --git a/src/servers/Server_Zone/GameConnection.h b/src/servers/Server_Zone/Network/GameConnection.h
similarity index 98%
rename from src/servers/Server_Zone/GameConnection.h
rename to src/servers/Server_Zone/Network/GameConnection.h
index a437ef71..b00fb7e0 100644
--- a/src/servers/Server_Zone/GameConnection.h
+++ b/src/servers/Server_Zone/Network/GameConnection.h
@@ -10,7 +10,7 @@
 
 #include <Server_Common/LockedQueue.h>
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 #define DECLARE_HANDLER( x ) void x( const Packets::GamePacket& inPacket, Entity::PlayerPtr pPlayer )
 
diff --git a/src/servers/Server_Zone/ActionHandler.cpp b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
similarity index 80%
rename from src/servers/Server_Zone/ActionHandler.cpp
rename to src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
index 220fa8e4..4466bb27 100644
--- a/src/servers/Server_Zone/ActionHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
@@ -9,45 +9,40 @@
 #include <boost/format.hpp>
 
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 
-#include "Session.h"
-#include "Zone.h"
-#include "ZonePosition.h"
-#include "ServerZone.h"
-#include "ZoneMgr.h"
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
+#include "src/servers/Server_Zone/Zone/ZonePosition.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
 
-#include "InitUIPacket.h"
-#include "PingPacket.h"
-#include "MoveActorPacket.h"
-#include "ChatPacket.h"
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
-#include "EventStartPacket.h"
-#include "EventFinishPacket.h"
-#include "PlayerStateFlagsPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-
-#include "GameCommandHandler.h"
-
-#include "Player.h"
-#include "Inventory.h"
-
-#include "Forwards.h"
-
-#include "EventHelper.h"
-
-#include "Action.h"
-#include "ActionTeleport.h"
+#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Event/EventHelper.h"
+#include "src/servers/Server_Zone/Action/Action.h"
+#include "src/servers/Server_Zone/Action/ActionTeleport.h"
 
 extern Core::Logger g_log;
 extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
-extern Core::GameCommandHandler g_gameCommandMgr;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/Server_Zone/CFHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
similarity index 79%
rename from src/servers/Server_Zone/CFHandlers.cpp
rename to src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
index 5a8eb88f..9b033dec 100644
--- a/src/servers/Server_Zone/CFHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/CFHandlers.cpp
@@ -1,26 +1,19 @@
 #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 "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
 
-#include "Session.h"
-
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
-
-#include "PlayerStateFlagsPacket.h"
-
-
-#include "Player.h"
-
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 
 
diff --git a/src/servers/Server_Zone/EventHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
similarity index 83%
rename from src/servers/Server_Zone/EventHandlers.cpp
rename to src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
index ae0028d0..9ec36e02 100644
--- a/src/servers/Server_Zone/EventHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/EventHandlers.cpp
@@ -5,23 +5,19 @@
 
 #include <boost/format.hpp>
 
-#include "GameConnection.h"
-#include "Session.h"
-
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
-#include "EventStartPacket.h"
-#include "EventFinishPacket.h"
-#include "PlayerStateFlagsPacket.h"
-#include "ScriptManager.h"
-
-#include "Player.h"
-
-#include "Forwards.h"
-
-#include "EventHelper.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Event/EventHelper.h"
 
 extern Core::Scripting::ScriptManager g_scriptMgr;
 
diff --git a/src/servers/Server_Zone/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
similarity index 90%
rename from src/servers/Server_Zone/GMCommandHandlers.cpp
rename to src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
index fed7cbfe..b8bcfaed 100644
--- a/src/servers/Server_Zone/GMCommandHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
@@ -8,46 +8,40 @@
 
 #include <boost/format.hpp>
 
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
+#include "src/servers/Server_Zone/Zone/ZonePosition.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
 
-#include "Session.h"
-#include "Zone.h"
-#include "ZonePosition.h"
-#include "ServerZone.h"
-#include "ZoneMgr.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-#include "InitUIPacket.h"
-#include "PingPacket.h"
-#include "MoveActorPacket.h"
-#include "ChatPacket.h"
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
-#include "EventStartPacket.h"
-#include "EventFinishPacket.h"
-#include "PlayerStateFlagsPacket.h"
-
-
-#include "GameCommandHandler.h"
-
-#include "Player.h"
-#include "Inventory.h"
-
-#include "Forwards.h"
-
-#include "EventHelper.h"
-
-#include "Action.h"
-#include "ActionTeleport.h"
+#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Event/EventHelper.h"
+#include "src/servers/Server_Zone/Action/Action.h"
+#include "src/servers/Server_Zone/Action/ActionTeleport.h"
 
 extern Core::Logger g_log;
 extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
-extern Core::GameCommandHandler g_gameCommandMgr;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/Server_Zone/InventoryHandler.cpp b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
similarity index 71%
rename from src/servers/Server_Zone/InventoryHandler.cpp
rename to src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
index 93734275..8229df26 100644
--- a/src/servers/Server_Zone/InventoryHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/InventoryHandler.cpp
@@ -8,46 +8,30 @@
 
 #include <boost/format.hpp>
 
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
+#include "src/servers/Server_Zone/Zone/ZonePosition.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
 
-#include "Session.h"
-#include "Zone.h"
-#include "ZonePosition.h"
-#include "ServerZone.h"
-#include "ZoneMgr.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
 
-#include "InitUIPacket.h"
-#include "PingPacket.h"
-#include "MoveActorPacket.h"
-#include "ChatPacket.h"
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
-#include "EventStartPacket.h"
-#include "EventFinishPacket.h"
-#include "PlayerStateFlagsPacket.h"
-
-
-#include "GameCommandHandler.h"
-
-#include "Player.h"
-#include "Inventory.h"
-
-#include "Forwards.h"
-
-#include "EventHelper.h"
-
-#include "Action.h"
-#include "ActionTeleport.h"
+#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 extern Core::Logger g_log;
 extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
-extern Core::GameCommandHandler g_gameCommandMgr;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/Server_Zone/PacketHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
similarity index 91%
rename from src/servers/Server_Zone/PacketHandlers.cpp
rename to src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
index 57adfcae..781d5420 100644
--- a/src/servers/Server_Zone/PacketHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp
@@ -9,45 +9,40 @@
 #include <boost/format.hpp>
 
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 
-#include "Session.h"
-#include "Zone.h"
-#include "ZonePosition.h"
-#include "ServerZone.h"
-#include "ZoneMgr.h"
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
+#include "src/servers/Server_Zone/Zone/ZonePosition.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
 
-#include "InitUIPacket.h"
-#include "PingPacket.h"
-#include "MoveActorPacket.h"
-#include "ChatPacket.h"
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
-#include "EventStartPacket.h"
-#include "EventFinishPacket.h"
-#include "PlayerStateFlagsPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-
-#include "GameCommandHandler.h"
-
-#include "Player.h"
-#include "Inventory.h"
-
-#include "Forwards.h"
-
-#include "EventHelper.h"
-
-#include "Action.h"
-#include "ActionTeleport.h"
+#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Event/EventHelper.h"
+#include "src/servers/Server_Zone/Action/Action.h"
+#include "src/servers/Server_Zone/Action/ActionTeleport.h"
 
 extern Core::Logger g_log;
 extern Core::Db::Database g_database;
 extern Core::ServerZone g_serverZone;
 extern Core::ZoneMgr g_zoneMgr;
 extern Core::Data::ExdData g_exdData;
-extern Core::GameCommandHandler g_gameCommandMgr;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/Server_Zone/SkillHandler.cpp b/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
similarity index 75%
rename from src/servers/Server_Zone/SkillHandler.cpp
rename to src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
index d03b9a28..a3026855 100644
--- a/src/servers/Server_Zone/SkillHandler.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/SkillHandler.cpp
@@ -7,27 +7,27 @@
 
 #include <boost/format.hpp>
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 
-#include "Session.h"
+#include "src/servers/Server_Zone/Session.h"
 
-#include "ServerNoticePacket.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
-#include "ActorControlPacket144.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h"
 
-#include "PlayerStateFlagsPacket.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-#include "GameCommandHandler.h"
+#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
 
-#include "Player.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
-#include "Action.h"
-#include "ActionTeleport.h"
-#include "ActionCast.h"
-#include "ScriptManager.h"
+#include "src/servers/Server_Zone/Action/Action.h"
+#include "src/servers/Server_Zone/Action/ActionTeleport.h"
+#include "src/servers/Server_Zone/Action/ActionCast.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
 
 extern Core::Scripting::ScriptManager g_scriptMgr;
diff --git a/src/servers/Server_Zone/ActorControlPacket142.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
similarity index 96%
rename from src/servers/Server_Zone/ActorControlPacket142.h
rename to src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
index f39bfe8d..737a79e1 100644
--- a/src/servers/Server_Zone/ActorControlPacket142.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h
@@ -3,7 +3,7 @@
 
 #include <Server_Common/GamePacketNew.h>
 #include <Server_Common/ServerPacketDef.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/ActorControlPacket143.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
similarity index 96%
rename from src/servers/Server_Zone/ActorControlPacket143.h
rename to src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
index adf49610..95250060 100644
--- a/src/servers/Server_Zone/ActorControlPacket143.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h
@@ -3,7 +3,7 @@
 
 #include <Server_Common/GamePacketNew.h>
 #include <Server_Common/ServerPacketDef.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 
 namespace Core {
diff --git a/src/servers/Server_Zone/ActorControlPacket144.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h
similarity index 100%
rename from src/servers/Server_Zone/ActorControlPacket144.h
rename to src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket144.h
diff --git a/src/servers/Server_Zone/ActorSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
similarity index 95%
rename from src/servers/Server_Zone/ActorSpawnPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
index 55bb4f17..f97add96 100644
--- a/src/servers/Server_Zone/ActorSpawnPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
@@ -3,8 +3,8 @@
 
 #include <Server_Common/GamePacketNew.h>
 #include <Server_Common/UtilMath.h>
-#include "Player.h"
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
@@ -12,7 +12,7 @@ namespace Packets {
 namespace Server {
 
 /**
-* @brief The packet sent to finish an event.
+* @brief The packet sent to spawn an actor.
 */
 class ActorSpawnPacket :
    public GamePacketNew<FFXIVIpcActorSpawn>
diff --git a/src/servers/Server_Zone/ChatPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
similarity index 94%
rename from src/servers/Server_Zone/ChatPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
index a1353281..e4958ad5 100644
--- a/src/servers/Server_Zone/ChatPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ChatPacket.h
@@ -3,7 +3,7 @@
 
 #include <Server_Common/GamePacketNew.h>
 #include <Server_Common/ServerPacketDef.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 
 namespace Core {
diff --git a/src/servers/Server_Zone/EventFinishPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h
similarity index 100%
rename from src/servers/Server_Zone/EventFinishPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/EventFinishPacket.h
diff --git a/src/servers/Server_Zone/EventPlayPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
similarity index 96%
rename from src/servers/Server_Zone/EventPlayPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
index bc48b6ff..73f39605 100644
--- a/src/servers/Server_Zone/EventPlayPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/EventPlayPacket.h
@@ -2,7 +2,7 @@
 #define _EVENTPLAY_H
 
 #include <Server_Common/GamePacketNew.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/EventStartPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
similarity index 95%
rename from src/servers/Server_Zone/EventStartPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
index e65baa97..f6dbb7a4 100644
--- a/src/servers/Server_Zone/EventStartPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/EventStartPacket.h
@@ -2,7 +2,7 @@
 #define _EVENTSTART_H
 
 #include <Server_Common/GamePacketNew.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/InitUIPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
similarity index 97%
rename from src/servers/Server_Zone/InitUIPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
index 3051676b..3f8d8671 100644
--- a/src/servers/Server_Zone/InitUIPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/InitUIPacket.h
@@ -3,8 +3,8 @@
 
 #include <Server_Common/GamePacketNew.h>
 #include <Server_Common/ServerPacketDef.h>
-#include "Player.h"
-#include "Forwards.h"
+#include "Server_Zone/Actor/Player.h"
+#include "Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/ModelEquipPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
similarity index 91%
rename from src/servers/Server_Zone/ModelEquipPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
index 8e826c3a..928129ad 100644
--- a/src/servers/Server_Zone/ModelEquipPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ModelEquipPacket.h
@@ -2,8 +2,8 @@
 #define _MODELEQUIPPACKET_H
 
 #include <Server_Common/GamePacketNew.h>
-#include "Player.h"
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/MoveActorPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
similarity index 93%
rename from src/servers/Server_Zone/MoveActorPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
index c2d042c0..172c7e39 100644
--- a/src/servers/Server_Zone/MoveActorPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/MoveActorPacket.h
@@ -4,8 +4,8 @@
 #include <Server_Common/GamePacketNew.h>
 #include <Server_Common/ServerPacketDef.h>
 #include <Server_Common/UtilMath.h>
-#include "Player.h"
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 
 namespace Core {
diff --git a/src/servers/Server_Zone/PingPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
similarity index 93%
rename from src/servers/Server_Zone/PingPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
index 26dbd981..e7088360 100644
--- a/src/servers/Server_Zone/PingPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/PingPacket.h
@@ -3,7 +3,7 @@
 
 #include <Server_Common/GamePacketNew.h>
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
new file mode 100644
index 00000000..891a3d3a
--- /dev/null
+++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -0,0 +1,105 @@
+#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_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
+#include "src/servers/Server_Zone/Inventory/Inventory.h"
+#include "src/servers/Server_Zone/Inventory/Item.h"
+
+namespace Core {
+namespace Network {
+namespace Packets {
+namespace Server {
+
+   /**
+   * @brief The packet sent to spawn a player.
+   */
+   class PlayerSpawnPacket :
+      public GamePacketNew<FFXIVIpcPlayerSpawn>
+   {
+   public:
+      PlayerSpawnPacket( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget ) :
+         GamePacketNew<FFXIVIpcPlayerSpawn>( pPlayer->getId(), pTarget->getId() )
+      {
+         initialize( pPlayer, pTarget );
+      };
+
+   private:
+      void initialize( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget )
+      {
+         // todo: figure out unkown offsets
+         // TODO: temporary gm rank
+         //m_data.gmRank = 0xff;
+
+
+         m_data.currentMount = 0;
+         m_data.classJob = pPlayer->getClass();
+         //m_data.status = static_cast< uint8_t >( pPlayer->getStatus() );
+         m_data.hPCurr = pPlayer->getHp();
+         m_data.mPCurr = pPlayer->getMp();
+         m_data.tPCurr = pPlayer->getTp();
+         m_data.hPMax = pPlayer->getMaxHp();
+         m_data.mPMax = pPlayer->getMaxMp();
+         m_data.gmRank = 0xff;
+         //m_data.tPMax = 3000;
+         m_data.level = pPlayer->getLevel();
+         memcpy( m_data.look, pPlayer->getLookArray(), 26 );
+         auto item = pPlayer->getInvetory()->getItemAt( Inventory::GearSet0, 0 );
+         if( item )
+            m_data.mainWeaponModel = item->getModelId1();
+         m_data.secWeaponModel = pPlayer->getModelSubWeapon();
+         m_data.models[0] = pPlayer->getModelForSlot( Inventory::EquipSlot::Head );
+         m_data.models[1] = pPlayer->getModelForSlot( Inventory::EquipSlot::Body );
+         m_data.models[2] = pPlayer->getModelForSlot( Inventory::EquipSlot::Hands );
+         m_data.models[3] = pPlayer->getModelForSlot( Inventory::EquipSlot::Legs );
+         m_data.models[4] = pPlayer->getModelForSlot( Inventory::EquipSlot::Feet );
+         strcpy( m_data.name, pPlayer->getName().c_str() );
+         m_data.pos.x = pPlayer->getPos().x;
+         m_data.pos.y = pPlayer->getPos().y;
+         m_data.pos.z = pPlayer->getPos().z;
+         m_data.voice = pPlayer->getVoiceId();
+
+         m_data.rotation = Math::Util::floatToUInt16Rot( pPlayer->getRotation() );
+
+         m_data.onlineStatus = static_cast< uint8_t >( pPlayer->getOnlineStatus() );
+
+         //m_data.u23 = 0x04;
+         //m_data.u24 = 256;
+         m_data.state = 1;
+         m_data.type = 1;
+         if( pTarget == pPlayer )
+         {
+            m_data.spawnIndex = 0x00;
+         }
+         else
+         {
+            m_data.spawnIndex = pTarget->getSpawnIdForActorId( pPlayer->getId() );
+         }
+         // 0x20 == spawn hidden to be displayed by the spawneffect control
+         m_data.displayFlags = pPlayer->getStance();
+
+         if( pPlayer->getZoningType() != Common::ZoneingType::None )
+         {
+            m_data.displayFlags |= 0x20;
+         }
+
+         m_data.targetId = pPlayer->getTargetId();
+         //m_data.type = 1;
+         //m_data.unknown_33 = 4;
+         //m_data.unknown_38 = 0x70;
+         //m_data.unknown_60 = 3;
+         //m_data.unknown_61 = 7;
+
+
+      };
+   };
+
+}
+}
+}
+}
+
+#endif /*_PlayerSpawn_H*/
\ No newline at end of file
diff --git a/src/servers/Server_Zone/PlayerStateFlagsPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
similarity index 86%
rename from src/servers/Server_Zone/PlayerStateFlagsPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
index ae0f81b9..de2858f9 100644
--- a/src/servers/Server_Zone/PlayerStateFlagsPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
@@ -2,8 +2,8 @@
 #define _PLAYERSTATE_H
 
 #include <Server_Common/GamePacketNew.h>
-#include "Player.h"
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
@@ -11,7 +11,7 @@ namespace Packets {
 namespace Server {
 
 /**
-* @brief The Ping response packet.
+* @brief Packet sent to set a players state, this impacts which actions he can perform.
 */
 class PlayerStateFlagsPacket :
    public GamePacketNew< FFXIVIpcPlayerStateFlags >
diff --git a/src/servers/Server_Zone/QuestMessagePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
similarity index 75%
rename from src/servers/Server_Zone/QuestMessagePacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
index 6e5d6b5c..019621c7 100644
--- a/src/servers/Server_Zone/QuestMessagePacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/QuestMessagePacket.h
@@ -2,8 +2,8 @@
 #define _QUESTMESSAGE_H
 
 #include <Server_Common/GamePacketNew.h>
-#include "Player.h"
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
@@ -11,13 +11,14 @@ namespace Packets {
 namespace Server {
 
 /**
-* @brief The Ping response packet.
+* @brief Packet to display a quest specific info message.
 */
 class QuestMessagePacket :
    public GamePacketNew< FFXIVIpcQuestMessage >
 {
 public:
-   QuestMessagePacket( Entity::ActorPtr pActor, uint32_t questId, int8_t msgId, uint8_t type = 0, uint32_t var1 = 0, uint32_t var2 = 0 ) :
+   QuestMessagePacket( Entity::ActorPtr pActor, uint32_t questId, int8_t msgId,
+                       uint8_t type = 0, uint32_t var1 = 0, uint32_t var2 = 0 ) :
       GamePacketNew< FFXIVIpcQuestMessage >( pActor->getId(), pActor->getId() )
    {
       initialize( questId, msgId, type, var1, var2 );
diff --git a/src/servers/Server_Zone/ServerNoticePacket.h b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
similarity index 93%
rename from src/servers/Server_Zone/ServerNoticePacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
index 6db52097..5e4fbbc3 100644
--- a/src/servers/Server_Zone/ServerNoticePacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h
@@ -3,7 +3,7 @@
 
 #include <Server_Common/GamePacketNew.h>
 #include <Server_Common/ServerPacketDef.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/UpdateHpMpTpPacket.h b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
similarity index 93%
rename from src/servers/Server_Zone/UpdateHpMpTpPacket.h
rename to src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
index 745dbccc..0fbb4e1c 100644
--- a/src/servers/Server_Zone/UpdateHpMpTpPacket.h
+++ b/src/servers/Server_Zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
@@ -2,7 +2,7 @@
 #define _UPDATEHPMPTP_H
 
 #include <Server_Common/GamePacketNew.h>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/Server_Zone/PlayerSpawnPacket.h b/src/servers/Server_Zone/PlayerSpawnPacket.h
deleted file mode 100644
index 71dda09a..00000000
--- a/src/servers/Server_Zone/PlayerSpawnPacket.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _PLAYERSPAWN_H
-#define _PLAYERSPAWN_H
-
-#include <Server_Common/ServerPacketDef.h>
-#include <Server_Common/GamePacketNew.h>
-#include <Server_Common/UtilMath.h>
-#include "Player.h"
-#include "Forwards.h"
-#include "Inventory.h"
-#include "Item.h"
-
-namespace Core {
-   namespace Network {
-      namespace Packets {
-         namespace Server {
-
-            /**
-            * @brief The packet sent to finish an event.
-            */
-            class PlayerSpawnPacket :
-               public GamePacketNew<FFXIVIpcPlayerSpawn>
-            {
-            public:
-               PlayerSpawnPacket( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget ) :
-                  GamePacketNew<FFXIVIpcPlayerSpawn>( pPlayer->getId(), pTarget->getId() )
-               {
-                  initialize( pPlayer, pTarget );
-               };
-
-            private:
-               void initialize( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget )
-               {
-                  // todo: figure out unkown offsets
-                  // TODO: temporary gm rank
-                  //m_data.gmRank = 0xff;
-                  
-     
-                  m_data.currentMount = 0;
-                  m_data.classJob = pPlayer->getClass();
-                  //m_data.status = static_cast< uint8_t >( pPlayer->getStatus() );
-                  m_data.hPCurr = pPlayer->getHp();
-                  m_data.mPCurr = pPlayer->getMp();
-                  m_data.tPCurr = pPlayer->getTp();
-                  m_data.hPMax = pPlayer->getMaxHp();
-                  m_data.mPMax = pPlayer->getMaxMp();
-                  m_data.gmRank = 0xff;
-                  //m_data.tPMax = 3000;
-                  m_data.level = pPlayer->getLevel();
-                  memcpy( m_data.look, pPlayer->getLookArray(), 26 );
-                  auto item = pPlayer->getInvetory()->getItemAt( Inventory::GearSet0, 0 );
-                  if( item )
-                     m_data.mainWeaponModel = item->getModelId1();
-                  m_data.secWeaponModel = pPlayer->getModelSubWeapon();
-                  m_data.models[0] = pPlayer->getModelForSlot( Inventory::EquipSlot::Head );
-                  m_data.models[1] = pPlayer->getModelForSlot( Inventory::EquipSlot::Body );
-                  m_data.models[2] = pPlayer->getModelForSlot( Inventory::EquipSlot::Hands );
-                  m_data.models[3] = pPlayer->getModelForSlot( Inventory::EquipSlot::Legs );
-                  m_data.models[4] = pPlayer->getModelForSlot( Inventory::EquipSlot::Feet );
-                  strcpy( m_data.name, pPlayer->getName().c_str() );
-                  m_data.pos.x = pPlayer->getPos().x;
-                  m_data.pos.y = pPlayer->getPos().y;
-                  m_data.pos.z = pPlayer->getPos().z;
-                  m_data.voice = pPlayer->getVoiceId();
-
-                  m_data.rotation = Math::Util::floatToUInt16Rot( pPlayer->getRotation() );
-
-                  m_data.onlineStatus = static_cast< uint8_t >( pPlayer->getOnlineStatus() );
-
-                  //m_data.u23 = 0x04;
-                  //m_data.u24 = 256;
-                  m_data.state = 1;
-                  m_data.type = 1;
-                  if( pTarget == pPlayer )
-                  {
-                     m_data.spawnIndex = 0x00;
-                  }
-                  else
-                  {
-                     m_data.spawnIndex = pTarget->getSpawnIdForActorId( pPlayer->getId() );
-                  }
-                  // 0x20 == spawn hidden to be displayed by the spawneffect control
-                  m_data.displayFlags = pPlayer->getStance();
-
-                  if( pPlayer->getZoningType() != Common::ZoneingType::None )
-                  {
-                     m_data.displayFlags |= 0x20;
-                  }
-
-                  m_data.targetId = pPlayer->getTargetId();
-                  //m_data.type = 1;
-                  //m_data.unknown_33 = 4;
-                  //m_data.unknown_38 = 0x70;
-                  //m_data.unknown_60 = 3;
-                  //m_data.unknown_61 = 7;
-
-
-               };
-            };
-
-         }
-      }
-   }
-}
-
-#endif /*_PlayerSpawn_H*/
\ No newline at end of file
diff --git a/src/servers/Server_Zone/ScriptManager.cpp b/src/servers/Server_Zone/Script/ScriptManager.cpp
similarity index 96%
rename from src/servers/Server_Zone/ScriptManager.cpp
rename to src/servers/Server_Zone/Script/ScriptManager.cpp
index 429967ed..1779ebef 100644
--- a/src/servers/Server_Zone/ScriptManager.cpp
+++ b/src/servers/Server_Zone/Script/ScriptManager.cpp
@@ -3,18 +3,16 @@
 #include <chaiscript/chaiscript.hpp>
 
 #include <Server_Common/ChaiscriptStdLib.h>
-#include "ScriptManager.h"
 
-#include "Zone.h"
-#include "Player.h"
-#include "BattleNpc.h"
-#include "ServerZone.h"
-#include "Event.h"
-#include "EventHelper.h"
-#include "ScriptManager.h"
-#include "StatusEffect.h"
-
-#include "ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Actor/BattleNpc.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Event/Event.h"
+#include "src/servers/Server_Zone/Event/EventHelper.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/servers/Server_Zone/ScriptManager.h b/src/servers/Server_Zone/Script/ScriptManager.h
similarity index 99%
rename from src/servers/Server_Zone/ScriptManager.h
rename to src/servers/Server_Zone/Script/ScriptManager.h
index fe75e729..bbdd6c27 100644
--- a/src/servers/Server_Zone/ScriptManager.h
+++ b/src/servers/Server_Zone/Script/ScriptManager.h
@@ -6,7 +6,7 @@
 #include <set>
 
 #include <Server_Common/Common.h>
-#include "Forwards.h"
+#include "../Forwards.h"
 
 
 namespace chaiscript
diff --git a/src/servers/Server_Zone/ScriptManagerInit.cpp b/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
similarity index 96%
rename from src/servers/Server_Zone/ScriptManagerInit.cpp
rename to src/servers/Server_Zone/Script/ScriptManagerInit.cpp
index ca374640..64a80d9d 100644
--- a/src/servers/Server_Zone/ScriptManagerInit.cpp
+++ b/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
@@ -2,16 +2,17 @@
 #include <chaiscript/chaiscript.hpp>
 
 #include <Server_Common/ChaiscriptStdLib.h>
-#include "ScriptManager.h"
 
-#include "Zone.h"
-#include "Player.h"
-#include "BattleNpc.h"
-#include "Event.h"
-#include "EventHelper.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
-#include "ServerNoticePacket.h"
-#include "StatusEffect.h"
+#include "src/servers/Server_Zone/Zone/Zone.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Actor/BattleNpc.h"
+#include "src/servers/Server_Zone/Event/Event.h"
+#include "src/servers/Server_Zone/Event/EventHelper.h"
+
+#include "src/servers/Server_Zone/Network/PacketWrappers/ServerNoticePacket.h"
+#include "src/servers/Server_Zone/StatusEffect/StatusEffect.h"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/servers/Server_Zone/ServerZone.cpp b/src/servers/Server_Zone/ServerZone.cpp
index d670047a..09c20e64 100644
--- a/src/servers/Server_Zone/ServerZone.cpp
+++ b/src/servers/Server_Zone/ServerZone.cpp
@@ -15,14 +15,14 @@
 #include <Server_Common/ExdData.h>
 #include <Server_Common/PacketContainer.h>
 
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 #include "Session.h"
 
-#include "ZoneMgr.h"
+#include "src/servers/Server_Zone/Zone/ZoneMgr.h"
 
-#include "GameCommandHandler.h"
+#include "src/servers/Server_Zone/DebugCommand/DebugCommandHandler.h"
 
-#include "ScriptManager.h"
+#include "Script/ScriptManager.h"
 
 #include "Forwards.h"
 #include <boost/foreach.hpp>
@@ -32,7 +32,7 @@
 
 Core::Logger g_log;
 Core::Db::Database g_database;
-Core::GameCommandHandler g_gameCommandMgr;
+Core::DebugCommandHandler g_gameCommandMgr;
 Core::Scripting::ScriptManager g_scriptMgr;
 Core::Data::ExdData g_exdData;
 Core::ZoneMgr g_zoneMgr;
diff --git a/src/servers/Server_Zone/ServerZone.h b/src/servers/Server_Zone/ServerZone.h
index 1c95e350..ed939388 100644
--- a/src/servers/Server_Zone/ServerZone.h
+++ b/src/servers/Server_Zone/ServerZone.h
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "Forwards.h"
-#include "BattleNpcTemplate.h"
+#include "src/servers/Server_Zone/Actor/BattleNpcTemplate.h"
 
 namespace Core {
 
diff --git a/src/servers/Server_Zone/Session.cpp b/src/servers/Server_Zone/Session.cpp
index e67b5fc5..8ffba9a7 100644
--- a/src/servers/Server_Zone/Session.cpp
+++ b/src/servers/Server_Zone/Session.cpp
@@ -2,10 +2,10 @@
 
 #include <Server_Common/Util.h>
 #include <Server_Common/PacketContainer.h>
-#include "GameConnection.h"
+#include "src/servers/Server_Zone/Network/GameConnection.h"
 #include "Session.h"
 
-#include "Player.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
 
 Core::Session::Session( uint32_t sessionId )
    : m_sessionId( sessionId )
diff --git a/src/servers/Server_Zone/StatusEffect.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
similarity index 97%
rename from src/servers/Server_Zone/StatusEffect.cpp
rename to src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
index b6734f6d..3a4e92fe 100644
--- a/src/servers/Server_Zone/StatusEffect.cpp
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.cpp
@@ -7,10 +7,10 @@
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
 
-#include "Actor.h"
+#include "src/servers/Server_Zone/Actor/Actor.h"
 
 #include "StatusEffect.h"
-#include "ScriptManager.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
 extern Core::Logger g_log;
 extern Core::Data::ExdData g_exdData;
diff --git a/src/servers/Server_Zone/StatusEffect.h b/src/servers/Server_Zone/StatusEffect/StatusEffect.h
similarity index 96%
rename from src/servers/Server_Zone/StatusEffect.h
rename to src/servers/Server_Zone/StatusEffect/StatusEffect.h
index 070bfb44..cda7c487 100644
--- a/src/servers/Server_Zone/StatusEffect.h
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffect.h
@@ -3,7 +3,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core
 {
diff --git a/src/servers/Server_Zone/StatusEffectContainer.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
similarity index 96%
rename from src/servers/Server_Zone/StatusEffectContainer.cpp
rename to src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
index 5ecdfbe1..e9f2a883 100644
--- a/src/servers/Server_Zone/StatusEffectContainer.cpp
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
@@ -1,11 +1,11 @@
 #include <Server_Common/Util.h>
 #include <Server_Common/ServerPacketDef.h>
 
-#include "Actor.h"
+#include "src/servers/Server_Zone/Actor/Actor.h"
 #include "StatusEffect.h"
 #include "StatusEffectContainer.h"
-#include "ActorControlPacket142.h"
-#include "ActorControlPacket143.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket142.h"
+#include "src/servers/Server_Zone/Network/PacketWrappers/ActorControlPacket143.h"
 
 
 using namespace Core::Common;
diff --git a/src/servers/Server_Zone/StatusEffectContainer.h b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h
similarity index 94%
rename from src/servers/Server_Zone/StatusEffectContainer.h
rename to src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h
index 824becc9..6d479090 100644
--- a/src/servers/Server_Zone/StatusEffectContainer.h
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h
@@ -6,7 +6,7 @@
 #include <queue>
 #include <map>
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core
 {
diff --git a/src/servers/Server_Zone/Cell.cpp b/src/servers/Server_Zone/Zone/Cell.cpp
similarity index 95%
rename from src/servers/Server_Zone/Cell.cpp
rename to src/servers/Server_Zone/Zone/Cell.cpp
index 6810ef78..08e886b3 100644
--- a/src/servers/Server_Zone/Cell.cpp
+++ b/src/servers/Server_Zone/Zone/Cell.cpp
@@ -1,10 +1,11 @@
 
 #include "Cell.h"
 
-#include "Actor.h"
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Actor/Actor.h"
+#include "src/servers/Server_Zone/Actor/BattleNpc.h"
+#include "src/servers/Server_Zone/Forwards.h"
 #include "Zone.h"
-#include "BattleNpc.h"
+
 
 // TODO: the entire zone / areahandling is a bit outdated ( in parts i used this for the 1.0 iteration )
 // likely this could be greatly improved or redone
diff --git a/src/servers/Server_Zone/Cell.h b/src/servers/Server_Zone/Zone/Cell.h
similarity index 97%
rename from src/servers/Server_Zone/Cell.h
rename to src/servers/Server_Zone/Zone/Cell.h
index ede57a6f..2d85748a 100644
--- a/src/servers/Server_Zone/Cell.h
+++ b/src/servers/Server_Zone/Zone/Cell.h
@@ -4,7 +4,7 @@
 
 #include <stdint.h>
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 #include <set>
 
 namespace Core {
diff --git a/src/servers/Server_Zone/CellHandler.h b/src/servers/Server_Zone/Zone/CellHandler.h
similarity index 100%
rename from src/servers/Server_Zone/CellHandler.h
rename to src/servers/Server_Zone/Zone/CellHandler.h
diff --git a/src/servers/Server_Zone/Zone.cpp b/src/servers/Server_Zone/Zone/Zone.cpp
similarity index 98%
rename from src/servers/Server_Zone/Zone.cpp
rename to src/servers/Server_Zone/Zone/Zone.cpp
index 209bae83..0be50fb5 100644
--- a/src/servers/Server_Zone/Zone.cpp
+++ b/src/servers/Server_Zone/Zone/Zone.cpp
@@ -13,19 +13,19 @@
 #include <Server_Common/ServerPacketDef.h>
 #include <Server_Common/PacketContainer.h>
 
-#include "Session.h"
-
-#include "Actor.h"
-#include "Player.h"
-#include "BattleNpc.h"
-#include "Forwards.h"
-
-#include "GameConnection.h"
-
 #include "Zone.h"
 #include "ZoneMgr.h"
-#include "ServerZone.h"
-#include "ScriptManager.h"
+
+#include "src/servers/Server_Zone/Session.h"
+#include "src/servers/Server_Zone/Actor/Actor.h"
+#include "src/servers/Server_Zone/Actor/Player.h"
+#include "src/servers/Server_Zone/Actor/BattleNpc.h"
+
+#include "src/servers/Server_Zone/Forwards.h"
+
+#include "src/servers/Server_Zone/Network/GameConnection.h"
+#include "src/servers/Server_Zone/ServerZone.h"
+#include "src/servers/Server_Zone/Script/ScriptManager.h"
 
 #include "CellHandler.h"
 
diff --git a/src/servers/Server_Zone/Zone.h b/src/servers/Server_Zone/Zone/Zone.h
similarity index 98%
rename from src/servers/Server_Zone/Zone.h
rename to src/servers/Server_Zone/Zone/Zone.h
index 162a8a32..0f339761 100644
--- a/src/servers/Server_Zone/Zone.h
+++ b/src/servers/Server_Zone/Zone/Zone.h
@@ -7,7 +7,7 @@
 #include "Cell.h"
 #include "CellHandler.h"
 
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 #include <set>
 #include <boost/enable_shared_from_this.hpp>
diff --git a/src/servers/Server_Zone/ZoneMgr.cpp b/src/servers/Server_Zone/Zone/ZoneMgr.cpp
similarity index 100%
rename from src/servers/Server_Zone/ZoneMgr.cpp
rename to src/servers/Server_Zone/Zone/ZoneMgr.cpp
diff --git a/src/servers/Server_Zone/ZoneMgr.h b/src/servers/Server_Zone/Zone/ZoneMgr.h
similarity index 92%
rename from src/servers/Server_Zone/ZoneMgr.h
rename to src/servers/Server_Zone/Zone/ZoneMgr.h
index 6be7e5ce..a7ac3040 100644
--- a/src/servers/Server_Zone/ZoneMgr.h
+++ b/src/servers/Server_Zone/Zone/ZoneMgr.h
@@ -4,7 +4,7 @@
 
 #include <unordered_map>
 #include <map>
-#include "Forwards.h"
+#include "src/servers/Server_Zone/Forwards.h"
 
 namespace Core {
 
diff --git a/src/servers/Server_Zone/ZonePosition.cpp b/src/servers/Server_Zone/Zone/ZonePosition.cpp
similarity index 100%
rename from src/servers/Server_Zone/ZonePosition.cpp
rename to src/servers/Server_Zone/Zone/ZonePosition.cpp
diff --git a/src/servers/Server_Zone/ZonePosition.h b/src/servers/Server_Zone/Zone/ZonePosition.h
similarity index 100%
rename from src/servers/Server_Zone/ZonePosition.h
rename to src/servers/Server_Zone/Zone/ZonePosition.h