diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37dcca479..8547508ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 set(AC_PATH_ROOT "${CMAKE_SOURCE_DIR}")
 
 # set macro-directory
-set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/modules/acore/cmake/macros")
+set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/modules/worldengine/nucleus/src/cmake/macros")
 
 include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
@@ -87,6 +87,26 @@ include(src/cmake/genrev.cmake)
 # print out the results before continuing
 include(src/cmake/showoptions.cmake)
 
+
+#
+# Loading framework
+#
+
+add_subdirectory(modules/worldengine/deps)
+
+if( SERVERS OR TOOLS)
+  add_subdirectory(modules/worldengine/nucleus)
+  add_subdirectory(modules/worldengine/lib-collision)
+endif()
+
+if( TOOLS )
+  add_subdirectory(modules/acore/extractors)
+endif()
+
+#
+# Loading dyn modules
+#
+
 # add modules and dependencies
 CU_SUBDIRLIST(sub_DIRS  "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
 FOREACH(subdir ${sub_DIRS})
@@ -97,6 +117,10 @@ FOREACH(subdir ${sub_DIRS})
     endif()
 ENDFOREACH()
 
+#
+# Loading application sources
+#
+
 CU_RUN_HOOK("BEFORE_SRC_LOAD")
 
 # add core sources
diff --git a/modules/acore/CMakeLists.txt b/modules/acore/CMakeLists.txt
deleted file mode 100644
index 558ef6ba6..000000000
--- a/modules/acore/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-CU_RUN_HOOK("BEFORE_ACORE_LOAD")
-
-add_subdirectory(deps)
-
-if( SERVERS )
-  add_subdirectory(framework)
-  add_subdirectory(world-engine/collision)
-else()
-  if( TOOLS )
-    add_subdirectory(extractors)
-    add_subdirectory(world-engine/collision)
-    add_subdirectory(framework)
-  endif()
-endif()
-
-CU_RUN_HOOK("AFTER_ACORE_LOAD")
-
diff --git a/modules/acore/extractors/map_extractor/CMakeLists.txt b/modules/acore/extractors/map_extractor/CMakeLists.txt
index db247e331..872c9f519 100644
--- a/modules/acore/extractors/map_extractor/CMakeLists.txt
+++ b/modules/acore/extractors/map_extractor/CMakeLists.txt
@@ -12,8 +12,8 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/modules/acore/framework
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
 )
@@ -21,7 +21,7 @@ set(include_Dirs
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
   )
 endif()
 
