diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64baed19..055e39b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_policy(SET CMP0014 NEW)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0.2)
 project (Sapphire)
 
 set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
@@ -23,7 +23,6 @@ set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
 
 ##########################################################################
 # Common and library path
-set(SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/common")
 set(LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries")
 
 ##########################################################################
@@ -32,38 +31,22 @@ include( "cmake/boost.cmake" )
 include( "cmake/mysql.cmake" )
 include( "cmake/compiler.cmake" )
 include( "cmake/cotire.cmake" )
-
 ##############################
 #             Git            #
 ##############################
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 git_describe(VERSION --all --dirty=-d)
-configure_file("${SERVER_COMMON_DIR}/Version.cpp.in"
-               "${SERVER_COMMON_DIR}/Version.cpp" @ONLY)
+configure_file("src/common/Version.cpp.in"
+               "src/common/Version.cpp" @ONLY)
 
 ##########################################################################
-# Common include folders
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/mysqlConnector/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src")
-
-include_directories("${PROJECT_INCLUDE_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}")
-
-##########################################################################
-# Common lib folders
-link_directories(${MYSQLCONNECTORCPP_LIBRARIES})
-link_directories(${SERVER_COMMON_DIR})
-link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader)
-
-add_subdirectory("src/servers")
-
 add_subdirectory("src/libraries/sapphire/datReader")
 add_subdirectory("src/libraries/sapphire/mysqlConnector")
-
 add_subdirectory("src/common")
 
+add_subdirectory("src/servers")
+
 add_subdirectory("src/tools/exd_common_gen")
 add_subdirectory("src/tools/exd_struct_gen")
 add_subdirectory("src/tools/exd_struct_test")
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 606f027b..c49d6bb5 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,12 +1,6 @@
-cmake_minimum_required(VERSION 2.6)
-project(Sapphire)
+cmake_minimum_required( VERSION 3.0.2 )
+project( Sapphire )
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
-file(GLOB UTILS_PUBLIC_INCLUDE_FILES 
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
-        "${CMAKE_CURRENT_SOURCE_DIR}/Exd/*.h" )
 file(GLOB UTILS_SOURCE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Config/*.cpp"
@@ -18,13 +12,13 @@ file(GLOB UTILS_SOURCE_FILES
         "${CMAKE_CURRENT_SOURCE_DIR}/Network/PacketDef/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Script/*.cpp"
         "${CMAKE_CURRENT_SOURCE_DIR}/Util/*.cpp")
-      
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 
-add_library(common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES})
 
-set_target_properties(common PROPERTIES
+add_library( common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
+
+set_target_properties( common PROPERTIES
     CXX_STANDARD 14
     CXX_STANDARD_REQUIRED ON
     CXX_EXTENSIONS ON
@@ -34,8 +28,14 @@ set_target_properties(common PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
 )
 
-if (UNIX)
-  target_link_libraries( common xivdat mysqlclient mysqlConnector )
+target_link_libraries( common PUBLIC xivdat )
+target_link_libraries( common PUBLIC mysqlConnector )
+
+if( UNIX )
+  target_link_libraries( common PUBLIC mysqlclient )
 else()
-  target_link_libraries( common xivdat mysqlConnector libmysql )
+  target_link_libraries( common PUBLIC libmysql )
 endif()
+
+target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/" )
+target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/")
diff --git a/src/common/Database/CharaDbConnection.cpp b/src/common/Database/CharaDbConnection.cpp
index ce5a1a7e..5dfcd831 100644
--- a/src/common/Database/CharaDbConnection.cpp
+++ b/src/common/Database/CharaDbConnection.cpp
@@ -1,5 +1,5 @@
 #include "CharaDbConnection.h"
-#include <libraries/sapphire/mysqlConnector/MySqlConnector.h>
+#include <MySqlConnector.h>
 
 Core::Db::CharaDbConnection::CharaDbConnection( ConnectionInfo& connInfo ) : DbConnection( connInfo )
 {
@@ -136,4 +136,4 @@ void Core::Db::CharaDbConnection::doPrepareStatements()
 
 
 
-}
\ No newline at end of file
+}
diff --git a/src/common/Database/DatabaseDef.h b/src/common/Database/DatabaseDef.h
index 8fc3f2d9..3253242e 100644
--- a/src/common/Database/DatabaseDef.h
+++ b/src/common/Database/DatabaseDef.h
@@ -1,11 +1,11 @@
 #ifndef _DATABASEDEF_H
 #define _DATABASEDEF_H
 
-#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
-#include <common/Database/DbLoader.h>
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
-#include <common/Database/PreparedStatement.h>
+#include <MySqlConnector.h>
+#include "Database/DbLoader.h"
+#include "Database/CharaDbConnection.h"
+#include "Database/DbWorkerPool.h"
+#include "Database/PreparedStatement.h"
 
 extern Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
 
diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index b33fbbd2..a4353394 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -1,8 +1,8 @@
 #include "DbConnection.h"
 #include "DbWorker.h"
-#include "src/libraries/sapphire/mysqlConnector/MySqlConnector.h"
+#include <MySqlConnector.h>
 
-#include <common/Logging/Logger.h>
+#include "Logging/Logger.h"
 #include "PreparedStatement.h"
 #include <boost/make_shared.hpp>
 
diff --git a/src/common/Database/DbConnection.h b/src/common/Database/DbConnection.h
index f304e423..d0fb81d5 100644
--- a/src/common/Database/DbConnection.h
+++ b/src/common/Database/DbConnection.h
@@ -6,7 +6,7 @@
 #include <mutex>
 #include <string>
 #include <vector>
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
diff --git a/src/common/Database/DbLoader.cpp b/src/common/Database/DbLoader.cpp
index c74d30b2..376d7b77 100644
--- a/src/common/Database/DbLoader.cpp
+++ b/src/common/Database/DbLoader.cpp
@@ -2,7 +2,7 @@
 #include <mysqld_error.h>
 #include "CharaDbConnection.h"
 #include "DbWorkerPool.h"
-#include <common/Logging/Logger.h>
+#include "Logging/Logger.h"
 
 extern Core::Logger g_log;
 
diff --git a/src/common/Database/DbWorker.cpp b/src/common/Database/DbWorker.cpp
index a242eb04..1888419e 100644
--- a/src/common/Database/DbWorker.cpp
+++ b/src/common/Database/DbWorker.cpp
@@ -1,6 +1,6 @@
 #include "DbWorker.h"
 #include "Operation.h"
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 
 Core::Db::DbWorker::DbWorker( Core::LockedWaitQueue< boost::shared_ptr< Operation > >* newQueue, DbConnection* pConn )
 {
diff --git a/src/common/Database/DbWorker.h b/src/common/Database/DbWorker.h
index cfadb795..8782f6a0 100644
--- a/src/common/Database/DbWorker.h
+++ b/src/common/Database/DbWorker.h
@@ -3,7 +3,7 @@
 
 #include <atomic>
 #include <thread>
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 #include <boost/shared_ptr.hpp>
 
 namespace Core
diff --git a/src/common/Database/DbWorkerPool.cpp b/src/common/Database/DbWorkerPool.cpp
index ceb44110..24529f01 100644
--- a/src/common/Database/DbWorkerPool.cpp
+++ b/src/common/Database/DbWorkerPool.cpp
@@ -1,13 +1,13 @@
 #include "DbWorkerPool.h"
 #include "DbConnection.h"
 #include "PreparedStatement.h"
-#include <libraries/sapphire/mysqlConnector/MySqlConnector.h>
+#include <MySqlConnector.h>
 #include "StatementTask.h"
 #include "Operation.h"
 #include "CharaDbConnection.h"
 #include <boost/make_shared.hpp>
 
-#include <common/Logging/Logger.h>
+#include "Logging/Logger.h"
 extern Core::Logger g_log;
 
 class PingOperation : public Core::Db::Operation
diff --git a/src/common/Database/DbWorkerPool.h b/src/common/Database/DbWorkerPool.h
index a16a5b28..b5722a53 100644
--- a/src/common/Database/DbWorkerPool.h
+++ b/src/common/Database/DbWorkerPool.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 #include <ResultSet.h>
-#include <common/Util/LockedWaitQueue.h>
+#include "Util/LockedWaitQueue.h"
 #include "DbConnection.h"
 namespace Core
 {
diff --git a/src/common/Network/Acceptor.cpp b/src/common/Network/Acceptor.cpp
index f86bb7a3..3560b90d 100644
--- a/src/common/Network/Acceptor.cpp
+++ b/src/common/Network/Acceptor.cpp
@@ -1,6 +1,6 @@
-#include <common/Network/Hive.h>
+#include "Hive.h"
 #include "Acceptor.h"
-#include <common/Network/Connection.h>
+#include "Connection.h"
 #include <boost/interprocess/detail/atomic.hpp>
 #include <boost/bind.hpp>
 
diff --git a/src/common/Network/Acceptor.h b/src/common/Network/Acceptor.h
index 191184e8..01cfb606 100644
--- a/src/common/Network/Acceptor.h
+++ b/src/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 <common/Forwards.h>
+#include "Forwards.h"
 
 namespace Core 
 {
diff --git a/src/common/Network/Connection.h b/src/common/Network/Connection.h
index 40dd66fe..342d79c6 100644
--- a/src/common/Network/Connection.h
+++ b/src/common/Network/Connection.h
@@ -9,7 +9,7 @@
 #include <list>
 #include <boost/cstdint.hpp>
 
-#include <common/Forwards.h>
+#include "Forwards.h"
 #include "Acceptor.h"
 
 
diff --git a/src/common/Network/GamePacket.cpp b/src/common/Network/GamePacket.cpp
index 10564229..15e9d0f9 100644
--- a/src/common/Network/GamePacket.cpp
+++ b/src/common/Network/GamePacket.cpp
@@ -5,7 +5,7 @@
 #include <time.h>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
-#include <common/Util/Util.h>
+#include "Util/Util.h"
 
 Core::Network::Packets::GamePacket::GamePacket( uint16_t subType, uint16_t size, uint32_t id1, uint32_t id2, uint16_t type )
 {
diff --git a/src/common/Network/GamePacket.h b/src/common/Network/GamePacket.h
index 97a9dcdb..e2f9c49f 100644
--- a/src/common/Network/GamePacket.h
+++ b/src/common/Network/GamePacket.h
@@ -2,7 +2,7 @@
 #define _GAMEPACKET_H_
 
 #include "CommonNetwork.h"
-#include <common/Forwards.h>
+#include "Forwards.h"
 #include <stdint.h>
 #include <string.h>
 
diff --git a/src/common/Network/PacketContainer.cpp b/src/common/Network/PacketContainer.cpp
index efe6235c..a0b6037f 100644
--- a/src/common/Network/PacketContainer.cpp
+++ b/src/common/Network/PacketContainer.cpp
@@ -1,6 +1,6 @@
 #include "PacketContainer.h"
 #include "GamePacket.h"
-#include <common/Common.h>
+#include "Common.h"
 
 #include <boost/format.hpp>
 
diff --git a/src/common/Network/PacketContainer.h b/src/common/Network/PacketContainer.h
index 9f39de72..a00e0b88 100644
--- a/src/common/Network/PacketContainer.h
+++ b/src/common/Network/PacketContainer.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <common/Common.h>
+#include "Common.h"
 #include "CommonNetwork.h"
 #include "GamePacket.h"
 
diff --git a/src/common/Network/PacketDef/Chat/ServerChatDef.h b/src/common/Network/PacketDef/Chat/ServerChatDef.h
index 843cf289..31c9ee8e 100644
--- a/src/common/Network/PacketDef/Chat/ServerChatDef.h
+++ b/src/common/Network/PacketDef/Chat/ServerChatDef.h
@@ -1,8 +1,8 @@
 #ifndef _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H
 #define _CORE_NETWORK_PACKETS_CHAT_SERVER_IPC_H
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {
diff --git a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
index cf971bef..0e915ce9 100644
--- a/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
+++ b/src/common/Network/PacketDef/Lobby/ServerLobbyDef.h
@@ -1,8 +1,8 @@
 #ifndef _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H
 #define _CORE_NETWORK_PACKETS_LOBBY_SERVER_IPC_H
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 55f83697..a5ffa9b5 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -7,8 +7,8 @@
 #ifndef _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H
 #define _CORE_NETWORK_PACKETS_ZONE_SERVER_IPC_H
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
 
 namespace Core {
 namespace Network {
diff --git a/src/common/Util/UtilMath.h b/src/common/Util/UtilMath.h
index 65e18e37..68feeabe 100644
--- a/src/common/Util/UtilMath.h
+++ b/src/common/Util/UtilMath.h
@@ -1,7 +1,7 @@
 #ifndef _UTILMATH_H
 #define _UTILMATH_H
 
-#include <common/Common.h>
+#include "Common.h"
 
 #define PI 3.14159265358979323846f
 
diff --git a/src/servers/sapphire_api/CMakeLists.txt b/src/servers/sapphire_api/CMakeLists.txt
index 21fd736e..fb32ceb0 100644
--- a/src/servers/sapphire_api/CMakeLists.txt
+++ b/src/servers/sapphire_api/CMakeLists.txt
@@ -7,7 +7,6 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(sapphire_api common xivdat)
 
 set_target_properties(sapphire_api PROPERTIES
     CXX_STANDARD 14
@@ -21,13 +20,9 @@ set_target_properties(sapphire_api PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries (sapphire_api common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries (sapphire_api common pthread dl z)
 else()
-  # ignore unchecked iterators warnings from msvc
-  add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-
-  target_link_libraries (sapphire_api common xivdat libmysql mysqlConnector zlib1)
-
+  target_link_libraries (sapphire_api common zlib1)
 endif()
 
 target_link_libraries( sapphire_api ${Boost_LIBRARIES} ${Boost_LIBRARIES} )
diff --git a/src/servers/sapphire_api/PlayerMinimal.cpp b/src/servers/sapphire_api/PlayerMinimal.cpp
index 1fa2604d..d3a1c6b9 100644
--- a/src/servers/sapphire_api/PlayerMinimal.cpp
+++ b/src/servers/sapphire_api/PlayerMinimal.cpp
@@ -1,10 +1,10 @@
 #include "PlayerMinimal.h"
 
-#include <common/Util/Util.h>
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Util/Util.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
 
-#include <common/Database/DatabaseDef.h>
+#include <Database/DatabaseDef.h>
 
 extern Core::Data::ExdDataGenerated g_exdDataGen;
 
diff --git a/src/servers/sapphire_api/SapphireAPI.cpp b/src/servers/sapphire_api/SapphireAPI.cpp
index 5372232d..40c13e8b 100644
--- a/src/servers/sapphire_api/SapphireAPI.cpp
+++ b/src/servers/sapphire_api/SapphireAPI.cpp
@@ -1,5 +1,5 @@
 #include "SapphireAPI.h"
-#include <common/Crypt/base64.h>
+#include <Crypt/base64.h>
 #include "Session.h"
 #include "PlayerMinimal.h"
 #include <time.h>
@@ -11,7 +11,7 @@
 #include <boost/foreach.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <common/Database/DatabaseDef.h>
+#include <Database/DatabaseDef.h>
 #include <boost/make_shared.hpp>
 
 Core::Network::SapphireAPI::SapphireAPI()
diff --git a/src/servers/sapphire_api/main.cpp b/src/servers/sapphire_api/main.cpp
index bdb1bc01..da037f9e 100644
--- a/src/servers/sapphire_api/main.cpp
+++ b/src/servers/sapphire_api/main.cpp
@@ -6,20 +6,20 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include <common/Logging/Logger.h>
-#include <common/Config/XMLConfig.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
 
-#include <common/Network/Connection.h>
-#include <common/Network/Hive.h>
-#include <common/Network/Acceptor.h>
+#include <Network/Connection.h>
+#include <Network/Hive.h>
+#include <Network/Acceptor.h>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Crypt/base64.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Crypt/base64.h>
 
-#include <common/Database/DbLoader.h>
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
-#include <common/Database/PreparedStatement.h>
+#include <Database/DbLoader.h>
+#include <Database/CharaDbConnection.h>
+#include <Database/DbWorkerPool.h>
+#include <Database/PreparedStatement.h>
 
 //Added for the default_resource example
 #include <fstream>
diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt
index 1674c61d..f937d857 100644
--- a/src/servers/sapphire_lobby/CMakeLists.txt
+++ b/src/servers/sapphire_lobby/CMakeLists.txt
@@ -8,7 +8,6 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
 add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
-add_dependencies(sapphire_lobby common xivdat)
 
 set_target_properties(sapphire_lobby PROPERTIES
     CXX_STANDARD 14
@@ -22,9 +21,10 @@ set_target_properties(sapphire_lobby PROPERTIES
 )
 
 if (UNIX)
-  target_link_libraries(sapphire_lobby common xivdat pthread mysqlclient mysqlConnector dl z)
+  target_link_libraries(sapphire_lobby common pthread dl z)
 else()
-  target_link_libraries(sapphire_lobby common xivdat libmysql mysqlConnector zlib1)
+  target_link_libraries(sapphire_lobby common zlib1)
 endif()
 
 target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
+cotire( sapphire_lobby )
diff --git a/src/servers/sapphire_lobby/GameConnection.cpp b/src/servers/sapphire_lobby/GameConnection.cpp
index 6b3b6705..c0ce4895 100644
--- a/src/servers/sapphire_lobby/GameConnection.cpp
+++ b/src/servers/sapphire_lobby/GameConnection.cpp
@@ -1,15 +1,15 @@
 #include "GameConnection.h"
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/Util.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/GamePacket.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Lobby/ServerLobbyDef.h>
-#include <common/Network/GamePacketParser.h>
-#include <common/Crypt/md5.h>
-#include <common/Crypt/blowfish.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Util/Util.h>
+#include <Logging/Logger.h>
+#include <Network/GamePacket.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Lobby/ServerLobbyDef.h>
+#include <Network/GamePacketParser.h>
+#include <Crypt/md5.h>
+#include <Crypt/blowfish.h>
 
 #include <boost/property_tree/json_parser.hpp>
 
diff --git a/src/servers/sapphire_lobby/GameConnection.h b/src/servers/sapphire_lobby/GameConnection.h
index 5af52cc5..54d3f915 100644
--- a/src/servers/sapphire_lobby/GameConnection.h
+++ b/src/servers/sapphire_lobby/GameConnection.h
@@ -1,13 +1,13 @@
 #ifndef GAMECONNECTION_H
 #define GAMECONNECTION_H
 
-#include <common/Network/Connection.h>
-#include <common/Network/Acceptor.h>
-#include <common/Network/CommonNetwork.h>
+#include <Network/Connection.h>
+#include <Network/Acceptor.h>
+#include <Network/CommonNetwork.h>
 
-#include <common/Network/GamePacket.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Util/LockedQueue.h>
+#include <Network/GamePacket.h>
+#include <Network/PacketContainer.h>
+#include <Util/LockedQueue.h>
 
 #include "LobbyPacketContainer.h"
 
diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.cpp b/src/servers/sapphire_lobby/LobbyPacketContainer.cpp
index 30870ff5..43c71de5 100644
--- a/src/servers/sapphire_lobby/LobbyPacketContainer.cpp
+++ b/src/servers/sapphire_lobby/LobbyPacketContainer.cpp
@@ -1,7 +1,7 @@
 #include "LobbyPacketContainer.h"
-#include <common/Network/GamePacket.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Crypt/blowfish.h>
+#include <Network/GamePacket.h>
+#include <Network/GamePacketNew.h>
+#include <Crypt/blowfish.h>
 
 namespace Core {
    namespace Network {
diff --git a/src/servers/sapphire_lobby/LobbyPacketContainer.h b/src/servers/sapphire_lobby/LobbyPacketContainer.h
index d5812402..c0425a4f 100644
--- a/src/servers/sapphire_lobby/LobbyPacketContainer.h
+++ b/src/servers/sapphire_lobby/LobbyPacketContainer.h
@@ -4,8 +4,8 @@
 #include <vector>
 #include <string.h>
 
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/Util.h>
+#include <Network/CommonNetwork.h>
+#include <Util/Util.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_lobby/RestConnector.cpp b/src/servers/sapphire_lobby/RestConnector.cpp
index 667bff52..696e3904 100644
--- a/src/servers/sapphire_lobby/RestConnector.cpp
+++ b/src/servers/sapphire_lobby/RestConnector.cpp
@@ -1,8 +1,8 @@
 #include "RestConnector.h"
 #include "LobbySession.h"
 #include "ServerLobby.h"
-#include <common/Logging/Logger.h>
-#include <common/Crypt/base64.h>
+#include <Logging/Logger.h>
+#include <Crypt/base64.h>
 #include <time.h>
 #include <iomanip>
 
diff --git a/src/servers/sapphire_lobby/ServerLobby.cpp b/src/servers/sapphire_lobby/ServerLobby.cpp
index 80e13d89..a68c2723 100644
--- a/src/servers/sapphire_lobby/ServerLobby.cpp
+++ b/src/servers/sapphire_lobby/ServerLobby.cpp
@@ -3,12 +3,12 @@
 #include <time.h>
 #include <map>
 
-#include <common/Network/Hive.h>
-#include <common/Network/Acceptor.h>
+#include <Network/Hive.h>
+#include <Network/Acceptor.h>
 
-#include <common/Version.h>
-#include <common/Logging/Logger.h>
-#include <common/Config/XMLConfig.h>
+#include <Version.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
 
 //#include "LobbySession.h"
 
diff --git a/src/servers/sapphire_lobby/ServerLobby.h b/src/servers/sapphire_lobby/ServerLobby.h
index 9c0da9b5..8f28cdc0 100644
--- a/src/servers/sapphire_lobby/ServerLobby.h
+++ b/src/servers/sapphire_lobby/ServerLobby.h
@@ -6,7 +6,7 @@
 #include <map>
 
 #include <boost/shared_ptr.hpp>
-#include <common/Config/XMLConfig.h>
+#include <Config/XMLConfig.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Action/Action.cpp b/src/servers/sapphire_zone/Action/Action.cpp
index ed3c3e36..bff1549d 100644
--- a/src/servers/sapphire_zone/Action/Action.cpp
+++ b/src/servers/sapphire_zone/Action/Action.cpp
@@ -1,6 +1,6 @@
 #include "Action.h"
 
-#include <common/Util/Util.h>
+#include <Util/Util.h>
 
 
 Core::Action::Action::Action()
diff --git a/src/servers/sapphire_zone/Action/Action.h b/src/servers/sapphire_zone/Action/Action.h
index 995835dd..cb630610 100644
--- a/src/servers/sapphire_zone/Action/Action.h
+++ b/src/servers/sapphire_zone/Action/Action.h
@@ -1,7 +1,7 @@
 #ifndef _ACTION_H_
 #define _ACTION_H_
 
-#include <common/Common.h>
+#include <Common.h>
 #include "../Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp
index 7d49afb3..0021b1ff 100644
--- a/src/servers/sapphire_zone/Action/ActionCast.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCast.cpp
@@ -1,8 +1,8 @@
-#include <common/Common.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index ddf39bfe..c81ceb36 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -1,7 +1,7 @@
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
 
-#include <common/Exd/ExdDataGenerated.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "ActionCollision.h"
 #include "Actor/Actor.h"
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index fd0b562b..7b845b51 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -1,7 +1,7 @@
 #ifndef _ACTIONCOLLISION_H
 #define _ACTIONCOLLISION_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include "Action.h"
 
 
diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp
index b513e03b..870da031 100644
--- a/src/servers/sapphire_zone/Action/ActionMount.cpp
+++ b/src/servers/sapphire_zone/Action/ActionMount.cpp
@@ -1,7 +1,7 @@
-#include <common/Common.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Logging/Logger.h>
+#include <Common.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
index c028c6e5..434494c1 100644
--- a/src/servers/sapphire_zone/Action/ActionTeleport.cpp
+++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
@@ -1,6 +1,6 @@
-#include <common/Util/Util.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Logging/Logger.h>
+#include <Util/Util.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index bfc874e7..6ea5f541 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -1,6 +1,6 @@
-#include <common/Util/Util.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Util/Util.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/sapphire_zone/Action/EventAction.h b/src/servers/sapphire_zone/Action/EventAction.h
index a92831ef..642513a2 100644
--- a/src/servers/sapphire_zone/Action/EventAction.h
+++ b/src/servers/sapphire_zone/Action/EventAction.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTACTION_H_
 #define _EVENTACTION_H_
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "../Forwards.h"
 #include "Action.h"
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp
index b1023426..0188a4ed 100644
--- a/src/servers/sapphire_zone/Action/EventItemAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventItemAction.cpp
@@ -1,8 +1,8 @@
 #include <string.h>
 
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Logging/Logger.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index dc8b4915..622b004a 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -1,9 +1,9 @@
 #include "Actor.h"
 
-#include <common/Network/PacketContainer.h>
-#include <common/Network/GamePacket.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
+#include <Network/PacketContainer.h>
+#include <Network/GamePacket.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
 
 #include "Forwards.h"
 #include "Action/Action.h"
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 5c8f7e45..352f114a 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -1,7 +1,7 @@
 #ifndef _GAME_OBJECT_H_
 #define _GAME_OBJECT_H_
 
-#include <common/Common.h>
+#include <Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index efd2927a..01130f40 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -1,8 +1,8 @@
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/GamePacket.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Network/PacketContainer.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/GamePacket.h>
 
 #include "Forwards.h"
 #include "Action/Action.h"
diff --git a/src/servers/sapphire_zone/Actor/Chara.h b/src/servers/sapphire_zone/Actor/Chara.h
index dd5bb340..25005000 100644
--- a/src/servers/sapphire_zone/Actor/Chara.h
+++ b/src/servers/sapphire_zone/Actor/Chara.h
@@ -1,7 +1,7 @@
 #ifndef _ACTOR_H_
 #define _ACTOR_H_
 
-#include <common/Common.h>
+#include <Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 1f683ec0..432ab466 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -3,13 +3,13 @@
 #include "Zone/InstanceContent.h"
 #include "Actor/Player.h"
 
-#include <common/Logging/Logger.h>
-#include <common/Network/GamePacket.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Util/UtilMath.h>
+#include <Logging/Logger.h>
+#include <Network/GamePacket.h>
+#include <Network/GamePacketNew.h>
+#include <Network/CommonNetwork.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/PacketContainer.h>
+#include <Util/UtilMath.h>
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 572b55a6..32a26169 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -1,13 +1,13 @@
 #include <boost/make_shared.hpp>
 
-#include <common/Common.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Config/XMLConfig.h>
-#include <common/Network/GamePacket.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Config/XMLConfig.h>
+#include <Network/GamePacket.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
 
 #include "Session.h"
 #include "Player.h"
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 89233164..7ae38c98 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -3,8 +3,8 @@
 
 #include "Forwards.h"
 
-#include <common/Common.h>
-#include <common/Util/SpawnIndexAllocator.h>
+#include <Common.h>
+#include <Util/SpawnIndexAllocator.h>
 
 #include "Chara.h"
 #include "Inventory/Inventory.h"
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index c9849eab..b4c435ba 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -1,8 +1,8 @@
-#include <common/Common.h>
-#include <common/Network/GamePacket.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Config/XMLConfig.h>
+#include <Common.h>
+#include <Network/GamePacket.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Config/XMLConfig.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
diff --git a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp
index 177e5928..9cf412ca 100644
--- a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp
@@ -1,6 +1,6 @@
-#include <common/Common.h>
-#include <common/Network/GamePacket.h>
-#include <common/Logging/Logger.h>
+#include <Common.h>
+#include <Network/GamePacket.h>
+#include <Logging/Logger.h>
 
 #include "Zone/Zone.h"
 
diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
index e70d2d4f..1cf4e9a0 100644
--- a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
@@ -1,8 +1,8 @@
-#include <common/Common.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/GamePacket.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacket.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/QuestMessagePacket.h"
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index aa0e6709..14520794 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -2,16 +2,16 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <common/Common.h>
-#include <common/Network/GamePacket.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Config/XMLConfig.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Common.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Network/GamePacket.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Config/XMLConfig.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
+#include <Common.h>
+#include <Database/DatabaseDef.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/InitUIPacket.h"
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
index b82a35e6..d342233c 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -1,11 +1,10 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0.2)
 cmake_policy(SET CMP0015 NEW)
 cmake_policy(SET CMP0014 OLD)
 
 add_subdirectory("Script/Scripts")
 
 project(sapphire_zone)
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
 
 file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
         /*.h
@@ -42,7 +41,6 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
 
 add_executable(sapphire_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
-add_dependencies(sapphire_zone common xivdat mysqlConnector )
 
 set_target_properties(sapphire_zone PROPERTIES
     CXX_STANDARD 14
@@ -57,11 +55,19 @@ set_target_properties(sapphire_zone PROPERTIES
     VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
 )
 
+target_link_libraries( sapphire_zone common )
+
 if (UNIX)
-  target_link_libraries ( sapphire_zone common xivdat pthread mysqlclient mysqlConnector dl z )
+  target_link_libraries( sapphire_zone pthread )
+  target_link_libraries( sapphire_zone dl )
+  target_link_libraries( sapphire_zone z )
 else()
-  target_link_libraries ( sapphire_zone common xivdat libmysql zlib1 mysqlConnector )
+  target_link_libraries( sapphire_zone zlib1 )
 endif()
 
 target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script/Scripts" )
+target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" )
 cotire( sapphire_zone )
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
index 6c8bdd40..b3a121a4 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
@@ -1,7 +1,7 @@
 #ifndef _GAMECOMMAND_H_
 #define _GAMECOMMAND_H_
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index bc26c957..0adf199d 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -3,15 +3,15 @@
 #include <boost/format.hpp>
 #include <cinttypes>
 
-#include <common/Common.h>
-#include <common/Version.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/UtilMath.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Version.h>
+#include <Network/GamePacketNew.h>
+#include <Network/CommonNetwork.h>
+#include <Util/UtilMath.h>
+#include <Network/PacketContainer.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Database/DatabaseDef.h>
 
 #include "DebugCommand.h"
 #include "DebugCommandHandler.h"
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
index a0956764..69e192b7 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
@@ -2,9 +2,9 @@
 #define _GAMECOMMANDHANDLER_H_
 
 #include <map>
+#include <Common.h>
 
 #include "DebugCommand.h"
-#include <common/Common.h>
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Event/Director.cpp b/src/servers/sapphire_zone/Event/Director.cpp
index 9dee7702..dc622023 100644
--- a/src/servers/sapphire_zone/Event/Director.cpp
+++ b/src/servers/sapphire_zone/Event/Director.cpp
@@ -1,7 +1,7 @@
 #include "Director.h"
 
-#include <common/Network/PacketDef/Ipcs.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/PacketDef/Ipcs.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 
 #include "Actor/Player.h"
 
diff --git a/src/servers/sapphire_zone/Event/Director.h b/src/servers/sapphire_zone/Event/Director.h
index 1693d47b..ec35bf44 100644
--- a/src/servers/sapphire_zone/Event/Director.h
+++ b/src/servers/sapphire_zone/Event/Director.h
@@ -1,7 +1,7 @@
 #ifndef SAPPHIRE_DIRECTOR_H
 #define SAPPHIRE_DIRECTOR_H
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 0be7640f..3423fc85 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -1,5 +1,5 @@
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
 #include "Framework.h"
 #include "EventHelper.h"
 #include "EventHandler.h"
diff --git a/src/servers/sapphire_zone/Framework.h b/src/servers/sapphire_zone/Framework.h
index 6c39483a..2609fa83 100644
--- a/src/servers/sapphire_zone/Framework.h
+++ b/src/servers/sapphire_zone/Framework.h
@@ -6,12 +6,12 @@
 
 #include "Forwards.h"
 
-
 #include "ServerZone.h"
 
-#include <common/Logging/Logger.h>
-
-#include <common/Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Database/CharaDbConnection.h>
+#include <Database/DbWorkerPool.h>
 
 #include "Script/ScriptMgr.h"
 
@@ -21,8 +21,6 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
 
 namespace Core
 {
diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
index fff194bc..820ab435 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.cpp
+++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp
@@ -1,11 +1,11 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/clamp.hpp>
 
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Logging/Logger.h>
-#include <common/Database/DatabaseDef.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
+#include <Database/DatabaseDef.h>
 
 #include "Actor/Player.h"
 
diff --git a/src/servers/sapphire_zone/Inventory/Inventory.h b/src/servers/sapphire_zone/Inventory/Inventory.h
index 8be14a2d..dacfa514 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.h
+++ b/src/servers/sapphire_zone/Inventory/Inventory.h
@@ -1,7 +1,7 @@
 #ifndef INVENTORY_H_
 #define INVENTORY_H_
 #include <map>
-#include <common/Common.h>
+#include <Common.h>
 #include "../Forwards.h"
 
 namespace Core
diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp
index fd2106d5..f5907f98 100644
--- a/src/servers/sapphire_zone/Inventory/Item.cpp
+++ b/src/servers/sapphire_zone/Inventory/Item.cpp
@@ -1,5 +1,5 @@
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Framework.h"
 #include "Item.h"
diff --git a/src/servers/sapphire_zone/Inventory/Item.h b/src/servers/sapphire_zone/Inventory/Item.h
index dc811e37..97df4937 100644
--- a/src/servers/sapphire_zone/Inventory/Item.h
+++ b/src/servers/sapphire_zone/Inventory/Item.h
@@ -1,7 +1,7 @@
 #ifndef _ITEM_H_
 #define _ITEM_H_
 
-#include <common/Common.h>
+#include <Common.h>
 
 namespace Core {
 
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
index a86c0ce1..23670cfa 100644
--- a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
+++ b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
@@ -1,6 +1,6 @@
-#include <common/Common.h>
-#include <common/Logging/Logger.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Logging/Logger.h>
+#include <Database/DatabaseDef.h>
 
 #include "Actor/Player.h"
 
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.h b/src/servers/sapphire_zone/Inventory/ItemContainer.h
index 6d2fcc4f..1d7147d5 100644
--- a/src/servers/sapphire_zone/Inventory/ItemContainer.h
+++ b/src/servers/sapphire_zone/Inventory/ItemContainer.h
@@ -3,7 +3,7 @@
 
 #include <map>
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include "../Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Linkshell/Linkshell.h b/src/servers/sapphire_zone/Linkshell/Linkshell.h
index 890f97fe..32698e3b 100644
--- a/src/servers/sapphire_zone/Linkshell/Linkshell.h
+++ b/src/servers/sapphire_zone/Linkshell/Linkshell.h
@@ -1,7 +1,7 @@
 #ifndef CORE_LINKSHELL_H
 #define CORE_LINKSHELL_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include <set>
 
 namespace Core
diff --git a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
index 94aa1858..5cdd5ad9 100644
--- a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
+++ b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
@@ -1,7 +1,7 @@
 #include <boost/make_shared.hpp>
 
-#include <common/Logging/Logger.h>
-#include <common/Database/DatabaseDef.h>
+#include <Logging/Logger.h>
+#include <Database/DatabaseDef.h>
 
 #include "Linkshell.h"
 #include "Framework.h"
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.cpp b/src/servers/sapphire_zone/Math/CalcBattle.cpp
index 86a70fe6..4a68d6b0 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.cpp
+++ b/src/servers/sapphire_zone/Math/CalcBattle.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Common.h>
 
 #include "Actor/Chara.h"
 
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.h b/src/servers/sapphire_zone/Math/CalcBattle.h
index af4ee014..c1c12ca7 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.h
+++ b/src/servers/sapphire_zone/Math/CalcBattle.h
@@ -1,7 +1,7 @@
 #ifndef _CALCBATTLE_H
 #define _CALCBATTLE_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include "Forwards.h"
 
 using namespace Core::Entity;
diff --git a/src/servers/sapphire_zone/Math/CalcStats.cpp b/src/servers/sapphire_zone/Math/CalcStats.cpp
index e7a127c1..10119e4a 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.cpp
+++ b/src/servers/sapphire_zone/Math/CalcStats.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Common.h>
 
 #include "Actor/Chara.h"
 
diff --git a/src/servers/sapphire_zone/Math/CalcStats.h b/src/servers/sapphire_zone/Math/CalcStats.h
index c1d5df63..ed11cfa0 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.h
+++ b/src/servers/sapphire_zone/Math/CalcStats.h
@@ -1,7 +1,7 @@
 #ifndef _CALCSTATS_H
 #define _CALCSTATS_H
 
-#include <common/Common.h>
+#include <Common.h>
 #include "Forwards.h"
 
 using namespace Core::Entity;
diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp
index ac3f3867..3dfdcd8b 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.cpp
+++ b/src/servers/sapphire_zone/Network/GameConnection.cpp
@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Util/Util.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Network/GamePacketParser.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Util/Util.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Network/GamePacketParser.h>
 
 #include "Zone/Zone.h"
 
diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h
index 8293e75c..e8a8af37 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.h
+++ b/src/servers/sapphire_zone/Network/GameConnection.h
@@ -1,11 +1,11 @@
 #ifndef GAMECONNECTION_H
 #define GAMECONNECTION_H
 
-#include <common/Network/Connection.h>
-#include <common/Network/Acceptor.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacket.h>
-#include <common/Util/LockedQueue.h>
+#include <Network/Connection.h>
+#include <Network/Acceptor.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacket.h>
+#include <Util/LockedQueue.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 46d2175c..961106d7 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
 
 #include "Zone/Zone.h"
 #include "Zone/ZonePosition.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
index fbc7d126..5a0bc0a4 100644
--- a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
@@ -1,9 +1,9 @@
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Zone/TerritoryMgr.h"
 #include "Zone/Zone.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index e59540eb..e4d0c4f0 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Common.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketContainer.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 1af6389f..dba11f3c 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -1,10 +1,10 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
 
 #include <unordered_map>
 #include <boost/format.hpp>
diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
index dea8d785..1d4983c3 100644
--- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
@@ -1,10 +1,10 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index e3937d75..2648374e 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -1,12 +1,12 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Logging/Logger.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Network/PacketDef/Chat/ServerChatDef.h>
-#include <common/Database/DatabaseDef.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Network/GamePacketNew.h>
+#include <Logging/Logger.h>
+#include <Network/PacketContainer.h>
+#include <Network/PacketDef/Chat/ServerChatDef.h>
+#include <Database/DatabaseDef.h>
 #include <boost/format.hpp>
 #include <unordered_map>
 #include "Network/GameConnection.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index e84c47dd..cf09e092 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -1,11 +1,11 @@
 #include <boost/format.hpp>
 
-#include <common/Common.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Logging/Logger.h>
+#include <Common.h>
+#include <Network/CommonNetwork.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketContainer.h>
+#include <Logging/Logger.h>
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h
index 0bd3d00e..a453baa9 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket142.h
@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL142_H
 #define _ACTORCONTROL142_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h
index 48287018..172a5ebc 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket143.h
@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL143_H
 #define _ACTORCONTROL143_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h
index b2104e96..474aa463 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/ActorControlPacket144.h
@@ -1,8 +1,8 @@
 #ifndef _ACTORCONTROL144_H
 #define _ACTORCONTROL144_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h
index f2788a9b..c1a4780d 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/ChatPacket.h
@@ -1,8 +1,8 @@
 #ifndef _CHATPACKET_H
 #define _CHATPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
index 1c37c123..05e2773e 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
@@ -1,7 +1,7 @@
 #ifndef _DIRECTORPLAYSCENE_H
 #define _DIRECTORPLAYSCENE_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h
index 774f87c2..f04d455c 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventFinishPacket.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTFINISH_H
 #define _EVENTFINISH_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 
 namespace Core {
 namespace Network {
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h
index 44dba83d..933458d9 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventPlayPacket.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTPLAY_H
 #define _EVENTPLAY_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
index 963c138f..5b5b282e 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTSTART_H
 #define _EVENTSTART_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
index db426e0a..8c4465c5 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
@@ -1,8 +1,8 @@
 #ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H
 #define _CORE_NETWORK_PACKETS_INITUIPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h
index bee13f75..41cd107a 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/ModelEquipPacket.h
@@ -1,7 +1,7 @@
 #ifndef _MODELEQUIPPACKET_H
 #define _MODELEQUIPPACKET_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
index 2ffa31d2..23c3e713 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
@@ -1,9 +1,9 @@
 #ifndef _MOVEACTORPACKET_H
 #define _MOVEACTORPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Util/UtilMath.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Util/UtilMath.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h
index 88c23887..c985d8c0 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PingPacket.h
@@ -1,7 +1,7 @@
 #ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H
 #define _CORE_NETWORK_PACKETS_PINGPACKET_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
index 06ecc139..e3cdcb73 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -1,9 +1,9 @@
 #ifndef _PLAYERSPAWN_H
 #define _PLAYERSPAWN_H
 
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Util/Util.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Util/Util.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 #include "Inventory/Inventory.h"
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
index ac1bf5a5..22b9fa06 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
@@ -1,7 +1,7 @@
 #ifndef _PLAYERSTATE_H
 #define _PLAYERSTATE_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h
index 4c462c5f..e87f7661 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/QuestMessagePacket.h
@@ -1,7 +1,7 @@
 #ifndef _QUESTMESSAGE_H
 #define _QUESTMESSAGE_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include "Actor/Player.h"
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h
index 3829598b..4bb7400d 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/ServerNoticePacket.h
@@ -1,8 +1,8 @@
 #ifndef _SERVERNOTICEPACKET_H
 #define _SERVERNOTICEPACKET_H
 
-#include <common/Network/GamePacketNew.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/GamePacketNew.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
index 64952593..3a815c6a 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
@@ -1,7 +1,7 @@
 #ifndef _UPDATEHPMPTP_H
 #define _UPDATEHPMPTP_H
 
-#include <common/Network/GamePacketNew.h>
+#include <Network/GamePacketNew.h>
 #include <Actor/Chara.h>
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
index 173d03ae..b78e7d02 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/NativeScriptMgr.cpp
@@ -1,7 +1,7 @@
 #include "NativeScriptMgr.h"
 #include <boost/filesystem.hpp>
 
-#include <common/Crypt/md5.h>
+#include <Crypt/md5.h>
 
 namespace Core {
 namespace Scripting {
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
index a55e11bd..6479a809 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
@@ -1,7 +1,7 @@
 #include "ScriptLoader.h"
 
-#include <common/Logging/Logger.h>
-#include <common/Config/XMLConfig.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
 #include "Framework.h"
 
 #include <boost/format.hpp>
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
index cf146040..ca7a5d83 100644
--- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
@@ -4,9 +4,11 @@
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>
 
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Config/XMLConfig.h>
+#include <Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Config/XMLConfig.h>
+
+#include "watchdog/Watchdog.h"
 
 #include "Zone/Zone.h"
 #include "Zone/InstanceContent.h"
@@ -27,7 +29,6 @@
 
 // enable the ambiguity fix for every platform to avoid #define nonsense
 #define WIN_AMBIGUITY_FIX
-#include <libraries/external/watchdog/Watchdog.h>
 
 extern Core::Framework g_framework;
 
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.h b/src/servers/sapphire_zone/Script/ScriptMgr.h
index e80b1e1b..8c1e1f02 100644
--- a/src/servers/sapphire_zone/Script/ScriptMgr.h
+++ b/src/servers/sapphire_zone/Script/ScriptMgr.h
@@ -5,7 +5,7 @@
 #include <mutex>
 #include <set>
 
-#include <common/Common.h>
+#include <Common.h>
 #include "Forwards.h"
 
 namespace Core
diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
index 419d7884..2647b366 100644
--- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
+++ b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
@@ -4,8 +4,6 @@ project(Sapphire_Script)
 file(GLOB SCRIPT_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 
 include_directories("${CMAKE_SOURCE_DIR}/src/servers/")
-include_directories("${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 
 message("exec: ${EXECUTABLE_OUTPUT_DIRECTORY}")
 
@@ -41,7 +39,6 @@ foreach(_scriptDir ${children})
 
         add_library("script_${_name}" MODULE ${SCRIPT_BUILD_FILES} "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
         target_link_libraries("script_${_name}" sapphire_zone)
-        cotire("script_${_name}")
 
         if(MSVC)
             target_link_libraries("script_${_name}" ${Boost_LIBRARIES})
@@ -58,9 +55,18 @@ foreach(_scriptDir ${children})
                 LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL "${SCRIPT_LIB_DIR}"
             )
         endif()
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/")
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/Script")
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/servers/sapphire_zone/Script/Scripts")
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/")
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_SOURCE_DIR}/src/common")
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+        target_include_directories("script_${_name}" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Scripts")
 
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
+        cotire("script_${_name}")
+
         if(MSVC)
             add_custom_command(TARGET "script_${_name}" POST_BUILD
                 COMMAND ${CMAKE_COMMAND} -E remove "${SCRIPT_LIB_DIR}/script_${_name}.exp"
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
index 6b8a479d..b31f63a5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
@@ -1,4 +1,4 @@
-#include <Script/NativeScriptApi.h>
+#include "Script/NativeScriptApi.h"
 #include "../ScriptObject.h"
 #include <Actor/Player.h>
 
@@ -44,4 +44,4 @@ public:
       }
 
    }
-};
\ No newline at end of file
+};
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index 339155a1..c4e88c79 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -1,22 +1,23 @@
 #include "ServerZone.h"
 
-#include <common/Version.h>
-#include <common/Logging/Logger.h>
-#include <common/Config/XMLConfig.h>
-#include <common/Version.h>
+#include <Version.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
+#include <Version.h>
 
 #include <MySqlBase.h>
 #include <Connection.h>
 
-#include <common/Network/Connection.h>
-#include <common/Network/Hive.h>
+#include <Network/Connection.h>
+#include <Network/Hive.h>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Database/DbLoader.h>
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
-#include <common/Database/PreparedStatement.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/PacketContainer.h>
+#include <Database/DbLoader.h>
+#include <Database/CharaDbConnection.h>
+#include <Database/DbWorkerPool.h>
+#include <Database/PreparedStatement.h>
+#include <Util/Util.h>
 
 #include "Actor/Player.h"
 
@@ -35,7 +36,6 @@
 #include <boost/make_shared.hpp>
 #include <boost/algorithm/string.hpp>
 #include <thread>
-#include <common/Util/Util.h>
 
 #include "Framework.h"
 
diff --git a/src/servers/sapphire_zone/ServerZone.h b/src/servers/sapphire_zone/ServerZone.h
index 0dc5dd11..ef85c00e 100644
--- a/src/servers/sapphire_zone/ServerZone.h
+++ b/src/servers/sapphire_zone/ServerZone.h
@@ -1,7 +1,7 @@
 #ifndef __GAMESERVER_H
 #define __GAMESERVER_H
 
-#include <common/Common.h>
+#include <Common.h>
 
 #include <boost/shared_ptr.hpp>
 #include <mutex>
diff --git a/src/servers/sapphire_zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp
index 1dc25366..2a1c2e33 100644
--- a/src/servers/sapphire_zone/Session.cpp
+++ b/src/servers/sapphire_zone/Session.cpp
@@ -1,9 +1,9 @@
 #include <boost/filesystem/operations.hpp>
 #include <time.h>
 
-#include <common/Util/Util.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Logging/Logger.h>
+#include <Util/Util.h>
+#include <Network/PacketContainer.h>
+#include <Logging/Logger.h>
 
 #include "Network/GameConnection.h"
 #include "Actor/Player.h"
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
index ecbac36e..0e40cd0f 100644
--- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
+++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
@@ -1,10 +1,10 @@
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
 
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Util/Util.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Util/Util.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Logging/Logger.h>
 
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index bbdc2f56..3192f94a 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -1,9 +1,9 @@
 
-#include <common/Common.h>
-#include <common/Logging/Logger.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Common.h>
+#include <Logging/Logger.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include "Event/Director.h"
 #include "Script/ScriptMgr.h"
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index f2d89c6e..23b6071b 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -1,6 +1,6 @@
-#include <common/Logging/Logger.h>
-#include <common/Database/DatabaseDef.h>
-#include <common/Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
+#include <Database/DatabaseDef.h>
+#include <Exd/ExdDataGenerated.h>
 
 #include <unordered_map>
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 7064d9d9..b858811e 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -2,16 +2,16 @@
 #include <vector>
 #include <time.h>
 
-#include <common/Logging/Logger.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Network/GamePacket.h>
-#include <common/Network/GamePacketNew.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/CommonNetwork.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Database/DatabaseDef.h>
+#include <Logging/Logger.h>
+#include <Util/Util.h>
+#include <Util/UtilMath.h>
+#include <Network/GamePacket.h>
+#include <Network/GamePacketNew.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Network/CommonNetwork.h>
+#include <Network/PacketDef/Zone/ServerZoneDef.h>
+#include <Network/PacketContainer.h>
+#include <Database/DatabaseDef.h>
 
 #include "Zone.h"
 #include "InstanceContent.h"
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 58e165a4..c48643af 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -2,7 +2,7 @@
 #define _ZONE_H
 
 #include <unordered_map>
-#include <common/Common.h>
+#include <Common.h>
 
 #include "Cell.h"
 #include "CellHandler.h"
diff --git a/src/servers/sapphire_zone/Zone/ZonePosition.h b/src/servers/sapphire_zone/Zone/ZonePosition.h
index 89177d6e..88b6a785 100644
--- a/src/servers/sapphire_zone/Zone/ZonePosition.h
+++ b/src/servers/sapphire_zone/Zone/ZonePosition.h
@@ -1,7 +1,7 @@
 #ifndef _ZONELINE_H
 #define _ZONELINE_H
 
-#include <common/Common.h>
+#include <Common.h>
 
 namespace Core {
 
diff --git a/src/tools/exd_common_gen/main.cpp b/src/tools/exd_common_gen/main.cpp
index 2295bcfd..0d6bc20b 100644
--- a/src/tools/exd_common_gen/main.cpp
+++ b/src/tools/exd_common_gen/main.cpp
@@ -8,8 +8,8 @@
 #include <iostream>
 #include <cctype>
 #include <set>
-#include <common/Exd/ExdData.h>
-#include <common/Logging/Logger.h>
+#include <Exd/ExdData.h>
+#include <Logging/Logger.h>
 #include <boost/range/algorithm/remove_if.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp
index 5965be14..e0d21973 100644
--- a/src/tools/exd_struct_gen/main.cpp
+++ b/src/tools/exd_struct_gen/main.cpp
@@ -9,8 +9,8 @@
 #include <iostream>
 #include <cctype>
 #include <set>
-#include <common/Exd/ExdData.h>
-#include <common/Logging/Logger.h>
+#include <Exd/ExdData.h>
+#include <Logging/Logger.h>
 #include <boost/range/algorithm/remove_if.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/tools/exd_struct_test/main.cpp b/src/tools/exd_struct_test/main.cpp
index 21e4b62c..debf4f33 100644
--- a/src/tools/exd_struct_test/main.cpp
+++ b/src/tools/exd_struct_test/main.cpp
@@ -9,8 +9,8 @@
 #include <iostream>
 #include <cctype>
 #include <set>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Logging/Logger.h>
+#include <Exd/ExdDataGenerated.h>
+#include <Logging/Logger.h>
 #include <boost/range/algorithm/remove_if.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/tools/quest_parser/main.cpp b/src/tools/quest_parser/main.cpp
index e4f14145..be74a184 100644
--- a/src/tools/quest_parser/main.cpp
+++ b/src/tools/quest_parser/main.cpp
@@ -15,8 +15,8 @@
 #include <GameData.h>
 #include <DatCat.h>
 
-#include <common/Exd/ExdData.h>
-#include <common/Logging/Logger.h>
+#include <Exd/ExdData.h>
+#include <Logging/Logger.h>
 
 
 Core::Logger g_log;