33 files changed, 340 insertions, 415 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d80aaf941..12df311743 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,12 +19,5 @@ endif()
 add_subdirectory(genrev)
 
 if( SERVERS )
-  set(sources_windows_Debugging
-    ${CMAKE_SOURCE_DIR}/src/core/Debugging/WheatyExceptionReport.cpp
-    ${CMAKE_SOURCE_DIR}/src/core/Debugging/WheatyExceptionReport.h
-  )
-  add_subdirectory(game)
-  add_subdirectory(authserver)
-  add_subdirectory(scripts)
-  add_subdirectory(worldserver)
+  add_subdirectory(server)
 endif()
diff --git a/src/common/cmake/compiler/clang/settings.cmake b/src/cmake/compiler/clang/settings.cmake
index 055860c999..055860c999 100644
--- a/src/common/cmake/compiler/clang/settings.cmake
+++ b/src/cmake/compiler/clang/settings.cmake
diff --git a/src/common/cmake/compiler/gcc/settings.cmake b/src/cmake/compiler/gcc/settings.cmake
index c4597c5071..c4597c5071 100644
--- a/src/common/cmake/compiler/gcc/settings.cmake
+++ b/src/cmake/compiler/gcc/settings.cmake
diff --git a/src/common/cmake/compiler/icc/settings.cmake b/src/cmake/compiler/icc/settings.cmake
index 133bc15e59..133bc15e59 100644
--- a/src/common/cmake/compiler/icc/settings.cmake
+++ b/src/cmake/compiler/icc/settings.cmake
diff --git a/src/common/cmake/compiler/mingw/settings.cmake b/src/cmake/compiler/mingw/settings.cmake
index 68156bd0b6..68156bd0b6 100644
--- a/src/common/cmake/compiler/mingw/settings.cmake
+++ b/src/cmake/compiler/mingw/settings.cmake
diff --git a/src/common/cmake/compiler/msvc/settings.cmake b/src/cmake/compiler/msvc/settings.cmake
index caca79ee37..caca79ee37 100644
--- a/src/common/cmake/compiler/msvc/settings.cmake
+++ b/src/cmake/compiler/msvc/settings.cmake
diff --git a/src/common/cmake/macros/CheckBuildDir.cmake b/src/cmake/macros/CheckBuildDir.cmake
index 085ca32746..085ca32746 100644
--- a/src/common/cmake/macros/CheckBuildDir.cmake
+++ b/src/cmake/macros/CheckBuildDir.cmake
diff --git a/src/common/cmake/macros/CheckPlatform.cmake b/src/cmake/macros/CheckPlatform.cmake
index c2d5866ec8..5ef5f6d9a5 100644
--- a/src/common/cmake/macros/CheckPlatform.cmake
+++ b/src/cmake/macros/CheckPlatform.cmake
@@ -7,12 +7,12 @@ else()
     MESSAGE(STATUS "Detected 32-bit platform")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/settings.cmake")
+include("${CMAKE_SOURCE_DIR}/src/cmake/platform/settings.cmake")
 
 if(WIN32)
-  include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/win/settings.cmake")
+  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/win/settings.cmake")
 elseif(UNIX)
-  include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/unix/settings.cmake")
+  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/unix/settings.cmake")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/after_platform.cmake")
+include("${CMAKE_SOURCE_DIR}/src/cmake/platform/after_platform.cmake")
diff --git a/src/common/cmake/macros/EnsureVersion.cmake b/src/cmake/macros/EnsureVersion.cmake
index a85e12abb7..a85e12abb7 100644
--- a/src/common/cmake/macros/EnsureVersion.cmake
+++ b/src/cmake/macros/EnsureVersion.cmake
diff --git a/src/common/cmake/macros/FindACE.cmake b/src/cmake/macros/FindACE.cmake
index 10d762f301..10d762f301 100644
--- a/src/common/cmake/macros/FindACE.cmake
+++ b/src/cmake/macros/FindACE.cmake
diff --git a/src/common/cmake/macros/FindGit.cmake b/src/cmake/macros/FindGit.cmake
index 0c4db36b40..a37370c849 100644
--- a/src/common/cmake/macros/FindGit.cmake
+++ b/src/cmake/macros/FindGit.cmake
@@ -7,7 +7,7 @@
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-include(${CMAKE_SOURCE_DIR}/src/core/cmake/macros/EnsureVersion.cmake)
+include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake)
 
 set(_REQUIRED_GIT_VERSION "1.7")
 