diff --git a/modules/acore/extractors/mesh_extractor/CMakeLists.txt b/modules/acore/extractors/mesh_extractor/CMakeLists.txt
index c2a6896ce..445532ba9 100644
--- a/modules/acore/extractors/mesh_extractor/CMakeLists.txt
+++ b/modules/acore/extractors/mesh_extractor/CMakeLists.txt
@@ -13,11 +13,11 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
 
 set(include_Base
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
   ${ACE_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -25,7 +25,7 @@ set(include_Base
 if( WIN32 )
   set(include_Base
     ${include_Base}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
     )
 endif()
 
diff --git a/modules/acore/extractors/mmaps_generator/CMakeLists.txt b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
index fde316be8..3997d02ab 100644
--- a/modules/acore/extractors/mmaps_generator/CMakeLists.txt
+++ b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
@@ -15,29 +15,29 @@ set(mmap_gen_Includes
   ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
   ${CMAKE_SOURCE_DIR}/src/game
   ${CMAKE_SOURCE_DIR}/src/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/game/Achievements
@@ -111,7 +111,7 @@ set(mmap_gen_Includes
 if( WIN32 )
   set(mmap_gen_Includes
     ${mmap_gen_Includes}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
     )
 endif()
 
diff --git a/modules/acore/extractors/vmap4_assembler/CMakeLists.txt b/modules/acore/extractors/vmap4_assembler/CMakeLists.txt
index 72b249cbc..021055f41 100644
--- a/modules/acore/extractors/vmap4_assembler/CMakeLists.txt
+++ b/modules/acore/extractors/vmap4_assembler/CMakeLists.txt
@@ -10,12 +10,12 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
   ${ACE_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
 )
diff --git a/modules/acore/extractors/vmap4_extractor/CMakeLists.txt b/modules/acore/extractors/vmap4_extractor/CMakeLists.txt
index d88ca55d4..4cc103ecf 100644
--- a/modules/acore/extractors/vmap4_extractor/CMakeLists.txt
+++ b/modules/acore/extractors/vmap4_extractor/CMakeLists.txt
@@ -12,13 +12,13 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
 )
 
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
   )
 endif()
 
diff --git a/modules/worldengine/deps/acelite/ace/CMakeLists.txt b/modules/worldengine/deps/acelite/ace/CMakeLists.txt
index f87b5d56e..b90158b15 100644
--- a/modules/worldengine/deps/acelite/ace/CMakeLists.txt
+++ b/modules/worldengine/deps/acelite/ace/CMakeLists.txt
@@ -328,9 +328,9 @@ if (USE_COREPCH)
 endif()
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/acelite
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
 )
 
 # Needed for PCH support
diff --git a/modules/worldengine/deps/bzip2/CMakeLists.txt b/modules/worldengine/deps/bzip2/CMakeLists.txt
index ecb9ba889..4cf894419 100644
--- a/modules/worldengine/deps/bzip2/CMakeLists.txt
+++ b/modules/worldengine/deps/bzip2/CMakeLists.txt
@@ -15,7 +15,7 @@ set(bzip2_STAT_SRCS
 )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
diff --git a/modules/worldengine/deps/g3dlite/CMakeLists.txt b/modules/worldengine/deps/g3dlite/CMakeLists.txt
index f52463269..8e75bdf17 100644
--- a/modules/worldengine/deps/g3dlite/CMakeLists.txt
+++ b/modules/worldengine/deps/g3dlite/CMakeLists.txt
@@ -57,7 +57,7 @@ set(g3dlib_STAT_SRCS
 if(WIN32)
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   )
 else()
   include_directories(
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Intersect.h b/modules/worldengine/deps/g3dlite/include/G3D/Intersect.h
index 4a3c8fb45..8dc4d0c68 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Intersect.h
+++ b/modules/worldengine/deps/g3dlite/include/G3D/Intersect.h
@@ -30,7 +30,7 @@ public:
 	/** \brief Returns true if the intersection of the ray and the solid box is non-empty. 
 
       \cite "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-      by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
+      by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
       Computer Graphics Lab, TU Braunschweig, Germany and
       University of Koblenz-Landau, Germany
     */
@@ -43,7 +43,7 @@ public:
      \a time is not set if there is no intersection.
           
      \cite Slope-Mul method from "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-      by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
+      by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
       Computer Graphics Lab, TU Braunschweig, Germany and
       University of Koblenz-Landau, Germany
       */
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h b/modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h
index 06ec7e674..8efb3de55 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h
+++ b/modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h
@@ -312,7 +312,7 @@ public:
     // "You might be tempted to write [...] them as inline functions 
     // inside their respective header files, but this is something you 
     // must definitely not do. An inline function can be duplicated 
-    // in every file in which it appears ���� and this duplication 
+    // in every file in which it appears ���� and this duplication 
     // includes the static object definition. Because inline functions 
     // automatically default to internal linkage, this would result in 
     // having multiple static objects across the various translation 
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Ray.h b/modules/worldengine/deps/g3dlite/include/G3D/Ray.h
index 80df5828a..1d9bf318d 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Ray.h
+++ b/modules/worldengine/deps/g3dlite/include/G3D/Ray.h
@@ -36,7 +36,7 @@ private:
 
 	// The following are for the "ray slope" optimization from
 	//  "Fast Ray / Axis-Aligned Bounding Box Overlap Tests using Ray Slopes" 
-	//  by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
+	//  by Martin Eisemann, Thorsten Grosch, Stefan M�ller and Marcus Magnor
 	//  Computer Graphics Lab, TU Braunschweig, Germany and
 	//  University of Koblenz-Landau, Germany*/
 	enum Classification {MMM, MMP, MPM, MPP, PMM, PMP, PPM, PPP, POO, MOO, OPO, OMO, OOP, OOM, OMM, OMP, OPM, OPP, MOM, MOP, POM, POP, MMO, MPO, PMO, PPO};	Classification classification;
diff --git a/modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp b/modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp
index 77eef0a55..4bc15d9fe 100644
--- a/modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp
+++ b/modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp
@@ -2267,7 +2267,7 @@ bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// AABB-triangle overlap test code based on Tomas Akenine-M��ller's
+// AABB-triangle overlap test code based on Tomas Akenine-M��ller's
 // http://www.cs.lth.se/home/Tomas_Akenine_Moller/code/tribox3.txt
 // Ported 2008-12-28
 
diff --git a/modules/worldengine/deps/g3dlite/source/license.cpp b/modules/worldengine/deps/g3dlite/source/license.cpp
index 5049184cf..ada04bbd4 100644
--- a/modules/worldengine/deps/g3dlite/source/license.cpp
+++ b/modules/worldengine/deps/g3dlite/source/license.cpp
@@ -24,7 +24,7 @@ std::string license() {
 "%s"
 "This program uses the G3D Library (http://g3d.sf.net), which\n"
 "is licensed under the \"Modified BSD\" Open Source license.  The G3D library\n"
-"source code is Copyright � 2000-2010, Morgan McGuire, All rights reserved.\n"
+"source code is Copyright � 2000-2010, Morgan McGuire, All rights reserved.\n"
 "This program uses The OpenGL Extension Wrangler Library, which \n"
 "is licensed under the \"Modified BSD\" Open Source license.  \n"
 "The OpenGL Extension Wrangler Library source code is\n"
diff --git a/modules/worldengine/deps/jemalloc/CMakeLists.txt b/modules/worldengine/deps/jemalloc/CMakeLists.txt
index cb262fe6a..fe976cb6c 100644
--- a/modules/worldengine/deps/jemalloc/CMakeLists.txt
+++ b/modules/worldengine/deps/jemalloc/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 
 # Create the header, so we can use it
 configure_file(
-  "${CMAKE_SOURCE_DIR}/modules/acore/deps/jemalloc/jemalloc_defs.h.in.cmake"
+  "${CMAKE_SOURCE_DIR}/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake"
   "${BUILDDIR}/jemalloc_defs.h"
   @ONLY
 )
diff --git a/modules/worldengine/deps/libmpq/CMakeLists.txt b/modules/worldengine/deps/libmpq/CMakeLists.txt
index 97f75a59c..c3e20934d 100644
--- a/modules/worldengine/deps/libmpq/CMakeLists.txt
+++ b/modules/worldengine/deps/libmpq/CMakeLists.txt
@@ -17,15 +17,15 @@ set(mpq_STAT_SRCS
 if( UNIX )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
   )
 elseif( WIN32 )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/win
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/bzip2
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
   )
 endif()
 
diff --git a/modules/worldengine/deps/mysqllite/CMakeLists.txt b/modules/worldengine/deps/mysqllite/CMakeLists.txt
index 88ec97606..29fda1813 100644
--- a/modules/worldengine/deps/mysqllite/CMakeLists.txt
+++ b/modules/worldengine/deps/mysqllite/CMakeLists.txt
@@ -54,7 +54,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/include/internal
   ${CMAKE_CURRENT_SOURCE_DIR}/dbug
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-czech.c b/modules/worldengine/deps/mysqllite/strings/ctype-czech.c
index 0095fe7f9..27a7bb39e 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-czech.c
+++ b/modules/worldengine/deps/mysqllite/strings/ctype-czech.c
@@ -21,13 +21,13 @@
 	solution was needed than the one-to-one conversion table. To
 	note a few, here is an example of a Czech sorting sequence:
 
-		co < hlaska < hl�ska < hlava < chlapec < krtek
+		co < hlaska < hl�ska < hlava < chlapec < krtek
 
 	It because some of the rules are: double char 'ch' is sorted
-	between 'h' and 'i'. Accented character '�' (a with acute) is
+	between 'h' and 'i'. Accented character '�' (a with acute) is
 	sorted after 'a' and before 'b', but only if the word is
 	otherwise the same. However, because 's' is sorted before 'v'
-	in hlava, the accentness of '�' is overridden. There are many
+	in hlava, the accentness of '�' is overridden. There are many
 	more rules.
 
 	This file defines functions my_strxfrm and my_strcoll for
@@ -138,30 +138,30 @@ static struct wordvalue doubles[] = {
 
 	We append 0 to the end.
 ---
-	Neform�ln� popis algoritmu:
+	Neform�ln� popis algoritmu:
 
-	Proch�z�me �et�zec zleva doprava.
+	Proch�z�me �et�zec zleva doprava.
 
-	Konec �et�zce je p�ed�n bu� jako parametr, nebo je to *p == 0.
-	Toto je o�et�eno makrem IS_END.
+	Konec �et�zce je p�ed�n bu� jako parametr, nebo je to *p == 0.
+	Toto je o�et�eno makrem IS_END.
 
-	Pokud jsme do�li na konec �et�zce p�i pr�chodu 0, nejdeme na
-	za��tek, ale na ulo�enou pozici, proto�e prvn� a druh� pr�chod
-	b�� sou�asn�.
+	Pokud jsme do�li na konec �et�zce p�i pr�chodu 0, nejdeme na
+	za��tek, ale na ulo�enou pozici, proto�e prvn� a druh� pr�chod
+	b��� sou�asn�.
 
-	Konec vstupu (pr�chodu) ozna��me na v�stupu hodnotou 1.
+	Konec vstupu (pr�chodu) ozna��me na v�stupu hodnotou 1.
 
-	Pro ka�d� znak �et�zce na�teme hodnotu z t��d�c� tabulky.
+	Pro ka�d� znak �et�zce na�teme hodnotu z t��d�c� tabulky.
 
-	Jde-li o hodnotu ignorovat (0), sko��me ihned na dal�� znak..
+	Jde-li o hodnotu ignorovat (0), sko��me ihned na dal�� znak..
 
-	Jde-li o hodnotu konec slova (2) a je to pr�chod 0 nebo 1,
-	p�esko��me v�echny dal�� 0 -- 2 a prohod�me pr�chody.
+	Jde-li o hodnotu konec slova (2) a je to pr�chod 0 nebo 1,
+	p�esko��me v�echny dal�� 0 -- 2 a prohod�me pr�chody.
 
-	Jde-li o kompozitn� znak (255), otestujeme, zda n�sleduje
-	spr�vn� do dvojice, dohled�me spr�vnou hodnotu.
+	Jde-li o kompozitn� znak (255), otestujeme, zda n�sleduje
+	spr�vn� do dvojice, dohled�me spr�vnou hodnotu.
 
-	Na konci p�ipoj�me znak 0
+	Na konci p�ipoj�me znak 0
  */
 
 #define ADD_TO_RESULT(dest, len, totlen, value)			\
@@ -315,24 +315,24 @@ static size_t my_strnxfrm_czech(CHARSET_INFO *cs __attribute__((unused)),
 
 
 /*
-	Neform�ln� popis algoritmu:
+	Neform�ln� popis algoritmu:
 
-	proch�z�me �et�zec zleva doprava
-	konec �et�zce pozn�me podle *p == 0
-	pokud jsme do�li na konec �et�zce p�i pr�chodu 0, nejdeme na
-		za��tek, ale na ulo�enou pozici, proto�e prvn� a druh�
-		pr�chod b�� sou�asn�
-	konec vstupu (pr�chodu) ozna��me na v�stupu hodnotou 1
+	proch�z�me �et�zec zleva doprava
+	konec �et�zce pozn�me podle *p == 0
+	pokud jsme do�li na konec �et�zce p�i pr�chodu 0, nejdeme na
+		za��tek, ale na ulo�enou pozici, proto�e prvn� a druh�
+		pr�chod b��� sou�asn�
+	konec vstupu (pr�chodu) ozna��me na v�stupu hodnotou 1
 
-	na�teme hodnotu z t��d�c� tabulky
-	jde-li o hodnotu ignorovat (0), sko��me na dal�� pr�chod
-	jde-li o hodnotu konec slova (2) a je to pr�chod 0 nebo 1,
-		p�esko��me v�echny dal�� 0 -- 2 a prohod�me
-		pr�chody
-	jde-li o kompozitn� znak (255), otestujeme, zda n�sleduje
-		spr�vn� do dvojice, dohled�me spr�vnou hodnotu
+	na�teme hodnotu z t��d�c� tabulky
+	jde-li o hodnotu ignorovat (0), sko��me na dal�� pr�chod
+	jde-li o hodnotu konec slova (2) a je to pr�chod 0 nebo 1,
+		p�esko��me v�echny dal�� 0 -- 2 a prohod�me
+		pr�chody
+	jde-li o kompozitn� znak (255), otestujeme, zda n�sleduje
+		spr�vn� do dvojice, dohled�me spr�vnou hodnotu
 
-	na konci p�ipoj�me znak 0
+	na konci p�ipoj�me znak 0
  */
 
 
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-latin1.c b/modules/worldengine/deps/mysqllite/strings/ctype-latin1.c
index dbd91c096..028a1be67 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-latin1.c
+++ b/modules/worldengine/deps/mysqllite/strings/ctype-latin1.c
@@ -456,19 +456,19 @@ CHARSET_INFO my_charset_latin1=
  *
  * The modern sort order is used, where:
  *
- * '�'  ->  "ae"
- * '�'  ->  "oe"
- * '�'  ->  "ue"
- * '�'  ->  "ss"
+ * '�'  ->  "ae"
+ * '�'  ->  "oe"
+ * '�'  ->  "ue"
+ * '�'  ->  "ss"
  */
 
 
 /*
  * This is a simple latin1 mapping table, which maps all accented
  * characters to their non-accented equivalents.  Note: in this
- * table, '�' is mapped to 'A', '�' is mapped to 'Y', etc. - all
+ * table, '�' is mapped to 'A', '�' is mapped to 'Y', etc. - all
  * accented characters except the following are treated the same way.
- * �, �, �, �, �, �
+ * �, �, �, �, �, �
  */
 
 static uchar sort_order_latin1_de[] = {
@@ -534,7 +534,7 @@ uchar combo2map[]={
   my_strnxfrm_latin_de() on both strings and compared the result strings.
 
   This means that:
-  � must also matches �E and A�, because my_strxn_frm_latin_de() will convert
+  � must also matches �E and A�, because my_strxn_frm_latin_de() will convert
   both to AE.
 
   The other option would be to not do any accent removal in
@@ -681,7 +681,7 @@ void my_hash_sort_latin1_de(CHARSET_INFO *cs __attribute__((unused)),
   const uchar *end;
   /*
     Remove end space. We have to do this to be able to compare
-    'AE' and '�' as identical
+    'AE' and '�' as identical
   */
   end= skip_trailing_space(key, len);
 
diff --git a/modules/worldengine/deps/mysqllite/strings/decimal.c b/modules/worldengine/deps/mysqllite/strings/decimal.c
index 7625ed80e..762773f04 100644
--- a/modules/worldengine/deps/mysqllite/strings/decimal.c
+++ b/modules/worldengine/deps/mysqllite/strings/decimal.c
@@ -30,7 +30,7 @@
   integer that determines the number of significant digits in a
   particular radix R, where R is either 2 or 10. S is a non-negative
   integer. Every value of an exact numeric type of scale S is of the
-  form n*10^{-S}, where n is an integer such that �-R^P <= n <= R^P.
+  form n*10^{-S}, where n is an integer such that �-R^P <= n <= R^P.
 
   [...]
 
diff --git a/modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt b/modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt
index f3f83abe1..a0028f9c9 100644
--- a/modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt
+++ b/modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt
@@ -19,7 +19,7 @@ set(Detour_STAT_SRCS
 
 if(WIN32)
   include_directories(
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   )
 endif()
 
diff --git a/modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt b/modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt
index 5c409aa17..2bf1518bc 100644
--- a/modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt
+++ b/modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt
@@ -22,7 +22,7 @@ set(Recast_STAT_SRCS
 
 if(WIN32)
   include_directories(
-    ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
   )
 endif()
 
diff --git a/modules/worldengine/lib-collision/CMakeLists.txt b/modules/worldengine/lib-collision/CMakeLists.txt
index 6393a27a6..daed397fd 100644
--- a/modules/worldengine/lib-collision/CMakeLists.txt
+++ b/modules/worldengine/lib-collision/CMakeLists.txt
@@ -32,20 +32,20 @@ set(collision_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
   ${CMAKE_SOURCE_DIR}/src/game/Addons
   ${CMAKE_SOURCE_DIR}/src/game/Conditions
   ${CMAKE_SOURCE_DIR}/src/game/Entities/Item
diff --git a/modules/worldengine/nucleus/cmake/macros/CheckPlatform.cmake b/modules/worldengine/nucleus/cmake/macros/CheckPlatform.cmake
deleted file mode 100644
index f5d3fa958..000000000
--- a/modules/worldengine/nucleus/cmake/macros/CheckPlatform.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-# check what platform we're on (64-bit or 32-bit), and create a simpler test than CMAKE_SIZEOF_VOID_P
-if(CMAKE_SIZEOF_VOID_P MATCHES 8)
-    set(PLATFORM 64)
-    MESSAGE(STATUS "Detected 64-bit platform")
-else()
-    set(PLATFORM 32)
-    MESSAGE(STATUS "Detected 32-bit platform")
-endif()
-
-include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/settings.cmake")
-
-if(WIN32)
-  include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/win/settings.cmake")
-elseif(UNIX)
-  include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/unix/settings.cmake")
-endif()
-
-include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/after_platform.cmake")
diff --git a/modules/worldengine/nucleus/AutoPtr.h b/modules/worldengine/nucleus/src/AutoPtr.h
similarity index 100%
rename from modules/worldengine/nucleus/AutoPtr.h
rename to modules/worldengine/nucleus/src/AutoPtr.h
diff --git a/modules/worldengine/nucleus/CMakeLists.txt b/modules/worldengine/nucleus/src/CMakeLists.txt
similarity index 92%
rename from modules/worldengine/nucleus/CMakeLists.txt
rename to modules/worldengine/nucleus/src/CMakeLists.txt
index 948ea99d7..a7f3f81eb 100644
--- a/modules/worldengine/nucleus/CMakeLists.txt
+++ b/modules/worldengine/nucleus/src/CMakeLists.txt
@@ -56,10 +56,10 @@ set(shared_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/sockets/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/utf8cpp
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/sockets/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/utf8cpp
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Configuration
diff --git a/modules/worldengine/nucleus/Common.cpp b/modules/worldengine/nucleus/src/Common.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Common.cpp
rename to modules/worldengine/nucleus/src/Common.cpp
diff --git a/modules/worldengine/nucleus/Common.h b/modules/worldengine/nucleus/src/Common.h
similarity index 100%
rename from modules/worldengine/nucleus/Common.h
rename to modules/worldengine/nucleus/src/Common.h
diff --git a/modules/worldengine/nucleus/CompilerDefs.h b/modules/worldengine/nucleus/src/CompilerDefs.h
similarity index 100%
rename from modules/worldengine/nucleus/CompilerDefs.h
rename to modules/worldengine/nucleus/src/CompilerDefs.h
diff --git a/modules/worldengine/nucleus/Configuration/Config.cpp b/modules/worldengine/nucleus/src/Configuration/Config.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Configuration/Config.cpp
rename to modules/worldengine/nucleus/src/Configuration/Config.cpp
diff --git a/modules/worldengine/nucleus/Configuration/Config.h b/modules/worldengine/nucleus/src/Configuration/Config.h
similarity index 100%
rename from modules/worldengine/nucleus/Configuration/Config.h
rename to modules/worldengine/nucleus/src/Configuration/Config.h
diff --git a/modules/worldengine/nucleus/Containers.h b/modules/worldengine/nucleus/src/Containers.h
similarity index 100%
rename from modules/worldengine/nucleus/Containers.h
rename to modules/worldengine/nucleus/src/Containers.h
diff --git a/modules/worldengine/nucleus/Cryptography/ARC4.cpp b/modules/worldengine/nucleus/src/Cryptography/ARC4.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/ARC4.cpp
rename to modules/worldengine/nucleus/src/Cryptography/ARC4.cpp
diff --git a/modules/worldengine/nucleus/Cryptography/ARC4.h b/modules/worldengine/nucleus/src/Cryptography/ARC4.h
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/ARC4.h
rename to modules/worldengine/nucleus/src/Cryptography/ARC4.h
diff --git a/modules/worldengine/nucleus/Cryptography/Authentication/AuthCrypt.cpp b/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/Authentication/AuthCrypt.cpp
rename to modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.cpp
diff --git a/modules/worldengine/nucleus/Cryptography/Authentication/AuthCrypt.h b/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.h
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/Authentication/AuthCrypt.h
rename to modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.h
diff --git a/modules/worldengine/nucleus/Cryptography/BigNumber.cpp b/modules/worldengine/nucleus/src/Cryptography/BigNumber.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/BigNumber.cpp
rename to modules/worldengine/nucleus/src/Cryptography/BigNumber.cpp
diff --git a/modules/worldengine/nucleus/Cryptography/BigNumber.h b/modules/worldengine/nucleus/src/Cryptography/BigNumber.h
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/BigNumber.h
rename to modules/worldengine/nucleus/src/Cryptography/BigNumber.h
diff --git a/modules/worldengine/nucleus/Cryptography/HMACSHA1.cpp b/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/HMACSHA1.cpp
rename to modules/worldengine/nucleus/src/Cryptography/HMACSHA1.cpp
diff --git a/modules/worldengine/nucleus/Cryptography/HMACSHA1.h b/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.h
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/HMACSHA1.h
rename to modules/worldengine/nucleus/src/Cryptography/HMACSHA1.h
diff --git a/modules/worldengine/nucleus/Cryptography/OpenSSLCrypto.cpp b/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/OpenSSLCrypto.cpp
rename to modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.cpp
diff --git a/modules/worldengine/nucleus/Cryptography/OpenSSLCrypto.h b/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.h
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/OpenSSLCrypto.h
rename to modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.h
diff --git a/modules/worldengine/nucleus/Cryptography/SHA1.cpp b/modules/worldengine/nucleus/src/Cryptography/SHA1.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/SHA1.cpp
rename to modules/worldengine/nucleus/src/Cryptography/SHA1.cpp
diff --git a/modules/worldengine/nucleus/Cryptography/SHA1.h b/modules/worldengine/nucleus/src/Cryptography/SHA1.h
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/SHA1.h
rename to modules/worldengine/nucleus/src/Cryptography/SHA1.h
diff --git a/modules/worldengine/nucleus/Cryptography/WardenKeyGeneration.h b/modules/worldengine/nucleus/src/Cryptography/WardenKeyGeneration.h
similarity index 100%
rename from modules/worldengine/nucleus/Cryptography/WardenKeyGeneration.h
rename to modules/worldengine/nucleus/src/Cryptography/WardenKeyGeneration.h
diff --git a/modules/worldengine/nucleus/DataStores/DBCFileLoader.cpp b/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.cpp
similarity index 100%
rename from modules/worldengine/nucleus/DataStores/DBCFileLoader.cpp
rename to modules/worldengine/nucleus/src/DataStores/DBCFileLoader.cpp
diff --git a/modules/worldengine/nucleus/DataStores/DBCFileLoader.h b/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.h
similarity index 100%
rename from modules/worldengine/nucleus/DataStores/DBCFileLoader.h
rename to modules/worldengine/nucleus/src/DataStores/DBCFileLoader.h
diff --git a/modules/worldengine/nucleus/DataStores/DBCStore.h b/modules/worldengine/nucleus/src/DataStores/DBCStore.h
similarity index 100%
rename from modules/worldengine/nucleus/DataStores/DBCStore.h
rename to modules/worldengine/nucleus/src/DataStores/DBCStore.h
diff --git a/modules/worldengine/nucleus/Database/AdhocStatement.cpp b/modules/worldengine/nucleus/src/Database/AdhocStatement.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/AdhocStatement.cpp
rename to modules/worldengine/nucleus/src/Database/AdhocStatement.cpp
diff --git a/modules/worldengine/nucleus/Database/AdhocStatement.h b/modules/worldengine/nucleus/src/Database/AdhocStatement.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/AdhocStatement.h
rename to modules/worldengine/nucleus/src/Database/AdhocStatement.h
diff --git a/modules/worldengine/nucleus/Database/DatabaseEnv.h b/modules/worldengine/nucleus/src/Database/DatabaseEnv.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/DatabaseEnv.h
rename to modules/worldengine/nucleus/src/Database/DatabaseEnv.h
diff --git a/modules/worldengine/nucleus/Database/DatabaseWorker.cpp b/modules/worldengine/nucleus/src/Database/DatabaseWorker.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/DatabaseWorker.cpp
rename to modules/worldengine/nucleus/src/Database/DatabaseWorker.cpp
diff --git a/modules/worldengine/nucleus/Database/DatabaseWorker.h b/modules/worldengine/nucleus/src/Database/DatabaseWorker.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/DatabaseWorker.h
rename to modules/worldengine/nucleus/src/Database/DatabaseWorker.h
diff --git a/modules/worldengine/nucleus/Database/DatabaseWorkerPool.h b/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/DatabaseWorkerPool.h
rename to modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h
diff --git a/modules/worldengine/nucleus/Database/Field.cpp b/modules/worldengine/nucleus/src/Database/Field.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/Field.cpp
rename to modules/worldengine/nucleus/src/Database/Field.cpp
diff --git a/modules/worldengine/nucleus/Database/Field.h b/modules/worldengine/nucleus/src/Database/Field.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/Field.h
rename to modules/worldengine/nucleus/src/Database/Field.h
diff --git a/modules/worldengine/nucleus/Database/Implementation/CharacterDatabase.cpp b/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/Implementation/CharacterDatabase.cpp
rename to modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp
diff --git a/modules/worldengine/nucleus/Database/Implementation/CharacterDatabase.h b/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/Implementation/CharacterDatabase.h
rename to modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h
diff --git a/modules/worldengine/nucleus/Database/Implementation/LoginDatabase.cpp b/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/Implementation/LoginDatabase.cpp
rename to modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.cpp
diff --git a/modules/worldengine/nucleus/Database/Implementation/LoginDatabase.h b/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/Implementation/LoginDatabase.h
rename to modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.h
diff --git a/modules/worldengine/nucleus/Database/Implementation/WorldDatabase.cpp b/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/Implementation/WorldDatabase.cpp
rename to modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.cpp
diff --git a/modules/worldengine/nucleus/Database/Implementation/WorldDatabase.h b/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/Implementation/WorldDatabase.h
rename to modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.h
diff --git a/modules/worldengine/nucleus/Database/MySQLConnection.cpp b/modules/worldengine/nucleus/src/Database/MySQLConnection.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/MySQLConnection.cpp
rename to modules/worldengine/nucleus/src/Database/MySQLConnection.cpp
diff --git a/modules/worldengine/nucleus/Database/MySQLConnection.h b/modules/worldengine/nucleus/src/Database/MySQLConnection.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/MySQLConnection.h
rename to modules/worldengine/nucleus/src/Database/MySQLConnection.h
diff --git a/modules/worldengine/nucleus/Database/MySQLThreading.h b/modules/worldengine/nucleus/src/Database/MySQLThreading.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/MySQLThreading.h
rename to modules/worldengine/nucleus/src/Database/MySQLThreading.h
diff --git a/modules/worldengine/nucleus/Database/PreparedStatement.cpp b/modules/worldengine/nucleus/src/Database/PreparedStatement.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/PreparedStatement.cpp
rename to modules/worldengine/nucleus/src/Database/PreparedStatement.cpp
diff --git a/modules/worldengine/nucleus/Database/PreparedStatement.h b/modules/worldengine/nucleus/src/Database/PreparedStatement.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/PreparedStatement.h
rename to modules/worldengine/nucleus/src/Database/PreparedStatement.h
diff --git a/modules/worldengine/nucleus/Database/QueryHolder.cpp b/modules/worldengine/nucleus/src/Database/QueryHolder.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/QueryHolder.cpp
rename to modules/worldengine/nucleus/src/Database/QueryHolder.cpp
diff --git a/modules/worldengine/nucleus/Database/QueryHolder.h b/modules/worldengine/nucleus/src/Database/QueryHolder.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/QueryHolder.h
rename to modules/worldengine/nucleus/src/Database/QueryHolder.h
diff --git a/modules/worldengine/nucleus/Database/QueryResult.cpp b/modules/worldengine/nucleus/src/Database/QueryResult.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/QueryResult.cpp
rename to modules/worldengine/nucleus/src/Database/QueryResult.cpp
diff --git a/modules/worldengine/nucleus/Database/QueryResult.h b/modules/worldengine/nucleus/src/Database/QueryResult.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/QueryResult.h
rename to modules/worldengine/nucleus/src/Database/QueryResult.h
diff --git a/modules/worldengine/nucleus/Database/SQLOperation.h b/modules/worldengine/nucleus/src/Database/SQLOperation.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/SQLOperation.h
rename to modules/worldengine/nucleus/src/Database/SQLOperation.h
diff --git a/modules/worldengine/nucleus/Database/Transaction.cpp b/modules/worldengine/nucleus/src/Database/Transaction.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Database/Transaction.cpp
rename to modules/worldengine/nucleus/src/Database/Transaction.cpp
diff --git a/modules/worldengine/nucleus/Database/Transaction.h b/modules/worldengine/nucleus/src/Database/Transaction.h
similarity index 100%
rename from modules/worldengine/nucleus/Database/Transaction.h
rename to modules/worldengine/nucleus/src/Database/Transaction.h
diff --git a/modules/worldengine/nucleus/Debugging/Errors.cpp b/modules/worldengine/nucleus/src/Debugging/Errors.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Debugging/Errors.cpp
rename to modules/worldengine/nucleus/src/Debugging/Errors.cpp
diff --git a/modules/worldengine/nucleus/Debugging/Errors.h b/modules/worldengine/nucleus/src/Debugging/Errors.h
similarity index 100%
rename from modules/worldengine/nucleus/Debugging/Errors.h
rename to modules/worldengine/nucleus/src/Debugging/Errors.h
diff --git a/modules/worldengine/nucleus/Debugging/WheatyExceptionReport.cpp b/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Debugging/WheatyExceptionReport.cpp
rename to modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp
diff --git a/modules/worldengine/nucleus/Debugging/WheatyExceptionReport.h b/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h
similarity index 100%
rename from modules/worldengine/nucleus/Debugging/WheatyExceptionReport.h
rename to modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h
diff --git a/modules/worldengine/nucleus/Define.h b/modules/worldengine/nucleus/src/Define.h
similarity index 100%
rename from modules/worldengine/nucleus/Define.h
rename to modules/worldengine/nucleus/src/Define.h
diff --git a/modules/worldengine/nucleus/Dynamic/FactoryHolder.h b/modules/worldengine/nucleus/src/Dynamic/FactoryHolder.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/FactoryHolder.h
rename to modules/worldengine/nucleus/src/Dynamic/FactoryHolder.h
diff --git a/modules/worldengine/nucleus/Dynamic/HashNamespace.h b/modules/worldengine/nucleus/src/Dynamic/HashNamespace.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/HashNamespace.h
rename to modules/worldengine/nucleus/src/Dynamic/HashNamespace.h
diff --git a/modules/worldengine/nucleus/Dynamic/LinkedList.h b/modules/worldengine/nucleus/src/Dynamic/LinkedList.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/LinkedList.h
rename to modules/worldengine/nucleus/src/Dynamic/LinkedList.h
diff --git a/modules/worldengine/nucleus/Dynamic/LinkedReference/RefManager.h b/modules/worldengine/nucleus/src/Dynamic/LinkedReference/RefManager.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/LinkedReference/RefManager.h
rename to modules/worldengine/nucleus/src/Dynamic/LinkedReference/RefManager.h
diff --git a/modules/worldengine/nucleus/Dynamic/LinkedReference/Reference.h b/modules/worldengine/nucleus/src/Dynamic/LinkedReference/Reference.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/LinkedReference/Reference.h
rename to modules/worldengine/nucleus/src/Dynamic/LinkedReference/Reference.h
diff --git a/modules/worldengine/nucleus/Dynamic/ObjectRegistry.h b/modules/worldengine/nucleus/src/Dynamic/ObjectRegistry.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/ObjectRegistry.h
rename to modules/worldengine/nucleus/src/Dynamic/ObjectRegistry.h
diff --git a/modules/worldengine/nucleus/Dynamic/TypeContainer.h b/modules/worldengine/nucleus/src/Dynamic/TypeContainer.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/TypeContainer.h
rename to modules/worldengine/nucleus/src/Dynamic/TypeContainer.h
diff --git a/modules/worldengine/nucleus/Dynamic/TypeContainerFunctions.h b/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctions.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/TypeContainerFunctions.h
rename to modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctions.h
diff --git a/modules/worldengine/nucleus/Dynamic/TypeContainerFunctionsPtr.h b/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctionsPtr.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/TypeContainerFunctionsPtr.h
rename to modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctionsPtr.h
diff --git a/modules/worldengine/nucleus/Dynamic/TypeContainerVisitor.h b/modules/worldengine/nucleus/src/Dynamic/TypeContainerVisitor.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/TypeContainerVisitor.h
rename to modules/worldengine/nucleus/src/Dynamic/TypeContainerVisitor.h
diff --git a/modules/worldengine/nucleus/Dynamic/TypeList.h b/modules/worldengine/nucleus/src/Dynamic/TypeList.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/TypeList.h
rename to modules/worldengine/nucleus/src/Dynamic/TypeList.h
diff --git a/modules/worldengine/nucleus/Dynamic/UnorderedMap.h b/modules/worldengine/nucleus/src/Dynamic/UnorderedMap.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/UnorderedMap.h
rename to modules/worldengine/nucleus/src/Dynamic/UnorderedMap.h
diff --git a/modules/worldengine/nucleus/Dynamic/UnorderedSet.h b/modules/worldengine/nucleus/src/Dynamic/UnorderedSet.h
similarity index 100%
rename from modules/worldengine/nucleus/Dynamic/UnorderedSet.h
rename to modules/worldengine/nucleus/src/Dynamic/UnorderedSet.h
diff --git a/modules/worldengine/nucleus/Logging/Log.cpp b/modules/worldengine/nucleus/src/Logging/Log.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Logging/Log.cpp
rename to modules/worldengine/nucleus/src/Logging/Log.cpp
diff --git a/modules/worldengine/nucleus/Logging/Log.h b/modules/worldengine/nucleus/src/Logging/Log.h
similarity index 100%
rename from modules/worldengine/nucleus/Logging/Log.h
rename to modules/worldengine/nucleus/src/Logging/Log.h
diff --git a/modules/worldengine/nucleus/Packets/ByteBuffer.cpp b/modules/worldengine/nucleus/src/Packets/ByteBuffer.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Packets/ByteBuffer.cpp
rename to modules/worldengine/nucleus/src/Packets/ByteBuffer.cpp
diff --git a/modules/worldengine/nucleus/Packets/ByteBuffer.h b/modules/worldengine/nucleus/src/Packets/ByteBuffer.h
similarity index 100%
rename from modules/worldengine/nucleus/Packets/ByteBuffer.h
rename to modules/worldengine/nucleus/src/Packets/ByteBuffer.h
diff --git a/modules/worldengine/nucleus/Packets/WorldPacket.h b/modules/worldengine/nucleus/src/Packets/WorldPacket.h
similarity index 100%
rename from modules/worldengine/nucleus/Packets/WorldPacket.h
rename to modules/worldengine/nucleus/src/Packets/WorldPacket.h
diff --git a/modules/worldengine/nucleus/PrecompiledHeaders/sharedPCH.cpp b/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.cpp
similarity index 100%
rename from modules/worldengine/nucleus/PrecompiledHeaders/sharedPCH.cpp
rename to modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.cpp
diff --git a/modules/worldengine/nucleus/PrecompiledHeaders/sharedPCH.h b/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.h
similarity index 100%
rename from modules/worldengine/nucleus/PrecompiledHeaders/sharedPCH.h
rename to modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.h
diff --git a/modules/worldengine/nucleus/SystemConfig.h b/modules/worldengine/nucleus/src/SystemConfig.h
similarity index 100%
rename from modules/worldengine/nucleus/SystemConfig.h
rename to modules/worldengine/nucleus/src/SystemConfig.h
diff --git a/modules/worldengine/nucleus/Threading/Callback.h b/modules/worldengine/nucleus/src/Threading/Callback.h
similarity index 100%
rename from modules/worldengine/nucleus/Threading/Callback.h
rename to modules/worldengine/nucleus/src/Threading/Callback.h
diff --git a/modules/worldengine/nucleus/Threading/DelayExecutor.cpp b/modules/worldengine/nucleus/src/Threading/DelayExecutor.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Threading/DelayExecutor.cpp
rename to modules/worldengine/nucleus/src/Threading/DelayExecutor.cpp
diff --git a/modules/worldengine/nucleus/Threading/DelayExecutor.h b/modules/worldengine/nucleus/src/Threading/DelayExecutor.h
similarity index 100%
rename from modules/worldengine/nucleus/Threading/DelayExecutor.h
rename to modules/worldengine/nucleus/src/Threading/DelayExecutor.h
diff --git a/modules/worldengine/nucleus/Threading/LockedQueue.h b/modules/worldengine/nucleus/src/Threading/LockedQueue.h
similarity index 100%
rename from modules/worldengine/nucleus/Threading/LockedQueue.h
rename to modules/worldengine/nucleus/src/Threading/LockedQueue.h
diff --git a/modules/worldengine/nucleus/Threading/Threading.cpp b/modules/worldengine/nucleus/src/Threading/Threading.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Threading/Threading.cpp
rename to modules/worldengine/nucleus/src/Threading/Threading.cpp
diff --git a/modules/worldengine/nucleus/Threading/Threading.h b/modules/worldengine/nucleus/src/Threading/Threading.h
similarity index 100%
rename from modules/worldengine/nucleus/Threading/Threading.h
rename to modules/worldengine/nucleus/src/Threading/Threading.h
diff --git a/modules/worldengine/nucleus/Utilities/ByteConverter.h b/modules/worldengine/nucleus/src/Utilities/ByteConverter.h
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/ByteConverter.h
rename to modules/worldengine/nucleus/src/Utilities/ByteConverter.h
diff --git a/modules/worldengine/nucleus/Utilities/EventProcessor.cpp b/modules/worldengine/nucleus/src/Utilities/EventProcessor.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/EventProcessor.cpp
rename to modules/worldengine/nucleus/src/Utilities/EventProcessor.cpp
diff --git a/modules/worldengine/nucleus/Utilities/EventProcessor.h b/modules/worldengine/nucleus/src/Utilities/EventProcessor.h
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/EventProcessor.h
rename to modules/worldengine/nucleus/src/Utilities/EventProcessor.h
diff --git a/modules/worldengine/nucleus/Utilities/ServiceWin32.cpp b/modules/worldengine/nucleus/src/Utilities/ServiceWin32.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/ServiceWin32.cpp
rename to modules/worldengine/nucleus/src/Utilities/ServiceWin32.cpp
diff --git a/modules/worldengine/nucleus/Utilities/ServiceWin32.h b/modules/worldengine/nucleus/src/Utilities/ServiceWin32.h
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/ServiceWin32.h
rename to modules/worldengine/nucleus/src/Utilities/ServiceWin32.h
diff --git a/modules/worldengine/nucleus/Utilities/SignalHandler.h b/modules/worldengine/nucleus/src/Utilities/SignalHandler.h
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/SignalHandler.h
rename to modules/worldengine/nucleus/src/Utilities/SignalHandler.h
diff --git a/modules/worldengine/nucleus/Utilities/Timer.h b/modules/worldengine/nucleus/src/Utilities/Timer.h
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/Timer.h
rename to modules/worldengine/nucleus/src/Utilities/Timer.h
diff --git a/modules/worldengine/nucleus/Utilities/Util.cpp b/modules/worldengine/nucleus/src/Utilities/Util.cpp
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/Util.cpp
rename to modules/worldengine/nucleus/src/Utilities/Util.cpp
diff --git a/modules/worldengine/nucleus/Utilities/Util.h b/modules/worldengine/nucleus/src/Utilities/Util.h
similarity index 100%
rename from modules/worldengine/nucleus/Utilities/Util.h
rename to modules/worldengine/nucleus/src/Utilities/Util.h
diff --git a/modules/worldengine/nucleus/cmake/compiler/clang/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/compiler/clang/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
diff --git a/modules/worldengine/nucleus/cmake/compiler/gcc/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake
similarity index 90%
rename from modules/worldengine/nucleus/cmake/compiler/gcc/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake
index bd3437dac..c4597c507 100644
--- a/modules/worldengine/nucleus/cmake/compiler/gcc/settings.cmake
+++ b/modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake
@@ -4,7 +4,7 @@ add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 set(GCC_EXPECTED_VERSION 4.8.2)
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION)
-  message(FATAL_ERROR "GCC: AzerothCore requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}")
+  message(FATAL_ERROR "GCC: This project requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}")
 endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
diff --git a/modules/worldengine/nucleus/cmake/compiler/icc/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/icc/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/compiler/icc/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/compiler/icc/settings.cmake
diff --git a/modules/worldengine/nucleus/cmake/compiler/mingw/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/compiler/mingw/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake
diff --git a/modules/worldengine/nucleus/cmake/compiler/msvc/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/compiler/msvc/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake
diff --git a/modules/worldengine/nucleus/cmake/macros/CheckBuildDir.cmake b/modules/worldengine/nucleus/src/cmake/macros/CheckBuildDir.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/macros/CheckBuildDir.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/CheckBuildDir.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/CheckPlatform.cmake b/modules/worldengine/nucleus/src/cmake/macros/CheckPlatform.cmake
new file mode 100644
index 000000000..8c7513ff0
--- /dev/null
+++ b/modules/worldengine/nucleus/src/cmake/macros/CheckPlatform.cmake
@@ -0,0 +1,18 @@
+# check what platform we're on (64-bit or 32-bit), and create a simpler test than CMAKE_SIZEOF_VOID_P
+if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+    set(PLATFORM 64)
+    MESSAGE(STATUS "Detected 64-bit platform")
+else()
+    set(PLATFORM 32)
+    MESSAGE(STATUS "Detected 32-bit platform")
+endif()
+
+include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/settings.cmake")
+
+if(WIN32)
+  include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake")
+elseif(UNIX)
+  include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake")
+endif()
+
+include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake")
diff --git a/modules/worldengine/nucleus/cmake/macros/EnsureVersion.cmake b/modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/macros/EnsureVersion.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake
diff --git a/modules/worldengine/nucleus/cmake/macros/FindACE.cmake b/modules/worldengine/nucleus/src/cmake/macros/FindACE.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/macros/FindACE.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/FindACE.cmake
diff --git a/modules/worldengine/nucleus/cmake/macros/FindGit.cmake b/modules/worldengine/nucleus/src/cmake/macros/FindGit.cmake
similarity index 94%
rename from modules/worldengine/nucleus/cmake/macros/FindGit.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/FindGit.cmake
index 2672dd4b0..ca37cd7d6 100644
--- a/modules/worldengine/nucleus/cmake/macros/FindGit.cmake
+++ b/modules/worldengine/nucleus/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}/modules/acore/cmake/macros/EnsureVersion.cmake)
+include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake)
 
 set(_REQUIRED_GIT_VERSION "1.7")
 
diff --git a/modules/worldengine/nucleus/cmake/macros/FindMySQL.cmake b/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/macros/FindMySQL.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake
diff --git a/modules/worldengine/nucleus/cmake/macros/FindOpenSSL.cmake b/modules/worldengine/nucleus/src/cmake/macros/FindOpenSSL.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/macros/FindOpenSSL.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/FindOpenSSL.cmake
diff --git a/modules/worldengine/nucleus/cmake/macros/FindPCHSupport.cmake b/modules/worldengine/nucleus/src/cmake/macros/FindPCHSupport.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/macros/FindPCHSupport.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/FindPCHSupport.cmake
diff --git a/modules/worldengine/nucleus/cmake/macros/FindReadline.cmake b/modules/worldengine/nucleus/src/cmake/macros/FindReadline.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/macros/FindReadline.cmake
rename to modules/worldengine/nucleus/src/cmake/macros/FindReadline.cmake
diff --git a/modules/worldengine/nucleus/cmake/platform/after_platform.cmake b/modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/platform/after_platform.cmake
rename to modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake
diff --git a/modules/worldengine/nucleus/cmake/platform/cmake_uninstall.in.cmake b/modules/worldengine/nucleus/src/cmake/platform/cmake_uninstall.in.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/platform/cmake_uninstall.in.cmake
rename to modules/worldengine/nucleus/src/cmake/platform/cmake_uninstall.in.cmake
diff --git a/modules/worldengine/nucleus/cmake/platform/settings.cmake b/modules/worldengine/nucleus/src/cmake/platform/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/cmake/platform/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/platform/settings.cmake
diff --git a/modules/worldengine/nucleus/cmake/platform/unix/settings.cmake b/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake
similarity index 75%
rename from modules/worldengine/nucleus/cmake/platform/unix/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake
index f1a85e9ae..632df48fe 100644
--- a/modules/worldengine/nucleus/cmake/platform/unix/settings.cmake
+++ b/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake
@@ -20,7 +20,7 @@ endif()
 
 # configure uninstaller
 configure_file(
-  "${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/cmake_uninstall.in.cmake"
+  "${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/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}/modules/acore/cmake/compiler/gcc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "icc")
-  include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/icc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/icc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/clang/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake)
 else()
 add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 endif()
diff --git a/modules/worldengine/nucleus/cmake/platform/win/settings.cmake b/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake
similarity index 64%
rename from modules/worldengine/nucleus/cmake/platform/win/settings.cmake
rename to modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake
index ce10d6716..4f86580e9 100644
--- a/modules/worldengine/nucleus/cmake/platform/win/settings.cmake
+++ b/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake
@@ -2,13 +2,13 @@
 option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1)
 
 # Package overloads
-set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/acore/deps/acelite)
+set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite)
 set(ACE_LIBRARY "ace")
 set(BZIP2_LIBRARIES "bzip2")
 set(ZLIB_LIBRARIES "zlib")
 
 if( USE_MYSQL_SOURCES )
-  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/acore/deps/mysqllite/include)
+  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/mysqllite/include)
   set(MYSQL_LIBRARY "libmysql")
   set( MYSQL_FOUND 1 )
   message(STATUS "Using supplied MySQL sources")
@@ -26,7 +26,7 @@ endif()
 #endif()
 
 if ( MSVC )
-  include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/msvc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake)
 elseif ( MINGW )
-  include(${CMAKE_SOURCE_DIR}/modules/acore/cmake/compiler/mingw/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake)
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eceb54160..4d106ab3a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,8 +20,8 @@ add_subdirectory(genrev)
 
 if( SERVERS )
   set(sources_windows_Debugging
-    ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging/WheatyExceptionReport.cpp
-    ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging/WheatyExceptionReport.h
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp
+    ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h
   )
   add_subdirectory(game)
   add_subdirectory(authserver)
diff --git a/src/authserver/CMakeLists.txt b/src/authserver/CMakeLists.txt
index 476321a6f..4fa2f788e 100644
--- a/src/authserver/CMakeLists.txt
+++ b/src/authserver/CMakeLists.txt
@@ -43,15 +43,15 @@ endif()
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Authentication
   ${CMAKE_CURRENT_SOURCE_DIR}/Realms
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 094696c62..fbf1f3dd9 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -110,28 +110,28 @@ set(game_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Maps
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Maps
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Accounts
   ${CMAKE_CURRENT_SOURCE_DIR}/Achievements
diff --git a/src/game/Entities/Creature/CreatureGroups.cpp b/src/game/Entities/Creature/CreatureGroups.cpp
index 62494930a..e808e1228 100644
--- a/src/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/game/Entities/Creature/CreatureGroups.cpp
@@ -225,7 +225,7 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z, bool run)
         if (member->HasUnitState(UNIT_STATE_NOT_MOVE))
             continue;
 
-        // Xinef: this should be automatized, if turn angle is greater than PI/2 (90�) we should swap formation angle
+        // Xinef: this should be automatized, if turn angle is greater than PI/2 (90�) we should swap formation angle
         if (M_PI - fabs(fabs(m_leader->GetOrientation() - pathAngle) - M_PI) > M_PI*0.50f)
         {
             // pussywizard: in both cases should be 2*M_PI - follow_angle
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index ec347eea7..dd6504152 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -75,28 +75,28 @@ message("")
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/zlib
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
   ${CMAKE_SOURCE_DIR}/src/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/game/Achievements
   ${CMAKE_SOURCE_DIR}/src/game/Addons
@@ -113,7 +113,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/game/Chat
   ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels
   ${CMAKE_SOURCE_DIR}/src/game/Conditions
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
   ${CMAKE_SOURCE_DIR}/src/game/Combat
   ${CMAKE_SOURCE_DIR}/src/game/DataStores
   ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding
diff --git a/src/worldserver/CMakeLists.txt b/src/worldserver/CMakeLists.txt
index 7313c1c94..410a6cf4c 100644
--- a/src/worldserver/CMakeLists.txt
+++ b/src/worldserver/CMakeLists.txt
@@ -43,27 +43,27 @@ endif()
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/gsoap
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/sockets/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Management
-  ${CMAKE_SOURCE_DIR}/modules/acore/world-engine/collision/Models
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Configuration
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Cryptography/Authentication
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/DataStores
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Debugging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic/LinkedReference
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Dynamic
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Logging
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Packets
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Threading
-  ${CMAKE_SOURCE_DIR}/modules/acore/framework/Utilities
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/gsoap
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/sockets/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Management
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/Models
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
   ${CMAKE_SOURCE_DIR}/src/game
   ${CMAKE_SOURCE_DIR}/src/game/Accounts
   ${CMAKE_SOURCE_DIR}/src/game/Achievements