diff --git a/src/common/cmake/macros/FindGperftools.cmake b/src/cmake/macros/FindGperftools.cmake
index f35104d2f9..f35104d2f9 100644
--- a/src/common/cmake/macros/FindGperftools.cmake
+++ b/src/cmake/macros/FindGperftools.cmake
diff --git a/src/common/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake
index 4f432ca4c8..4f432ca4c8 100644
--- a/src/common/cmake/macros/FindMySQL.cmake
+++ b/src/cmake/macros/FindMySQL.cmake
diff --git a/src/common/cmake/macros/FindOpenSSL.cmake b/src/cmake/macros/FindOpenSSL.cmake
index 245a91d419..245a91d419 100644
--- a/src/common/cmake/macros/FindOpenSSL.cmake
+++ b/src/cmake/macros/FindOpenSSL.cmake
diff --git a/src/common/cmake/macros/FindPCHSupport.cmake b/src/cmake/macros/FindPCHSupport.cmake
index b068b69c26..b068b69c26 100644
--- a/src/common/cmake/macros/FindPCHSupport.cmake
+++ b/src/cmake/macros/FindPCHSupport.cmake
diff --git a/src/common/cmake/macros/FindReadline.cmake b/src/cmake/macros/FindReadline.cmake
index 07c6b368df..07c6b368df 100644
--- a/src/common/cmake/macros/FindReadline.cmake
+++ b/src/cmake/macros/FindReadline.cmake
diff --git a/src/common/cmake/platform/after_platform.cmake b/src/cmake/platform/after_platform.cmake
index bf02e719d8..bf02e719d8 100644
--- a/src/common/cmake/platform/after_platform.cmake
+++ b/src/cmake/platform/after_platform.cmake
diff --git a/src/common/cmake/platform/cmake_uninstall.in.cmake b/src/cmake/platform/cmake_uninstall.in.cmake
index 06f9c8263a..06f9c8263a 100644
--- a/src/common/cmake/platform/cmake_uninstall.in.cmake
+++ b/src/cmake/platform/cmake_uninstall.in.cmake
diff --git a/src/common/cmake/platform/settings.cmake b/src/cmake/platform/settings.cmake
index 6df5bc2165..6df5bc2165 100644
--- a/src/common/cmake/platform/settings.cmake
+++ b/src/cmake/platform/settings.cmake
diff --git a/src/common/cmake/platform/unix/settings.cmake b/src/cmake/platform/unix/settings.cmake
index e54efac02c..34ac006d66 100644
--- a/src/common/cmake/platform/unix/settings.cmake
+++ b/src/cmake/platform/unix/settings.cmake
@@ -20,7 +20,7 @@ endif()
 
 # configure uninstaller
 configure_file(
-  "${CMAKE_SOURCE_DIR}/src/core/cmake/platform/cmake_uninstall.in.cmake"
+  "${CMAKE_SOURCE_DIR}/src/cmake/platform/cmake_uninstall.in.cmake"
   "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
   @ONLY
 )
@@ -34,11 +34,11 @@ message(STATUS "UNIX: Created uninstall target")
 
 message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}")
 if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/gcc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/gcc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "icc")
-  include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/icc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/icc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/clang/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/clang/settings.cmake)
 else()
 add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 endif()
diff --git a/src/common/cmake/platform/win/settings.cmake b/src/cmake/platform/win/settings.cmake
index 59387222ab..e44f34413f 100644
--- a/src/common/cmake/platform/win/settings.cmake
+++ b/src/cmake/platform/win/settings.cmake
@@ -3,6 +3,7 @@ option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 0)
 
 # Package overloads
 set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/deps/acelite)
+set(ACE_DIR ${ACE_INCLUDE_DIR})
 set(ACE_LIBRARY "ace")
 set(BZIP2_LIBRARIES "bzip2")
 set(ZLIB_LIBRARIES "zlib")
@@ -26,7 +27,7 @@ endif()
 #endif()
 
 if ( MSVC )
-  include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/msvc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/msvc/settings.cmake)
 elseif ( MINGW )
-  include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/mingw/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/mingw/settings.cmake)
 endif()
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index cedfc7fb20..02645fa9ed 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -12,6 +12,7 @@ if( USE_COREPCH )
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
+file(GLOB_RECURSE sources_Collision Collision/*.cpp Collision/*.h)
 file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration/*.h)
 file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography/*.h)
 file(GLOB_RECURSE sources_Database Database/*.cpp Database/*.h)
@@ -40,6 +41,7 @@ endif()
 
 set(shared_STAT_SRCS
   ${shared_STAT_SRCS}
+  ${sources_Collision}
   ${sources_Configuration}
   ${sources_Cryptography}
   ${sources_Database}
@@ -62,6 +64,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/deps/utf8cpp
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/Collision
   ${CMAKE_CURRENT_SOURCE_DIR}/Configuration
   ${CMAKE_CURRENT_SOURCE_DIR}/Cryptography
   ${CMAKE_CURRENT_SOURCE_DIR}/Database
@@ -72,7 +75,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/Packets
   ${CMAKE_CURRENT_SOURCE_DIR}/Threading
   ${CMAKE_CURRENT_SOURCE_DIR}/Utilities
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
   ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
diff --git a/src/common/Collision/CMakeLists.txt b/src/common/Collision/CMakeLists.txt
deleted file mode 100644
index 3aad291df9..0000000000
--- a/src/common/Collision/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (C)
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-if( USE_COREPCH )
-  include_directories(${CMAKE_CURRENT_BINARY_DIR})
-endif()
-
-file(GLOB_RECURSE sources_Management Management/*.cpp Management/*.h)
-file(GLOB_RECURSE sources_Maps Maps/*.cpp Maps/*.h)
-file(GLOB_RECURSE sources_Models Models/*.cpp Models/*.h)
-file(GLOB sources_localdir *.cpp *.h)
-
-if (USE_COREPCH)
-  set(collision_STAT_PCH_HDR PrecompiledHeaders/collisionPCH.h)
-  set(collision_STAT_PCH_SRC PrecompiledHeaders/collisionPCH.cpp)
-endif ()
-
-set(collision_STAT_SRCS
-  ${collision_STAT_SRCS}
-  ${sources_Management}
-  ${sources_Maps}
-  ${sources_Models}
-  ${sources_localdir}
-)
-
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/src/core/
-  ${CMAKE_SOURCE_DIR}/src/core/Configuration
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/src/core/Logging
-  ${CMAKE_SOURCE_DIR}/src/core/Threading
-  ${CMAKE_SOURCE_DIR}/src/core/Packets
-  ${CMAKE_SOURCE_DIR}/src/core/Utilities
-  ${CMAKE_SOURCE_DIR}/src/core/DataStores
-  ${CMAKE_SOURCE_DIR}/src/framework/Addons
-  ${CMAKE_SOURCE_DIR}/src/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
-  ${CMAKE_SOURCE_DIR}/src/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/Spline
-  ${CMAKE_SOURCE_DIR}/src/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/game/Server
-  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/game/World
-  ${CMAKE_SOURCE_DIR}/src/game/Spells
-  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/Management
-  ${CMAKE_CURRENT_SOURCE_DIR}/Maps
-  ${CMAKE_CURRENT_SOURCE_DIR}/Models
-  ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
-)
-
-add_library(collision STATIC
-  ${collision_STAT_SRCS}
-  ${collision_STAT_PCH_SRC}
-)
-
-target_link_libraries(collision
-  shared
-)
-
-# Generate precompiled header
-if (USE_COREPCH)
-  add_cxx_pch(collision ${collision_STAT_PCH_HDR} ${collision_STAT_PCH_SRC})
-endif ()
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
new file mode 100644
index 0000000000..d6a3e97362
--- /dev/null
+++ b/src/server/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Copyright (C) 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+if( SERVERS )
+set(sources_windows_Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h
+)
+
+add_subdirectory(game)
+add_subdirectory(authserver)
+add_subdirectory(scripts)
+add_subdirectory(worldserver)
+endif()
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 43c6d7794d..65c4ed58e8 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -43,15 +43,15 @@ endif()
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Packets
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/src/core/Logging
-  ${CMAKE_SOURCE_DIR}/src/core/Threading
-  ${CMAKE_SOURCE_DIR}/src/core/Utilities
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Packets
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/src/common/Logging
+  ${CMAKE_SOURCE_DIR}/src/common/Threading
+  ${CMAKE_SOURCE_DIR}/src/common/Utilities
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Authentication
   ${CMAKE_CURRENT_SOURCE_DIR}/Realms
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 1eb7d66f84..ae9e463cbc 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -116,24 +116,24 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
   ${CMAKE_SOURCE_DIR}/deps/SFMT
   ${CMAKE_SOURCE_DIR}/deps/zlib
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Configuration
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/core/DataStores
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic
-  ${CMAKE_SOURCE_DIR}/src/core/Logging
-  ${CMAKE_SOURCE_DIR}/src/core/Packets
-  ${CMAKE_SOURCE_DIR}/src/core/Threading
-  ${CMAKE_SOURCE_DIR}/src/core/Utilities
-  ${CMAKE_SOURCE_DIR}/src/framework/Addons
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Configuration
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/common/DataStores
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/common/Logging
+  ${CMAKE_SOURCE_DIR}/src/common/Packets
+  ${CMAKE_SOURCE_DIR}/src/common/Threading
+  ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Accounts
   ${CMAKE_CURRENT_SOURCE_DIR}/Achievements
@@ -206,8 +206,8 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/World
   ${CMAKE_CURRENT_SOURCE_DIR}/ArenaSpectator
   ${CMAKE_CURRENT_SOURCE_DIR}/Misc
-  ${CMAKE_SOURCE_DIR}/src/scripts/
-  ${CMAKE_SOURCE_DIR}/src/scripts/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/server/scripts/
+  ${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
   ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 20576191c2..6804d939fe 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -83,97 +83,97 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
   ${CMAKE_SOURCE_DIR}/deps/SFMT
   ${CMAKE_SOURCE_DIR}/deps/zlib
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Configuration
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/core/DataStores
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic
-  ${CMAKE_SOURCE_DIR}/src/core/Logging
-  ${CMAKE_SOURCE_DIR}/src/core/Packets
-  ${CMAKE_SOURCE_DIR}/src/core/Threading
-  ${CMAKE_SOURCE_DIR}/src/core/Utilities
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/framework/Addons
-  ${CMAKE_SOURCE_DIR}/src/game/Accounts
-  ${CMAKE_SOURCE_DIR}/src/game/Achievements
-  ${CMAKE_SOURCE_DIR}/src/game/AI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/SmartScripts
-  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse
-  ${CMAKE_SOURCE_DIR}/src/game/Battlefield
-  ${CMAKE_SOURCE_DIR}/src/game/Battlefield/Zones
-  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds
-  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds/Zones
-  ${CMAKE_SOURCE_DIR}/src/game/Calendar
-  ${CMAKE_SOURCE_DIR}/src/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels
-  ${CMAKE_SOURCE_DIR}/src/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/core/Configuration
-  ${CMAKE_SOURCE_DIR}/src/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Corpse
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/DynamicObject
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item/Container
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Pet
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Player
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Totem
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Transport
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Vehicle
-  ${CMAKE_SOURCE_DIR}/src/game/Events
-  ${CMAKE_SOURCE_DIR}/src/game/Globals
-  ${CMAKE_SOURCE_DIR}/src/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/game/Groups
-  ${CMAKE_SOURCE_DIR}/src/game/Guilds
-  ${CMAKE_SOURCE_DIR}/src/game/Handlers
-  ${CMAKE_SOURCE_DIR}/src/game/Instances
-  ${CMAKE_SOURCE_DIR}/src/game/LookingForGroup
-  ${CMAKE_SOURCE_DIR}/src/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/Spline
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
-  ${CMAKE_SOURCE_DIR}/src/game/Opcodes
-  ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
-  ${CMAKE_SOURCE_DIR}/src/game/Petitions
-  ${CMAKE_SOURCE_DIR}/src/game/Pools
-  ${CMAKE_SOURCE_DIR}/src/game/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/src/game/Quests
-  ${CMAKE_SOURCE_DIR}/src/game/Reputation
-  ${CMAKE_SOURCE_DIR}/src/game/Scripting
-  ${CMAKE_SOURCE_DIR}/src/game/Server
-  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/game/Skills
-  ${CMAKE_SOURCE_DIR}/src/game/Spells
-  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
-  ${CMAKE_SOURCE_DIR}/src/game/Texts
-  ${CMAKE_SOURCE_DIR}/src/game/Tickets
-  ${CMAKE_SOURCE_DIR}/src/game/Tools
-  ${CMAKE_SOURCE_DIR}/src/game/Warden
-  ${CMAKE_SOURCE_DIR}/src/game/Warden/Modules
-  ${CMAKE_SOURCE_DIR}/src/game/Weather
-  ${CMAKE_SOURCE_DIR}/src/game/World
-  ${CMAKE_SOURCE_DIR}/src/game/ArenaSpectator
-  ${CMAKE_SOURCE_DIR}/src/game/Misc
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Configuration
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/common/DataStores
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/common/Logging
+  ${CMAKE_SOURCE_DIR}/src/common/Packets
+  ${CMAKE_SOURCE_DIR}/src/common/Threading
+  ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
+  ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/SmartScripts
+  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield/Zones
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds/Zones
+  ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
+  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/common/Configuration
+  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Transport
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+  ${CMAKE_SOURCE_DIR}/src/server/game/Events
+  ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+  ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+  ${CMAKE_SOURCE_DIR}/src/server/game/Handlers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+  ${CMAKE_SOURCE_DIR}/src/server/game/LookingForGroup
+  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Spline
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/server/game/Opcodes
+  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/server/game/Petitions
+  ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+  ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+  ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+  ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+  ${CMAKE_SOURCE_DIR}/src/server/game/Texts
+  ${CMAKE_SOURCE_DIR}/src/server/game/Tickets
+  ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+  ${CMAKE_SOURCE_DIR}/src/server/game/Warden
+  ${CMAKE_SOURCE_DIR}/src/server/game/Warden/Modules
+  ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+  ${CMAKE_SOURCE_DIR}/src/server/game/World
+  ${CMAKE_SOURCE_DIR}/src/server/game/ArenaSpectator
+  ${CMAKE_SOURCE_DIR}/src/server/game/Misc
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
   ${ACE_INCLUDE_DIR}
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 6f8a0c4ceb..58ec995c4e 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -48,96 +48,96 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/deps/gsoap
   ${CMAKE_SOURCE_DIR}/deps/sockets/include
   ${CMAKE_SOURCE_DIR}/deps/SFMT
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Configuration
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/core/DataStores
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic
-  ${CMAKE_SOURCE_DIR}/src/core/Logging
-  ${CMAKE_SOURCE_DIR}/src/core/Packets
-  ${CMAKE_SOURCE_DIR}/src/core/Threading
-  ${CMAKE_SOURCE_DIR}/src/core/Utilities
-  ${CMAKE_SOURCE_DIR}/src/framework/Addons
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Configuration
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/common/DataStores
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/common/Logging
+  ${CMAKE_SOURCE_DIR}/src/common/Packets
+  ${CMAKE_SOURCE_DIR}/src/common/Threading
+  ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
   ${game_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}/src/game
-  ${CMAKE_SOURCE_DIR}/src/game/Accounts
-  ${CMAKE_SOURCE_DIR}/src/game/Achievements
-  ${CMAKE_SOURCE_DIR}/src/game/AI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/SmartScripts
-  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse
-  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse/AuctionHouseBot
-  ${CMAKE_SOURCE_DIR}/src/game/Battlefield
-  ${CMAKE_SOURCE_DIR}/src/game/Battlefield/Zones
-  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds
-  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds/Zones
-  ${CMAKE_SOURCE_DIR}/src/game/Calendar
-  ${CMAKE_SOURCE_DIR}/src/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels
-  ${CMAKE_SOURCE_DIR}/src/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding
-  ${CMAKE_SOURCE_DIR}/src/game/Entities
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Corpse
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/DynamicObject
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item/Container
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Pet
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Player
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Totem
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Vehicle
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Transport
-  ${CMAKE_SOURCE_DIR}/src/game/Events
-  ${CMAKE_SOURCE_DIR}/src/game/Globals
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/game/Groups
-  ${CMAKE_SOURCE_DIR}/src/game/Guilds
-  ${CMAKE_SOURCE_DIR}/src/game/Handlers
-  ${CMAKE_SOURCE_DIR}/src/game/Instances
-  ${CMAKE_SOURCE_DIR}/src/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/Spline
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
-  ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
-  ${CMAKE_SOURCE_DIR}/src/game/Pools
-  ${CMAKE_SOURCE_DIR}/src/game/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/src/game/Quests
-  ${CMAKE_SOURCE_DIR}/src/game/Reputation
-  ${CMAKE_SOURCE_DIR}/src/game/Scripting
-  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/game/Server
-  ${CMAKE_SOURCE_DIR}/src/game/Skills
-  ${CMAKE_SOURCE_DIR}/src/game/Spells
-  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
-  ${CMAKE_SOURCE_DIR}/src/game/Tools
-  ${CMAKE_SOURCE_DIR}/src/game/Warden
-  ${CMAKE_SOURCE_DIR}/src/game/Warden/Modules
-  ${CMAKE_SOURCE_DIR}/src/game/Weather
-  ${CMAKE_SOURCE_DIR}/src/game/World
-  ${CMAKE_SOURCE_DIR}/src/game/Misc
-  ${CMAKE_SOURCE_DIR}/src/scripts/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/src/authserver/Server
-  ${CMAKE_SOURCE_DIR}/src/authserver/Realms
+  ${CMAKE_SOURCE_DIR}/src/server/game
+  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
+  ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/SmartScripts
+  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield/Zones
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds/Zones
+  ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
+  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Transport
+  ${CMAKE_SOURCE_DIR}/src/server/game/Events
+  ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+  ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+  ${CMAKE_SOURCE_DIR}/src/server/game/Handlers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Spline
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+  ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+  ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server
+  ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+  ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+  ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+  ${CMAKE_SOURCE_DIR}/src/server/game/Warden
+  ${CMAKE_SOURCE_DIR}/src/server/game/Warden/Modules
+  ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+  ${CMAKE_SOURCE_DIR}/src/server/game/World
+  ${CMAKE_SOURCE_DIR}/src/server/game/Misc
+  ${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Server
+  ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/CommandLine
   ${CMAKE_CURRENT_SOURCE_DIR}/RemoteAccess
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 0945371ce0..2c00a7e130 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -12,7 +12,7 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/src/core
+    ${CMAKE_SOURCE_DIR}/src/common
     ${CMAKE_SOURCE_DIR}/deps/libmpq
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
diff --git a/src/tools/mesh_extractor/CMakeLists.txt b/src/tools/mesh_extractor/CMakeLists.txt
index 0d3a7b4415..7c330adcee 100644
--- a/src/tools/mesh_extractor/CMakeLists.txt
+++ b/src/tools/mesh_extractor/CMakeLists.txt
@@ -13,7 +13,7 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
 
 set(include_Base
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/core
+  ${CMAKE_SOURCE_DIR}/src/common
   ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
   ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
   ${CMAKE_SOURCE_DIR}/deps/libmpq
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index 712df819ad..6c3a932b9a 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -21,91 +21,91 @@ set(mmap_gen_Includes
   ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
   ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
   ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Configuration
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography
-  ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/src/core/Database
-  ${CMAKE_SOURCE_DIR}/src/core/DataStores
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/src/core/Dynamic
-  ${CMAKE_SOURCE_DIR}/src/core/Logging
-  ${CMAKE_SOURCE_DIR}/src/core/Packets
-  ${CMAKE_SOURCE_DIR}/src/core/Threading
-  ${CMAKE_SOURCE_DIR}/src/core/Utilities
-  ${CMAKE_SOURCE_DIR}/src/framework/Addons
-  ${CMAKE_SOURCE_DIR}/src/game
-  ${CMAKE_SOURCE_DIR}/src/game/Accounts
-  ${CMAKE_SOURCE_DIR}/src/game/Achievements
-  ${CMAKE_SOURCE_DIR}/src/game/AI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/CoreAI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/ScriptedAI
-  ${CMAKE_SOURCE_DIR}/src/game/AI/SmartScripts
-  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse
-  ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse/AuctionHouseBot
-  ${CMAKE_SOURCE_DIR}/src/game/Battlefield
-  ${CMAKE_SOURCE_DIR}/src/game/Battlefield/Zones
-  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds
-  ${CMAKE_SOURCE_DIR}/src/game/Battlegrounds/Zones
-  ${CMAKE_SOURCE_DIR}/src/game/Calendar
-  ${CMAKE_SOURCE_DIR}/src/game/Chat
-  ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels
-  ${CMAKE_SOURCE_DIR}/src/game/Combat
-  ${CMAKE_SOURCE_DIR}/src/game/Conditions
-  ${CMAKE_SOURCE_DIR}/src/game/DataStores
-  ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding
-  ${CMAKE_SOURCE_DIR}/src/game/Entities
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Corpse
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/DynamicObject
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Item/Container
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Pet
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Player
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Totem
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Vehicle
-  ${CMAKE_SOURCE_DIR}/src/game/Entities/Transport
-  ${CMAKE_SOURCE_DIR}/src/game/Events
-  ${CMAKE_SOURCE_DIR}/src/game/Globals
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells
-  ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers
-  ${CMAKE_SOURCE_DIR}/src/game/Grids
-  ${CMAKE_SOURCE_DIR}/src/game/Groups
-  ${CMAKE_SOURCE_DIR}/src/game/Guilds
-  ${CMAKE_SOURCE_DIR}/src/game/Handlers
-  ${CMAKE_SOURCE_DIR}/src/game/Instances
-  ${CMAKE_SOURCE_DIR}/src/game/Loot
-  ${CMAKE_SOURCE_DIR}/src/game/Mails
-  ${CMAKE_SOURCE_DIR}/src/game/Maps
-  ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous
-  ${CMAKE_SOURCE_DIR}/src/game/Movement
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/MovementGenerators
-  ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints
-  ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
-  ${CMAKE_SOURCE_DIR}/src/game/Pools
-  ${CMAKE_SOURCE_DIR}/src/game/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/src/game/Quests
-  ${CMAKE_SOURCE_DIR}/src/game/Reputation
-  ${CMAKE_SOURCE_DIR}/src/game/Scripting
-  ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol
-  ${CMAKE_SOURCE_DIR}/src/game/Server
-  ${CMAKE_SOURCE_DIR}/src/game/Skills
-  ${CMAKE_SOURCE_DIR}/src/game/Spells
-  ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras
-  ${CMAKE_SOURCE_DIR}/src/game/Tools
-  ${CMAKE_SOURCE_DIR}/src/game/Warden
-  ${CMAKE_SOURCE_DIR}/src/game/Warden/Modules
-  ${CMAKE_SOURCE_DIR}/src/game/Weather
-  ${CMAKE_SOURCE_DIR}/src/game/World
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Management
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Configuration
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography
+  ${CMAKE_SOURCE_DIR}/src/common/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/common/DataStores
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/common/Logging
+  ${CMAKE_SOURCE_DIR}/src/common/Packets
+  ${CMAKE_SOURCE_DIR}/src/common/Threading
+  ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+  ${CMAKE_SOURCE_DIR}/src/server/game
+  ${CMAKE_SOURCE_DIR}/src/server/game/Accounts
+  ${CMAKE_SOURCE_DIR}/src/server/game/Achievements
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/CoreAI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/ScriptedAI
+  ${CMAKE_SOURCE_DIR}/src/server/game/AI/SmartScripts
+  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse
+  ${CMAKE_SOURCE_DIR}/src/server/game/AuctionHouse/AuctionHouseBot
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlefield/Zones
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds
+  ${CMAKE_SOURCE_DIR}/src/server/game/Battlegrounds/Zones
+  ${CMAKE_SOURCE_DIR}/src/server/game/Calendar
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat
+  ${CMAKE_SOURCE_DIR}/src/server/game/Chat/Channels
+  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/DungeonFinding
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Corpse
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/DynamicObject
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item/Container
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Pet
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Player
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Totem
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Vehicle
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Transport
+  ${CMAKE_SOURCE_DIR}/src/server/game/Events
+  ${CMAKE_SOURCE_DIR}/src/server/game/Globals
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Grids
+  ${CMAKE_SOURCE_DIR}/src/server/game/Groups
+  ${CMAKE_SOURCE_DIR}/src/server/game/Guilds
+  ${CMAKE_SOURCE_DIR}/src/server/game/Handlers
+  ${CMAKE_SOURCE_DIR}/src/server/game/Instances
+  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/server/game/Mails
+  ${CMAKE_SOURCE_DIR}/src/server/game/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/MovementGenerators
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
+  ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
+  ${CMAKE_SOURCE_DIR}/src/server/game/Quests
+  ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
+  ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server
+  ${CMAKE_SOURCE_DIR}/src/server/game/Skills
+  ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/server/game/Spells/Auras
+  ${CMAKE_SOURCE_DIR}/src/server/game/Tools
+  ${CMAKE_SOURCE_DIR}/src/server/game/Warden
+  ${CMAKE_SOURCE_DIR}/src/server/game/Warden/Modules
+  ${CMAKE_SOURCE_DIR}/src/server/game/Weather
+  ${CMAKE_SOURCE_DIR}/src/server/game/World
 )
 
 if( WIN32 )
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index d7f9a5a817..0bb29fef47 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -44,7 +44,7 @@ namespace MMAP
 
     // see following files:
     // contrib/extractor/system.cpp
-    // src/game/Map.cpp
+    // src/server/game/Map.cpp
 
     struct MeshData
     {
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index d633585660..f15181217f 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -11,11 +11,11 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/src/core
-  ${CMAKE_SOURCE_DIR}/src/core/Debugging
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps
-  ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/common/Collision/Models
   ${ACE_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
 )