diff --git a/.gitignore b/.gitignore
index 57b2b70b0..cc03f1452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,15 +4,13 @@
 
 conf/*
 !conf/*.dist
+env/dist/*
+env/user/*
 modules/*
-
-!modules/drassil
-modules/drassil/joiner
-!modules/hw-core
-!modules/acore
-!modules/worldengine
-
 build*/
+var/*
+
+!.gitkeep
 
 #
 #Generic
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e8d620b4..32edeb345 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,13 +28,13 @@ 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/worldengine/nucleus/src/cmake/macros")
+set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/src/cmake/macros")
 
 include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
 
 # some utils for cmake
-include(modules/drassil/cmake-utils/utils.cmake)
+include(deps/drassil/cmake-utils/utils.cmake)
 
 include(src/cmake/ac_macros.cmake)
 
@@ -97,16 +97,14 @@ include(src/cmake/showoptions.cmake)
 # Loading framework
 #
 
-add_subdirectory(modules/worldengine/deps)
+add_subdirectory(deps)
 
 if( SERVERS OR TOOLS)
-  add_subdirectory(modules/worldengine/nucleus)
-  add_subdirectory(modules/worldengine/lib-collision)
-  add_subdirectory(modules/acore/game-framework)
+  add_subdirectory(src/common)
 endif()
 
 if( TOOLS )
-  add_subdirectory(modules/acore/extractors)
+  add_subdirectory(src/tools)
 endif()
 
 #
diff --git a/bin/bash_shared/defines.sh b/apps/bash_shared/defines.sh
similarity index 50%
rename from bin/bash_shared/defines.sh
rename to apps/bash_shared/defines.sh
index 512173a8b..8a3eb6e18 100644
--- a/bin/bash_shared/defines.sh
+++ b/apps/bash_shared/defines.sh
@@ -1,11 +1,13 @@
 unamestr=`uname`
 if [[ "$unamestr" == 'Darwin' ]]; then
-   AC_PATH_ROOT=$(greadlink -f "$AC_PATH_BIN/../")
+   AC_PATH_ROOT=$(greadlink -f "$AC_PATH_APPS/../")
 else
-   AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../")
+   AC_PATH_ROOT=$(readlink -f "$AC_PATH_APPS/../")
 fi
 
 AC_PATH_CONF="$AC_PATH_ROOT/conf"
 
 AC_PATH_MODULES="$AC_PATH_ROOT/modules"
 
+AC_PATH_DEPS="$AC_PATH_ROOT/deps"
+
diff --git a/bin/bash_shared/includes.sh b/apps/bash_shared/includes.sh
similarity index 80%
rename from bin/bash_shared/includes.sh
rename to apps/bash_shared/includes.sh
index 8dd3c9821..d90b4b451 100644
--- a/bin/bash_shared/includes.sh
+++ b/apps/bash_shared/includes.sh
@@ -3,13 +3,13 @@
 # force default language for applications
 LC_ALL=C 
 
-AC_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
+AC_PATH_APPS="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
 
-AC_PATH_SHARED="$AC_PATH_BIN/bash_shared"
+AC_PATH_SHARED="$AC_PATH_APPS/bash_shared"
 
 source "$AC_PATH_SHARED/defines.sh"
 
-source "$AC_PATH_MODULES/hw-core/bash-lib-event/src/hooks.sh"
+source "$AC_PATH_DEPS/hw-core/bash-lib-event/src/hooks.sh"
 
 
 function registerHooks() { hwc_event_register_hooks "$@"; }
diff --git a/bin/compiler/.gitignore b/apps/compiler/.gitignore
similarity index 100%
rename from bin/compiler/.gitignore
rename to apps/compiler/.gitignore
diff --git a/bin/compiler/1-clean.sh b/apps/compiler/1-clean.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bin/compiler/1-clean.sh
rename to apps/compiler/1-clean.sh
diff --git a/bin/compiler/2-configure.sh b/apps/compiler/2-configure.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bin/compiler/2-configure.sh
rename to apps/compiler/2-configure.sh
diff --git a/bin/compiler/3-build.sh b/apps/compiler/3-build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bin/compiler/3-build.sh
rename to apps/compiler/3-build.sh
diff --git a/bin/compiler/README.md b/apps/compiler/README.md
similarity index 100%
rename from bin/compiler/README.md
rename to apps/compiler/README.md
diff --git a/bin/compiler/compiler.sh b/apps/compiler/compiler.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bin/compiler/compiler.sh
rename to apps/compiler/compiler.sh
diff --git a/bin/compiler/includes/defines.sh b/apps/compiler/includes/defines.sh
similarity index 100%
rename from bin/compiler/includes/defines.sh
rename to apps/compiler/includes/defines.sh
diff --git a/bin/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh
similarity index 100%
rename from bin/compiler/includes/functions.sh
rename to apps/compiler/includes/functions.sh
diff --git a/bin/compiler/includes/includes.sh b/apps/compiler/includes/includes.sh
similarity index 81%
rename from bin/compiler/includes/includes.sh
rename to apps/compiler/includes/includes.sh
index ffde93a73..c425160dc 100644
--- a/bin/compiler/includes/includes.sh
+++ b/apps/compiler/includes/includes.sh
@@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/../../bash_shared/includes.sh"
 
-AC_PATH_COMPILER="$AC_PATH_BIN/compiler"
+AC_PATH_COMPILER="$AC_PATH_APPS/compiler"
 
 if [ -f "$AC_PATH_COMPILER/config.sh"  ]; then
     source "$AC_PATH_COMPILER/config.sh" # should overwrite previous
@@ -10,7 +10,7 @@ fi
 
 function ac_on_after_build() {
     # move the run engine
-    cp -rvf "$AC_PATH_MODULES/acore/startup-scripts/"* "$BINPATH"
+    cp -rvf "$AC_PATH_APPS/startup-scripts/"* "$BINPATH"
 }
 
 registerHooks "ON_AFTER_BUILD" ac_on_after_build
diff --git a/bin/db_assembler/.gitignore b/apps/db_assembler/.gitignore
similarity index 100%
rename from bin/db_assembler/.gitignore
rename to apps/db_assembler/.gitignore
diff --git a/bin/db_assembler/README.md b/apps/db_assembler/README.md
similarity index 100%
rename from bin/db_assembler/README.md
rename to apps/db_assembler/README.md
diff --git a/bin/db_assembler/db_assembler.sh b/apps/db_assembler/db_assembler.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bin/db_assembler/db_assembler.sh
rename to apps/db_assembler/db_assembler.sh
diff --git a/bin/db_assembler/includes/functions.sh b/apps/db_assembler/includes/functions.sh
similarity index 100%
rename from bin/db_assembler/includes/functions.sh
rename to apps/db_assembler/includes/functions.sh
diff --git a/bin/db_assembler/includes/includes.sh b/apps/db_assembler/includes/includes.sh
similarity index 85%
rename from bin/db_assembler/includes/includes.sh
rename to apps/db_assembler/includes/includes.sh
index b4ac55515..50bb57535 100644
--- a/bin/db_assembler/includes/includes.sh
+++ b/apps/db_assembler/includes/includes.sh
@@ -2,7 +2,7 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/../../bash_shared/includes.sh"
 
-AC_PATH_DBASSEMBLER="$AC_PATH_BIN/db_assembler"
+AC_PATH_DBASSEMBLER="$AC_PATH_APPS/db_assembler"
 
 if [ -f "$AC_PATH_DBASSEMBLER/config.sh"  ]; then
     source "$AC_PATH_DBASSEMBLER/config.sh" # should overwrite previous
diff --git a/bin/db_exporter/.gitignore b/apps/db_exporter/.gitignore
similarity index 100%
rename from bin/db_exporter/.gitignore
rename to apps/db_exporter/.gitignore
diff --git a/bin/db_exporter/README.md b/apps/db_exporter/README.md
similarity index 100%
rename from bin/db_exporter/README.md
rename to apps/db_exporter/README.md
diff --git a/bin/db_exporter/db_export.sh b/apps/db_exporter/db_export.sh
old mode 100755
new mode 100644
similarity index 95%
rename from bin/db_exporter/db_export.sh
rename to apps/db_exporter/db_export.sh
index dc321f90a..c7dff778d
--- a/bin/db_exporter/db_export.sh
+++ b/apps/db_exporter/db_export.sh
@@ -2,7 +2,7 @@
 
 ROOTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../" && pwd )"
 
-source $ROOTPATH"/bin/bash_shared/includes.sh"
+source $ROOTPATH"/apps/bash_shared/includes.sh"
 
 if [ -f "./config.sh"  ]; then
     source "./config.sh" # should overwrite previous
diff --git a/bin/db_pendings/import.sh b/apps/db_pendings/import.sh
old mode 100755
new mode 100644
similarity index 100%
rename from bin/db_pendings/import.sh
rename to apps/db_pendings/import.sh
diff --git a/bin/installer/includes/functions.sh b/apps/installer/includes/functions.sh
similarity index 100%
rename from bin/installer/includes/functions.sh
rename to apps/installer/includes/functions.sh
diff --git a/bin/installer/includes/includes.sh b/apps/installer/includes/includes.sh
similarity index 65%
rename from bin/installer/includes/includes.sh
rename to apps/installer/includes/includes.sh
index fdede154f..16ba79579 100644
--- a/bin/installer/includes/includes.sh
+++ b/apps/installer/includes/includes.sh
@@ -2,13 +2,13 @@ CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_PATH/../../bash_shared/includes.sh"
 
-AC_PATH_INSTALLER="$AC_PATH_BIN/installer"
+AC_PATH_INSTALLER="$AC_PATH_APPS/installer"
 
 if [ -f "$AC_PATH_INSTALLER/config.sh"  ]; then
     source "$AC_PATH_INSTALLER/config.sh" # should overwrite previous
 fi
 
-source "$AC_PATH_BIN/compiler/includes/includes.sh"
-source "$AC_PATH_BIN/db_assembler/includes/includes.sh"
+source "$AC_PATH_APPS/compiler/includes/includes.sh"
+source "$AC_PATH_APPS/db_assembler/includes/includes.sh"
 
 source "$AC_PATH_INSTALLER/includes/functions.sh"
diff --git a/bin/installer/includes/os_configs/debian.sh b/apps/installer/includes/os_configs/debian.sh
similarity index 100%
rename from bin/installer/includes/os_configs/debian.sh
rename to apps/installer/includes/os_configs/debian.sh
diff --git a/bin/installer/includes/os_configs/osx.sh b/apps/installer/includes/os_configs/osx.sh
similarity index 100%
rename from bin/installer/includes/os_configs/osx.sh
rename to apps/installer/includes/os_configs/osx.sh
diff --git a/bin/installer/includes/os_configs/ubuntu.sh b/apps/installer/includes/os_configs/ubuntu.sh
similarity index 100%
rename from bin/installer/includes/os_configs/ubuntu.sh
rename to apps/installer/includes/os_configs/ubuntu.sh
diff --git a/bin/installer/includes/os_configs/windows.sh b/apps/installer/includes/os_configs/windows.sh
similarity index 100%
rename from bin/installer/includes/os_configs/windows.sh
rename to apps/installer/includes/os_configs/windows.sh
diff --git a/bin/installer/main.sh b/apps/installer/main.sh
similarity index 93%
rename from bin/installer/main.sh
rename to apps/installer/main.sh
index a71bca199..7123117a4 100644
--- a/bin/installer/main.sh
+++ b/apps/installer/main.sh
@@ -53,10 +53,10 @@ function _switch() {
             inst_module_remove $2
             ;;
         "Sub Menu >> Compiler")
-            bash "$AC_PATH_BIN/compiler/compiler.sh"
+            bash "$AC_PATH_APPS/compiler/compiler.sh"
             ;;
         "Sub Menu >> DB Assembler")
-            bash "$AC_PATH_BIN/db_assembler/db_assembler.sh"
+            bash "$AC_PATH_APPS/db_assembler/db_assembler.sh"
             ;;
         "Quit")
             echo "Goodbye!"
diff --git a/modules/acore/startup-scripts/conf.sh.dist b/apps/startup-scripts/conf.sh.dist
similarity index 100%
rename from modules/acore/startup-scripts/conf.sh.dist
rename to apps/startup-scripts/conf.sh.dist
diff --git a/modules/acore/startup-scripts/examples/restarter-auth.sh b/apps/startup-scripts/examples/restarter-auth.sh
similarity index 100%
rename from modules/acore/startup-scripts/examples/restarter-auth.sh
rename to apps/startup-scripts/examples/restarter-auth.sh
diff --git a/modules/acore/startup-scripts/examples/restarter-world.sh b/apps/startup-scripts/examples/restarter-world.sh
similarity index 100%
rename from modules/acore/startup-scripts/examples/restarter-world.sh
rename to apps/startup-scripts/examples/restarter-world.sh
diff --git a/modules/acore/startup-scripts/examples/starter-auth.sh b/apps/startup-scripts/examples/starter-auth.sh
similarity index 100%
rename from modules/acore/startup-scripts/examples/starter-auth.sh
rename to apps/startup-scripts/examples/starter-auth.sh
diff --git a/modules/acore/startup-scripts/examples/starter-world.sh b/apps/startup-scripts/examples/starter-world.sh
similarity index 100%
rename from modules/acore/startup-scripts/examples/starter-world.sh
rename to apps/startup-scripts/examples/starter-world.sh
diff --git a/modules/acore/startup-scripts/run-engine b/apps/startup-scripts/run-engine
similarity index 100%
rename from modules/acore/startup-scripts/run-engine
rename to apps/startup-scripts/run-engine
diff --git a/modules/acore/startup-scripts/starter b/apps/startup-scripts/starter
old mode 100755
new mode 100644
similarity index 100%
rename from modules/acore/startup-scripts/starter
rename to apps/startup-scripts/starter
diff --git a/bin/acore b/bin/acore
new file mode 100755
index 000000000..a9c10efb2
--- /dev/null
+++ b/bin/acore
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source ./acore-installer
\ No newline at end of file
diff --git a/bin/acore-compiler b/bin/acore-compiler
new file mode 100755
index 000000000..aa356deed
--- /dev/null
+++ b/bin/acore-compiler
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/compiler/compiler.sh
\ No newline at end of file
diff --git a/bin/acore-db-asm b/bin/acore-db-asm
new file mode 100755
index 000000000..7cc11c8ef
--- /dev/null
+++ b/bin/acore-db-asm
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/db_assembler/db_assembler.sh
\ No newline at end of file
diff --git a/bin/acore-db-export b/bin/acore-db-export
new file mode 100755
index 000000000..9a1f15458
--- /dev/null
+++ b/bin/acore-db-export
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/db_exporter/db_exporter.sh
\ No newline at end of file
diff --git a/bin/acore-db-pendings b/bin/acore-db-pendings
new file mode 100755
index 000000000..569d161c6
--- /dev/null
+++ b/bin/acore-db-pendings
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/db_pendings/import.sh
\ No newline at end of file
diff --git a/bin/acore-installer b/bin/acore-installer
new file mode 100755
index 000000000..c61d00458
--- /dev/null
+++ b/bin/acore-installer
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash ../apps/installer/main.sh
\ No newline at end of file
diff --git a/conf/config.sh.dist b/conf/config.sh.dist
index 5aeff93df..96bde9836 100644
--- a/conf/config.sh.dist
+++ b/conf/config.sh.dist
@@ -2,13 +2,13 @@
 SRCPATH="$AC_PATH_ROOT"
 
 # absolute path where build files must be stored
-BUILDPATH="$AC_PATH_ROOT/build/obj"
+BUILDPATH="$AC_PATH_ROOT/var/build/obj"
 
 # absolute path where binary files must be stored
-BINPATH="$AC_PATH_ROOT/build/dist"
+BINPATH="$AC_PATH_ROOT/env/dist"
 
 # absolute path where config. files must be stored
-CONFDIR="$AC_PATH_ROOT/build/dist/etc/"
+CONFDIR="$AC_PATH_ROOT/env/dist/etc/"
 
 ##############################################
 #
@@ -71,7 +71,7 @@ DATABASES=(
 	"WORLD"
 )
 
-OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/"
+OUTPUT_FOLDER="$AC_PATH_ROOT/env/dist/sql/"
 
 #
 # Enable following flag 
@@ -80,7 +80,7 @@ OUTPUT_FOLDER="$AC_PATH_ROOT/bin/db_assembler/output/"
 #
 BACKUP_ENABLE=true
 
-BACKUP_FOLDER="$AC_PATH_ROOT/bin/db_assembler/backup/"
+BACKUP_FOLDER="$AC_PATH_ROOT/env/dist/sql/backup/"
 
 # FULL DB
 DB_CHARACTERS_PATHS=(
diff --git a/modules/worldengine/deps/.gitignore b/deps/.gitignore
similarity index 100%
rename from modules/worldengine/deps/.gitignore
rename to deps/.gitignore
diff --git a/modules/worldengine/deps/CMakeLists.txt b/deps/CMakeLists.txt
similarity index 100%
rename from modules/worldengine/deps/CMakeLists.txt
rename to deps/CMakeLists.txt
diff --git a/modules/worldengine/deps/PackageList.txt b/deps/PackageList.txt
similarity index 100%
rename from modules/worldengine/deps/PackageList.txt
rename to deps/PackageList.txt
diff --git a/modules/worldengine/deps/SFMT/SFMT.h b/deps/SFMT/SFMT.h
similarity index 100%
rename from modules/worldengine/deps/SFMT/SFMT.h
rename to deps/SFMT/SFMT.h
diff --git a/modules/worldengine/deps/SFMT/randomc.h b/deps/SFMT/randomc.h
similarity index 100%
rename from modules/worldengine/deps/SFMT/randomc.h
rename to deps/SFMT/randomc.h
diff --git a/modules/worldengine/deps/acelite/AUTHORS b/deps/acelite/AUTHORS
similarity index 100%
rename from modules/worldengine/deps/acelite/AUTHORS
rename to deps/acelite/AUTHORS
diff --git a/modules/worldengine/deps/acelite/CMakeLists.txt b/deps/acelite/CMakeLists.txt
similarity index 100%
rename from modules/worldengine/deps/acelite/CMakeLists.txt
rename to deps/acelite/CMakeLists.txt
diff --git a/modules/worldengine/deps/acelite/COPYING b/deps/acelite/COPYING
similarity index 100%
rename from modules/worldengine/deps/acelite/COPYING
rename to deps/acelite/COPYING
diff --git a/modules/worldengine/deps/acelite/NEWS b/deps/acelite/NEWS
similarity index 100%
rename from modules/worldengine/deps/acelite/NEWS
rename to deps/acelite/NEWS
diff --git a/modules/worldengine/deps/acelite/README b/deps/acelite/README
similarity index 100%
rename from modules/worldengine/deps/acelite/README
rename to deps/acelite/README
diff --git a/modules/worldengine/deps/acelite/THANKS b/deps/acelite/THANKS
similarity index 100%
rename from modules/worldengine/deps/acelite/THANKS
rename to deps/acelite/THANKS
diff --git a/modules/worldengine/deps/acelite/VERSION b/deps/acelite/VERSION
similarity index 100%
rename from modules/worldengine/deps/acelite/VERSION
rename to deps/acelite/VERSION
diff --git a/modules/worldengine/deps/acelite/ace/ACE.cpp b/deps/acelite/ace/ACE.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ACE.cpp
rename to deps/acelite/ace/ACE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ACE.h b/deps/acelite/ace/ACE.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ACE.h
rename to deps/acelite/ace/ACE.h
diff --git a/modules/worldengine/deps/acelite/ace/ACE.inl b/deps/acelite/ace/ACE.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ACE.inl
rename to deps/acelite/ace/ACE.inl
diff --git a/modules/worldengine/deps/acelite/ace/ACE.pc.in b/deps/acelite/ace/ACE.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ACE.pc.in
rename to deps/acelite/ace/ACE.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/ACE_crc32.cpp b/deps/acelite/ace/ACE_crc32.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ACE_crc32.cpp
rename to deps/acelite/ace/ACE_crc32.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ACE_crc_ccitt.cpp b/deps/acelite/ace/ACE_crc_ccitt.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ACE_crc_ccitt.cpp
rename to deps/acelite/ace/ACE_crc_ccitt.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ACE_export.h b/deps/acelite/ace/ACE_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ACE_export.h
rename to deps/acelite/ace/ACE_export.h
diff --git a/modules/worldengine/deps/acelite/ace/ARGV.cpp b/deps/acelite/ace/ARGV.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ARGV.cpp
rename to deps/acelite/ace/ARGV.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ARGV.h b/deps/acelite/ace/ARGV.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ARGV.h
rename to deps/acelite/ace/ARGV.h
diff --git a/modules/worldengine/deps/acelite/ace/ARGV.inl b/deps/acelite/ace/ARGV.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ARGV.inl
rename to deps/acelite/ace/ARGV.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.cpp b/deps/acelite/ace/ATM_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Acceptor.cpp
rename to deps/acelite/ace/ATM_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.h b/deps/acelite/ace/ATM_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Acceptor.h
rename to deps/acelite/ace/ATM_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.inl b/deps/acelite/ace/ATM_Acceptor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Acceptor.inl
rename to deps/acelite/ace/ATM_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Addr.cpp b/deps/acelite/ace/ATM_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Addr.cpp
rename to deps/acelite/ace/ATM_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Addr.h b/deps/acelite/ace/ATM_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Addr.h
rename to deps/acelite/ace/ATM_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Addr.inl b/deps/acelite/ace/ATM_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Addr.inl
rename to deps/acelite/ace/ATM_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Connector.cpp b/deps/acelite/ace/ATM_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Connector.cpp
rename to deps/acelite/ace/ATM_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Connector.h b/deps/acelite/ace/ATM_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Connector.h
rename to deps/acelite/ace/ATM_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Connector.inl b/deps/acelite/ace/ATM_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Connector.inl
rename to deps/acelite/ace/ATM_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Params.cpp b/deps/acelite/ace/ATM_Params.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Params.cpp
rename to deps/acelite/ace/ATM_Params.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Params.h b/deps/acelite/ace/ATM_Params.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Params.h
rename to deps/acelite/ace/ATM_Params.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Params.inl b/deps/acelite/ace/ATM_Params.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Params.inl
rename to deps/acelite/ace/ATM_Params.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_QoS.cpp b/deps/acelite/ace/ATM_QoS.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_QoS.cpp
rename to deps/acelite/ace/ATM_QoS.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_QoS.h b/deps/acelite/ace/ATM_QoS.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_QoS.h
rename to deps/acelite/ace/ATM_QoS.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_QoS.inl b/deps/acelite/ace/ATM_QoS.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_QoS.inl
rename to deps/acelite/ace/ATM_QoS.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Stream.cpp b/deps/acelite/ace/ATM_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Stream.cpp
rename to deps/acelite/ace/ATM_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Stream.h b/deps/acelite/ace/ATM_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Stream.h
rename to deps/acelite/ace/ATM_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Stream.inl b/deps/acelite/ace/ATM_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ATM_Stream.inl
rename to deps/acelite/ace/ATM_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/Abstract_Timer_Queue.cpp b/deps/acelite/ace/Abstract_Timer_Queue.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Abstract_Timer_Queue.cpp
rename to deps/acelite/ace/Abstract_Timer_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Abstract_Timer_Queue.h b/deps/acelite/ace/Abstract_Timer_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Abstract_Timer_Queue.h
rename to deps/acelite/ace/Abstract_Timer_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Acceptor.cpp b/deps/acelite/ace/Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Acceptor.cpp
rename to deps/acelite/ace/Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Acceptor.h b/deps/acelite/ace/Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Acceptor.h
rename to deps/acelite/ace/Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/Activation_Queue.cpp b/deps/acelite/ace/Activation_Queue.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Activation_Queue.cpp
rename to deps/acelite/ace/Activation_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Activation_Queue.h b/deps/acelite/ace/Activation_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Activation_Queue.h
rename to deps/acelite/ace/Activation_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Activation_Queue.inl b/deps/acelite/ace/Activation_Queue.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Activation_Queue.inl
rename to deps/acelite/ace/Activation_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/Active_Map_Manager.cpp b/deps/acelite/ace/Active_Map_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Active_Map_Manager.cpp
rename to deps/acelite/ace/Active_Map_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Active_Map_Manager.h b/deps/acelite/ace/Active_Map_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Active_Map_Manager.h
rename to deps/acelite/ace/Active_Map_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Active_Map_Manager.inl b/deps/acelite/ace/Active_Map_Manager.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Active_Map_Manager.inl
rename to deps/acelite/ace/Active_Map_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.cpp b/deps/acelite/ace/Active_Map_Manager_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.cpp
rename to deps/acelite/ace/Active_Map_Manager_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.h b/deps/acelite/ace/Active_Map_Manager_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.h
rename to deps/acelite/ace/Active_Map_Manager_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.inl b/deps/acelite/ace/Active_Map_Manager_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.inl
rename to deps/acelite/ace/Active_Map_Manager_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Addr.cpp b/deps/acelite/ace/Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Addr.cpp
rename to deps/acelite/ace/Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Addr.h b/deps/acelite/ace/Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Addr.h
rename to deps/acelite/ace/Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/Addr.inl b/deps/acelite/ace/Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Addr.inl
rename to deps/acelite/ace/Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Arg_Shifter.cpp b/deps/acelite/ace/Arg_Shifter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Arg_Shifter.cpp
rename to deps/acelite/ace/Arg_Shifter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Arg_Shifter.h b/deps/acelite/ace/Arg_Shifter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Arg_Shifter.h
rename to deps/acelite/ace/Arg_Shifter.h
diff --git a/modules/worldengine/deps/acelite/ace/Argv_Type_Converter.cpp b/deps/acelite/ace/Argv_Type_Converter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Argv_Type_Converter.cpp
rename to deps/acelite/ace/Argv_Type_Converter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Argv_Type_Converter.h b/deps/acelite/ace/Argv_Type_Converter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Argv_Type_Converter.h
rename to deps/acelite/ace/Argv_Type_Converter.h
diff --git a/modules/worldengine/deps/acelite/ace/Argv_Type_Converter.inl b/deps/acelite/ace/Argv_Type_Converter.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Argv_Type_Converter.inl
rename to deps/acelite/ace/Argv_Type_Converter.inl
diff --git a/modules/worldengine/deps/acelite/ace/Array_Base.cpp b/deps/acelite/ace/Array_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Array_Base.cpp
rename to deps/acelite/ace/Array_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Array_Base.h b/deps/acelite/ace/Array_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Array_Base.h
rename to deps/acelite/ace/Array_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Array_Base.inl b/deps/acelite/ace/Array_Base.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Array_Base.inl
rename to deps/acelite/ace/Array_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/Array_Map.cpp b/deps/acelite/ace/Array_Map.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Array_Map.cpp
rename to deps/acelite/ace/Array_Map.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Array_Map.h b/deps/acelite/ace/Array_Map.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Array_Map.h
rename to deps/acelite/ace/Array_Map.h
diff --git a/modules/worldengine/deps/acelite/ace/Array_Map.inl b/deps/acelite/ace/Array_Map.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Array_Map.inl
rename to deps/acelite/ace/Array_Map.inl
diff --git a/modules/worldengine/deps/acelite/ace/Assert.cpp b/deps/acelite/ace/Assert.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Assert.cpp
rename to deps/acelite/ace/Assert.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Assert.h b/deps/acelite/ace/Assert.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Assert.h
rename to deps/acelite/ace/Assert.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Acceptor.cpp b/deps/acelite/ace/Asynch_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_Acceptor.cpp
rename to deps/acelite/ace/Asynch_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Acceptor.h b/deps/acelite/ace/Asynch_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_Acceptor.h
rename to deps/acelite/ace/Asynch_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Connector.cpp b/deps/acelite/ace/Asynch_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_Connector.cpp
rename to deps/acelite/ace/Asynch_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Connector.h b/deps/acelite/ace/Asynch_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_Connector.h
rename to deps/acelite/ace/Asynch_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_IO.cpp b/deps/acelite/ace/Asynch_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_IO.cpp
rename to deps/acelite/ace/Asynch_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_IO.h b/deps/acelite/ace/Asynch_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_IO.h
rename to deps/acelite/ace/Asynch_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.cpp b/deps/acelite/ace/Asynch_IO_Impl.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.cpp
rename to deps/acelite/ace/Asynch_IO_Impl.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.h b/deps/acelite/ace/Asynch_IO_Impl.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.h
rename to deps/acelite/ace/Asynch_IO_Impl.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.inl b/deps/acelite/ace/Asynch_IO_Impl.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.inl
rename to deps/acelite/ace/Asynch_IO_Impl.inl
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Pseudo_Task.cpp b/deps/acelite/ace/Asynch_Pseudo_Task.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_Pseudo_Task.cpp
rename to deps/acelite/ace/Asynch_Pseudo_Task.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Pseudo_Task.h b/deps/acelite/ace/Asynch_Pseudo_Task.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Asynch_Pseudo_Task.h
rename to deps/acelite/ace/Asynch_Pseudo_Task.h
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op.cpp b/deps/acelite/ace/Atomic_Op.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op.cpp
rename to deps/acelite/ace/Atomic_Op.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op.h b/deps/acelite/ace/Atomic_Op.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op.h
rename to deps/acelite/ace/Atomic_Op.h
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op.inl b/deps/acelite/ace/Atomic_Op.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op.inl
rename to deps/acelite/ace/Atomic_Op.inl
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.cpp b/deps/acelite/ace/Atomic_Op_GCC_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.cpp
rename to deps/acelite/ace/Atomic_Op_GCC_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.h b/deps/acelite/ace/Atomic_Op_GCC_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.h
rename to deps/acelite/ace/Atomic_Op_GCC_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.inl b/deps/acelite/ace/Atomic_Op_GCC_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.inl
rename to deps/acelite/ace/Atomic_Op_GCC_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_Sparc.c b/deps/acelite/ace/Atomic_Op_Sparc.c
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_Sparc.c
rename to deps/acelite/ace/Atomic_Op_Sparc.c
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_Sparc.h b/deps/acelite/ace/Atomic_Op_Sparc.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_Sparc.h
rename to deps/acelite/ace/Atomic_Op_Sparc.h
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_T.cpp b/deps/acelite/ace/Atomic_Op_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_T.cpp
rename to deps/acelite/ace/Atomic_Op_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_T.h b/deps/acelite/ace/Atomic_Op_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_T.h
rename to deps/acelite/ace/Atomic_Op_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op_T.inl b/deps/acelite/ace/Atomic_Op_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Atomic_Op_T.inl
rename to deps/acelite/ace/Atomic_Op_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Event.cpp b/deps/acelite/ace/Auto_Event.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Event.cpp
rename to deps/acelite/ace/Auto_Event.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Event.h b/deps/acelite/ace/Auto_Event.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Event.h
rename to deps/acelite/ace/Auto_Event.h
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Event.inl b/deps/acelite/ace/Auto_Event.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Event.inl
rename to deps/acelite/ace/Auto_Event.inl
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Functor.cpp b/deps/acelite/ace/Auto_Functor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Functor.cpp
rename to deps/acelite/ace/Auto_Functor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Functor.h b/deps/acelite/ace/Auto_Functor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Functor.h
rename to deps/acelite/ace/Auto_Functor.h
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Functor.inl b/deps/acelite/ace/Auto_Functor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Functor.inl
rename to deps/acelite/ace/Auto_Functor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Auto_IncDec_T.cpp b/deps/acelite/ace/Auto_IncDec_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_IncDec_T.cpp
rename to deps/acelite/ace/Auto_IncDec_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Auto_IncDec_T.h b/deps/acelite/ace/Auto_IncDec_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_IncDec_T.h
rename to deps/acelite/ace/Auto_IncDec_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Auto_IncDec_T.inl b/deps/acelite/ace/Auto_IncDec_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_IncDec_T.inl
rename to deps/acelite/ace/Auto_IncDec_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Ptr.cpp b/deps/acelite/ace/Auto_Ptr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Ptr.cpp
rename to deps/acelite/ace/Auto_Ptr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Ptr.h b/deps/acelite/ace/Auto_Ptr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Ptr.h
rename to deps/acelite/ace/Auto_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Ptr.inl b/deps/acelite/ace/Auto_Ptr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Auto_Ptr.inl
rename to deps/acelite/ace/Auto_Ptr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Barrier.cpp b/deps/acelite/ace/Barrier.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Barrier.cpp
rename to deps/acelite/ace/Barrier.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Barrier.h b/deps/acelite/ace/Barrier.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Barrier.h
rename to deps/acelite/ace/Barrier.h
diff --git a/modules/worldengine/deps/acelite/ace/Barrier.inl b/deps/acelite/ace/Barrier.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Barrier.inl
rename to deps/acelite/ace/Barrier.inl
diff --git a/modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.cpp b/deps/acelite/ace/Base_Thread_Adapter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.cpp
rename to deps/acelite/ace/Base_Thread_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.h b/deps/acelite/ace/Base_Thread_Adapter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.h
rename to deps/acelite/ace/Base_Thread_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.inl b/deps/acelite/ace/Base_Thread_Adapter.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.inl
rename to deps/acelite/ace/Base_Thread_Adapter.inl
diff --git a/modules/worldengine/deps/acelite/ace/Based_Pointer_Repository.cpp b/deps/acelite/ace/Based_Pointer_Repository.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Based_Pointer_Repository.cpp
rename to deps/acelite/ace/Based_Pointer_Repository.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Based_Pointer_Repository.h b/deps/acelite/ace/Based_Pointer_Repository.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Based_Pointer_Repository.h
rename to deps/acelite/ace/Based_Pointer_Repository.h
diff --git a/modules/worldengine/deps/acelite/ace/Based_Pointer_T.cpp b/deps/acelite/ace/Based_Pointer_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Based_Pointer_T.cpp
rename to deps/acelite/ace/Based_Pointer_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Based_Pointer_T.h b/deps/acelite/ace/Based_Pointer_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Based_Pointer_T.h
rename to deps/acelite/ace/Based_Pointer_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Based_Pointer_T.inl b/deps/acelite/ace/Based_Pointer_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Based_Pointer_T.inl
rename to deps/acelite/ace/Based_Pointer_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Stats.cpp b/deps/acelite/ace/Basic_Stats.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Basic_Stats.cpp
rename to deps/acelite/ace/Basic_Stats.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Stats.h b/deps/acelite/ace/Basic_Stats.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Basic_Stats.h
rename to deps/acelite/ace/Basic_Stats.h
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Stats.inl b/deps/acelite/ace/Basic_Stats.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Basic_Stats.inl
rename to deps/acelite/ace/Basic_Stats.inl
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Types.cpp b/deps/acelite/ace/Basic_Types.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Basic_Types.cpp
rename to deps/acelite/ace/Basic_Types.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Types.h b/deps/acelite/ace/Basic_Types.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Basic_Types.h
rename to deps/acelite/ace/Basic_Types.h
diff --git a/modules/worldengine/deps/acelite/ace/Bound_Ptr.h b/deps/acelite/ace/Bound_Ptr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Bound_Ptr.h
rename to deps/acelite/ace/Bound_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Bound_Ptr.inl b/deps/acelite/ace/Bound_Ptr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Bound_Ptr.inl
rename to deps/acelite/ace/Bound_Ptr.inl
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Base.cpp b/deps/acelite/ace/CDR_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Base.cpp
rename to deps/acelite/ace/CDR_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Base.h b/deps/acelite/ace/CDR_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Base.h
rename to deps/acelite/ace/CDR_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Base.inl b/deps/acelite/ace/CDR_Base.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Base.inl
rename to deps/acelite/ace/CDR_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Size.cpp b/deps/acelite/ace/CDR_Size.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Size.cpp
rename to deps/acelite/ace/CDR_Size.cpp
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Size.h b/deps/acelite/ace/CDR_Size.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Size.h
rename to deps/acelite/ace/CDR_Size.h
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Size.inl b/deps/acelite/ace/CDR_Size.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Size.inl
rename to deps/acelite/ace/CDR_Size.inl
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Stream.cpp b/deps/acelite/ace/CDR_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Stream.cpp
rename to deps/acelite/ace/CDR_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Stream.h b/deps/acelite/ace/CDR_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Stream.h
rename to deps/acelite/ace/CDR_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Stream.inl b/deps/acelite/ace/CDR_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CDR_Stream.inl
rename to deps/acelite/ace/CDR_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/CE_Screen_Output.cpp b/deps/acelite/ace/CE_Screen_Output.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CE_Screen_Output.cpp
rename to deps/acelite/ace/CE_Screen_Output.cpp
diff --git a/modules/worldengine/deps/acelite/ace/CE_Screen_Output.h b/deps/acelite/ace/CE_Screen_Output.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CE_Screen_Output.h
rename to deps/acelite/ace/CE_Screen_Output.h
diff --git a/modules/worldengine/deps/acelite/ace/CMakeLists.txt b/deps/acelite/ace/CMakeLists.txt
similarity index 98%
rename from modules/worldengine/deps/acelite/ace/CMakeLists.txt
rename to deps/acelite/ace/CMakeLists.txt
index b90158b15..deb86f7f3 100644
--- a/modules/worldengine/deps/acelite/ace/CMakeLists.txt
+++ b/deps/acelite/ace/CMakeLists.txt
@@ -328,9 +328,9 @@ if (USE_COREPCH)
 endif()
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite
+  ${CMAKE_SOURCE_DIR}/deps/acelite
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+  ${CMAKE_SOURCE_DIR}/deps/zlib
 )
 
 # Needed for PCH support
diff --git a/modules/worldengine/deps/acelite/ace/CORBA_macros.h b/deps/acelite/ace/CORBA_macros.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/CORBA_macros.h
rename to deps/acelite/ace/CORBA_macros.h
diff --git a/modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.cpp b/deps/acelite/ace/Cache_Map_Manager_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.cpp
rename to deps/acelite/ace/Cache_Map_Manager_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.h b/deps/acelite/ace/Cache_Map_Manager_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.h
rename to deps/acelite/ace/Cache_Map_Manager_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.inl b/deps/acelite/ace/Cache_Map_Manager_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.inl
rename to deps/acelite/ace/Cache_Map_Manager_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Cached_Connect_Strategy_T.cpp b/deps/acelite/ace/Cached_Connect_Strategy_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cached_Connect_Strategy_T.cpp
rename to deps/acelite/ace/Cached_Connect_Strategy_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Cached_Connect_Strategy_T.h b/deps/acelite/ace/Cached_Connect_Strategy_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cached_Connect_Strategy_T.h
rename to deps/acelite/ace/Cached_Connect_Strategy_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Caching_Strategies_T.cpp b/deps/acelite/ace/Caching_Strategies_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Caching_Strategies_T.cpp
rename to deps/acelite/ace/Caching_Strategies_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Caching_Strategies_T.h b/deps/acelite/ace/Caching_Strategies_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Caching_Strategies_T.h
rename to deps/acelite/ace/Caching_Strategies_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Caching_Strategies_T.inl b/deps/acelite/ace/Caching_Strategies_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Caching_Strategies_T.inl
rename to deps/acelite/ace/Caching_Strategies_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Caching_Utility_T.cpp b/deps/acelite/ace/Caching_Utility_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Caching_Utility_T.cpp
rename to deps/acelite/ace/Caching_Utility_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Caching_Utility_T.h b/deps/acelite/ace/Caching_Utility_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Caching_Utility_T.h
rename to deps/acelite/ace/Caching_Utility_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Capabilities.cpp b/deps/acelite/ace/Capabilities.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Capabilities.cpp
rename to deps/acelite/ace/Capabilities.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Capabilities.h b/deps/acelite/ace/Capabilities.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Capabilities.h
rename to deps/acelite/ace/Capabilities.h
diff --git a/modules/worldengine/deps/acelite/ace/Capabilities.inl b/deps/acelite/ace/Capabilities.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Capabilities.inl
rename to deps/acelite/ace/Capabilities.inl
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup.cpp b/deps/acelite/ace/Cleanup.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cleanup.cpp
rename to deps/acelite/ace/Cleanup.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup.h b/deps/acelite/ace/Cleanup.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cleanup.h
rename to deps/acelite/ace/Cleanup.h
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup.inl b/deps/acelite/ace/Cleanup.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cleanup.inl
rename to deps/acelite/ace/Cleanup.inl
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup_Strategies_T.cpp b/deps/acelite/ace/Cleanup_Strategies_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cleanup_Strategies_T.cpp
rename to deps/acelite/ace/Cleanup_Strategies_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup_Strategies_T.h b/deps/acelite/ace/Cleanup_Strategies_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Cleanup_Strategies_T.h
rename to deps/acelite/ace/Cleanup_Strategies_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Codecs.cpp b/deps/acelite/ace/Codecs.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codecs.cpp
rename to deps/acelite/ace/Codecs.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Codecs.h b/deps/acelite/ace/Codecs.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codecs.h
rename to deps/acelite/ace/Codecs.h
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_IBM1047.cpp b/deps/acelite/ace/Codeset_IBM1047.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codeset_IBM1047.cpp
rename to deps/acelite/ace/Codeset_IBM1047.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_IBM1047.h b/deps/acelite/ace/Codeset_IBM1047.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codeset_IBM1047.h
rename to deps/acelite/ace/Codeset_IBM1047.h
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Registry.cpp b/deps/acelite/ace/Codeset_Registry.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codeset_Registry.cpp
rename to deps/acelite/ace/Codeset_Registry.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Registry.h b/deps/acelite/ace/Codeset_Registry.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codeset_Registry.h
rename to deps/acelite/ace/Codeset_Registry.h
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Registry.inl b/deps/acelite/ace/Codeset_Registry.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codeset_Registry.inl
rename to deps/acelite/ace/Codeset_Registry.inl
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Registry_db.cpp b/deps/acelite/ace/Codeset_Registry_db.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codeset_Registry_db.cpp
rename to deps/acelite/ace/Codeset_Registry_db.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Symbols.h b/deps/acelite/ace/Codeset_Symbols.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Codeset_Symbols.h
rename to deps/acelite/ace/Codeset_Symbols.h
diff --git a/modules/worldengine/deps/acelite/ace/Compression/ACE_Compression.mpc b/deps/acelite/ace/Compression/ACE_Compression.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/ACE_Compression.mpc
rename to deps/acelite/ace/Compression/ACE_Compression.mpc
diff --git a/modules/worldengine/deps/acelite/ace/Compression/ACE_Compression_export.h b/deps/acelite/ace/Compression/ACE_Compression_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/ACE_Compression_export.h
rename to deps/acelite/ace/Compression/ACE_Compression_export.h
diff --git a/modules/worldengine/deps/acelite/ace/Compression/Compressor.cpp b/deps/acelite/ace/Compression/Compressor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/Compressor.cpp
rename to deps/acelite/ace/Compression/Compressor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Compression/Compressor.h b/deps/acelite/ace/Compression/Compressor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/Compressor.h
rename to deps/acelite/ace/Compression/Compressor.h
diff --git a/modules/worldengine/deps/acelite/ace/Compression/Compressor.inl b/deps/acelite/ace/Compression/Compressor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/Compressor.inl
rename to deps/acelite/ace/Compression/Compressor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Compression/rle/ACE_RLECompression.mpc b/deps/acelite/ace/Compression/rle/ACE_RLECompression.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/rle/ACE_RLECompression.mpc
rename to deps/acelite/ace/Compression/rle/ACE_RLECompression.mpc
diff --git a/modules/worldengine/deps/acelite/ace/Compression/rle/ACE_RLECompression_export.h b/deps/acelite/ace/Compression/rle/ACE_RLECompression_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/rle/ACE_RLECompression_export.h
rename to deps/acelite/ace/Compression/rle/ACE_RLECompression_export.h
diff --git a/modules/worldengine/deps/acelite/ace/Compression/rle/RLECompressor.cpp b/deps/acelite/ace/Compression/rle/RLECompressor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/rle/RLECompressor.cpp
rename to deps/acelite/ace/Compression/rle/RLECompressor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Compression/rle/RLECompressor.h b/deps/acelite/ace/Compression/rle/RLECompressor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Compression/rle/RLECompressor.h
rename to deps/acelite/ace/Compression/rle/RLECompressor.h
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Attributes.cpp b/deps/acelite/ace/Condition_Attributes.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Attributes.cpp
rename to deps/acelite/ace/Condition_Attributes.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Attributes.h b/deps/acelite/ace/Condition_Attributes.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Attributes.h
rename to deps/acelite/ace/Condition_Attributes.h
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Attributes.inl b/deps/acelite/ace/Condition_Attributes.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Attributes.inl
rename to deps/acelite/ace/Condition_Attributes.inl
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Recursive_Thread_Mutex.cpp b/deps/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
rename to deps/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Recursive_Thread_Mutex.h b/deps/acelite/ace/Condition_Recursive_Thread_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Recursive_Thread_Mutex.h
rename to deps/acelite/ace/Condition_Recursive_Thread_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Condition_T.cpp b/deps/acelite/ace/Condition_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_T.cpp
rename to deps/acelite/ace/Condition_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Condition_T.h b/deps/acelite/ace/Condition_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_T.h
rename to deps/acelite/ace/Condition_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Condition_T.inl b/deps/acelite/ace/Condition_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_T.inl
rename to deps/acelite/ace/Condition_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.cpp b/deps/acelite/ace/Condition_Thread_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.cpp
rename to deps/acelite/ace/Condition_Thread_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.h b/deps/acelite/ace/Condition_Thread_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.h
rename to deps/acelite/ace/Condition_Thread_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.inl b/deps/acelite/ace/Condition_Thread_Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.inl
rename to deps/acelite/ace/Condition_Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Configuration.cpp b/deps/acelite/ace/Configuration.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Configuration.cpp
rename to deps/acelite/ace/Configuration.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Configuration.h b/deps/acelite/ace/Configuration.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Configuration.h
rename to deps/acelite/ace/Configuration.h
diff --git a/modules/worldengine/deps/acelite/ace/Configuration.inl b/deps/acelite/ace/Configuration.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Configuration.inl
rename to deps/acelite/ace/Configuration.inl
diff --git a/modules/worldengine/deps/acelite/ace/Configuration_Import_Export.cpp b/deps/acelite/ace/Configuration_Import_Export.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Configuration_Import_Export.cpp
rename to deps/acelite/ace/Configuration_Import_Export.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Configuration_Import_Export.h b/deps/acelite/ace/Configuration_Import_Export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Configuration_Import_Export.h
rename to deps/acelite/ace/Configuration_Import_Export.h
diff --git a/modules/worldengine/deps/acelite/ace/Connection_Recycling_Strategy.cpp b/deps/acelite/ace/Connection_Recycling_Strategy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Connection_Recycling_Strategy.cpp
rename to deps/acelite/ace/Connection_Recycling_Strategy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Connection_Recycling_Strategy.h b/deps/acelite/ace/Connection_Recycling_Strategy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Connection_Recycling_Strategy.h
rename to deps/acelite/ace/Connection_Recycling_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/Connector.cpp b/deps/acelite/ace/Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Connector.cpp
rename to deps/acelite/ace/Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Connector.h b/deps/acelite/ace/Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Connector.h
rename to deps/acelite/ace/Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/Containers.cpp b/deps/acelite/ace/Containers.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Containers.cpp
rename to deps/acelite/ace/Containers.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Containers.h b/deps/acelite/ace/Containers.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Containers.h
rename to deps/acelite/ace/Containers.h
diff --git a/modules/worldengine/deps/acelite/ace/Containers.inl b/deps/acelite/ace/Containers.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Containers.inl
rename to deps/acelite/ace/Containers.inl
diff --git a/modules/worldengine/deps/acelite/ace/Containers_T.cpp b/deps/acelite/ace/Containers_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Containers_T.cpp
rename to deps/acelite/ace/Containers_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Containers_T.h b/deps/acelite/ace/Containers_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Containers_T.h
rename to deps/acelite/ace/Containers_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Containers_T.inl b/deps/acelite/ace/Containers_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Containers_T.inl
rename to deps/acelite/ace/Containers_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Copy_Disabled.cpp b/deps/acelite/ace/Copy_Disabled.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Copy_Disabled.cpp
rename to deps/acelite/ace/Copy_Disabled.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Copy_Disabled.h b/deps/acelite/ace/Copy_Disabled.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Copy_Disabled.h
rename to deps/acelite/ace/Copy_Disabled.h
diff --git a/modules/worldengine/deps/acelite/ace/Countdown_Time.h b/deps/acelite/ace/Countdown_Time.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Countdown_Time.h
rename to deps/acelite/ace/Countdown_Time.h
diff --git a/modules/worldengine/deps/acelite/ace/Countdown_Time_T.cpp b/deps/acelite/ace/Countdown_Time_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Countdown_Time_T.cpp
rename to deps/acelite/ace/Countdown_Time_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Countdown_Time_T.h b/deps/acelite/ace/Countdown_Time_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Countdown_Time_T.h
rename to deps/acelite/ace/Countdown_Time_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Countdown_Time_T.inl b/deps/acelite/ace/Countdown_Time_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Countdown_Time_T.inl
rename to deps/acelite/ace/Countdown_Time_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV.cpp b/deps/acelite/ace/DEV.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV.cpp
rename to deps/acelite/ace/DEV.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV.h b/deps/acelite/ace/DEV.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV.h
rename to deps/acelite/ace/DEV.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV.inl b/deps/acelite/ace/DEV.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV.inl
rename to deps/acelite/ace/DEV.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Addr.cpp b/deps/acelite/ace/DEV_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_Addr.cpp
rename to deps/acelite/ace/DEV_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Addr.h b/deps/acelite/ace/DEV_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_Addr.h
rename to deps/acelite/ace/DEV_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Addr.inl b/deps/acelite/ace/DEV_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_Addr.inl
rename to deps/acelite/ace/DEV_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Connector.cpp b/deps/acelite/ace/DEV_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_Connector.cpp
rename to deps/acelite/ace/DEV_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Connector.h b/deps/acelite/ace/DEV_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_Connector.h
rename to deps/acelite/ace/DEV_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Connector.inl b/deps/acelite/ace/DEV_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_Connector.inl
rename to deps/acelite/ace/DEV_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV_IO.cpp b/deps/acelite/ace/DEV_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_IO.cpp
rename to deps/acelite/ace/DEV_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV_IO.h b/deps/acelite/ace/DEV_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_IO.h
rename to deps/acelite/ace/DEV_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV_IO.inl b/deps/acelite/ace/DEV_IO.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DEV_IO.inl
rename to deps/acelite/ace/DEV_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/DLL.cpp b/deps/acelite/ace/DLL.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DLL.cpp
rename to deps/acelite/ace/DLL.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DLL.h b/deps/acelite/ace/DLL.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DLL.h
rename to deps/acelite/ace/DLL.h
diff --git a/modules/worldengine/deps/acelite/ace/DLL_Manager.cpp b/deps/acelite/ace/DLL_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DLL_Manager.cpp
rename to deps/acelite/ace/DLL_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DLL_Manager.h b/deps/acelite/ace/DLL_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/DLL_Manager.h
rename to deps/acelite/ace/DLL_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Date_Time.cpp b/deps/acelite/ace/Date_Time.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Date_Time.cpp
rename to deps/acelite/ace/Date_Time.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Date_Time.h b/deps/acelite/ace/Date_Time.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Date_Time.h
rename to deps/acelite/ace/Date_Time.h
diff --git a/modules/worldengine/deps/acelite/ace/Date_Time.inl b/deps/acelite/ace/Date_Time.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Date_Time.inl
rename to deps/acelite/ace/Date_Time.inl
diff --git a/modules/worldengine/deps/acelite/ace/Default_Constants.h b/deps/acelite/ace/Default_Constants.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Default_Constants.h
rename to deps/acelite/ace/Default_Constants.h
diff --git a/modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.cpp b/deps/acelite/ace/Dev_Poll_Reactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.cpp
rename to deps/acelite/ace/Dev_Poll_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.h b/deps/acelite/ace/Dev_Poll_Reactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.h
rename to deps/acelite/ace/Dev_Poll_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.inl b/deps/acelite/ace/Dev_Poll_Reactor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.inl
rename to deps/acelite/ace/Dev_Poll_Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dirent.cpp b/deps/acelite/ace/Dirent.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dirent.cpp
rename to deps/acelite/ace/Dirent.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dirent.h b/deps/acelite/ace/Dirent.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dirent.h
rename to deps/acelite/ace/Dirent.h
diff --git a/modules/worldengine/deps/acelite/ace/Dirent.inl b/deps/acelite/ace/Dirent.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dirent.inl
rename to deps/acelite/ace/Dirent.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dirent_Selector.cpp b/deps/acelite/ace/Dirent_Selector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dirent_Selector.cpp
rename to deps/acelite/ace/Dirent_Selector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dirent_Selector.h b/deps/acelite/ace/Dirent_Selector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dirent_Selector.h
rename to deps/acelite/ace/Dirent_Selector.h
diff --git a/modules/worldengine/deps/acelite/ace/Dirent_Selector.inl b/deps/acelite/ace/Dirent_Selector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dirent_Selector.inl
rename to deps/acelite/ace/Dirent_Selector.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dump.cpp b/deps/acelite/ace/Dump.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dump.cpp
rename to deps/acelite/ace/Dump.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dump.h b/deps/acelite/ace/Dump.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dump.h
rename to deps/acelite/ace/Dump.h
diff --git a/modules/worldengine/deps/acelite/ace/Dump_T.cpp b/deps/acelite/ace/Dump_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dump_T.cpp
rename to deps/acelite/ace/Dump_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dump_T.h b/deps/acelite/ace/Dump_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dump_T.h
rename to deps/acelite/ace/Dump_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic.cpp b/deps/acelite/ace/Dynamic.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic.cpp
rename to deps/acelite/ace/Dynamic.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic.h b/deps/acelite/ace/Dynamic.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic.h
rename to deps/acelite/ace/Dynamic.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic.inl b/deps/acelite/ace/Dynamic.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic.inl
rename to deps/acelite/ace/Dynamic.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.cpp b/deps/acelite/ace/Dynamic_Message_Strategy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.cpp
rename to deps/acelite/ace/Dynamic_Message_Strategy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.h b/deps/acelite/ace/Dynamic_Message_Strategy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.h
rename to deps/acelite/ace/Dynamic_Message_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.inl b/deps/acelite/ace/Dynamic_Message_Strategy.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.inl
rename to deps/acelite/ace/Dynamic_Message_Strategy.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service.cpp b/deps/acelite/ace/Dynamic_Service.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Service.cpp
rename to deps/acelite/ace/Dynamic_Service.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service.h b/deps/acelite/ace/Dynamic_Service.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Service.h
rename to deps/acelite/ace/Dynamic_Service.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service.inl b/deps/acelite/ace/Dynamic_Service.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Service.inl
rename to deps/acelite/ace/Dynamic_Service.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Base.cpp b/deps/acelite/ace/Dynamic_Service_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Service_Base.cpp
rename to deps/acelite/ace/Dynamic_Service_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Base.h b/deps/acelite/ace/Dynamic_Service_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Service_Base.h
rename to deps/acelite/ace/Dynamic_Service_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Dependency.cpp b/deps/acelite/ace/Dynamic_Service_Dependency.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Service_Dependency.cpp
rename to deps/acelite/ace/Dynamic_Service_Dependency.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Dependency.h b/deps/acelite/ace/Dynamic_Service_Dependency.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Dynamic_Service_Dependency.h
rename to deps/acelite/ace/Dynamic_Service_Dependency.h
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ACE_ETCL.pc.in b/deps/acelite/ace/ETCL/ACE_ETCL.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ACE_ETCL.pc.in
rename to deps/acelite/ace/ETCL/ACE_ETCL.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in b/deps/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
rename to deps/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.ll b/deps/acelite/ace/ETCL/ETCL.ll
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL.ll
rename to deps/acelite/ace/ETCL/ETCL.ll
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.mpc b/deps/acelite/ace/ETCL/ETCL.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL.mpc
rename to deps/acelite/ace/ETCL/ETCL.mpc
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.yy b/deps/acelite/ace/ETCL/ETCL.yy
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL.yy
rename to deps/acelite/ace/ETCL/ETCL.yy
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.cpp b/deps/acelite/ace/ETCL/ETCL_Constraint.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.cpp
rename to deps/acelite/ace/ETCL/ETCL_Constraint.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.h b/deps/acelite/ace/ETCL/ETCL_Constraint.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.h
rename to deps/acelite/ace/ETCL/ETCL_Constraint.h
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.inl b/deps/acelite/ace/ETCL/ETCL_Constraint.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.inl
rename to deps/acelite/ace/ETCL/ETCL_Constraint.inl
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp b/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
rename to deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.h b/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
rename to deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Interpreter.cpp b/deps/acelite/ace/ETCL/ETCL_Interpreter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_Interpreter.cpp
rename to deps/acelite/ace/ETCL/ETCL_Interpreter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Interpreter.h b/deps/acelite/ace/ETCL/ETCL_Interpreter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_Interpreter.h
rename to deps/acelite/ace/ETCL/ETCL_Interpreter.h
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_l.cpp b/deps/acelite/ace/ETCL/ETCL_l.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_l.cpp
rename to deps/acelite/ace/ETCL/ETCL_l.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_y.cpp b/deps/acelite/ace/ETCL/ETCL_y.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_y.cpp
rename to deps/acelite/ace/ETCL/ETCL_y.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_y.h b/deps/acelite/ace/ETCL/ETCL_y.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ETCL_y.h
rename to deps/acelite/ace/ETCL/ETCL_y.h
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ace_etcl_export.h b/deps/acelite/ace/ETCL/ace_etcl_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/ace_etcl_export.h
rename to deps/acelite/ace/ETCL/ace_etcl_export.h
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/etcl_parser_export.h b/deps/acelite/ace/ETCL/etcl_parser_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ETCL/etcl_parser_export.h
rename to deps/acelite/ace/ETCL/etcl_parser_export.h
diff --git a/modules/worldengine/deps/acelite/ace/Encoding_Converter.cpp b/deps/acelite/ace/Encoding_Converter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Encoding_Converter.cpp
rename to deps/acelite/ace/Encoding_Converter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Encoding_Converter.h b/deps/acelite/ace/Encoding_Converter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Encoding_Converter.h
rename to deps/acelite/ace/Encoding_Converter.h
diff --git a/modules/worldengine/deps/acelite/ace/Encoding_Converter_Factory.cpp b/deps/acelite/ace/Encoding_Converter_Factory.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Encoding_Converter_Factory.cpp
rename to deps/acelite/ace/Encoding_Converter_Factory.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Encoding_Converter_Factory.h b/deps/acelite/ace/Encoding_Converter_Factory.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Encoding_Converter_Factory.h
rename to deps/acelite/ace/Encoding_Converter_Factory.h
diff --git a/modules/worldengine/deps/acelite/ace/Env_Value_T.cpp b/deps/acelite/ace/Env_Value_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Env_Value_T.cpp
rename to deps/acelite/ace/Env_Value_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Env_Value_T.h b/deps/acelite/ace/Env_Value_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Env_Value_T.h
rename to deps/acelite/ace/Env_Value_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Env_Value_T.inl b/deps/acelite/ace/Env_Value_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Env_Value_T.inl
rename to deps/acelite/ace/Env_Value_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event.cpp b/deps/acelite/ace/Event.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event.cpp
rename to deps/acelite/ace/Event.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event.h b/deps/acelite/ace/Event.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event.h
rename to deps/acelite/ace/Event.h
diff --git a/modules/worldengine/deps/acelite/ace/Event.inl b/deps/acelite/ace/Event.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event.inl
rename to deps/acelite/ace/Event.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event_Base.cpp b/deps/acelite/ace/Event_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Base.cpp
rename to deps/acelite/ace/Event_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event_Base.h b/deps/acelite/ace/Event_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Base.h
rename to deps/acelite/ace/Event_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Event_Base.inl b/deps/acelite/ace/Event_Base.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Base.inl
rename to deps/acelite/ace/Event_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler.cpp b/deps/acelite/ace/Event_Handler.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler.cpp
rename to deps/acelite/ace/Event_Handler.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler.h b/deps/acelite/ace/Event_Handler.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler.h
rename to deps/acelite/ace/Event_Handler.h
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler.inl b/deps/acelite/ace/Event_Handler.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler.inl
rename to deps/acelite/ace/Event_Handler.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp b/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
rename to deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h b/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
rename to deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl b/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
rename to deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler_T.cpp b/deps/acelite/ace/Event_Handler_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler_T.cpp
rename to deps/acelite/ace/Event_Handler_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler_T.h b/deps/acelite/ace/Event_Handler_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler_T.h
rename to deps/acelite/ace/Event_Handler_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler_T.inl b/deps/acelite/ace/Event_Handler_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Event_Handler_T.inl
rename to deps/acelite/ace/Event_Handler_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/FIFO.cpp b/deps/acelite/ace/FIFO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO.cpp
rename to deps/acelite/ace/FIFO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO.h b/deps/acelite/ace/FIFO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO.h
rename to deps/acelite/ace/FIFO.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO.inl b/deps/acelite/ace/FIFO.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO.inl
rename to deps/acelite/ace/FIFO.inl
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv.cpp b/deps/acelite/ace/FIFO_Recv.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Recv.cpp
rename to deps/acelite/ace/FIFO_Recv.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv.h b/deps/acelite/ace/FIFO_Recv.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Recv.h
rename to deps/acelite/ace/FIFO_Recv.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv.inl b/deps/acelite/ace/FIFO_Recv.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Recv.inl
rename to deps/acelite/ace/FIFO_Recv.inl
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.cpp b/deps/acelite/ace/FIFO_Recv_Msg.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.cpp
rename to deps/acelite/ace/FIFO_Recv_Msg.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.h b/deps/acelite/ace/FIFO_Recv_Msg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.h
rename to deps/acelite/ace/FIFO_Recv_Msg.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.inl b/deps/acelite/ace/FIFO_Recv_Msg.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.inl
rename to deps/acelite/ace/FIFO_Recv_Msg.inl
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send.cpp b/deps/acelite/ace/FIFO_Send.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Send.cpp
rename to deps/acelite/ace/FIFO_Send.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send.h b/deps/acelite/ace/FIFO_Send.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Send.h
rename to deps/acelite/ace/FIFO_Send.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send.inl b/deps/acelite/ace/FIFO_Send.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Send.inl
rename to deps/acelite/ace/FIFO_Send.inl
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.cpp b/deps/acelite/ace/FIFO_Send_Msg.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.cpp
rename to deps/acelite/ace/FIFO_Send_Msg.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.h b/deps/acelite/ace/FIFO_Send_Msg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.h
rename to deps/acelite/ace/FIFO_Send_Msg.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.inl b/deps/acelite/ace/FIFO_Send_Msg.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.inl
rename to deps/acelite/ace/FIFO_Send_Msg.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE.cpp b/deps/acelite/ace/FILE.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE.cpp
rename to deps/acelite/ace/FILE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE.h b/deps/acelite/ace/FILE.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE.h
rename to deps/acelite/ace/FILE.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE.inl b/deps/acelite/ace/FILE.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE.inl
rename to deps/acelite/ace/FILE.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Addr.cpp b/deps/acelite/ace/FILE_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_Addr.cpp
rename to deps/acelite/ace/FILE_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Addr.h b/deps/acelite/ace/FILE_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_Addr.h
rename to deps/acelite/ace/FILE_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Addr.inl b/deps/acelite/ace/FILE_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_Addr.inl
rename to deps/acelite/ace/FILE_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Connector.cpp b/deps/acelite/ace/FILE_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_Connector.cpp
rename to deps/acelite/ace/FILE_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Connector.h b/deps/acelite/ace/FILE_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_Connector.h
rename to deps/acelite/ace/FILE_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Connector.inl b/deps/acelite/ace/FILE_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_Connector.inl
rename to deps/acelite/ace/FILE_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE_IO.cpp b/deps/acelite/ace/FILE_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_IO.cpp
rename to deps/acelite/ace/FILE_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE_IO.h b/deps/acelite/ace/FILE_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_IO.h
rename to deps/acelite/ace/FILE_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE_IO.inl b/deps/acelite/ace/FILE_IO.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FILE_IO.inl
rename to deps/acelite/ace/FILE_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/File_Lock.cpp b/deps/acelite/ace/File_Lock.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/File_Lock.cpp
rename to deps/acelite/ace/File_Lock.cpp
diff --git a/modules/worldengine/deps/acelite/ace/File_Lock.h b/deps/acelite/ace/File_Lock.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/File_Lock.h
rename to deps/acelite/ace/File_Lock.h
diff --git a/modules/worldengine/deps/acelite/ace/File_Lock.inl b/deps/acelite/ace/File_Lock.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/File_Lock.inl
rename to deps/acelite/ace/File_Lock.inl
diff --git a/modules/worldengine/deps/acelite/ace/Filecache.cpp b/deps/acelite/ace/Filecache.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Filecache.cpp
rename to deps/acelite/ace/Filecache.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Filecache.h b/deps/acelite/ace/Filecache.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Filecache.h
rename to deps/acelite/ace/Filecache.h
diff --git a/modules/worldengine/deps/acelite/ace/FlReactor/ACE_FlReactor.pc.in b/deps/acelite/ace/FlReactor/ACE_FlReactor.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FlReactor/ACE_FlReactor.pc.in
rename to deps/acelite/ace/FlReactor/ACE_FlReactor.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/FlReactor/ACE_FlReactor_export.h b/deps/acelite/ace/FlReactor/ACE_FlReactor_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FlReactor/ACE_FlReactor_export.h
rename to deps/acelite/ace/FlReactor/ACE_FlReactor_export.h
diff --git a/modules/worldengine/deps/acelite/ace/FlReactor/FlReactor.cpp b/deps/acelite/ace/FlReactor/FlReactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FlReactor/FlReactor.cpp
rename to deps/acelite/ace/FlReactor/FlReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FlReactor/FlReactor.h b/deps/acelite/ace/FlReactor/FlReactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FlReactor/FlReactor.h
rename to deps/acelite/ace/FlReactor/FlReactor.h
diff --git a/modules/worldengine/deps/acelite/ace/FlReactor/ace_flreactor.mpc b/deps/acelite/ace/FlReactor/ace_flreactor.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FlReactor/ace_flreactor.mpc
rename to deps/acelite/ace/FlReactor/ace_flreactor.mpc
diff --git a/modules/worldengine/deps/acelite/ace/Flag_Manip.cpp b/deps/acelite/ace/Flag_Manip.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Flag_Manip.cpp
rename to deps/acelite/ace/Flag_Manip.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Flag_Manip.h b/deps/acelite/ace/Flag_Manip.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Flag_Manip.h
rename to deps/acelite/ace/Flag_Manip.h
diff --git a/modules/worldengine/deps/acelite/ace/Flag_Manip.inl b/deps/acelite/ace/Flag_Manip.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Flag_Manip.inl
rename to deps/acelite/ace/Flag_Manip.inl
diff --git a/modules/worldengine/deps/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in b/deps/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
rename to deps/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/FoxReactor/ACE_FoxReactor_export.h b/deps/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
rename to deps/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
diff --git a/modules/worldengine/deps/acelite/ace/FoxReactor/FoxReactor.cpp b/deps/acelite/ace/FoxReactor/FoxReactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FoxReactor/FoxReactor.cpp
rename to deps/acelite/ace/FoxReactor/FoxReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FoxReactor/FoxReactor.h b/deps/acelite/ace/FoxReactor/FoxReactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FoxReactor/FoxReactor.h
rename to deps/acelite/ace/FoxReactor/FoxReactor.h
diff --git a/modules/worldengine/deps/acelite/ace/FoxReactor/ace_foxreactor.mpc b/deps/acelite/ace/FoxReactor/ace_foxreactor.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/FoxReactor/ace_foxreactor.mpc
rename to deps/acelite/ace/FoxReactor/ace_foxreactor.mpc
diff --git a/modules/worldengine/deps/acelite/ace/Framework_Component.cpp b/deps/acelite/ace/Framework_Component.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Framework_Component.cpp
rename to deps/acelite/ace/Framework_Component.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Framework_Component.h b/deps/acelite/ace/Framework_Component.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Framework_Component.h
rename to deps/acelite/ace/Framework_Component.h
diff --git a/modules/worldengine/deps/acelite/ace/Framework_Component.inl b/deps/acelite/ace/Framework_Component.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Framework_Component.inl
rename to deps/acelite/ace/Framework_Component.inl
diff --git a/modules/worldengine/deps/acelite/ace/Framework_Component_T.cpp b/deps/acelite/ace/Framework_Component_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Framework_Component_T.cpp
rename to deps/acelite/ace/Framework_Component_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Framework_Component_T.h b/deps/acelite/ace/Framework_Component_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Framework_Component_T.h
rename to deps/acelite/ace/Framework_Component_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Free_List.cpp b/deps/acelite/ace/Free_List.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Free_List.cpp
rename to deps/acelite/ace/Free_List.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Free_List.h b/deps/acelite/ace/Free_List.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Free_List.h
rename to deps/acelite/ace/Free_List.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor.cpp b/deps/acelite/ace/Functor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor.cpp
rename to deps/acelite/ace/Functor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Functor.h b/deps/acelite/ace/Functor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor.h
rename to deps/acelite/ace/Functor.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor.inl b/deps/acelite/ace/Functor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor.inl
rename to deps/acelite/ace/Functor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Functor_String.cpp b/deps/acelite/ace/Functor_String.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor_String.cpp
rename to deps/acelite/ace/Functor_String.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Functor_String.h b/deps/acelite/ace/Functor_String.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor_String.h
rename to deps/acelite/ace/Functor_String.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor_String.inl b/deps/acelite/ace/Functor_String.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor_String.inl
rename to deps/acelite/ace/Functor_String.inl
diff --git a/modules/worldengine/deps/acelite/ace/Functor_T.cpp b/deps/acelite/ace/Functor_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor_T.cpp
rename to deps/acelite/ace/Functor_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Functor_T.h b/deps/acelite/ace/Functor_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor_T.h
rename to deps/acelite/ace/Functor_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor_T.inl b/deps/acelite/ace/Functor_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Functor_T.inl
rename to deps/acelite/ace/Functor_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Future.cpp b/deps/acelite/ace/Future.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Future.cpp
rename to deps/acelite/ace/Future.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Future.h b/deps/acelite/ace/Future.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Future.h
rename to deps/acelite/ace/Future.h
diff --git a/modules/worldengine/deps/acelite/ace/Future_Set.cpp b/deps/acelite/ace/Future_Set.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Future_Set.cpp
rename to deps/acelite/ace/Future_Set.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Future_Set.h b/deps/acelite/ace/Future_Set.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Future_Set.h
rename to deps/acelite/ace/Future_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Get_Opt.cpp b/deps/acelite/ace/Get_Opt.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Get_Opt.cpp
rename to deps/acelite/ace/Get_Opt.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Get_Opt.h b/deps/acelite/ace/Get_Opt.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Get_Opt.h
rename to deps/acelite/ace/Get_Opt.h
diff --git a/modules/worldengine/deps/acelite/ace/Get_Opt.inl b/deps/acelite/ace/Get_Opt.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Get_Opt.inl
rename to deps/acelite/ace/Get_Opt.inl
diff --git a/modules/worldengine/deps/acelite/ace/Global_Macros.h b/deps/acelite/ace/Global_Macros.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Global_Macros.h
rename to deps/acelite/ace/Global_Macros.h
diff --git a/modules/worldengine/deps/acelite/ace/Guard_T.cpp b/deps/acelite/ace/Guard_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Guard_T.cpp
rename to deps/acelite/ace/Guard_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Guard_T.h b/deps/acelite/ace/Guard_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Guard_T.h
rename to deps/acelite/ace/Guard_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Guard_T.inl b/deps/acelite/ace/Guard_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Guard_T.inl
rename to deps/acelite/ace/Guard_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Gobbler.h b/deps/acelite/ace/Handle_Gobbler.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Handle_Gobbler.h
rename to deps/acelite/ace/Handle_Gobbler.h
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Gobbler.inl b/deps/acelite/ace/Handle_Gobbler.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Handle_Gobbler.inl
rename to deps/acelite/ace/Handle_Gobbler.inl
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Ops.cpp b/deps/acelite/ace/Handle_Ops.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Handle_Ops.cpp
rename to deps/acelite/ace/Handle_Ops.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Ops.h b/deps/acelite/ace/Handle_Ops.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Handle_Ops.h
rename to deps/acelite/ace/Handle_Ops.h
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Set.cpp b/deps/acelite/ace/Handle_Set.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Handle_Set.cpp
rename to deps/acelite/ace/Handle_Set.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Set.h b/deps/acelite/ace/Handle_Set.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Handle_Set.h
rename to deps/acelite/ace/Handle_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Set.inl b/deps/acelite/ace/Handle_Set.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Handle_Set.inl
rename to deps/acelite/ace/Handle_Set.inl
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.cpp b/deps/acelite/ace/Hash_Cache_Map_Manager_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.cpp
rename to deps/acelite/ace/Hash_Cache_Map_Manager_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.h b/deps/acelite/ace/Hash_Cache_Map_Manager_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.h
rename to deps/acelite/ace/Hash_Cache_Map_Manager_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.inl b/deps/acelite/ace/Hash_Cache_Map_Manager_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.inl
rename to deps/acelite/ace/Hash_Cache_Map_Manager_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager.h b/deps/acelite/ace/Hash_Map_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Map_Manager.h
rename to deps/acelite/ace/Hash_Map_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.cpp b/deps/acelite/ace/Hash_Map_Manager_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.cpp
rename to deps/acelite/ace/Hash_Map_Manager_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.h b/deps/acelite/ace/Hash_Map_Manager_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.h
rename to deps/acelite/ace/Hash_Map_Manager_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.inl b/deps/acelite/ace/Hash_Map_Manager_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.inl
rename to deps/acelite/ace/Hash_Map_Manager_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.cpp b/deps/acelite/ace/Hash_Map_With_Allocator_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.cpp
rename to deps/acelite/ace/Hash_Map_With_Allocator_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.h b/deps/acelite/ace/Hash_Map_With_Allocator_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.h
rename to deps/acelite/ace/Hash_Map_With_Allocator_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.inl b/deps/acelite/ace/Hash_Map_With_Allocator_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.inl
rename to deps/acelite/ace/Hash_Map_With_Allocator_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.cpp b/deps/acelite/ace/Hash_Multi_Map_Manager_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.cpp
rename to deps/acelite/ace/Hash_Multi_Map_Manager_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.h b/deps/acelite/ace/Hash_Multi_Map_Manager_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.h
rename to deps/acelite/ace/Hash_Multi_Map_Manager_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.inl b/deps/acelite/ace/Hash_Multi_Map_Manager_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.inl
rename to deps/acelite/ace/Hash_Multi_Map_Manager_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Hashable.cpp b/deps/acelite/ace/Hashable.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hashable.cpp
rename to deps/acelite/ace/Hashable.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Hashable.h b/deps/acelite/ace/Hashable.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hashable.h
rename to deps/acelite/ace/Hashable.h
diff --git a/modules/worldengine/deps/acelite/ace/Hashable.inl b/deps/acelite/ace/Hashable.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Hashable.inl
rename to deps/acelite/ace/Hashable.inl
diff --git a/modules/worldengine/deps/acelite/ace/High_Res_Timer.cpp b/deps/acelite/ace/High_Res_Timer.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/High_Res_Timer.cpp
rename to deps/acelite/ace/High_Res_Timer.cpp
diff --git a/modules/worldengine/deps/acelite/ace/High_Res_Timer.h b/deps/acelite/ace/High_Res_Timer.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/High_Res_Timer.h
rename to deps/acelite/ace/High_Res_Timer.h
diff --git a/modules/worldengine/deps/acelite/ace/High_Res_Timer.inl b/deps/acelite/ace/High_Res_Timer.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/High_Res_Timer.inl
rename to deps/acelite/ace/High_Res_Timer.inl
diff --git a/modules/worldengine/deps/acelite/ace/ICMP_Socket.cpp b/deps/acelite/ace/ICMP_Socket.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ICMP_Socket.cpp
rename to deps/acelite/ace/ICMP_Socket.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ICMP_Socket.h b/deps/acelite/ace/ICMP_Socket.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ICMP_Socket.h
rename to deps/acelite/ace/ICMP_Socket.h
diff --git a/modules/worldengine/deps/acelite/ace/INET_Addr.cpp b/deps/acelite/ace/INET_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/INET_Addr.cpp
rename to deps/acelite/ace/INET_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/INET_Addr.h b/deps/acelite/ace/INET_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/INET_Addr.h
rename to deps/acelite/ace/INET_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/INET_Addr.inl b/deps/acelite/ace/INET_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/INET_Addr.inl
rename to deps/acelite/ace/INET_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/IOStream.cpp b/deps/acelite/ace/IOStream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IOStream.cpp
rename to deps/acelite/ace/IOStream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IOStream.h b/deps/acelite/ace/IOStream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IOStream.h
rename to deps/acelite/ace/IOStream.h
diff --git a/modules/worldengine/deps/acelite/ace/IOStream_T.cpp b/deps/acelite/ace/IOStream_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IOStream_T.cpp
rename to deps/acelite/ace/IOStream_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IOStream_T.h b/deps/acelite/ace/IOStream_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IOStream_T.h
rename to deps/acelite/ace/IOStream_T.h
diff --git a/modules/worldengine/deps/acelite/ace/IOStream_T.inl b/deps/acelite/ace/IOStream_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IOStream_T.inl
rename to deps/acelite/ace/IOStream_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.cpp b/deps/acelite/ace/IO_Cntl_Msg.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.cpp
rename to deps/acelite/ace/IO_Cntl_Msg.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.h b/deps/acelite/ace/IO_Cntl_Msg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.h
rename to deps/acelite/ace/IO_Cntl_Msg.h
diff --git a/modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.inl b/deps/acelite/ace/IO_Cntl_Msg.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.inl
rename to deps/acelite/ace/IO_Cntl_Msg.inl
diff --git a/modules/worldengine/deps/acelite/ace/IO_SAP.cpp b/deps/acelite/ace/IO_SAP.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IO_SAP.cpp
rename to deps/acelite/ace/IO_SAP.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IO_SAP.h b/deps/acelite/ace/IO_SAP.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IO_SAP.h
rename to deps/acelite/ace/IO_SAP.h
diff --git a/modules/worldengine/deps/acelite/ace/IO_SAP.inl b/deps/acelite/ace/IO_SAP.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IO_SAP.inl
rename to deps/acelite/ace/IO_SAP.inl
diff --git a/modules/worldengine/deps/acelite/ace/IPC_SAP.cpp b/deps/acelite/ace/IPC_SAP.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IPC_SAP.cpp
rename to deps/acelite/ace/IPC_SAP.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IPC_SAP.h b/deps/acelite/ace/IPC_SAP.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IPC_SAP.h
rename to deps/acelite/ace/IPC_SAP.h
diff --git a/modules/worldengine/deps/acelite/ace/IPC_SAP.inl b/deps/acelite/ace/IPC_SAP.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/IPC_SAP.inl
rename to deps/acelite/ace/IPC_SAP.inl
diff --git a/modules/worldengine/deps/acelite/ace/If_Then_Else.h b/deps/acelite/ace/If_Then_Else.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/If_Then_Else.h
rename to deps/acelite/ace/If_Then_Else.h
diff --git a/modules/worldengine/deps/acelite/ace/Init_ACE.cpp b/deps/acelite/ace/Init_ACE.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Init_ACE.cpp
rename to deps/acelite/ace/Init_ACE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Init_ACE.h b/deps/acelite/ace/Init_ACE.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Init_ACE.h
rename to deps/acelite/ace/Init_ACE.h
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.cpp b/deps/acelite/ace/Intrusive_Auto_Ptr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.cpp
rename to deps/acelite/ace/Intrusive_Auto_Ptr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.h b/deps/acelite/ace/Intrusive_Auto_Ptr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.h
rename to deps/acelite/ace/Intrusive_Auto_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.inl b/deps/acelite/ace/Intrusive_Auto_Ptr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.inl
rename to deps/acelite/ace/Intrusive_Auto_Ptr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List.cpp b/deps/acelite/ace/Intrusive_List.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_List.cpp
rename to deps/acelite/ace/Intrusive_List.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List.h b/deps/acelite/ace/Intrusive_List.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_List.h
rename to deps/acelite/ace/Intrusive_List.h
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List.inl b/deps/acelite/ace/Intrusive_List.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_List.inl
rename to deps/acelite/ace/Intrusive_List.inl
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List_Node.cpp b/deps/acelite/ace/Intrusive_List_Node.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_List_Node.cpp
rename to deps/acelite/ace/Intrusive_List_Node.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List_Node.h b/deps/acelite/ace/Intrusive_List_Node.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_List_Node.h
rename to deps/acelite/ace/Intrusive_List_Node.h
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List_Node.inl b/deps/acelite/ace/Intrusive_List_Node.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Intrusive_List_Node.inl
rename to deps/acelite/ace/Intrusive_List_Node.inl
diff --git a/modules/worldengine/deps/acelite/ace/LOCK_SOCK_Acceptor.cpp b/deps/acelite/ace/LOCK_SOCK_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LOCK_SOCK_Acceptor.cpp
rename to deps/acelite/ace/LOCK_SOCK_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LOCK_SOCK_Acceptor.h b/deps/acelite/ace/LOCK_SOCK_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LOCK_SOCK_Acceptor.h
rename to deps/acelite/ace/LOCK_SOCK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK.cpp b/deps/acelite/ace/LSOCK.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK.cpp
rename to deps/acelite/ace/LSOCK.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK.h b/deps/acelite/ace/LSOCK.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK.h
rename to deps/acelite/ace/LSOCK.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK.inl b/deps/acelite/ace/LSOCK.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK.inl
rename to deps/acelite/ace/LSOCK.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.cpp b/deps/acelite/ace/LSOCK_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.cpp
rename to deps/acelite/ace/LSOCK_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.h b/deps/acelite/ace/LSOCK_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.h
rename to deps/acelite/ace/LSOCK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.cpp b/deps/acelite/ace/LSOCK_CODgram.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_CODgram.cpp
rename to deps/acelite/ace/LSOCK_CODgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.h b/deps/acelite/ace/LSOCK_CODgram.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_CODgram.h
rename to deps/acelite/ace/LSOCK_CODgram.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.inl b/deps/acelite/ace/LSOCK_CODgram.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_CODgram.inl
rename to deps/acelite/ace/LSOCK_CODgram.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.cpp b/deps/acelite/ace/LSOCK_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Connector.cpp
rename to deps/acelite/ace/LSOCK_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.h b/deps/acelite/ace/LSOCK_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Connector.h
rename to deps/acelite/ace/LSOCK_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.inl b/deps/acelite/ace/LSOCK_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Connector.inl
rename to deps/acelite/ace/LSOCK_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.cpp b/deps/acelite/ace/LSOCK_Dgram.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Dgram.cpp
rename to deps/acelite/ace/LSOCK_Dgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.h b/deps/acelite/ace/LSOCK_Dgram.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Dgram.h
rename to deps/acelite/ace/LSOCK_Dgram.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.inl b/deps/acelite/ace/LSOCK_Dgram.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Dgram.inl
rename to deps/acelite/ace/LSOCK_Dgram.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.cpp b/deps/acelite/ace/LSOCK_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Stream.cpp
rename to deps/acelite/ace/LSOCK_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.h b/deps/acelite/ace/LSOCK_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Stream.h
rename to deps/acelite/ace/LSOCK_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.inl b/deps/acelite/ace/LSOCK_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/LSOCK_Stream.inl
rename to deps/acelite/ace/LSOCK_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/Lib_Find.cpp b/deps/acelite/ace/Lib_Find.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lib_Find.cpp
rename to deps/acelite/ace/Lib_Find.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Lib_Find.h b/deps/acelite/ace/Lib_Find.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lib_Find.h
rename to deps/acelite/ace/Lib_Find.h
diff --git a/modules/worldengine/deps/acelite/ace/Local_Memory_Pool.cpp b/deps/acelite/ace/Local_Memory_Pool.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Memory_Pool.cpp
rename to deps/acelite/ace/Local_Memory_Pool.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Local_Memory_Pool.h b/deps/acelite/ace/Local_Memory_Pool.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Memory_Pool.h
rename to deps/acelite/ace/Local_Memory_Pool.h
diff --git a/modules/worldengine/deps/acelite/ace/Local_Name_Space.cpp b/deps/acelite/ace/Local_Name_Space.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Name_Space.cpp
rename to deps/acelite/ace/Local_Name_Space.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Local_Name_Space.h b/deps/acelite/ace/Local_Name_Space.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Name_Space.h
rename to deps/acelite/ace/Local_Name_Space.h
diff --git a/modules/worldengine/deps/acelite/ace/Local_Name_Space_T.cpp b/deps/acelite/ace/Local_Name_Space_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Name_Space_T.cpp
rename to deps/acelite/ace/Local_Name_Space_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Local_Name_Space_T.h b/deps/acelite/ace/Local_Name_Space_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Name_Space_T.h
rename to deps/acelite/ace/Local_Name_Space_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Local_Tokens.cpp b/deps/acelite/ace/Local_Tokens.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Tokens.cpp
rename to deps/acelite/ace/Local_Tokens.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Local_Tokens.h b/deps/acelite/ace/Local_Tokens.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Tokens.h
rename to deps/acelite/ace/Local_Tokens.h
diff --git a/modules/worldengine/deps/acelite/ace/Local_Tokens.inl b/deps/acelite/ace/Local_Tokens.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Local_Tokens.inl
rename to deps/acelite/ace/Local_Tokens.inl
diff --git a/modules/worldengine/deps/acelite/ace/Lock.cpp b/deps/acelite/ace/Lock.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lock.cpp
rename to deps/acelite/ace/Lock.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Lock.h b/deps/acelite/ace/Lock.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lock.h
rename to deps/acelite/ace/Lock.h
diff --git a/modules/worldengine/deps/acelite/ace/Lock.inl b/deps/acelite/ace/Lock.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lock.inl
rename to deps/acelite/ace/Lock.inl
diff --git a/modules/worldengine/deps/acelite/ace/Lock_Adapter_T.cpp b/deps/acelite/ace/Lock_Adapter_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lock_Adapter_T.cpp
rename to deps/acelite/ace/Lock_Adapter_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Lock_Adapter_T.h b/deps/acelite/ace/Lock_Adapter_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lock_Adapter_T.h
rename to deps/acelite/ace/Lock_Adapter_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Lock_Adapter_T.inl b/deps/acelite/ace/Lock_Adapter_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Lock_Adapter_T.inl
rename to deps/acelite/ace/Lock_Adapter_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Log_Category.cpp b/deps/acelite/ace/Log_Category.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Category.cpp
rename to deps/acelite/ace/Log_Category.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Category.h b/deps/acelite/ace/Log_Category.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Category.h
rename to deps/acelite/ace/Log_Category.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Category.inl b/deps/acelite/ace/Log_Category.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Category.inl
rename to deps/acelite/ace/Log_Category.inl
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg.cpp b/deps/acelite/ace/Log_Msg.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg.cpp
rename to deps/acelite/ace/Log_Msg.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg.h b/deps/acelite/ace/Log_Msg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg.h
rename to deps/acelite/ace/Log_Msg.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg.inl b/deps/acelite/ace/Log_Msg.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg.inl
rename to deps/acelite/ace/Log_Msg.inl
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_Backend.cpp b/deps/acelite/ace/Log_Msg_Backend.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_Backend.cpp
rename to deps/acelite/ace/Log_Msg_Backend.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_Backend.h b/deps/acelite/ace/Log_Msg_Backend.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_Backend.h
rename to deps/acelite/ace/Log_Msg_Backend.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_Callback.cpp b/deps/acelite/ace/Log_Msg_Callback.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_Callback.cpp
rename to deps/acelite/ace/Log_Msg_Callback.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_Callback.h b/deps/acelite/ace/Log_Msg_Callback.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_Callback.h
rename to deps/acelite/ace/Log_Msg_Callback.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_IPC.cpp b/deps/acelite/ace/Log_Msg_IPC.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_IPC.cpp
rename to deps/acelite/ace/Log_Msg_IPC.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_IPC.h b/deps/acelite/ace/Log_Msg_IPC.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_IPC.h
rename to deps/acelite/ace/Log_Msg_IPC.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_NT_Event_Log.cpp b/deps/acelite/ace/Log_Msg_NT_Event_Log.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_NT_Event_Log.cpp
rename to deps/acelite/ace/Log_Msg_NT_Event_Log.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_NT_Event_Log.h b/deps/acelite/ace/Log_Msg_NT_Event_Log.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_NT_Event_Log.h
rename to deps/acelite/ace/Log_Msg_NT_Event_Log.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_UNIX_Syslog.cpp b/deps/acelite/ace/Log_Msg_UNIX_Syslog.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_UNIX_Syslog.cpp
rename to deps/acelite/ace/Log_Msg_UNIX_Syslog.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg_UNIX_Syslog.h b/deps/acelite/ace/Log_Msg_UNIX_Syslog.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Msg_UNIX_Syslog.h
rename to deps/acelite/ace/Log_Msg_UNIX_Syslog.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Priority.h b/deps/acelite/ace/Log_Priority.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Priority.h
rename to deps/acelite/ace/Log_Priority.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Record.cpp b/deps/acelite/ace/Log_Record.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Record.cpp
rename to deps/acelite/ace/Log_Record.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Record.h b/deps/acelite/ace/Log_Record.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Record.h
rename to deps/acelite/ace/Log_Record.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Record.inl b/deps/acelite/ace/Log_Record.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Log_Record.inl
rename to deps/acelite/ace/Log_Record.inl
diff --git a/modules/worldengine/deps/acelite/ace/Logging_Strategy.cpp b/deps/acelite/ace/Logging_Strategy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Logging_Strategy.cpp
rename to deps/acelite/ace/Logging_Strategy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Logging_Strategy.h b/deps/acelite/ace/Logging_Strategy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Logging_Strategy.h
rename to deps/acelite/ace/Logging_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.cpp b/deps/acelite/ace/MEM_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Acceptor.cpp
rename to deps/acelite/ace/MEM_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.h b/deps/acelite/ace/MEM_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Acceptor.h
rename to deps/acelite/ace/MEM_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.inl b/deps/acelite/ace/MEM_Acceptor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Acceptor.inl
rename to deps/acelite/ace/MEM_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Addr.cpp b/deps/acelite/ace/MEM_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Addr.cpp
rename to deps/acelite/ace/MEM_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Addr.h b/deps/acelite/ace/MEM_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Addr.h
rename to deps/acelite/ace/MEM_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Addr.inl b/deps/acelite/ace/MEM_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Addr.inl
rename to deps/acelite/ace/MEM_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Connector.cpp b/deps/acelite/ace/MEM_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Connector.cpp
rename to deps/acelite/ace/MEM_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Connector.h b/deps/acelite/ace/MEM_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Connector.h
rename to deps/acelite/ace/MEM_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Connector.inl b/deps/acelite/ace/MEM_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Connector.inl
rename to deps/acelite/ace/MEM_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_IO.cpp b/deps/acelite/ace/MEM_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_IO.cpp
rename to deps/acelite/ace/MEM_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_IO.h b/deps/acelite/ace/MEM_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_IO.h
rename to deps/acelite/ace/MEM_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_IO.inl b/deps/acelite/ace/MEM_IO.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_IO.inl
rename to deps/acelite/ace/MEM_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_SAP.cpp b/deps/acelite/ace/MEM_SAP.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_SAP.cpp
rename to deps/acelite/ace/MEM_SAP.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_SAP.h b/deps/acelite/ace/MEM_SAP.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_SAP.h
rename to deps/acelite/ace/MEM_SAP.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_SAP.inl b/deps/acelite/ace/MEM_SAP.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_SAP.inl
rename to deps/acelite/ace/MEM_SAP.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Stream.cpp b/deps/acelite/ace/MEM_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Stream.cpp
rename to deps/acelite/ace/MEM_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Stream.h b/deps/acelite/ace/MEM_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Stream.h
rename to deps/acelite/ace/MEM_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Stream.inl b/deps/acelite/ace/MEM_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MEM_Stream.inl
rename to deps/acelite/ace/MEM_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.cpp b/deps/acelite/ace/MMAP_Memory_Pool.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.cpp
rename to deps/acelite/ace/MMAP_Memory_Pool.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.h b/deps/acelite/ace/MMAP_Memory_Pool.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.h
rename to deps/acelite/ace/MMAP_Memory_Pool.h
diff --git a/modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.inl b/deps/acelite/ace/MMAP_Memory_Pool.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.inl
rename to deps/acelite/ace/MMAP_Memory_Pool.inl
diff --git a/modules/worldengine/deps/acelite/ace/Malloc.cpp b/deps/acelite/ace/Malloc.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc.cpp
rename to deps/acelite/ace/Malloc.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Malloc.h b/deps/acelite/ace/Malloc.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc.h
rename to deps/acelite/ace/Malloc.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc.inl b/deps/acelite/ace/Malloc.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc.inl
rename to deps/acelite/ace/Malloc.inl
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.cpp b/deps/acelite/ace/Malloc_Allocator.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc_Allocator.cpp
rename to deps/acelite/ace/Malloc_Allocator.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.h b/deps/acelite/ace/Malloc_Allocator.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc_Allocator.h
rename to deps/acelite/ace/Malloc_Allocator.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.inl b/deps/acelite/ace/Malloc_Allocator.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc_Allocator.inl
rename to deps/acelite/ace/Malloc_Allocator.inl
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Base.h b/deps/acelite/ace/Malloc_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc_Base.h
rename to deps/acelite/ace/Malloc_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_T.cpp b/deps/acelite/ace/Malloc_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc_T.cpp
rename to deps/acelite/ace/Malloc_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_T.h b/deps/acelite/ace/Malloc_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc_T.h
rename to deps/acelite/ace/Malloc_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_T.inl b/deps/acelite/ace/Malloc_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Malloc_T.inl
rename to deps/acelite/ace/Malloc_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Managed_Object.cpp b/deps/acelite/ace/Managed_Object.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Managed_Object.cpp
rename to deps/acelite/ace/Managed_Object.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Managed_Object.h b/deps/acelite/ace/Managed_Object.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Managed_Object.h
rename to deps/acelite/ace/Managed_Object.h
diff --git a/modules/worldengine/deps/acelite/ace/Managed_Object.inl b/deps/acelite/ace/Managed_Object.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Managed_Object.inl
rename to deps/acelite/ace/Managed_Object.inl
diff --git a/modules/worldengine/deps/acelite/ace/Manual_Event.cpp b/deps/acelite/ace/Manual_Event.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Manual_Event.cpp
rename to deps/acelite/ace/Manual_Event.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Manual_Event.h b/deps/acelite/ace/Manual_Event.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Manual_Event.h
rename to deps/acelite/ace/Manual_Event.h
diff --git a/modules/worldengine/deps/acelite/ace/Manual_Event.inl b/deps/acelite/ace/Manual_Event.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Manual_Event.inl
rename to deps/acelite/ace/Manual_Event.inl
diff --git a/modules/worldengine/deps/acelite/ace/Map_Manager.cpp b/deps/acelite/ace/Map_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Map_Manager.cpp
rename to deps/acelite/ace/Map_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Map_Manager.h b/deps/acelite/ace/Map_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Map_Manager.h
rename to deps/acelite/ace/Map_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Map_Manager.inl b/deps/acelite/ace/Map_Manager.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Map_Manager.inl
rename to deps/acelite/ace/Map_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Map_T.cpp b/deps/acelite/ace/Map_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Map_T.cpp
rename to deps/acelite/ace/Map_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Map_T.h b/deps/acelite/ace/Map_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Map_T.h
rename to deps/acelite/ace/Map_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Map_T.inl b/deps/acelite/ace/Map_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Map_T.inl
rename to deps/acelite/ace/Map_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Mem_Map.cpp b/deps/acelite/ace/Mem_Map.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Mem_Map.cpp
rename to deps/acelite/ace/Mem_Map.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Mem_Map.h b/deps/acelite/ace/Mem_Map.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Mem_Map.h
rename to deps/acelite/ace/Mem_Map.h
diff --git a/modules/worldengine/deps/acelite/ace/Mem_Map.inl b/deps/acelite/ace/Mem_Map.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Mem_Map.inl
rename to deps/acelite/ace/Mem_Map.inl
diff --git a/modules/worldengine/deps/acelite/ace/Memory_Pool.h b/deps/acelite/ace/Memory_Pool.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Memory_Pool.h
rename to deps/acelite/ace/Memory_Pool.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block.cpp b/deps/acelite/ace/Message_Block.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Block.cpp
rename to deps/acelite/ace/Message_Block.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block.h b/deps/acelite/ace/Message_Block.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Block.h
rename to deps/acelite/ace/Message_Block.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block.inl b/deps/acelite/ace/Message_Block.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Block.inl
rename to deps/acelite/ace/Message_Block.inl
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block_T.cpp b/deps/acelite/ace/Message_Block_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Block_T.cpp
rename to deps/acelite/ace/Message_Block_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block_T.h b/deps/acelite/ace/Message_Block_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Block_T.h
rename to deps/acelite/ace/Message_Block_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block_T.inl b/deps/acelite/ace/Message_Block_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Block_T.inl
rename to deps/acelite/ace/Message_Block_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue.cpp b/deps/acelite/ace/Message_Queue.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue.cpp
rename to deps/acelite/ace/Message_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue.h b/deps/acelite/ace/Message_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue.h
rename to deps/acelite/ace/Message_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue.inl b/deps/acelite/ace/Message_Queue.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue.inl
rename to deps/acelite/ace/Message_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_NT.cpp b/deps/acelite/ace/Message_Queue_NT.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_NT.cpp
rename to deps/acelite/ace/Message_Queue_NT.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_NT.h b/deps/acelite/ace/Message_Queue_NT.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_NT.h
rename to deps/acelite/ace/Message_Queue_NT.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_NT.inl b/deps/acelite/ace/Message_Queue_NT.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_NT.inl
rename to deps/acelite/ace/Message_Queue_NT.inl
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_T.cpp b/deps/acelite/ace/Message_Queue_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_T.cpp
rename to deps/acelite/ace/Message_Queue_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_T.h b/deps/acelite/ace/Message_Queue_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_T.h
rename to deps/acelite/ace/Message_Queue_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_Vx.cpp b/deps/acelite/ace/Message_Queue_Vx.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_Vx.cpp
rename to deps/acelite/ace/Message_Queue_Vx.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_Vx.h b/deps/acelite/ace/Message_Queue_Vx.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_Vx.h
rename to deps/acelite/ace/Message_Queue_Vx.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue_Vx.inl b/deps/acelite/ace/Message_Queue_Vx.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Message_Queue_Vx.inl
rename to deps/acelite/ace/Message_Queue_Vx.inl
diff --git a/modules/worldengine/deps/acelite/ace/Method_Request.cpp b/deps/acelite/ace/Method_Request.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Method_Request.cpp
rename to deps/acelite/ace/Method_Request.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Method_Request.h b/deps/acelite/ace/Method_Request.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Method_Request.h
rename to deps/acelite/ace/Method_Request.h
diff --git a/modules/worldengine/deps/acelite/ace/Metrics_Cache.h b/deps/acelite/ace/Metrics_Cache.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Metrics_Cache.h
rename to deps/acelite/ace/Metrics_Cache.h
diff --git a/modules/worldengine/deps/acelite/ace/Metrics_Cache_T.cpp b/deps/acelite/ace/Metrics_Cache_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Metrics_Cache_T.cpp
rename to deps/acelite/ace/Metrics_Cache_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Metrics_Cache_T.h b/deps/acelite/ace/Metrics_Cache_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Metrics_Cache_T.h
rename to deps/acelite/ace/Metrics_Cache_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Metrics_Cache_T.inl b/deps/acelite/ace/Metrics_Cache_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Metrics_Cache_T.inl
rename to deps/acelite/ace/Metrics_Cache_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Min_Max.h b/deps/acelite/ace/Min_Max.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Min_Max.h
rename to deps/acelite/ace/Min_Max.h
diff --git a/modules/worldengine/deps/acelite/ace/Module.cpp b/deps/acelite/ace/Module.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Module.cpp
rename to deps/acelite/ace/Module.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Module.h b/deps/acelite/ace/Module.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Module.h
rename to deps/acelite/ace/Module.h
diff --git a/modules/worldengine/deps/acelite/ace/Module.inl b/deps/acelite/ace/Module.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Module.inl
rename to deps/acelite/ace/Module.inl
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Admin.cpp b/deps/acelite/ace/Monitor_Admin.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Admin.cpp
rename to deps/acelite/ace/Monitor_Admin.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Admin.h b/deps/acelite/ace/Monitor_Admin.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Admin.h
rename to deps/acelite/ace/Monitor_Admin.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Admin_Manager.cpp b/deps/acelite/ace/Monitor_Admin_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Admin_Manager.cpp
rename to deps/acelite/ace/Monitor_Admin_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Admin_Manager.h b/deps/acelite/ace/Monitor_Admin_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Admin_Manager.h
rename to deps/acelite/ace/Monitor_Admin_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Base.cpp b/deps/acelite/ace/Monitor_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Base.cpp
rename to deps/acelite/ace/Monitor_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Base.h b/deps/acelite/ace/Monitor_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Base.h
rename to deps/acelite/ace/Monitor_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Base.inl b/deps/acelite/ace/Monitor_Base.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Base.inl
rename to deps/acelite/ace/Monitor_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp b/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
rename to deps/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.h b/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.h
rename to deps/acelite/ace/Monitor_Control/Auto_Update_Starter.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h b/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
rename to deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h b/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h b/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp b/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.h b/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
rename to deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp b/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
rename to deps/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.h b/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.h
rename to deps/acelite/ace/Monitor_Control/Constraint_Interpreter.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Visitor.cpp b/deps/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
rename to deps/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Visitor.h b/deps/acelite/ace/Monitor_Control/Constraint_Visitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Visitor.h
rename to deps/acelite/ace/Monitor_Control/Constraint_Visitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h b/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
rename to deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h b/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.h b/deps/acelite/ace/Monitor_Control/Monitor_Control.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.h
rename to deps/acelite/ace/Monitor_Control/Monitor_Control.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.mpc b/deps/acelite/ace/Monitor_Control/Monitor_Control.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.mpc
rename to deps/acelite/ace/Monitor_Control/Monitor_Control.mpc
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.vsd b/deps/acelite/ace/Monitor_Control/Monitor_Control.vsd
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.vsd
rename to deps/acelite/ace/Monitor_Control/Monitor_Control.vsd
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control_export.h b/deps/acelite/ace/Monitor_Control/Monitor_Control_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control_export.h
rename to deps/acelite/ace/Monitor_Control/Monitor_Control_export.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control_utils.h b/deps/acelite/ace/Monitor_Control/Monitor_Control_utils.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control_utils.h
rename to deps/acelite/ace/Monitor_Control/Monitor_Control_utils.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Group.cpp b/deps/acelite/ace/Monitor_Control/Monitor_Group.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Group.cpp
rename to deps/acelite/ace/Monitor_Control/Monitor_Group.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Group.h b/deps/acelite/ace/Monitor_Control/Monitor_Group.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Group.h
rename to deps/acelite/ace/Monitor_Control/Monitor_Group.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Query.cpp b/deps/acelite/ace/Monitor_Control/Monitor_Query.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Query.cpp
rename to deps/acelite/ace/Monitor_Control/Monitor_Query.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Query.h b/deps/acelite/ace/Monitor_Control/Monitor_Query.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Query.h
rename to deps/acelite/ace/Monitor_Control/Monitor_Query.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.h b/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.h b/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h b/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Windows_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Windows_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Monitor.h b/deps/acelite/ace/Monitor_Control/Windows_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Windows_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
rename to deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h b/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
rename to deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control_Action.cpp b/deps/acelite/ace/Monitor_Control_Action.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control_Action.cpp
rename to deps/acelite/ace/Monitor_Control_Action.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control_Action.h b/deps/acelite/ace/Monitor_Control_Action.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control_Action.h
rename to deps/acelite/ace/Monitor_Control_Action.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control_Types.cpp b/deps/acelite/ace/Monitor_Control_Types.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control_Types.cpp
rename to deps/acelite/ace/Monitor_Control_Types.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Control_Types.h b/deps/acelite/ace/Monitor_Control_Types.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Control_Types.h
rename to deps/acelite/ace/Monitor_Control_Types.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Point_Registry.cpp b/deps/acelite/ace/Monitor_Point_Registry.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Point_Registry.cpp
rename to deps/acelite/ace/Monitor_Point_Registry.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Point_Registry.h b/deps/acelite/ace/Monitor_Point_Registry.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Point_Registry.h
rename to deps/acelite/ace/Monitor_Point_Registry.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Size.cpp b/deps/acelite/ace/Monitor_Size.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Size.cpp
rename to deps/acelite/ace/Monitor_Size.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Size.h b/deps/acelite/ace/Monitor_Size.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monitor_Size.h
rename to deps/acelite/ace/Monitor_Size.h
diff --git a/modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.cpp b/deps/acelite/ace/Monotonic_Time_Policy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.cpp
rename to deps/acelite/ace/Monotonic_Time_Policy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.h b/deps/acelite/ace/Monotonic_Time_Policy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.h
rename to deps/acelite/ace/Monotonic_Time_Policy.h
diff --git a/modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.inl b/deps/acelite/ace/Monotonic_Time_Policy.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.inl
rename to deps/acelite/ace/Monotonic_Time_Policy.inl
diff --git a/modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.cpp b/deps/acelite/ace/Msg_WFMO_Reactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.cpp
rename to deps/acelite/ace/Msg_WFMO_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.h b/deps/acelite/ace/Msg_WFMO_Reactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.h
rename to deps/acelite/ace/Msg_WFMO_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.inl b/deps/acelite/ace/Msg_WFMO_Reactor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.inl
rename to deps/acelite/ace/Msg_WFMO_Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.cpp b/deps/acelite/ace/Multihomed_INET_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.cpp
rename to deps/acelite/ace/Multihomed_INET_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.h b/deps/acelite/ace/Multihomed_INET_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.h
rename to deps/acelite/ace/Multihomed_INET_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.inl b/deps/acelite/ace/Multihomed_INET_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.inl
rename to deps/acelite/ace/Multihomed_INET_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Mutex.cpp b/deps/acelite/ace/Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Mutex.cpp
rename to deps/acelite/ace/Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Mutex.h b/deps/acelite/ace/Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Mutex.h
rename to deps/acelite/ace/Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Mutex.inl b/deps/acelite/ace/Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Mutex.inl
rename to deps/acelite/ace/Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/NT_Service.cpp b/deps/acelite/ace/NT_Service.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/NT_Service.cpp
rename to deps/acelite/ace/NT_Service.cpp
diff --git a/modules/worldengine/deps/acelite/ace/NT_Service.h b/deps/acelite/ace/NT_Service.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/NT_Service.h
rename to deps/acelite/ace/NT_Service.h
diff --git a/modules/worldengine/deps/acelite/ace/NT_Service.inl b/deps/acelite/ace/NT_Service.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/NT_Service.inl
rename to deps/acelite/ace/NT_Service.inl
diff --git a/modules/worldengine/deps/acelite/ace/Name_Proxy.cpp b/deps/acelite/ace/Name_Proxy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Name_Proxy.cpp
rename to deps/acelite/ace/Name_Proxy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Name_Proxy.h b/deps/acelite/ace/Name_Proxy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Name_Proxy.h
rename to deps/acelite/ace/Name_Proxy.h
diff --git a/modules/worldengine/deps/acelite/ace/Name_Request_Reply.cpp b/deps/acelite/ace/Name_Request_Reply.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Name_Request_Reply.cpp
rename to deps/acelite/ace/Name_Request_Reply.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Name_Request_Reply.h b/deps/acelite/ace/Name_Request_Reply.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Name_Request_Reply.h
rename to deps/acelite/ace/Name_Request_Reply.h
diff --git a/modules/worldengine/deps/acelite/ace/Name_Space.cpp b/deps/acelite/ace/Name_Space.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Name_Space.cpp
rename to deps/acelite/ace/Name_Space.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Name_Space.h b/deps/acelite/ace/Name_Space.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Name_Space.h
rename to deps/acelite/ace/Name_Space.h
diff --git a/modules/worldengine/deps/acelite/ace/Naming_Context.cpp b/deps/acelite/ace/Naming_Context.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Naming_Context.cpp
rename to deps/acelite/ace/Naming_Context.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Naming_Context.h b/deps/acelite/ace/Naming_Context.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Naming_Context.h
rename to deps/acelite/ace/Naming_Context.h
diff --git a/modules/worldengine/deps/acelite/ace/Naming_Context.inl b/deps/acelite/ace/Naming_Context.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Naming_Context.inl
rename to deps/acelite/ace/Naming_Context.inl
diff --git a/modules/worldengine/deps/acelite/ace/Netlink_Addr.cpp b/deps/acelite/ace/Netlink_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Netlink_Addr.cpp
rename to deps/acelite/ace/Netlink_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Netlink_Addr.h b/deps/acelite/ace/Netlink_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Netlink_Addr.h
rename to deps/acelite/ace/Netlink_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/Netlink_Addr.inl b/deps/acelite/ace/Netlink_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Netlink_Addr.inl
rename to deps/acelite/ace/Netlink_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Node.cpp b/deps/acelite/ace/Node.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Node.cpp
rename to deps/acelite/ace/Node.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Node.h b/deps/acelite/ace/Node.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Node.h
rename to deps/acelite/ace/Node.h
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Queue.cpp b/deps/acelite/ace/Notification_Queue.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Notification_Queue.cpp
rename to deps/acelite/ace/Notification_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Queue.h b/deps/acelite/ace/Notification_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Notification_Queue.h
rename to deps/acelite/ace/Notification_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Queue.inl b/deps/acelite/ace/Notification_Queue.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Notification_Queue.inl
rename to deps/acelite/ace/Notification_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Strategy.cpp b/deps/acelite/ace/Notification_Strategy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Notification_Strategy.cpp
rename to deps/acelite/ace/Notification_Strategy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Strategy.h b/deps/acelite/ace/Notification_Strategy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Notification_Strategy.h
rename to deps/acelite/ace/Notification_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Strategy.inl b/deps/acelite/ace/Notification_Strategy.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Notification_Strategy.inl
rename to deps/acelite/ace/Notification_Strategy.inl
diff --git a/modules/worldengine/deps/acelite/ace/Null_Barrier.h b/deps/acelite/ace/Null_Barrier.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Null_Barrier.h
rename to deps/acelite/ace/Null_Barrier.h
diff --git a/modules/worldengine/deps/acelite/ace/Null_Condition.h b/deps/acelite/ace/Null_Condition.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Null_Condition.h
rename to deps/acelite/ace/Null_Condition.h
diff --git a/modules/worldengine/deps/acelite/ace/Null_Mutex.h b/deps/acelite/ace/Null_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Null_Mutex.h
rename to deps/acelite/ace/Null_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Null_Semaphore.h b/deps/acelite/ace/Null_Semaphore.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Null_Semaphore.h
rename to deps/acelite/ace/Null_Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Numeric_Limits.h b/deps/acelite/ace/Numeric_Limits.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Numeric_Limits.h
rename to deps/acelite/ace/Numeric_Limits.h
diff --git a/modules/worldengine/deps/acelite/ace/OS.h b/deps/acelite/ace/OS.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS.h
rename to deps/acelite/ace/OS.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_Errno.cpp b/deps/acelite/ace/OS_Errno.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Errno.cpp
rename to deps/acelite/ace/OS_Errno.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_Errno.h b/deps/acelite/ace/OS_Errno.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Errno.h
rename to deps/acelite/ace/OS_Errno.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_Errno.inl b/deps/acelite/ace/OS_Errno.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Errno.inl
rename to deps/acelite/ace/OS_Errno.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.cpp b/deps/acelite/ace/OS_Log_Msg_Attributes.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.cpp
rename to deps/acelite/ace/OS_Log_Msg_Attributes.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.h b/deps/acelite/ace/OS_Log_Msg_Attributes.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.h
rename to deps/acelite/ace/OS_Log_Msg_Attributes.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.inl b/deps/acelite/ace/OS_Log_Msg_Attributes.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.inl
rename to deps/acelite/ace/OS_Log_Msg_Attributes.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_Memory.h b/deps/acelite/ace/OS_Memory.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Memory.h
rename to deps/acelite/ace/OS_Memory.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_Thread.cpp b/deps/acelite/ace/OS_NS_Thread.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_Thread.cpp
rename to deps/acelite/ace/OS_NS_Thread.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_Thread.h b/deps/acelite/ace/OS_NS_Thread.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_Thread.h
rename to deps/acelite/ace/OS_NS_Thread.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_Thread.inl b/deps/acelite/ace/OS_NS_Thread.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_Thread.inl
rename to deps/acelite/ace/OS_NS_Thread.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.cpp b/deps/acelite/ace/OS_NS_arpa_inet.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.cpp
rename to deps/acelite/ace/OS_NS_arpa_inet.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.h b/deps/acelite/ace/OS_NS_arpa_inet.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.h
rename to deps/acelite/ace/OS_NS_arpa_inet.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.inl b/deps/acelite/ace/OS_NS_arpa_inet.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.inl
rename to deps/acelite/ace/OS_NS_arpa_inet.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_ctype.cpp b/deps/acelite/ace/OS_NS_ctype.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_ctype.cpp
rename to deps/acelite/ace/OS_NS_ctype.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_ctype.h b/deps/acelite/ace/OS_NS_ctype.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_ctype.h
rename to deps/acelite/ace/OS_NS_ctype.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_ctype.inl b/deps/acelite/ace/OS_NS_ctype.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_ctype.inl
rename to deps/acelite/ace/OS_NS_ctype.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_dirent.cpp b/deps/acelite/ace/OS_NS_dirent.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_dirent.cpp
rename to deps/acelite/ace/OS_NS_dirent.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_dirent.h b/deps/acelite/ace/OS_NS_dirent.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_dirent.h
rename to deps/acelite/ace/OS_NS_dirent.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_dirent.inl b/deps/acelite/ace/OS_NS_dirent.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_dirent.inl
rename to deps/acelite/ace/OS_NS_dirent.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.cpp b/deps/acelite/ace/OS_NS_dlfcn.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.cpp
rename to deps/acelite/ace/OS_NS_dlfcn.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.h b/deps/acelite/ace/OS_NS_dlfcn.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.h
rename to deps/acelite/ace/OS_NS_dlfcn.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.inl b/deps/acelite/ace/OS_NS_dlfcn.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.inl
rename to deps/acelite/ace/OS_NS_dlfcn.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_errno.cpp b/deps/acelite/ace/OS_NS_errno.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_errno.cpp
rename to deps/acelite/ace/OS_NS_errno.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_errno.h b/deps/acelite/ace/OS_NS_errno.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_errno.h
rename to deps/acelite/ace/OS_NS_errno.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_errno.inl b/deps/acelite/ace/OS_NS_errno.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_errno.inl
rename to deps/acelite/ace/OS_NS_errno.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_fcntl.cpp b/deps/acelite/ace/OS_NS_fcntl.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_fcntl.cpp
rename to deps/acelite/ace/OS_NS_fcntl.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_fcntl.h b/deps/acelite/ace/OS_NS_fcntl.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_fcntl.h
rename to deps/acelite/ace/OS_NS_fcntl.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_fcntl.inl b/deps/acelite/ace/OS_NS_fcntl.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_fcntl.inl
rename to deps/acelite/ace/OS_NS_fcntl.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_macros.h b/deps/acelite/ace/OS_NS_macros.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_macros.h
rename to deps/acelite/ace/OS_NS_macros.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_math.cpp b/deps/acelite/ace/OS_NS_math.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_math.cpp
rename to deps/acelite/ace/OS_NS_math.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_math.h b/deps/acelite/ace/OS_NS_math.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_math.h
rename to deps/acelite/ace/OS_NS_math.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_math.inl b/deps/acelite/ace/OS_NS_math.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_math.inl
rename to deps/acelite/ace/OS_NS_math.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_netdb.cpp b/deps/acelite/ace/OS_NS_netdb.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_netdb.cpp
rename to deps/acelite/ace/OS_NS_netdb.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_netdb.h b/deps/acelite/ace/OS_NS_netdb.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_netdb.h
rename to deps/acelite/ace/OS_NS_netdb.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_netdb.inl b/deps/acelite/ace/OS_NS_netdb.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_netdb.inl
rename to deps/acelite/ace/OS_NS_netdb.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_poll.cpp b/deps/acelite/ace/OS_NS_poll.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_poll.cpp
rename to deps/acelite/ace/OS_NS_poll.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_poll.h b/deps/acelite/ace/OS_NS_poll.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_poll.h
rename to deps/acelite/ace/OS_NS_poll.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_poll.inl b/deps/acelite/ace/OS_NS_poll.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_poll.inl
rename to deps/acelite/ace/OS_NS_poll.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_pwd.cpp b/deps/acelite/ace/OS_NS_pwd.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_pwd.cpp
rename to deps/acelite/ace/OS_NS_pwd.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_pwd.h b/deps/acelite/ace/OS_NS_pwd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_pwd.h
rename to deps/acelite/ace/OS_NS_pwd.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_pwd.inl b/deps/acelite/ace/OS_NS_pwd.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_pwd.inl
rename to deps/acelite/ace/OS_NS_pwd.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_regex.cpp b/deps/acelite/ace/OS_NS_regex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_regex.cpp
rename to deps/acelite/ace/OS_NS_regex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_regex.h b/deps/acelite/ace/OS_NS_regex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_regex.h
rename to deps/acelite/ace/OS_NS_regex.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_regex.inl b/deps/acelite/ace/OS_NS_regex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_regex.inl
rename to deps/acelite/ace/OS_NS_regex.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_signal.cpp b/deps/acelite/ace/OS_NS_signal.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_signal.cpp
rename to deps/acelite/ace/OS_NS_signal.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_signal.h b/deps/acelite/ace/OS_NS_signal.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_signal.h
rename to deps/acelite/ace/OS_NS_signal.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_signal.inl b/deps/acelite/ace/OS_NS_signal.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_signal.inl
rename to deps/acelite/ace/OS_NS_signal.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stdio.cpp b/deps/acelite/ace/OS_NS_stdio.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stdio.cpp
rename to deps/acelite/ace/OS_NS_stdio.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stdio.h b/deps/acelite/ace/OS_NS_stdio.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stdio.h
rename to deps/acelite/ace/OS_NS_stdio.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stdio.inl b/deps/acelite/ace/OS_NS_stdio.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stdio.inl
rename to deps/acelite/ace/OS_NS_stdio.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stdlib.cpp b/deps/acelite/ace/OS_NS_stdlib.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stdlib.cpp
rename to deps/acelite/ace/OS_NS_stdlib.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stdlib.h b/deps/acelite/ace/OS_NS_stdlib.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stdlib.h
rename to deps/acelite/ace/OS_NS_stdlib.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stdlib.inl b/deps/acelite/ace/OS_NS_stdlib.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stdlib.inl
rename to deps/acelite/ace/OS_NS_stdlib.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_string.cpp b/deps/acelite/ace/OS_NS_string.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_string.cpp
rename to deps/acelite/ace/OS_NS_string.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_string.h b/deps/acelite/ace/OS_NS_string.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_string.h
rename to deps/acelite/ace/OS_NS_string.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_string.inl b/deps/acelite/ace/OS_NS_string.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_string.inl
rename to deps/acelite/ace/OS_NS_string.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_strings.cpp b/deps/acelite/ace/OS_NS_strings.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_strings.cpp
rename to deps/acelite/ace/OS_NS_strings.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_strings.h b/deps/acelite/ace/OS_NS_strings.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_strings.h
rename to deps/acelite/ace/OS_NS_strings.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_strings.inl b/deps/acelite/ace/OS_NS_strings.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_strings.inl
rename to deps/acelite/ace/OS_NS_strings.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stropts.cpp b/deps/acelite/ace/OS_NS_stropts.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stropts.cpp
rename to deps/acelite/ace/OS_NS_stropts.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stropts.h b/deps/acelite/ace/OS_NS_stropts.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stropts.h
rename to deps/acelite/ace/OS_NS_stropts.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_stropts.inl b/deps/acelite/ace/OS_NS_stropts.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_stropts.inl
rename to deps/acelite/ace/OS_NS_stropts.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.cpp b/deps/acelite/ace/OS_NS_sys_mman.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.cpp
rename to deps/acelite/ace/OS_NS_sys_mman.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.h b/deps/acelite/ace/OS_NS_sys_mman.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.h
rename to deps/acelite/ace/OS_NS_sys_mman.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.inl b/deps/acelite/ace/OS_NS_sys_mman.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.inl
rename to deps/acelite/ace/OS_NS_sys_mman.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.cpp b/deps/acelite/ace/OS_NS_sys_msg.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.cpp
rename to deps/acelite/ace/OS_NS_sys_msg.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.h b/deps/acelite/ace/OS_NS_sys_msg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.h
rename to deps/acelite/ace/OS_NS_sys_msg.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.inl b/deps/acelite/ace/OS_NS_sys_msg.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.inl
rename to deps/acelite/ace/OS_NS_sys_msg.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.cpp b/deps/acelite/ace/OS_NS_sys_resource.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.cpp
rename to deps/acelite/ace/OS_NS_sys_resource.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.h b/deps/acelite/ace/OS_NS_sys_resource.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.h
rename to deps/acelite/ace/OS_NS_sys_resource.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.inl b/deps/acelite/ace/OS_NS_sys_resource.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.inl
rename to deps/acelite/ace/OS_NS_sys_resource.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_select.cpp b/deps/acelite/ace/OS_NS_sys_select.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_select.cpp
rename to deps/acelite/ace/OS_NS_sys_select.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_select.h b/deps/acelite/ace/OS_NS_sys_select.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_select.h
rename to deps/acelite/ace/OS_NS_sys_select.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_select.inl b/deps/acelite/ace/OS_NS_sys_select.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_select.inl
rename to deps/acelite/ace/OS_NS_sys_select.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.cpp b/deps/acelite/ace/OS_NS_sys_sendfile.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.cpp
rename to deps/acelite/ace/OS_NS_sys_sendfile.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.h b/deps/acelite/ace/OS_NS_sys_sendfile.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.h
rename to deps/acelite/ace/OS_NS_sys_sendfile.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.inl b/deps/acelite/ace/OS_NS_sys_sendfile.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.inl
rename to deps/acelite/ace/OS_NS_sys_sendfile.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.cpp b/deps/acelite/ace/OS_NS_sys_shm.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.cpp
rename to deps/acelite/ace/OS_NS_sys_shm.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.h b/deps/acelite/ace/OS_NS_sys_shm.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.h
rename to deps/acelite/ace/OS_NS_sys_shm.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.inl b/deps/acelite/ace/OS_NS_sys_shm.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.inl
rename to deps/acelite/ace/OS_NS_sys_shm.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.cpp b/deps/acelite/ace/OS_NS_sys_socket.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.cpp
rename to deps/acelite/ace/OS_NS_sys_socket.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.h b/deps/acelite/ace/OS_NS_sys_socket.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.h
rename to deps/acelite/ace/OS_NS_sys_socket.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.inl b/deps/acelite/ace/OS_NS_sys_socket.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.inl
rename to deps/acelite/ace/OS_NS_sys_socket.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.cpp b/deps/acelite/ace/OS_NS_sys_stat.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.cpp
rename to deps/acelite/ace/OS_NS_sys_stat.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.h b/deps/acelite/ace/OS_NS_sys_stat.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.h
rename to deps/acelite/ace/OS_NS_sys_stat.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.inl b/deps/acelite/ace/OS_NS_sys_stat.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.inl
rename to deps/acelite/ace/OS_NS_sys_stat.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_time.cpp b/deps/acelite/ace/OS_NS_sys_time.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_time.cpp
rename to deps/acelite/ace/OS_NS_sys_time.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_time.h b/deps/acelite/ace/OS_NS_sys_time.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_time.h
rename to deps/acelite/ace/OS_NS_sys_time.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_time.inl b/deps/acelite/ace/OS_NS_sys_time.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_time.inl
rename to deps/acelite/ace/OS_NS_sys_time.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.cpp b/deps/acelite/ace/OS_NS_sys_uio.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.cpp
rename to deps/acelite/ace/OS_NS_sys_uio.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.h b/deps/acelite/ace/OS_NS_sys_uio.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.h
rename to deps/acelite/ace/OS_NS_sys_uio.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.inl b/deps/acelite/ace/OS_NS_sys_uio.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.inl
rename to deps/acelite/ace/OS_NS_sys_uio.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_utsname.cpp b/deps/acelite/ace/OS_NS_sys_utsname.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_utsname.cpp
rename to deps/acelite/ace/OS_NS_sys_utsname.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_utsname.h b/deps/acelite/ace/OS_NS_sys_utsname.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_utsname.h
rename to deps/acelite/ace/OS_NS_sys_utsname.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.cpp b/deps/acelite/ace/OS_NS_sys_wait.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.cpp
rename to deps/acelite/ace/OS_NS_sys_wait.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.h b/deps/acelite/ace/OS_NS_sys_wait.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.h
rename to deps/acelite/ace/OS_NS_sys_wait.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.inl b/deps/acelite/ace/OS_NS_sys_wait.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.inl
rename to deps/acelite/ace/OS_NS_sys_wait.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_time.cpp b/deps/acelite/ace/OS_NS_time.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_time.cpp
rename to deps/acelite/ace/OS_NS_time.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_time.h b/deps/acelite/ace/OS_NS_time.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_time.h
rename to deps/acelite/ace/OS_NS_time.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_time.inl b/deps/acelite/ace/OS_NS_time.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_time.inl
rename to deps/acelite/ace/OS_NS_time.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_unistd.cpp b/deps/acelite/ace/OS_NS_unistd.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_unistd.cpp
rename to deps/acelite/ace/OS_NS_unistd.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_unistd.h b/deps/acelite/ace/OS_NS_unistd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_unistd.h
rename to deps/acelite/ace/OS_NS_unistd.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_unistd.inl b/deps/acelite/ace/OS_NS_unistd.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_unistd.inl
rename to deps/acelite/ace/OS_NS_unistd.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_wchar.cpp b/deps/acelite/ace/OS_NS_wchar.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_wchar.cpp
rename to deps/acelite/ace/OS_NS_wchar.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_wchar.h b/deps/acelite/ace/OS_NS_wchar.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_wchar.h
rename to deps/acelite/ace/OS_NS_wchar.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_wchar.inl b/deps/acelite/ace/OS_NS_wchar.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_wchar.inl
rename to deps/acelite/ace/OS_NS_wchar.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_wctype.cpp b/deps/acelite/ace/OS_NS_wctype.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_wctype.cpp
rename to deps/acelite/ace/OS_NS_wctype.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_wctype.h b/deps/acelite/ace/OS_NS_wctype.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_wctype.h
rename to deps/acelite/ace/OS_NS_wctype.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_NS_wctype.inl b/deps/acelite/ace/OS_NS_wctype.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_NS_wctype.inl
rename to deps/acelite/ace/OS_NS_wctype.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_QoS.cpp b/deps/acelite/ace/OS_QoS.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_QoS.cpp
rename to deps/acelite/ace/OS_QoS.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_QoS.h b/deps/acelite/ace/OS_QoS.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_QoS.h
rename to deps/acelite/ace/OS_QoS.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_TLI.cpp b/deps/acelite/ace/OS_TLI.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_TLI.cpp
rename to deps/acelite/ace/OS_TLI.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_TLI.h b/deps/acelite/ace/OS_TLI.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_TLI.h
rename to deps/acelite/ace/OS_TLI.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_TLI.inl b/deps/acelite/ace/OS_TLI.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_TLI.inl
rename to deps/acelite/ace/OS_TLI.inl
diff --git a/modules/worldengine/deps/acelite/ace/OS_Thread_Adapter.cpp b/deps/acelite/ace/OS_Thread_Adapter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Thread_Adapter.cpp
rename to deps/acelite/ace/OS_Thread_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_Thread_Adapter.h b/deps/acelite/ace/OS_Thread_Adapter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_Thread_Adapter.h
rename to deps/acelite/ace/OS_Thread_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_main.cpp b/deps/acelite/ace/OS_main.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_main.cpp
rename to deps/acelite/ace/OS_main.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_main.h b/deps/acelite/ace/OS_main.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/OS_main.h
rename to deps/acelite/ace/OS_main.h
diff --git a/modules/worldengine/deps/acelite/ace/Obchunk.cpp b/deps/acelite/ace/Obchunk.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obchunk.cpp
rename to deps/acelite/ace/Obchunk.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Obchunk.h b/deps/acelite/ace/Obchunk.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obchunk.h
rename to deps/acelite/ace/Obchunk.h
diff --git a/modules/worldengine/deps/acelite/ace/Obchunk.inl b/deps/acelite/ace/Obchunk.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obchunk.inl
rename to deps/acelite/ace/Obchunk.inl
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager.cpp b/deps/acelite/ace/Object_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Object_Manager.cpp
rename to deps/acelite/ace/Object_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager.h b/deps/acelite/ace/Object_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Object_Manager.h
rename to deps/acelite/ace/Object_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager.inl b/deps/acelite/ace/Object_Manager.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Object_Manager.inl
rename to deps/acelite/ace/Object_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager_Base.cpp b/deps/acelite/ace/Object_Manager_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Object_Manager_Base.cpp
rename to deps/acelite/ace/Object_Manager_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager_Base.h b/deps/acelite/ace/Object_Manager_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Object_Manager_Base.h
rename to deps/acelite/ace/Object_Manager_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Obstack.cpp b/deps/acelite/ace/Obstack.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obstack.cpp
rename to deps/acelite/ace/Obstack.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Obstack.h b/deps/acelite/ace/Obstack.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obstack.h
rename to deps/acelite/ace/Obstack.h
diff --git a/modules/worldengine/deps/acelite/ace/Obstack_T.cpp b/deps/acelite/ace/Obstack_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obstack_T.cpp
rename to deps/acelite/ace/Obstack_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Obstack_T.h b/deps/acelite/ace/Obstack_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obstack_T.h
rename to deps/acelite/ace/Obstack_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Obstack_T.inl b/deps/acelite/ace/Obstack_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Obstack_T.inl
rename to deps/acelite/ace/Obstack_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/PI_Malloc.cpp b/deps/acelite/ace/PI_Malloc.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/PI_Malloc.cpp
rename to deps/acelite/ace/PI_Malloc.cpp
diff --git a/modules/worldengine/deps/acelite/ace/PI_Malloc.h b/deps/acelite/ace/PI_Malloc.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/PI_Malloc.h
rename to deps/acelite/ace/PI_Malloc.h
diff --git a/modules/worldengine/deps/acelite/ace/PI_Malloc.inl b/deps/acelite/ace/PI_Malloc.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/PI_Malloc.inl
rename to deps/acelite/ace/PI_Malloc.inl
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_Asynch_IO.cpp b/deps/acelite/ace/POSIX_Asynch_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/POSIX_Asynch_IO.cpp
rename to deps/acelite/ace/POSIX_Asynch_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_Asynch_IO.h b/deps/acelite/ace/POSIX_Asynch_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/POSIX_Asynch_IO.h
rename to deps/acelite/ace/POSIX_Asynch_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_CB_Proactor.cpp b/deps/acelite/ace/POSIX_CB_Proactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/POSIX_CB_Proactor.cpp
rename to deps/acelite/ace/POSIX_CB_Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_CB_Proactor.h b/deps/acelite/ace/POSIX_CB_Proactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/POSIX_CB_Proactor.h
rename to deps/acelite/ace/POSIX_CB_Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.cpp b/deps/acelite/ace/POSIX_Proactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/POSIX_Proactor.cpp
rename to deps/acelite/ace/POSIX_Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.h b/deps/acelite/ace/POSIX_Proactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/POSIX_Proactor.h
rename to deps/acelite/ace/POSIX_Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.inl b/deps/acelite/ace/POSIX_Proactor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/POSIX_Proactor.inl
rename to deps/acelite/ace/POSIX_Proactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.cpp b/deps/acelite/ace/Pagefile_Memory_Pool.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.cpp
rename to deps/acelite/ace/Pagefile_Memory_Pool.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.h b/deps/acelite/ace/Pagefile_Memory_Pool.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.h
rename to deps/acelite/ace/Pagefile_Memory_Pool.h
diff --git a/modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.inl b/deps/acelite/ace/Pagefile_Memory_Pool.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.inl
rename to deps/acelite/ace/Pagefile_Memory_Pool.inl
diff --git a/modules/worldengine/deps/acelite/ace/Pair_T.cpp b/deps/acelite/ace/Pair_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pair_T.cpp
rename to deps/acelite/ace/Pair_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Pair_T.h b/deps/acelite/ace/Pair_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pair_T.h
rename to deps/acelite/ace/Pair_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Pair_T.inl b/deps/acelite/ace/Pair_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pair_T.inl
rename to deps/acelite/ace/Pair_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Parse_Node.cpp b/deps/acelite/ace/Parse_Node.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Parse_Node.cpp
rename to deps/acelite/ace/Parse_Node.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Parse_Node.h b/deps/acelite/ace/Parse_Node.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Parse_Node.h
rename to deps/acelite/ace/Parse_Node.h
diff --git a/modules/worldengine/deps/acelite/ace/Ping_Socket.cpp b/deps/acelite/ace/Ping_Socket.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Ping_Socket.cpp
rename to deps/acelite/ace/Ping_Socket.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Ping_Socket.h b/deps/acelite/ace/Ping_Socket.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Ping_Socket.h
rename to deps/acelite/ace/Ping_Socket.h
diff --git a/modules/worldengine/deps/acelite/ace/Ping_Socket.inl b/deps/acelite/ace/Ping_Socket.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Ping_Socket.inl
rename to deps/acelite/ace/Ping_Socket.inl
diff --git a/modules/worldengine/deps/acelite/ace/Pipe.cpp b/deps/acelite/ace/Pipe.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pipe.cpp
rename to deps/acelite/ace/Pipe.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Pipe.h b/deps/acelite/ace/Pipe.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pipe.h
rename to deps/acelite/ace/Pipe.h
diff --git a/modules/worldengine/deps/acelite/ace/Pipe.inl b/deps/acelite/ace/Pipe.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Pipe.inl
rename to deps/acelite/ace/Pipe.inl
diff --git a/modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
rename to deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
diff --git a/modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h b/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
rename to deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
diff --git a/modules/worldengine/deps/acelite/ace/Priority_Reactor.cpp b/deps/acelite/ace/Priority_Reactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Priority_Reactor.cpp
rename to deps/acelite/ace/Priority_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Priority_Reactor.h b/deps/acelite/ace/Priority_Reactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Priority_Reactor.h
rename to deps/acelite/ace/Priority_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Proactor.cpp b/deps/acelite/ace/Proactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Proactor.cpp
rename to deps/acelite/ace/Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Proactor.h b/deps/acelite/ace/Proactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Proactor.h
rename to deps/acelite/ace/Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Proactor.inl b/deps/acelite/ace/Proactor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Proactor.inl
rename to deps/acelite/ace/Proactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Proactor_Impl.cpp b/deps/acelite/ace/Proactor_Impl.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Proactor_Impl.cpp
rename to deps/acelite/ace/Proactor_Impl.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Proactor_Impl.h b/deps/acelite/ace/Proactor_Impl.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Proactor_Impl.h
rename to deps/acelite/ace/Proactor_Impl.h
diff --git a/modules/worldengine/deps/acelite/ace/Process.cpp b/deps/acelite/ace/Process.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process.cpp
rename to deps/acelite/ace/Process.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process.h b/deps/acelite/ace/Process.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process.h
rename to deps/acelite/ace/Process.h
diff --git a/modules/worldengine/deps/acelite/ace/Process.inl b/deps/acelite/ace/Process.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process.inl
rename to deps/acelite/ace/Process.inl
diff --git a/modules/worldengine/deps/acelite/ace/Process_Manager.cpp b/deps/acelite/ace/Process_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Manager.cpp
rename to deps/acelite/ace/Process_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process_Manager.h b/deps/acelite/ace/Process_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Manager.h
rename to deps/acelite/ace/Process_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Process_Manager.inl b/deps/acelite/ace/Process_Manager.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Manager.inl
rename to deps/acelite/ace/Process_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Process_Mutex.cpp b/deps/acelite/ace/Process_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Mutex.cpp
rename to deps/acelite/ace/Process_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process_Mutex.h b/deps/acelite/ace/Process_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Mutex.h
rename to deps/acelite/ace/Process_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Process_Mutex.inl b/deps/acelite/ace/Process_Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Mutex.inl
rename to deps/acelite/ace/Process_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Process_Semaphore.cpp b/deps/acelite/ace/Process_Semaphore.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Semaphore.cpp
rename to deps/acelite/ace/Process_Semaphore.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process_Semaphore.h b/deps/acelite/ace/Process_Semaphore.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Semaphore.h
rename to deps/acelite/ace/Process_Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Process_Semaphore.inl b/deps/acelite/ace/Process_Semaphore.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Process_Semaphore.inl
rename to deps/acelite/ace/Process_Semaphore.inl
diff --git a/modules/worldengine/deps/acelite/ace/Profile_Timer.cpp b/deps/acelite/ace/Profile_Timer.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Profile_Timer.cpp
rename to deps/acelite/ace/Profile_Timer.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Profile_Timer.h b/deps/acelite/ace/Profile_Timer.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Profile_Timer.h
rename to deps/acelite/ace/Profile_Timer.h
diff --git a/modules/worldengine/deps/acelite/ace/Profile_Timer.inl b/deps/acelite/ace/Profile_Timer.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Profile_Timer.inl
rename to deps/acelite/ace/Profile_Timer.inl
diff --git a/modules/worldengine/deps/acelite/ace/QoS/ACE_QoS.pc.in b/deps/acelite/ace/QoS/ACE_QoS.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/ACE_QoS.pc.in
rename to deps/acelite/ace/QoS/ACE_QoS.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/QoS/ACE_QoS_Export.h b/deps/acelite/ace/QoS/ACE_QoS_Export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/ACE_QoS_Export.h
rename to deps/acelite/ace/QoS/ACE_QoS_Export.h
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Decorator.cpp b/deps/acelite/ace/QoS/QoS_Decorator.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Decorator.cpp
rename to deps/acelite/ace/QoS/QoS_Decorator.cpp
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Decorator.h b/deps/acelite/ace/QoS/QoS_Decorator.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Decorator.h
rename to deps/acelite/ace/QoS/QoS_Decorator.h
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Manager.cpp b/deps/acelite/ace/QoS/QoS_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Manager.cpp
rename to deps/acelite/ace/QoS/QoS_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Manager.h b/deps/acelite/ace/QoS/QoS_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Manager.h
rename to deps/acelite/ace/QoS/QoS_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session.h b/deps/acelite/ace/QoS/QoS_Session.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Session.h
rename to deps/acelite/ace/QoS/QoS_Session.h
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Factory.cpp b/deps/acelite/ace/QoS/QoS_Session_Factory.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Factory.cpp
rename to deps/acelite/ace/QoS/QoS_Session_Factory.cpp
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Factory.h b/deps/acelite/ace/QoS/QoS_Session_Factory.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Factory.h
rename to deps/acelite/ace/QoS/QoS_Session_Factory.h
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.cpp b/deps/acelite/ace/QoS/QoS_Session_Impl.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.cpp
rename to deps/acelite/ace/QoS/QoS_Session_Impl.cpp
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.h b/deps/acelite/ace/QoS/QoS_Session_Impl.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.h
rename to deps/acelite/ace/QoS/QoS_Session_Impl.h
diff --git a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.inl b/deps/acelite/ace/QoS/QoS_Session_Impl.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.inl
rename to deps/acelite/ace/QoS/QoS_Session_Impl.inl
diff --git a/modules/worldengine/deps/acelite/ace/QoS/README b/deps/acelite/ace/QoS/README
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/README
rename to deps/acelite/ace/QoS/README
diff --git a/modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
rename to deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
diff --git a/modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
rename to deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
diff --git a/modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl b/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
rename to deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
diff --git a/modules/worldengine/deps/acelite/ace/QoS/qos.mpc b/deps/acelite/ace/QoS/qos.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QoS/qos.mpc
rename to deps/acelite/ace/QoS/qos.mpc
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/.gitignore b/deps/acelite/ace/QtReactor/.gitignore
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QtReactor/.gitignore
rename to deps/acelite/ace/QtReactor/.gitignore
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/ACE_QtReactor.pc.in b/deps/acelite/ace/QtReactor/ACE_QtReactor.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QtReactor/ACE_QtReactor.pc.in
rename to deps/acelite/ace/QtReactor/ACE_QtReactor.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/ACE_QtReactor_export.h b/deps/acelite/ace/QtReactor/ACE_QtReactor_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QtReactor/ACE_QtReactor_export.h
rename to deps/acelite/ace/QtReactor/ACE_QtReactor_export.h
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/QtReactor.cpp b/deps/acelite/ace/QtReactor/QtReactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QtReactor/QtReactor.cpp
rename to deps/acelite/ace/QtReactor/QtReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/QtReactor.h b/deps/acelite/ace/QtReactor/QtReactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QtReactor/QtReactor.h
rename to deps/acelite/ace/QtReactor/QtReactor.h
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/ace_qt4reactor.mpc b/deps/acelite/ace/QtReactor/ace_qt4reactor.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/QtReactor/ace_qt4reactor.mpc
rename to deps/acelite/ace/QtReactor/ace_qt4reactor.mpc
diff --git a/modules/worldengine/deps/acelite/ace/RB_Tree.cpp b/deps/acelite/ace/RB_Tree.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RB_Tree.cpp
rename to deps/acelite/ace/RB_Tree.cpp
diff --git a/modules/worldengine/deps/acelite/ace/RB_Tree.h b/deps/acelite/ace/RB_Tree.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RB_Tree.h
rename to deps/acelite/ace/RB_Tree.h
diff --git a/modules/worldengine/deps/acelite/ace/RB_Tree.inl b/deps/acelite/ace/RB_Tree.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RB_Tree.inl
rename to deps/acelite/ace/RB_Tree.inl
diff --git a/modules/worldengine/deps/acelite/ace/README b/deps/acelite/ace/README
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/README
rename to deps/acelite/ace/README
diff --git a/modules/worldengine/deps/acelite/ace/RW_Mutex.cpp b/deps/acelite/ace/RW_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Mutex.cpp
rename to deps/acelite/ace/RW_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/RW_Mutex.h b/deps/acelite/ace/RW_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Mutex.h
rename to deps/acelite/ace/RW_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/RW_Mutex.inl b/deps/acelite/ace/RW_Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Mutex.inl
rename to deps/acelite/ace/RW_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/RW_Process_Mutex.cpp b/deps/acelite/ace/RW_Process_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Process_Mutex.cpp
rename to deps/acelite/ace/RW_Process_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/RW_Process_Mutex.h b/deps/acelite/ace/RW_Process_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Process_Mutex.h
rename to deps/acelite/ace/RW_Process_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/RW_Process_Mutex.inl b/deps/acelite/ace/RW_Process_Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Process_Mutex.inl
rename to deps/acelite/ace/RW_Process_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.cpp b/deps/acelite/ace/RW_Thread_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.cpp
rename to deps/acelite/ace/RW_Thread_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.h b/deps/acelite/ace/RW_Thread_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.h
rename to deps/acelite/ace/RW_Thread_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.inl b/deps/acelite/ace/RW_Thread_Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.inl
rename to deps/acelite/ace/RW_Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Reactor.cpp b/deps/acelite/ace/Reactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor.cpp
rename to deps/acelite/ace/Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reactor.h b/deps/acelite/ace/Reactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor.h
rename to deps/acelite/ace/Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Reactor.inl b/deps/acelite/ace/Reactor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor.inl
rename to deps/acelite/ace/Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Impl.cpp b/deps/acelite/ace/Reactor_Impl.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Impl.cpp
rename to deps/acelite/ace/Reactor_Impl.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Impl.h b/deps/acelite/ace/Reactor_Impl.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Impl.h
rename to deps/acelite/ace/Reactor_Impl.h
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.cpp b/deps/acelite/ace/Reactor_Notification_Strategy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.cpp
rename to deps/acelite/ace/Reactor_Notification_Strategy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.h b/deps/acelite/ace/Reactor_Notification_Strategy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.h
rename to deps/acelite/ace/Reactor_Notification_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.inl b/deps/acelite/ace/Reactor_Notification_Strategy.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.inl
rename to deps/acelite/ace/Reactor_Notification_Strategy.inl
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Timer_Interface.cpp b/deps/acelite/ace/Reactor_Timer_Interface.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Timer_Interface.cpp
rename to deps/acelite/ace/Reactor_Timer_Interface.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Timer_Interface.h b/deps/acelite/ace/Reactor_Timer_Interface.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Timer_Interface.h
rename to deps/acelite/ace/Reactor_Timer_Interface.h
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Token_T.cpp b/deps/acelite/ace/Reactor_Token_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Token_T.cpp
rename to deps/acelite/ace/Reactor_Token_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Token_T.h b/deps/acelite/ace/Reactor_Token_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reactor_Token_T.h
rename to deps/acelite/ace/Reactor_Token_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Read_Buffer.cpp b/deps/acelite/ace/Read_Buffer.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Read_Buffer.cpp
rename to deps/acelite/ace/Read_Buffer.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Read_Buffer.h b/deps/acelite/ace/Read_Buffer.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Read_Buffer.h
rename to deps/acelite/ace/Read_Buffer.h
diff --git a/modules/worldengine/deps/acelite/ace/Read_Buffer.inl b/deps/acelite/ace/Read_Buffer.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Read_Buffer.inl
rename to deps/acelite/ace/Read_Buffer.inl
diff --git a/modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.cpp b/deps/acelite/ace/Recursive_Thread_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.cpp
rename to deps/acelite/ace/Recursive_Thread_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.h b/deps/acelite/ace/Recursive_Thread_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.h
rename to deps/acelite/ace/Recursive_Thread_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.inl b/deps/acelite/ace/Recursive_Thread_Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.inl
rename to deps/acelite/ace/Recursive_Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Recyclable.cpp b/deps/acelite/ace/Recyclable.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Recyclable.cpp
rename to deps/acelite/ace/Recyclable.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Recyclable.h b/deps/acelite/ace/Recyclable.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Recyclable.h
rename to deps/acelite/ace/Recyclable.h
diff --git a/modules/worldengine/deps/acelite/ace/Recyclable.inl b/deps/acelite/ace/Recyclable.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Recyclable.inl
rename to deps/acelite/ace/Recyclable.inl
diff --git a/modules/worldengine/deps/acelite/ace/Refcountable_T.cpp b/deps/acelite/ace/Refcountable_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Refcountable_T.cpp
rename to deps/acelite/ace/Refcountable_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Refcountable_T.h b/deps/acelite/ace/Refcountable_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Refcountable_T.h
rename to deps/acelite/ace/Refcountable_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Refcountable_T.inl b/deps/acelite/ace/Refcountable_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Refcountable_T.inl
rename to deps/acelite/ace/Refcountable_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.cpp b/deps/acelite/ace/Refcounted_Auto_Ptr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.cpp
rename to deps/acelite/ace/Refcounted_Auto_Ptr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.h b/deps/acelite/ace/Refcounted_Auto_Ptr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.h
rename to deps/acelite/ace/Refcounted_Auto_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.inl b/deps/acelite/ace/Refcounted_Auto_Ptr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.inl
rename to deps/acelite/ace/Refcounted_Auto_Ptr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Registry.cpp b/deps/acelite/ace/Registry.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Registry.cpp
rename to deps/acelite/ace/Registry.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Registry.h b/deps/acelite/ace/Registry.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Registry.h
rename to deps/acelite/ace/Registry.h
diff --git a/modules/worldengine/deps/acelite/ace/Registry_Name_Space.cpp b/deps/acelite/ace/Registry_Name_Space.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Registry_Name_Space.cpp
rename to deps/acelite/ace/Registry_Name_Space.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Registry_Name_Space.h b/deps/acelite/ace/Registry_Name_Space.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Registry_Name_Space.h
rename to deps/acelite/ace/Registry_Name_Space.h
diff --git a/modules/worldengine/deps/acelite/ace/Remote_Name_Space.cpp b/deps/acelite/ace/Remote_Name_Space.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Remote_Name_Space.cpp
rename to deps/acelite/ace/Remote_Name_Space.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Remote_Name_Space.h b/deps/acelite/ace/Remote_Name_Space.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Remote_Name_Space.h
rename to deps/acelite/ace/Remote_Name_Space.h
diff --git a/modules/worldengine/deps/acelite/ace/Remote_Tokens.cpp b/deps/acelite/ace/Remote_Tokens.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Remote_Tokens.cpp
rename to deps/acelite/ace/Remote_Tokens.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Remote_Tokens.h b/deps/acelite/ace/Remote_Tokens.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Remote_Tokens.h
rename to deps/acelite/ace/Remote_Tokens.h
diff --git a/modules/worldengine/deps/acelite/ace/Remote_Tokens.inl b/deps/acelite/ace/Remote_Tokens.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Remote_Tokens.inl
rename to deps/acelite/ace/Remote_Tokens.inl
diff --git a/modules/worldengine/deps/acelite/ace/Reverse_Lock_T.cpp b/deps/acelite/ace/Reverse_Lock_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reverse_Lock_T.cpp
rename to deps/acelite/ace/Reverse_Lock_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reverse_Lock_T.h b/deps/acelite/ace/Reverse_Lock_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reverse_Lock_T.h
rename to deps/acelite/ace/Reverse_Lock_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Reverse_Lock_T.inl b/deps/acelite/ace/Reverse_Lock_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Reverse_Lock_T.inl
rename to deps/acelite/ace/Reverse_Lock_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Rtems_init.c b/deps/acelite/ace/Rtems_init.c
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Rtems_init.c
rename to deps/acelite/ace/Rtems_init.c
diff --git a/modules/worldengine/deps/acelite/ace/SOCK.cpp b/deps/acelite/ace/SOCK.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK.cpp
rename to deps/acelite/ace/SOCK.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK.h b/deps/acelite/ace/SOCK.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK.h
rename to deps/acelite/ace/SOCK.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK.inl b/deps/acelite/ace/SOCK.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK.inl
rename to deps/acelite/ace/SOCK.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.cpp b/deps/acelite/ace/SOCK_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Acceptor.cpp
rename to deps/acelite/ace/SOCK_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.h b/deps/acelite/ace/SOCK_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Acceptor.h
rename to deps/acelite/ace/SOCK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.inl b/deps/acelite/ace/SOCK_Acceptor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Acceptor.inl
rename to deps/acelite/ace/SOCK_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.cpp b/deps/acelite/ace/SOCK_CODgram.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_CODgram.cpp
rename to deps/acelite/ace/SOCK_CODgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.h b/deps/acelite/ace/SOCK_CODgram.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_CODgram.h
rename to deps/acelite/ace/SOCK_CODgram.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.inl b/deps/acelite/ace/SOCK_CODgram.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_CODgram.inl
rename to deps/acelite/ace/SOCK_CODgram.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Connector.cpp b/deps/acelite/ace/SOCK_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Connector.cpp
rename to deps/acelite/ace/SOCK_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Connector.h b/deps/acelite/ace/SOCK_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Connector.h
rename to deps/acelite/ace/SOCK_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Connector.inl b/deps/acelite/ace/SOCK_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Connector.inl
rename to deps/acelite/ace/SOCK_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.cpp b/deps/acelite/ace/SOCK_Dgram.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram.cpp
rename to deps/acelite/ace/SOCK_Dgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.h b/deps/acelite/ace/SOCK_Dgram.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram.h
rename to deps/acelite/ace/SOCK_Dgram.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.inl b/deps/acelite/ace/SOCK_Dgram.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram.inl
rename to deps/acelite/ace/SOCK_Dgram.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.cpp b/deps/acelite/ace/SOCK_Dgram_Bcast.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.cpp
rename to deps/acelite/ace/SOCK_Dgram_Bcast.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.h b/deps/acelite/ace/SOCK_Dgram_Bcast.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.h
rename to deps/acelite/ace/SOCK_Dgram_Bcast.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.inl b/deps/acelite/ace/SOCK_Dgram_Bcast.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.inl
rename to deps/acelite/ace/SOCK_Dgram_Bcast.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.cpp b/deps/acelite/ace/SOCK_Dgram_Mcast.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.cpp
rename to deps/acelite/ace/SOCK_Dgram_Mcast.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.h b/deps/acelite/ace/SOCK_Dgram_Mcast.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.h
rename to deps/acelite/ace/SOCK_Dgram_Mcast.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.inl b/deps/acelite/ace/SOCK_Dgram_Mcast.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.inl
rename to deps/acelite/ace/SOCK_Dgram_Mcast.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_IO.cpp b/deps/acelite/ace/SOCK_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_IO.cpp
rename to deps/acelite/ace/SOCK_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_IO.h b/deps/acelite/ace/SOCK_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_IO.h
rename to deps/acelite/ace/SOCK_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_IO.inl b/deps/acelite/ace/SOCK_IO.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_IO.inl
rename to deps/acelite/ace/SOCK_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.cpp b/deps/acelite/ace/SOCK_Netlink.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Netlink.cpp
rename to deps/acelite/ace/SOCK_Netlink.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.h b/deps/acelite/ace/SOCK_Netlink.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Netlink.h
rename to deps/acelite/ace/SOCK_Netlink.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.inl b/deps/acelite/ace/SOCK_Netlink.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Netlink.inl
rename to deps/acelite/ace/SOCK_Netlink.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.cpp b/deps/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
rename to deps/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.h b/deps/acelite/ace/SOCK_SEQPACK_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.h
rename to deps/acelite/ace/SOCK_SEQPACK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.inl b/deps/acelite/ace/SOCK_SEQPACK_Acceptor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.inl
rename to deps/acelite/ace/SOCK_SEQPACK_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.cpp b/deps/acelite/ace/SOCK_SEQPACK_Association.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.cpp
rename to deps/acelite/ace/SOCK_SEQPACK_Association.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.h b/deps/acelite/ace/SOCK_SEQPACK_Association.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.h
rename to deps/acelite/ace/SOCK_SEQPACK_Association.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.inl b/deps/acelite/ace/SOCK_SEQPACK_Association.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.inl
rename to deps/acelite/ace/SOCK_SEQPACK_Association.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.cpp b/deps/acelite/ace/SOCK_SEQPACK_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.cpp
rename to deps/acelite/ace/SOCK_SEQPACK_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.h b/deps/acelite/ace/SOCK_SEQPACK_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.h
rename to deps/acelite/ace/SOCK_SEQPACK_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.inl b/deps/acelite/ace/SOCK_SEQPACK_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.inl
rename to deps/acelite/ace/SOCK_SEQPACK_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Stream.cpp b/deps/acelite/ace/SOCK_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Stream.cpp
rename to deps/acelite/ace/SOCK_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Stream.h b/deps/acelite/ace/SOCK_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Stream.h
rename to deps/acelite/ace/SOCK_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Stream.inl b/deps/acelite/ace/SOCK_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SOCK_Stream.inl
rename to deps/acelite/ace/SOCK_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE.cpp b/deps/acelite/ace/SPIPE.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE.cpp
rename to deps/acelite/ace/SPIPE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE.h b/deps/acelite/ace/SPIPE.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE.h
rename to deps/acelite/ace/SPIPE.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE.inl b/deps/acelite/ace/SPIPE.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE.inl
rename to deps/acelite/ace/SPIPE.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.cpp b/deps/acelite/ace/SPIPE_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.cpp
rename to deps/acelite/ace/SPIPE_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.h b/deps/acelite/ace/SPIPE_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.h
rename to deps/acelite/ace/SPIPE_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.cpp b/deps/acelite/ace/SPIPE_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Addr.cpp
rename to deps/acelite/ace/SPIPE_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.h b/deps/acelite/ace/SPIPE_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Addr.h
rename to deps/acelite/ace/SPIPE_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.inl b/deps/acelite/ace/SPIPE_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Addr.inl
rename to deps/acelite/ace/SPIPE_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.cpp b/deps/acelite/ace/SPIPE_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Connector.cpp
rename to deps/acelite/ace/SPIPE_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.h b/deps/acelite/ace/SPIPE_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Connector.h
rename to deps/acelite/ace/SPIPE_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.inl b/deps/acelite/ace/SPIPE_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Connector.inl
rename to deps/acelite/ace/SPIPE_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.cpp b/deps/acelite/ace/SPIPE_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Stream.cpp
rename to deps/acelite/ace/SPIPE_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.h b/deps/acelite/ace/SPIPE_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Stream.h
rename to deps/acelite/ace/SPIPE_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.inl b/deps/acelite/ace/SPIPE_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SPIPE_Stream.inl
rename to deps/acelite/ace/SPIPE_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/SSL/ACE_SSL.pc.in b/deps/acelite/ace/SSL/ACE_SSL.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/ACE_SSL.pc.in
rename to deps/acelite/ace/SSL/ACE_SSL.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_BIO.cpp b/deps/acelite/ace/SSL/SSL_Asynch_BIO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_BIO.cpp
rename to deps/acelite/ace/SSL/SSL_Asynch_BIO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_BIO.h b/deps/acelite/ace/SSL/SSL_Asynch_BIO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_BIO.h
rename to deps/acelite/ace/SSL/SSL_Asynch_BIO.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.cpp b/deps/acelite/ace/SSL/SSL_Asynch_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.cpp
rename to deps/acelite/ace/SSL/SSL_Asynch_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.h b/deps/acelite/ace/SSL/SSL_Asynch_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.h
rename to deps/acelite/ace/SSL/SSL_Asynch_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.inl b/deps/acelite/ace/SSL/SSL_Asynch_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.inl
rename to deps/acelite/ace/SSL/SSL_Asynch_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Context.cpp b/deps/acelite/ace/SSL/SSL_Context.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Context.cpp
rename to deps/acelite/ace/SSL/SSL_Context.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Context.h b/deps/acelite/ace/SSL/SSL_Context.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Context.h
rename to deps/acelite/ace/SSL/SSL_Context.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Context.inl b/deps/acelite/ace/SSL/SSL_Context.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Context.inl
rename to deps/acelite/ace/SSL/SSL_Context.inl
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Export.h b/deps/acelite/ace/SSL/SSL_Export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Export.h
rename to deps/acelite/ace/SSL/SSL_Export.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Initializer.cpp b/deps/acelite/ace/SSL/SSL_Initializer.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Initializer.cpp
rename to deps/acelite/ace/SSL/SSL_Initializer.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_Initializer.h b/deps/acelite/ace/SSL/SSL_Initializer.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_Initializer.h
rename to deps/acelite/ace/SSL/SSL_Initializer.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.cpp b/deps/acelite/ace/SSL/SSL_SOCK.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.cpp
rename to deps/acelite/ace/SSL/SSL_SOCK.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.h b/deps/acelite/ace/SSL/SSL_SOCK.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.h
rename to deps/acelite/ace/SSL/SSL_SOCK.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.inl b/deps/acelite/ace/SSL/SSL_SOCK.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.inl
rename to deps/acelite/ace/SSL/SSL_SOCK.inl
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp b/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
rename to deps/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.h b/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.h
rename to deps/acelite/ace/SSL/SSL_SOCK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.inl b/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
rename to deps/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.cpp b/deps/acelite/ace/SSL/SSL_SOCK_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.cpp
rename to deps/acelite/ace/SSL/SSL_SOCK_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.h b/deps/acelite/ace/SSL/SSL_SOCK_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.h
rename to deps/acelite/ace/SSL/SSL_SOCK_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.inl b/deps/acelite/ace/SSL/SSL_SOCK_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.inl
rename to deps/acelite/ace/SSL/SSL_SOCK_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.cpp b/deps/acelite/ace/SSL/SSL_SOCK_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.cpp
rename to deps/acelite/ace/SSL/SSL_SOCK_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.h b/deps/acelite/ace/SSL/SSL_SOCK_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.h
rename to deps/acelite/ace/SSL/SSL_SOCK_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.inl b/deps/acelite/ace/SSL/SSL_SOCK_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.inl
rename to deps/acelite/ace/SSL/SSL_SOCK_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/SSL/ssl.mpc b/deps/acelite/ace/SSL/ssl.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/ssl.mpc
rename to deps/acelite/ace/SSL/ssl.mpc
diff --git a/modules/worldengine/deps/acelite/ace/SSL/ssl_for_tao.mpc b/deps/acelite/ace/SSL/ssl_for_tao.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/ssl_for_tao.mpc
rename to deps/acelite/ace/SSL/ssl_for_tao.mpc
diff --git a/modules/worldengine/deps/acelite/ace/SSL/sslconf.h b/deps/acelite/ace/SSL/sslconf.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SSL/sslconf.h
rename to deps/acelite/ace/SSL/sslconf.h
diff --git a/modules/worldengine/deps/acelite/ace/SString.cpp b/deps/acelite/ace/SString.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SString.cpp
rename to deps/acelite/ace/SString.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SString.h b/deps/acelite/ace/SString.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SString.h
rename to deps/acelite/ace/SString.h
diff --git a/modules/worldengine/deps/acelite/ace/SString.inl b/deps/acelite/ace/SString.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SString.inl
rename to deps/acelite/ace/SString.inl
diff --git a/modules/worldengine/deps/acelite/ace/SStringfwd.h b/deps/acelite/ace/SStringfwd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SStringfwd.h
rename to deps/acelite/ace/SStringfwd.h
diff --git a/modules/worldengine/deps/acelite/ace/SUN_Proactor.cpp b/deps/acelite/ace/SUN_Proactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SUN_Proactor.cpp
rename to deps/acelite/ace/SUN_Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SUN_Proactor.h b/deps/acelite/ace/SUN_Proactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SUN_Proactor.h
rename to deps/acelite/ace/SUN_Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message.cpp b/deps/acelite/ace/SV_Message.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Message.cpp
rename to deps/acelite/ace/SV_Message.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message.h b/deps/acelite/ace/SV_Message.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Message.h
rename to deps/acelite/ace/SV_Message.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message.inl b/deps/acelite/ace/SV_Message.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Message.inl
rename to deps/acelite/ace/SV_Message.inl
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message_Queue.cpp b/deps/acelite/ace/SV_Message_Queue.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Message_Queue.cpp
rename to deps/acelite/ace/SV_Message_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message_Queue.h b/deps/acelite/ace/SV_Message_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Message_Queue.h
rename to deps/acelite/ace/SV_Message_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message_Queue.inl b/deps/acelite/ace/SV_Message_Queue.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Message_Queue.inl
rename to deps/acelite/ace/SV_Message_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.cpp b/deps/acelite/ace/SV_Semaphore_Complex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.cpp
rename to deps/acelite/ace/SV_Semaphore_Complex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.h b/deps/acelite/ace/SV_Semaphore_Complex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.h
rename to deps/acelite/ace/SV_Semaphore_Complex.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.inl b/deps/acelite/ace/SV_Semaphore_Complex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.inl
rename to deps/acelite/ace/SV_Semaphore_Complex.inl
diff --git a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.cpp b/deps/acelite/ace/SV_Semaphore_Simple.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.cpp
rename to deps/acelite/ace/SV_Semaphore_Simple.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.h b/deps/acelite/ace/SV_Semaphore_Simple.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.h
rename to deps/acelite/ace/SV_Semaphore_Simple.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.inl b/deps/acelite/ace/SV_Semaphore_Simple.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.inl
rename to deps/acelite/ace/SV_Semaphore_Simple.inl
diff --git a/modules/worldengine/deps/acelite/ace/SV_Shared_Memory.cpp b/deps/acelite/ace/SV_Shared_Memory.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Shared_Memory.cpp
rename to deps/acelite/ace/SV_Shared_Memory.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SV_Shared_Memory.h b/deps/acelite/ace/SV_Shared_Memory.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Shared_Memory.h
rename to deps/acelite/ace/SV_Shared_Memory.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Shared_Memory.inl b/deps/acelite/ace/SV_Shared_Memory.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/SV_Shared_Memory.inl
rename to deps/acelite/ace/SV_Shared_Memory.inl
diff --git a/modules/worldengine/deps/acelite/ace/Sample_History.cpp b/deps/acelite/ace/Sample_History.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sample_History.cpp
rename to deps/acelite/ace/Sample_History.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sample_History.h b/deps/acelite/ace/Sample_History.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sample_History.h
rename to deps/acelite/ace/Sample_History.h
diff --git a/modules/worldengine/deps/acelite/ace/Sample_History.inl b/deps/acelite/ace/Sample_History.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sample_History.inl
rename to deps/acelite/ace/Sample_History.inl
diff --git a/modules/worldengine/deps/acelite/ace/Sbrk_Memory_Pool.cpp b/deps/acelite/ace/Sbrk_Memory_Pool.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sbrk_Memory_Pool.cpp
rename to deps/acelite/ace/Sbrk_Memory_Pool.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sbrk_Memory_Pool.h b/deps/acelite/ace/Sbrk_Memory_Pool.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sbrk_Memory_Pool.h
rename to deps/acelite/ace/Sbrk_Memory_Pool.h
diff --git a/modules/worldengine/deps/acelite/ace/Sched_Params.cpp b/deps/acelite/ace/Sched_Params.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sched_Params.cpp
rename to deps/acelite/ace/Sched_Params.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sched_Params.h b/deps/acelite/ace/Sched_Params.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sched_Params.h
rename to deps/acelite/ace/Sched_Params.h
diff --git a/modules/worldengine/deps/acelite/ace/Sched_Params.inl b/deps/acelite/ace/Sched_Params.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sched_Params.inl
rename to deps/acelite/ace/Sched_Params.inl
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor.h b/deps/acelite/ace/Select_Reactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Select_Reactor.h
rename to deps/acelite/ace/Select_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor_Base.cpp b/deps/acelite/ace/Select_Reactor_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Select_Reactor_Base.cpp
rename to deps/acelite/ace/Select_Reactor_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor_Base.h b/deps/acelite/ace/Select_Reactor_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Select_Reactor_Base.h
rename to deps/acelite/ace/Select_Reactor_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor_Base.inl b/deps/acelite/ace/Select_Reactor_Base.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Select_Reactor_Base.inl
rename to deps/acelite/ace/Select_Reactor_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor_T.cpp b/deps/acelite/ace/Select_Reactor_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Select_Reactor_T.cpp
rename to deps/acelite/ace/Select_Reactor_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor_T.h b/deps/acelite/ace/Select_Reactor_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Select_Reactor_T.h
rename to deps/acelite/ace/Select_Reactor_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor_T.inl b/deps/acelite/ace/Select_Reactor_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Select_Reactor_T.inl
rename to deps/acelite/ace/Select_Reactor_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Semaphore.cpp b/deps/acelite/ace/Semaphore.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Semaphore.cpp
rename to deps/acelite/ace/Semaphore.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Semaphore.h b/deps/acelite/ace/Semaphore.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Semaphore.h
rename to deps/acelite/ace/Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Semaphore.inl b/deps/acelite/ace/Semaphore.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Semaphore.inl
rename to deps/acelite/ace/Semaphore.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Config.cpp b/deps/acelite/ace/Service_Config.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Config.cpp
rename to deps/acelite/ace/Service_Config.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Config.h b/deps/acelite/ace/Service_Config.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Config.h
rename to deps/acelite/ace/Service_Config.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Config.inl b/deps/acelite/ace/Service_Config.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Config.inl
rename to deps/acelite/ace/Service_Config.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Gestalt.cpp b/deps/acelite/ace/Service_Gestalt.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Gestalt.cpp
rename to deps/acelite/ace/Service_Gestalt.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Gestalt.h b/deps/acelite/ace/Service_Gestalt.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Gestalt.h
rename to deps/acelite/ace/Service_Gestalt.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Gestalt.inl b/deps/acelite/ace/Service_Gestalt.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Gestalt.inl
rename to deps/acelite/ace/Service_Gestalt.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Manager.cpp b/deps/acelite/ace/Service_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Manager.cpp
rename to deps/acelite/ace/Service_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Manager.h b/deps/acelite/ace/Service_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Manager.h
rename to deps/acelite/ace/Service_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Object.cpp b/deps/acelite/ace/Service_Object.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Object.cpp
rename to deps/acelite/ace/Service_Object.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Object.h b/deps/acelite/ace/Service_Object.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Object.h
rename to deps/acelite/ace/Service_Object.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Object.inl b/deps/acelite/ace/Service_Object.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Object.inl
rename to deps/acelite/ace/Service_Object.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Repository.cpp b/deps/acelite/ace/Service_Repository.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Repository.cpp
rename to deps/acelite/ace/Service_Repository.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Repository.h b/deps/acelite/ace/Service_Repository.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Repository.h
rename to deps/acelite/ace/Service_Repository.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Repository.inl b/deps/acelite/ace/Service_Repository.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Repository.inl
rename to deps/acelite/ace/Service_Repository.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Types.cpp b/deps/acelite/ace/Service_Types.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Types.cpp
rename to deps/acelite/ace/Service_Types.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Types.h b/deps/acelite/ace/Service_Types.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Types.h
rename to deps/acelite/ace/Service_Types.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Types.inl b/deps/acelite/ace/Service_Types.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Service_Types.inl
rename to deps/acelite/ace/Service_Types.inl
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory.cpp b/deps/acelite/ace/Shared_Memory.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory.cpp
rename to deps/acelite/ace/Shared_Memory.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory.h b/deps/acelite/ace/Shared_Memory.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory.h
rename to deps/acelite/ace/Shared_Memory.h
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_MM.cpp b/deps/acelite/ace/Shared_Memory_MM.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_MM.cpp
rename to deps/acelite/ace/Shared_Memory_MM.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_MM.h b/deps/acelite/ace/Shared_Memory_MM.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_MM.h
rename to deps/acelite/ace/Shared_Memory_MM.h
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_MM.inl b/deps/acelite/ace/Shared_Memory_MM.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_MM.inl
rename to deps/acelite/ace/Shared_Memory_MM.inl
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_Pool.cpp b/deps/acelite/ace/Shared_Memory_Pool.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_Pool.cpp
rename to deps/acelite/ace/Shared_Memory_Pool.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_Pool.h b/deps/acelite/ace/Shared_Memory_Pool.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_Pool.h
rename to deps/acelite/ace/Shared_Memory_Pool.h
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_SV.cpp b/deps/acelite/ace/Shared_Memory_SV.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_SV.cpp
rename to deps/acelite/ace/Shared_Memory_SV.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_SV.h b/deps/acelite/ace/Shared_Memory_SV.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_SV.h
rename to deps/acelite/ace/Shared_Memory_SV.h
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory_SV.inl b/deps/acelite/ace/Shared_Memory_SV.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Memory_SV.inl
rename to deps/acelite/ace/Shared_Memory_SV.inl
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Object.cpp b/deps/acelite/ace/Shared_Object.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Object.cpp
rename to deps/acelite/ace/Shared_Object.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Object.h b/deps/acelite/ace/Shared_Object.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Object.h
rename to deps/acelite/ace/Shared_Object.h
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Object.inl b/deps/acelite/ace/Shared_Object.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Shared_Object.inl
rename to deps/acelite/ace/Shared_Object.inl
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Adapter.cpp b/deps/acelite/ace/Sig_Adapter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sig_Adapter.cpp
rename to deps/acelite/ace/Sig_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Adapter.h b/deps/acelite/ace/Sig_Adapter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sig_Adapter.h
rename to deps/acelite/ace/Sig_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Handler.cpp b/deps/acelite/ace/Sig_Handler.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sig_Handler.cpp
rename to deps/acelite/ace/Sig_Handler.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Handler.h b/deps/acelite/ace/Sig_Handler.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sig_Handler.h
rename to deps/acelite/ace/Sig_Handler.h
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Handler.inl b/deps/acelite/ace/Sig_Handler.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sig_Handler.inl
rename to deps/acelite/ace/Sig_Handler.inl
diff --git a/modules/worldengine/deps/acelite/ace/Signal.cpp b/deps/acelite/ace/Signal.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Signal.cpp
rename to deps/acelite/ace/Signal.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Signal.h b/deps/acelite/ace/Signal.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Signal.h
rename to deps/acelite/ace/Signal.h
diff --git a/modules/worldengine/deps/acelite/ace/Signal.inl b/deps/acelite/ace/Signal.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Signal.inl
rename to deps/acelite/ace/Signal.inl
diff --git a/modules/worldengine/deps/acelite/ace/Singleton.cpp b/deps/acelite/ace/Singleton.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Singleton.cpp
rename to deps/acelite/ace/Singleton.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Singleton.h b/deps/acelite/ace/Singleton.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Singleton.h
rename to deps/acelite/ace/Singleton.h
diff --git a/modules/worldengine/deps/acelite/ace/Singleton.inl b/deps/acelite/ace/Singleton.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Singleton.inl
rename to deps/acelite/ace/Singleton.inl
diff --git a/modules/worldengine/deps/acelite/ace/Sock_Connect.cpp b/deps/acelite/ace/Sock_Connect.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sock_Connect.cpp
rename to deps/acelite/ace/Sock_Connect.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sock_Connect.h b/deps/acelite/ace/Sock_Connect.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Sock_Connect.h
rename to deps/acelite/ace/Sock_Connect.h
diff --git a/modules/worldengine/deps/acelite/ace/Stack_Trace.cpp b/deps/acelite/ace/Stack_Trace.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stack_Trace.cpp
rename to deps/acelite/ace/Stack_Trace.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stack_Trace.h b/deps/acelite/ace/Stack_Trace.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stack_Trace.h
rename to deps/acelite/ace/Stack_Trace.h
diff --git a/modules/worldengine/deps/acelite/ace/Static_Object_Lock.h b/deps/acelite/ace/Static_Object_Lock.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Static_Object_Lock.h
rename to deps/acelite/ace/Static_Object_Lock.h
diff --git a/modules/worldengine/deps/acelite/ace/Stats.cpp b/deps/acelite/ace/Stats.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stats.cpp
rename to deps/acelite/ace/Stats.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stats.h b/deps/acelite/ace/Stats.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stats.h
rename to deps/acelite/ace/Stats.h
diff --git a/modules/worldengine/deps/acelite/ace/Stats.inl b/deps/acelite/ace/Stats.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stats.inl
rename to deps/acelite/ace/Stats.inl
diff --git a/modules/worldengine/deps/acelite/ace/Strategies_T.cpp b/deps/acelite/ace/Strategies_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Strategies_T.cpp
rename to deps/acelite/ace/Strategies_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Strategies_T.h b/deps/acelite/ace/Strategies_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Strategies_T.h
rename to deps/acelite/ace/Strategies_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Strategies_T.inl b/deps/acelite/ace/Strategies_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Strategies_T.inl
rename to deps/acelite/ace/Strategies_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Stream.cpp b/deps/acelite/ace/Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stream.cpp
rename to deps/acelite/ace/Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stream.h b/deps/acelite/ace/Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stream.h
rename to deps/acelite/ace/Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/Stream.inl b/deps/acelite/ace/Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stream.inl
rename to deps/acelite/ace/Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/Stream_Modules.cpp b/deps/acelite/ace/Stream_Modules.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stream_Modules.cpp
rename to deps/acelite/ace/Stream_Modules.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stream_Modules.h b/deps/acelite/ace/Stream_Modules.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Stream_Modules.h
rename to deps/acelite/ace/Stream_Modules.h
diff --git a/modules/worldengine/deps/acelite/ace/String_Base.cpp b/deps/acelite/ace/String_Base.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/String_Base.cpp
rename to deps/acelite/ace/String_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/String_Base.h b/deps/acelite/ace/String_Base.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/String_Base.h
rename to deps/acelite/ace/String_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/String_Base.inl b/deps/acelite/ace/String_Base.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/String_Base.inl
rename to deps/acelite/ace/String_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/String_Base_Const.cpp b/deps/acelite/ace/String_Base_Const.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/String_Base_Const.cpp
rename to deps/acelite/ace/String_Base_Const.cpp
diff --git a/modules/worldengine/deps/acelite/ace/String_Base_Const.h b/deps/acelite/ace/String_Base_Const.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/String_Base_Const.h
rename to deps/acelite/ace/String_Base_Const.h
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf.h b/deps/acelite/ace/Svc_Conf.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf.h
rename to deps/acelite/ace/Svc_Conf.h
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf.y b/deps/acelite/ace/Svc_Conf.y
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf.y
rename to deps/acelite/ace/Svc_Conf.y
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf_Lexer.cpp b/deps/acelite/ace/Svc_Conf_Lexer.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf_Lexer.cpp
rename to deps/acelite/ace/Svc_Conf_Lexer.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf_Lexer.h b/deps/acelite/ace/Svc_Conf_Lexer.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf_Lexer.h
rename to deps/acelite/ace/Svc_Conf_Lexer.h
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf_Param.h b/deps/acelite/ace/Svc_Conf_Param.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf_Param.h
rename to deps/acelite/ace/Svc_Conf_Param.h
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf_Token_Table.h b/deps/acelite/ace/Svc_Conf_Token_Table.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf_Token_Table.h
rename to deps/acelite/ace/Svc_Conf_Token_Table.h
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf_Tokens.h b/deps/acelite/ace/Svc_Conf_Tokens.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf_Tokens.h
rename to deps/acelite/ace/Svc_Conf_Tokens.h
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf_y.cpp b/deps/acelite/ace/Svc_Conf_y.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Conf_y.cpp
rename to deps/acelite/ace/Svc_Conf_y.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Handler.cpp b/deps/acelite/ace/Svc_Handler.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Handler.cpp
rename to deps/acelite/ace/Svc_Handler.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Handler.h b/deps/acelite/ace/Svc_Handler.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Svc_Handler.h
rename to deps/acelite/ace/Svc_Handler.h
diff --git a/modules/worldengine/deps/acelite/ace/Synch.h b/deps/acelite/ace/Synch.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Synch.h
rename to deps/acelite/ace/Synch.h
diff --git a/modules/worldengine/deps/acelite/ace/Synch_Options.cpp b/deps/acelite/ace/Synch_Options.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Synch_Options.cpp
rename to deps/acelite/ace/Synch_Options.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Synch_Options.h b/deps/acelite/ace/Synch_Options.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Synch_Options.h
rename to deps/acelite/ace/Synch_Options.h
diff --git a/modules/worldengine/deps/acelite/ace/Synch_Traits.h b/deps/acelite/ace/Synch_Traits.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Synch_Traits.h
rename to deps/acelite/ace/Synch_Traits.h
diff --git a/modules/worldengine/deps/acelite/ace/System_Time.cpp b/deps/acelite/ace/System_Time.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/System_Time.cpp
rename to deps/acelite/ace/System_Time.cpp
diff --git a/modules/worldengine/deps/acelite/ace/System_Time.h b/deps/acelite/ace/System_Time.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/System_Time.h
rename to deps/acelite/ace/System_Time.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI.cpp b/deps/acelite/ace/TLI.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI.cpp
rename to deps/acelite/ace/TLI.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI.h b/deps/acelite/ace/TLI.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI.h
rename to deps/acelite/ace/TLI.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI.inl b/deps/acelite/ace/TLI.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI.inl
rename to deps/acelite/ace/TLI.inl
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Acceptor.cpp b/deps/acelite/ace/TLI_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Acceptor.cpp
rename to deps/acelite/ace/TLI_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Acceptor.h b/deps/acelite/ace/TLI_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Acceptor.h
rename to deps/acelite/ace/TLI_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Connector.cpp b/deps/acelite/ace/TLI_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Connector.cpp
rename to deps/acelite/ace/TLI_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Connector.h b/deps/acelite/ace/TLI_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Connector.h
rename to deps/acelite/ace/TLI_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Connector.inl b/deps/acelite/ace/TLI_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Connector.inl
rename to deps/acelite/ace/TLI_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Stream.cpp b/deps/acelite/ace/TLI_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Stream.cpp
rename to deps/acelite/ace/TLI_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Stream.h b/deps/acelite/ace/TLI_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Stream.h
rename to deps/acelite/ace/TLI_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Stream.inl b/deps/acelite/ace/TLI_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TLI_Stream.inl
rename to deps/acelite/ace/TLI_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/TP_Reactor.cpp b/deps/acelite/ace/TP_Reactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TP_Reactor.cpp
rename to deps/acelite/ace/TP_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TP_Reactor.h b/deps/acelite/ace/TP_Reactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TP_Reactor.h
rename to deps/acelite/ace/TP_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/TP_Reactor.inl b/deps/acelite/ace/TP_Reactor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TP_Reactor.inl
rename to deps/acelite/ace/TP_Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/TSS_Adapter.cpp b/deps/acelite/ace/TSS_Adapter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TSS_Adapter.cpp
rename to deps/acelite/ace/TSS_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TSS_Adapter.h b/deps/acelite/ace/TSS_Adapter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TSS_Adapter.h
rename to deps/acelite/ace/TSS_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/TSS_T.cpp b/deps/acelite/ace/TSS_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TSS_T.cpp
rename to deps/acelite/ace/TSS_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TSS_T.h b/deps/acelite/ace/TSS_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TSS_T.h
rename to deps/acelite/ace/TSS_T.h
diff --git a/modules/worldengine/deps/acelite/ace/TSS_T.inl b/deps/acelite/ace/TSS_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TSS_T.inl
rename to deps/acelite/ace/TSS_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/TTY_IO.cpp b/deps/acelite/ace/TTY_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TTY_IO.cpp
rename to deps/acelite/ace/TTY_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TTY_IO.h b/deps/acelite/ace/TTY_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TTY_IO.h
rename to deps/acelite/ace/TTY_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/Task.cpp b/deps/acelite/ace/Task.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task.cpp
rename to deps/acelite/ace/Task.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Task.h b/deps/acelite/ace/Task.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task.h
rename to deps/acelite/ace/Task.h
diff --git a/modules/worldengine/deps/acelite/ace/Task.inl b/deps/acelite/ace/Task.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task.inl
rename to deps/acelite/ace/Task.inl
diff --git a/modules/worldengine/deps/acelite/ace/Task_Ex_T.cpp b/deps/acelite/ace/Task_Ex_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task_Ex_T.cpp
rename to deps/acelite/ace/Task_Ex_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Task_Ex_T.h b/deps/acelite/ace/Task_Ex_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task_Ex_T.h
rename to deps/acelite/ace/Task_Ex_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Task_Ex_T.inl b/deps/acelite/ace/Task_Ex_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task_Ex_T.inl
rename to deps/acelite/ace/Task_Ex_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Task_T.cpp b/deps/acelite/ace/Task_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task_T.cpp
rename to deps/acelite/ace/Task_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Task_T.h b/deps/acelite/ace/Task_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task_T.h
rename to deps/acelite/ace/Task_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Task_T.inl b/deps/acelite/ace/Task_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Task_T.inl
rename to deps/acelite/ace/Task_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Test_and_Set.cpp b/deps/acelite/ace/Test_and_Set.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Test_and_Set.cpp
rename to deps/acelite/ace/Test_and_Set.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Test_and_Set.h b/deps/acelite/ace/Test_and_Set.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Test_and_Set.h
rename to deps/acelite/ace/Test_and_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread.cpp b/deps/acelite/ace/Thread.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread.cpp
rename to deps/acelite/ace/Thread.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread.h b/deps/acelite/ace/Thread.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread.h
rename to deps/acelite/ace/Thread.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread.inl b/deps/acelite/ace/Thread.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread.inl
rename to deps/acelite/ace/Thread.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Adapter.cpp b/deps/acelite/ace/Thread_Adapter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Adapter.cpp
rename to deps/acelite/ace/Thread_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Adapter.h b/deps/acelite/ace/Thread_Adapter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Adapter.h
rename to deps/acelite/ace/Thread_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Adapter.inl b/deps/acelite/ace/Thread_Adapter.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Adapter.inl
rename to deps/acelite/ace/Thread_Adapter.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Control.cpp b/deps/acelite/ace/Thread_Control.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Control.cpp
rename to deps/acelite/ace/Thread_Control.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Control.h b/deps/acelite/ace/Thread_Control.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Control.h
rename to deps/acelite/ace/Thread_Control.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Control.inl b/deps/acelite/ace/Thread_Control.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Control.inl
rename to deps/acelite/ace/Thread_Control.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Exit.cpp b/deps/acelite/ace/Thread_Exit.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Exit.cpp
rename to deps/acelite/ace/Thread_Exit.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Exit.h b/deps/acelite/ace/Thread_Exit.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Exit.h
rename to deps/acelite/ace/Thread_Exit.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Hook.cpp b/deps/acelite/ace/Thread_Hook.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Hook.cpp
rename to deps/acelite/ace/Thread_Hook.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Hook.h b/deps/acelite/ace/Thread_Hook.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Hook.h
rename to deps/acelite/ace/Thread_Hook.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Manager.cpp b/deps/acelite/ace/Thread_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Manager.cpp
rename to deps/acelite/ace/Thread_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Manager.h b/deps/acelite/ace/Thread_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Manager.h
rename to deps/acelite/ace/Thread_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Manager.inl b/deps/acelite/ace/Thread_Manager.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Manager.inl
rename to deps/acelite/ace/Thread_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Mutex.cpp b/deps/acelite/ace/Thread_Mutex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Mutex.cpp
rename to deps/acelite/ace/Thread_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Mutex.h b/deps/acelite/ace/Thread_Mutex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Mutex.h
rename to deps/acelite/ace/Thread_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Mutex.inl b/deps/acelite/ace/Thread_Mutex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Mutex.inl
rename to deps/acelite/ace/Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.cpp b/deps/acelite/ace/Thread_Semaphore.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Semaphore.cpp
rename to deps/acelite/ace/Thread_Semaphore.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.h b/deps/acelite/ace/Thread_Semaphore.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Semaphore.h
rename to deps/acelite/ace/Thread_Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.inl b/deps/acelite/ace/Thread_Semaphore.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Thread_Semaphore.inl
rename to deps/acelite/ace/Thread_Semaphore.inl
diff --git a/modules/worldengine/deps/acelite/ace/Throughput_Stats.cpp b/deps/acelite/ace/Throughput_Stats.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Throughput_Stats.cpp
rename to deps/acelite/ace/Throughput_Stats.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Throughput_Stats.h b/deps/acelite/ace/Throughput_Stats.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Throughput_Stats.h
rename to deps/acelite/ace/Throughput_Stats.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy.cpp b/deps/acelite/ace/Time_Policy.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Policy.cpp
rename to deps/acelite/ace/Time_Policy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy.h b/deps/acelite/ace/Time_Policy.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Policy.h
rename to deps/acelite/ace/Time_Policy.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy.inl b/deps/acelite/ace/Time_Policy.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Policy.inl
rename to deps/acelite/ace/Time_Policy.inl
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy_T.cpp b/deps/acelite/ace/Time_Policy_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Policy_T.cpp
rename to deps/acelite/ace/Time_Policy_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy_T.h b/deps/acelite/ace/Time_Policy_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Policy_T.h
rename to deps/acelite/ace/Time_Policy_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy_T.inl b/deps/acelite/ace/Time_Policy_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Policy_T.inl
rename to deps/acelite/ace/Time_Policy_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value.cpp b/deps/acelite/ace/Time_Value.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Value.cpp
rename to deps/acelite/ace/Time_Value.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value.h b/deps/acelite/ace/Time_Value.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Value.h
rename to deps/acelite/ace/Time_Value.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value.inl b/deps/acelite/ace/Time_Value.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Value.inl
rename to deps/acelite/ace/Time_Value.inl
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value_T.cpp b/deps/acelite/ace/Time_Value_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Value_T.cpp
rename to deps/acelite/ace/Time_Value_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value_T.h b/deps/acelite/ace/Time_Value_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Value_T.h
rename to deps/acelite/ace/Time_Value_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value_T.inl b/deps/acelite/ace/Time_Value_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Time_Value_T.inl
rename to deps/acelite/ace/Time_Value_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe.cpp b/deps/acelite/ace/Timeprobe.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timeprobe.cpp
rename to deps/acelite/ace/Timeprobe.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe.h b/deps/acelite/ace/Timeprobe.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timeprobe.h
rename to deps/acelite/ace/Timeprobe.h
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe.inl b/deps/acelite/ace/Timeprobe.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timeprobe.inl
rename to deps/acelite/ace/Timeprobe.inl
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe_T.cpp b/deps/acelite/ace/Timeprobe_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timeprobe_T.cpp
rename to deps/acelite/ace/Timeprobe_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe_T.h b/deps/acelite/ace/Timeprobe_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timeprobe_T.h
rename to deps/acelite/ace/Timeprobe_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Hash.h b/deps/acelite/ace/Timer_Hash.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Hash.h
rename to deps/acelite/ace/Timer_Hash.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Hash_T.cpp b/deps/acelite/ace/Timer_Hash_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Hash_T.cpp
rename to deps/acelite/ace/Timer_Hash_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Hash_T.h b/deps/acelite/ace/Timer_Hash_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Hash_T.h
rename to deps/acelite/ace/Timer_Hash_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Heap.h b/deps/acelite/ace/Timer_Heap.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Heap.h
rename to deps/acelite/ace/Timer_Heap.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Heap_T.cpp b/deps/acelite/ace/Timer_Heap_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Heap_T.cpp
rename to deps/acelite/ace/Timer_Heap_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Heap_T.h b/deps/acelite/ace/Timer_Heap_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Heap_T.h
rename to deps/acelite/ace/Timer_Heap_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_List.h b/deps/acelite/ace/Timer_List.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_List.h
rename to deps/acelite/ace/Timer_List.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_List_T.cpp b/deps/acelite/ace/Timer_List_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_List_T.cpp
rename to deps/acelite/ace/Timer_List_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timer_List_T.h b/deps/acelite/ace/Timer_List_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_List_T.h
rename to deps/acelite/ace/Timer_List_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue.h b/deps/acelite/ace/Timer_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue.h
rename to deps/acelite/ace/Timer_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.cpp b/deps/acelite/ace/Timer_Queue_Adapters.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.cpp
rename to deps/acelite/ace/Timer_Queue_Adapters.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.h b/deps/acelite/ace/Timer_Queue_Adapters.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.h
rename to deps/acelite/ace/Timer_Queue_Adapters.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.inl b/deps/acelite/ace/Timer_Queue_Adapters.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.inl
rename to deps/acelite/ace/Timer_Queue_Adapters.inl
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.cpp b/deps/acelite/ace/Timer_Queue_Iterator.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.cpp
rename to deps/acelite/ace/Timer_Queue_Iterator.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.h b/deps/acelite/ace/Timer_Queue_Iterator.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.h
rename to deps/acelite/ace/Timer_Queue_Iterator.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.inl b/deps/acelite/ace/Timer_Queue_Iterator.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.inl
rename to deps/acelite/ace/Timer_Queue_Iterator.inl
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_T.cpp b/deps/acelite/ace/Timer_Queue_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_T.cpp
rename to deps/acelite/ace/Timer_Queue_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_T.h b/deps/acelite/ace/Timer_Queue_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_T.h
rename to deps/acelite/ace/Timer_Queue_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queue_T.inl b/deps/acelite/ace/Timer_Queue_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queue_T.inl
rename to deps/acelite/ace/Timer_Queue_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Queuefwd.h b/deps/acelite/ace/Timer_Queuefwd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Queuefwd.h
rename to deps/acelite/ace/Timer_Queuefwd.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Wheel.h b/deps/acelite/ace/Timer_Wheel.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Wheel.h
rename to deps/acelite/ace/Timer_Wheel.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Wheel_T.cpp b/deps/acelite/ace/Timer_Wheel_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Wheel_T.cpp
rename to deps/acelite/ace/Timer_Wheel_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Wheel_T.h b/deps/acelite/ace/Timer_Wheel_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Timer_Wheel_T.h
rename to deps/acelite/ace/Timer_Wheel_T.h
diff --git a/modules/worldengine/deps/acelite/ace/TkReactor/ACE_TkReactor.pc.in b/deps/acelite/ace/TkReactor/ACE_TkReactor.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TkReactor/ACE_TkReactor.pc.in
rename to deps/acelite/ace/TkReactor/ACE_TkReactor.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/TkReactor/ACE_TkReactor_export.h b/deps/acelite/ace/TkReactor/ACE_TkReactor_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TkReactor/ACE_TkReactor_export.h
rename to deps/acelite/ace/TkReactor/ACE_TkReactor_export.h
diff --git a/modules/worldengine/deps/acelite/ace/TkReactor/TkReactor.cpp b/deps/acelite/ace/TkReactor/TkReactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TkReactor/TkReactor.cpp
rename to deps/acelite/ace/TkReactor/TkReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TkReactor/TkReactor.h b/deps/acelite/ace/TkReactor/TkReactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TkReactor/TkReactor.h
rename to deps/acelite/ace/TkReactor/TkReactor.h
diff --git a/modules/worldengine/deps/acelite/ace/TkReactor/ace_tkreactor.mpc b/deps/acelite/ace/TkReactor/ace_tkreactor.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/TkReactor/ace_tkreactor.mpc
rename to deps/acelite/ace/TkReactor/ace_tkreactor.mpc
diff --git a/modules/worldengine/deps/acelite/ace/Token.cpp b/deps/acelite/ace/Token.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token.cpp
rename to deps/acelite/ace/Token.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token.h b/deps/acelite/ace/Token.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token.h
rename to deps/acelite/ace/Token.h
diff --git a/modules/worldengine/deps/acelite/ace/Token.inl b/deps/acelite/ace/Token.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token.inl
rename to deps/acelite/ace/Token.inl
diff --git a/modules/worldengine/deps/acelite/ace/Token_Collection.cpp b/deps/acelite/ace/Token_Collection.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Collection.cpp
rename to deps/acelite/ace/Token_Collection.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token_Collection.h b/deps/acelite/ace/Token_Collection.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Collection.h
rename to deps/acelite/ace/Token_Collection.h
diff --git a/modules/worldengine/deps/acelite/ace/Token_Collection.inl b/deps/acelite/ace/Token_Collection.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Collection.inl
rename to deps/acelite/ace/Token_Collection.inl
diff --git a/modules/worldengine/deps/acelite/ace/Token_Invariants.cpp b/deps/acelite/ace/Token_Invariants.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Invariants.cpp
rename to deps/acelite/ace/Token_Invariants.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token_Invariants.h b/deps/acelite/ace/Token_Invariants.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Invariants.h
rename to deps/acelite/ace/Token_Invariants.h
diff --git a/modules/worldengine/deps/acelite/ace/Token_Manager.cpp b/deps/acelite/ace/Token_Manager.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Manager.cpp
rename to deps/acelite/ace/Token_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token_Manager.h b/deps/acelite/ace/Token_Manager.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Manager.h
rename to deps/acelite/ace/Token_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Token_Manager.inl b/deps/acelite/ace/Token_Manager.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Manager.inl
rename to deps/acelite/ace/Token_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Token_Request_Reply.cpp b/deps/acelite/ace/Token_Request_Reply.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Request_Reply.cpp
rename to deps/acelite/ace/Token_Request_Reply.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token_Request_Reply.h b/deps/acelite/ace/Token_Request_Reply.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Request_Reply.h
rename to deps/acelite/ace/Token_Request_Reply.h
diff --git a/modules/worldengine/deps/acelite/ace/Token_Request_Reply.inl b/deps/acelite/ace/Token_Request_Reply.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Token_Request_Reply.inl
rename to deps/acelite/ace/Token_Request_Reply.inl
diff --git a/modules/worldengine/deps/acelite/ace/Tokenizer_T.cpp b/deps/acelite/ace/Tokenizer_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Tokenizer_T.cpp
rename to deps/acelite/ace/Tokenizer_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Tokenizer_T.h b/deps/acelite/ace/Tokenizer_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Tokenizer_T.h
rename to deps/acelite/ace/Tokenizer_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Trace.cpp b/deps/acelite/ace/Trace.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Trace.cpp
rename to deps/acelite/ace/Trace.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Trace.h b/deps/acelite/ace/Trace.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Trace.h
rename to deps/acelite/ace/Trace.h
diff --git a/modules/worldengine/deps/acelite/ace/Truncate.h b/deps/acelite/ace/Truncate.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Truncate.h
rename to deps/acelite/ace/Truncate.h
diff --git a/modules/worldengine/deps/acelite/ace/Typed_SV_Message.cpp b/deps/acelite/ace/Typed_SV_Message.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Typed_SV_Message.cpp
rename to deps/acelite/ace/Typed_SV_Message.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Typed_SV_Message.h b/deps/acelite/ace/Typed_SV_Message.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Typed_SV_Message.h
rename to deps/acelite/ace/Typed_SV_Message.h
diff --git a/modules/worldengine/deps/acelite/ace/Typed_SV_Message.inl b/deps/acelite/ace/Typed_SV_Message.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Typed_SV_Message.inl
rename to deps/acelite/ace/Typed_SV_Message.inl
diff --git a/modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.cpp b/deps/acelite/ace/Typed_SV_Message_Queue.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.cpp
rename to deps/acelite/ace/Typed_SV_Message_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.h b/deps/acelite/ace/Typed_SV_Message_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.h
rename to deps/acelite/ace/Typed_SV_Message_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.inl b/deps/acelite/ace/Typed_SV_Message_Queue.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.inl
rename to deps/acelite/ace/Typed_SV_Message_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/UNIX_Addr.cpp b/deps/acelite/ace/UNIX_Addr.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UNIX_Addr.cpp
rename to deps/acelite/ace/UNIX_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UNIX_Addr.h b/deps/acelite/ace/UNIX_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UNIX_Addr.h
rename to deps/acelite/ace/UNIX_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/UNIX_Addr.inl b/deps/acelite/ace/UNIX_Addr.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UNIX_Addr.inl
rename to deps/acelite/ace/UNIX_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.cpp b/deps/acelite/ace/UPIPE_Acceptor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.cpp
rename to deps/acelite/ace/UPIPE_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.h b/deps/acelite/ace/UPIPE_Acceptor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.h
rename to deps/acelite/ace/UPIPE_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.inl b/deps/acelite/ace/UPIPE_Acceptor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.inl
rename to deps/acelite/ace/UPIPE_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Addr.h b/deps/acelite/ace/UPIPE_Addr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Addr.h
rename to deps/acelite/ace/UPIPE_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.cpp b/deps/acelite/ace/UPIPE_Connector.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Connector.cpp
rename to deps/acelite/ace/UPIPE_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.h b/deps/acelite/ace/UPIPE_Connector.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Connector.h
rename to deps/acelite/ace/UPIPE_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.inl b/deps/acelite/ace/UPIPE_Connector.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Connector.inl
rename to deps/acelite/ace/UPIPE_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.cpp b/deps/acelite/ace/UPIPE_Stream.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Stream.cpp
rename to deps/acelite/ace/UPIPE_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.h b/deps/acelite/ace/UPIPE_Stream.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Stream.h
rename to deps/acelite/ace/UPIPE_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.inl b/deps/acelite/ace/UPIPE_Stream.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UPIPE_Stream.inl
rename to deps/acelite/ace/UPIPE_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.cpp b/deps/acelite/ace/UTF16_Encoding_Converter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.cpp
rename to deps/acelite/ace/UTF16_Encoding_Converter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.h b/deps/acelite/ace/UTF16_Encoding_Converter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.h
rename to deps/acelite/ace/UTF16_Encoding_Converter.h
diff --git a/modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.inl b/deps/acelite/ace/UTF16_Encoding_Converter.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.inl
rename to deps/acelite/ace/UTF16_Encoding_Converter.inl
diff --git a/modules/worldengine/deps/acelite/ace/UTF32_Encoding_Converter.cpp b/deps/acelite/ace/UTF32_Encoding_Converter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UTF32_Encoding_Converter.cpp
rename to deps/acelite/ace/UTF32_Encoding_Converter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UTF32_Encoding_Converter.h b/deps/acelite/ace/UTF32_Encoding_Converter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UTF32_Encoding_Converter.h
rename to deps/acelite/ace/UTF32_Encoding_Converter.h
diff --git a/modules/worldengine/deps/acelite/ace/UTF8_Encoding_Converter.cpp b/deps/acelite/ace/UTF8_Encoding_Converter.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UTF8_Encoding_Converter.cpp
rename to deps/acelite/ace/UTF8_Encoding_Converter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UTF8_Encoding_Converter.h b/deps/acelite/ace/UTF8_Encoding_Converter.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UTF8_Encoding_Converter.h
rename to deps/acelite/ace/UTF8_Encoding_Converter.h
diff --git a/modules/worldengine/deps/acelite/ace/UUID.cpp b/deps/acelite/ace/UUID.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UUID.cpp
rename to deps/acelite/ace/UUID.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UUID.h b/deps/acelite/ace/UUID.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UUID.h
rename to deps/acelite/ace/UUID.h
diff --git a/modules/worldengine/deps/acelite/ace/UUID.inl b/deps/acelite/ace/UUID.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/UUID.inl
rename to deps/acelite/ace/UUID.inl
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.cpp b/deps/acelite/ace/Unbounded_Queue.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Queue.cpp
rename to deps/acelite/ace/Unbounded_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.h b/deps/acelite/ace/Unbounded_Queue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Queue.h
rename to deps/acelite/ace/Unbounded_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.inl b/deps/acelite/ace/Unbounded_Queue.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Queue.inl
rename to deps/acelite/ace/Unbounded_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set.cpp b/deps/acelite/ace/Unbounded_Set.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Set.cpp
rename to deps/acelite/ace/Unbounded_Set.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set.h b/deps/acelite/ace/Unbounded_Set.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Set.h
rename to deps/acelite/ace/Unbounded_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set.inl b/deps/acelite/ace/Unbounded_Set.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Set.inl
rename to deps/acelite/ace/Unbounded_Set.inl
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.cpp b/deps/acelite/ace/Unbounded_Set_Ex.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.cpp
rename to deps/acelite/ace/Unbounded_Set_Ex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.h b/deps/acelite/ace/Unbounded_Set_Ex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.h
rename to deps/acelite/ace/Unbounded_Set_Ex.h
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.inl b/deps/acelite/ace/Unbounded_Set_Ex.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.inl
rename to deps/acelite/ace/Unbounded_Set_Ex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Value_Ptr.h b/deps/acelite/ace/Value_Ptr.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Value_Ptr.h
rename to deps/acelite/ace/Value_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Vector_T.cpp b/deps/acelite/ace/Vector_T.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Vector_T.cpp
rename to deps/acelite/ace/Vector_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Vector_T.h b/deps/acelite/ace/Vector_T.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Vector_T.h
rename to deps/acelite/ace/Vector_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Vector_T.inl b/deps/acelite/ace/Vector_T.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Vector_T.inl
rename to deps/acelite/ace/Vector_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Version.h b/deps/acelite/ace/Version.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Version.h
rename to deps/acelite/ace/Version.h
diff --git a/modules/worldengine/deps/acelite/ace/Versioned_Namespace.h b/deps/acelite/ace/Versioned_Namespace.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/Versioned_Namespace.h
rename to deps/acelite/ace/Versioned_Namespace.h
diff --git a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.cpp b/deps/acelite/ace/WFMO_Reactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/WFMO_Reactor.cpp
rename to deps/acelite/ace/WFMO_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.h b/deps/acelite/ace/WFMO_Reactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/WFMO_Reactor.h
rename to deps/acelite/ace/WFMO_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.inl b/deps/acelite/ace/WFMO_Reactor.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/WFMO_Reactor.inl
rename to deps/acelite/ace/WFMO_Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/WIN32_Asynch_IO.cpp b/deps/acelite/ace/WIN32_Asynch_IO.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/WIN32_Asynch_IO.cpp
rename to deps/acelite/ace/WIN32_Asynch_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/WIN32_Asynch_IO.h b/deps/acelite/ace/WIN32_Asynch_IO.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/WIN32_Asynch_IO.h
rename to deps/acelite/ace/WIN32_Asynch_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/WIN32_Proactor.cpp b/deps/acelite/ace/WIN32_Proactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/WIN32_Proactor.cpp
rename to deps/acelite/ace/WIN32_Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/WIN32_Proactor.h b/deps/acelite/ace/WIN32_Proactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/WIN32_Proactor.h
rename to deps/acelite/ace/WIN32_Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/XML_Svc_Conf.cpp b/deps/acelite/ace/XML_Svc_Conf.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Svc_Conf.cpp
rename to deps/acelite/ace/XML_Svc_Conf.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Svc_Conf.h b/deps/acelite/ace/XML_Svc_Conf.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Svc_Conf.h
rename to deps/acelite/ace/XML_Svc_Conf.h
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in b/deps/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
rename to deps/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML.mpc b/deps/acelite/ace/XML_Utils/XML.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML.mpc
rename to deps/acelite/ace/XML_Utils/XML.mpc
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp b/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
rename to deps/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp b/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
rename to deps/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp b/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
rename to deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp b/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
rename to deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp b/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
rename to deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Types.hpp b/deps/acelite/ace/XML_Utils/XMLSchema/Types.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Types.hpp
rename to deps/acelite/ace/XML_Utils/XMLSchema/Types.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Types.ipp b/deps/acelite/ace/XML_Utils/XMLSchema/Types.ipp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Types.ipp
rename to deps/acelite/ace/XML_Utils/XMLSchema/Types.ipp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Writer.hpp b/deps/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
rename to deps/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Writer.ipp b/deps/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
rename to deps/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/id_map.hpp b/deps/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
rename to deps/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Error_Handler.cpp b/deps/acelite/ace/XML_Utils/XML_Error_Handler.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Error_Handler.cpp
rename to deps/acelite/ace/XML_Utils/XML_Error_Handler.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Error_Handler.h b/deps/acelite/ace/XML_Utils/XML_Error_Handler.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Error_Handler.h
rename to deps/acelite/ace/XML_Utils/XML_Error_Handler.h
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Helper.h b/deps/acelite/ace/XML_Utils/XML_Helper.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Helper.h
rename to deps/acelite/ace/XML_Utils/XML_Helper.h
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Helper.tpp b/deps/acelite/ace/XML_Utils/XML_Helper.tpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Helper.tpp
rename to deps/acelite/ace/XML_Utils/XML_Helper.tpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp b/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
rename to deps/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.h b/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.h
rename to deps/acelite/ace/XML_Utils/XML_Schema_Resolver.h
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp b/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
rename to deps/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Typedefs.cpp b/deps/acelite/ace/XML_Utils/XML_Typedefs.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Typedefs.cpp
rename to deps/acelite/ace/XML_Utils/XML_Typedefs.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Typedefs.h b/deps/acelite/ace/XML_Utils/XML_Typedefs.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Typedefs.h
rename to deps/acelite/ace/XML_Utils/XML_Typedefs.h
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Utils_Export.h b/deps/acelite/ace/XML_Utils/XML_Utils_Export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XML_Utils_Export.h
rename to deps/acelite/ace/XML_Utils/XML_Utils_Export.h
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Elements.hpp b/deps/acelite/ace/XML_Utils/XSCRT/Elements.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Elements.hpp
rename to deps/acelite/ace/XML_Utils/XSCRT/Elements.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp b/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
rename to deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp b/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
rename to deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Parser.hpp b/deps/acelite/ace/XML_Utils/XSCRT/Parser.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Parser.hpp
rename to deps/acelite/ace/XML_Utils/XSCRT/Parser.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Traversal.hpp b/deps/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
rename to deps/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Traversal.tpp b/deps/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
rename to deps/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Writer.hpp b/deps/acelite/ace/XML_Utils/XSCRT/Writer.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Writer.hpp
rename to deps/acelite/ace/XML_Utils/XSCRT/Writer.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/XML.hpp b/deps/acelite/ace/XML_Utils/XSCRT/XML.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/XML.hpp
rename to deps/acelite/ace/XML_Utils/XSCRT/XML.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp b/deps/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
rename to deps/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XercesString.cpp b/deps/acelite/ace/XML_Utils/XercesString.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XercesString.cpp
rename to deps/acelite/ace/XML_Utils/XercesString.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XML_Utils/XercesString.h b/deps/acelite/ace/XML_Utils/XercesString.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XML_Utils/XercesString.h
rename to deps/acelite/ace/XML_Utils/XercesString.h
diff --git a/modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.cpp b/deps/acelite/ace/XTI_ATM_Mcast.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.cpp
rename to deps/acelite/ace/XTI_ATM_Mcast.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.h b/deps/acelite/ace/XTI_ATM_Mcast.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.h
rename to deps/acelite/ace/XTI_ATM_Mcast.h
diff --git a/modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.inl b/deps/acelite/ace/XTI_ATM_Mcast.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.inl
rename to deps/acelite/ace/XTI_ATM_Mcast.inl
diff --git a/modules/worldengine/deps/acelite/ace/XtReactor/ACE_XtReactor.pc.in b/deps/acelite/ace/XtReactor/ACE_XtReactor.pc.in
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XtReactor/ACE_XtReactor.pc.in
rename to deps/acelite/ace/XtReactor/ACE_XtReactor.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/XtReactor/ACE_XtReactor_export.h b/deps/acelite/ace/XtReactor/ACE_XtReactor_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XtReactor/ACE_XtReactor_export.h
rename to deps/acelite/ace/XtReactor/ACE_XtReactor_export.h
diff --git a/modules/worldengine/deps/acelite/ace/XtReactor/XtReactor.cpp b/deps/acelite/ace/XtReactor/XtReactor.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XtReactor/XtReactor.cpp
rename to deps/acelite/ace/XtReactor/XtReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XtReactor/XtReactor.h b/deps/acelite/ace/XtReactor/XtReactor.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XtReactor/XtReactor.h
rename to deps/acelite/ace/XtReactor/XtReactor.h
diff --git a/modules/worldengine/deps/acelite/ace/XtReactor/ace_xtreactor.mpc b/deps/acelite/ace/XtReactor/ace_xtreactor.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/XtReactor/ace_xtreactor.mpc
rename to deps/acelite/ace/XtReactor/ace_xtreactor.mpc
diff --git a/modules/worldengine/deps/acelite/ace/ace.mpc b/deps/acelite/ace/ace.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace.mpc
rename to deps/acelite/ace/ace.mpc
diff --git a/modules/worldengine/deps/acelite/ace/ace.mwc b/deps/acelite/ace/ace.mwc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace.mwc
rename to deps/acelite/ace/ace.mwc
diff --git a/modules/worldengine/deps/acelite/ace/ace.rc b/deps/acelite/ace/ace.rc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace.rc
rename to deps/acelite/ace/ace.rc
diff --git a/modules/worldengine/deps/acelite/ace/ace_for_tao.mpc b/deps/acelite/ace/ace_for_tao.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace_for_tao.mpc
rename to deps/acelite/ace/ace_for_tao.mpc
diff --git a/modules/worldengine/deps/acelite/ace/ace_message_table.bin b/deps/acelite/ace/ace_message_table.bin
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace_message_table.bin
rename to deps/acelite/ace/ace_message_table.bin
diff --git a/modules/worldengine/deps/acelite/ace/ace_wchar.cpp b/deps/acelite/ace/ace_wchar.cpp
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace_wchar.cpp
rename to deps/acelite/ace/ace_wchar.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ace_wchar.h b/deps/acelite/ace/ace_wchar.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace_wchar.h
rename to deps/acelite/ace/ace_wchar.h
diff --git a/modules/worldengine/deps/acelite/ace/ace_wchar.inl b/deps/acelite/ace/ace_wchar.inl
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/ace_wchar.inl
rename to deps/acelite/ace/ace_wchar.inl
diff --git a/modules/worldengine/deps/acelite/ace/checked_iterator.h b/deps/acelite/ace/checked_iterator.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/checked_iterator.h
rename to deps/acelite/ace/checked_iterator.h
diff --git a/modules/worldengine/deps/acelite/ace/codecs.mpb b/deps/acelite/ace/codecs.mpb
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/codecs.mpb
rename to deps/acelite/ace/codecs.mpb
diff --git a/modules/worldengine/deps/acelite/ace/config-WinCE.h b/deps/acelite/ace/config-WinCE.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-WinCE.h
rename to deps/acelite/ace/config-WinCE.h
diff --git a/modules/worldengine/deps/acelite/ace/config-aix-5.x.h b/deps/acelite/ace/config-aix-5.x.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-aix-5.x.h
rename to deps/acelite/ace/config-aix-5.x.h
diff --git a/modules/worldengine/deps/acelite/ace/config-aix-7.h b/deps/acelite/ace/config-aix-7.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-aix-7.h
rename to deps/acelite/ace/config-aix-7.h
diff --git a/modules/worldengine/deps/acelite/ace/config-all.h b/deps/acelite/ace/config-all.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-all.h
rename to deps/acelite/ace/config-all.h
diff --git a/modules/worldengine/deps/acelite/ace/config-android.h b/deps/acelite/ace/config-android.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-android.h
rename to deps/acelite/ace/config-android.h
diff --git a/modules/worldengine/deps/acelite/ace/config-cygwin32.h b/deps/acelite/ace/config-cygwin32.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-cygwin32.h
rename to deps/acelite/ace/config-cygwin32.h
diff --git a/modules/worldengine/deps/acelite/ace/config-freebsd.h b/deps/acelite/ace/config-freebsd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-freebsd.h
rename to deps/acelite/ace/config-freebsd.h
diff --git a/modules/worldengine/deps/acelite/ace/config-g++-common.h b/deps/acelite/ace/config-g++-common.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-g++-common.h
rename to deps/acelite/ace/config-g++-common.h
diff --git a/modules/worldengine/deps/acelite/ace/config-hpux-11.00.h b/deps/acelite/ace/config-hpux-11.00.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-hpux-11.00.h
rename to deps/acelite/ace/config-hpux-11.00.h
diff --git a/modules/worldengine/deps/acelite/ace/config-icc-common.h b/deps/acelite/ace/config-icc-common.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-icc-common.h
rename to deps/acelite/ace/config-icc-common.h
diff --git a/modules/worldengine/deps/acelite/ace/config-integritySCA.h b/deps/acelite/ace/config-integritySCA.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-integritySCA.h
rename to deps/acelite/ace/config-integritySCA.h
diff --git a/modules/worldengine/deps/acelite/ace/config-kfreebsd.h b/deps/acelite/ace/config-kfreebsd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-kfreebsd.h
rename to deps/acelite/ace/config-kfreebsd.h
diff --git a/modules/worldengine/deps/acelite/ace/config-linux.h b/deps/acelite/ace/config-linux.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-linux.h
rename to deps/acelite/ace/config-linux.h
diff --git a/modules/worldengine/deps/acelite/ace/config-lite.h b/deps/acelite/ace/config-lite.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-lite.h
rename to deps/acelite/ace/config-lite.h
diff --git a/modules/worldengine/deps/acelite/ace/config-lynxos.h b/deps/acelite/ace/config-lynxos.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-lynxos.h
rename to deps/acelite/ace/config-lynxos.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-iOS-hardware.h b/deps/acelite/ace/config-macosx-iOS-hardware.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-iOS-hardware.h
rename to deps/acelite/ace/config-macosx-iOS-hardware.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-iOS-simulator.h b/deps/acelite/ace/config-macosx-iOS-simulator.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-iOS-simulator.h
rename to deps/acelite/ace/config-macosx-iOS-simulator.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-leopard.h b/deps/acelite/ace/config-macosx-leopard.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-leopard.h
rename to deps/acelite/ace/config-macosx-leopard.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-lion.h b/deps/acelite/ace/config-macosx-lion.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-lion.h
rename to deps/acelite/ace/config-macosx-lion.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-mavericks.h b/deps/acelite/ace/config-macosx-mavericks.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-mavericks.h
rename to deps/acelite/ace/config-macosx-mavericks.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-mountainlion.h b/deps/acelite/ace/config-macosx-mountainlion.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-mountainlion.h
rename to deps/acelite/ace/config-macosx-mountainlion.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-panther.h b/deps/acelite/ace/config-macosx-panther.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-panther.h
rename to deps/acelite/ace/config-macosx-panther.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-snowleopard.h b/deps/acelite/ace/config-macosx-snowleopard.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-snowleopard.h
rename to deps/acelite/ace/config-macosx-snowleopard.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-tiger.h b/deps/acelite/ace/config-macosx-tiger.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-tiger.h
rename to deps/acelite/ace/config-macosx-tiger.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx-yosemite.h b/deps/acelite/ace/config-macosx-yosemite.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx-yosemite.h
rename to deps/acelite/ace/config-macosx-yosemite.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macosx.h b/deps/acelite/ace/config-macosx.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macosx.h
rename to deps/acelite/ace/config-macosx.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macros.h b/deps/acelite/ace/config-macros.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-macros.h
rename to deps/acelite/ace/config-macros.h
diff --git a/modules/worldengine/deps/acelite/ace/config-netbsd.h b/deps/acelite/ace/config-netbsd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-netbsd.h
rename to deps/acelite/ace/config-netbsd.h
diff --git a/modules/worldengine/deps/acelite/ace/config-openbsd.h b/deps/acelite/ace/config-openbsd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-openbsd.h
rename to deps/acelite/ace/config-openbsd.h
diff --git a/modules/worldengine/deps/acelite/ace/config-openvms.h b/deps/acelite/ace/config-openvms.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-openvms.h
rename to deps/acelite/ace/config-openvms.h
diff --git a/modules/worldengine/deps/acelite/ace/config-pharlap.h b/deps/acelite/ace/config-pharlap.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-pharlap.h
rename to deps/acelite/ace/config-pharlap.h
diff --git a/modules/worldengine/deps/acelite/ace/config-posix-nonetworking.h b/deps/acelite/ace/config-posix-nonetworking.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-posix-nonetworking.h
rename to deps/acelite/ace/config-posix-nonetworking.h
diff --git a/modules/worldengine/deps/acelite/ace/config-posix.h b/deps/acelite/ace/config-posix.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-posix.h
rename to deps/acelite/ace/config-posix.h
diff --git a/modules/worldengine/deps/acelite/ace/config-qnx.h b/deps/acelite/ace/config-qnx.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-qnx.h
rename to deps/acelite/ace/config-qnx.h
diff --git a/modules/worldengine/deps/acelite/ace/config-rtems.h b/deps/acelite/ace/config-rtems.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-rtems.h
rename to deps/acelite/ace/config-rtems.h
diff --git a/modules/worldengine/deps/acelite/ace/config-suncc-common.h b/deps/acelite/ace/config-suncc-common.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-suncc-common.h
rename to deps/acelite/ace/config-suncc-common.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.10.h b/deps/acelite/ace/config-sunos5.10.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.10.h
rename to deps/acelite/ace/config-sunos5.10.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.11.h b/deps/acelite/ace/config-sunos5.11.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.11.h
rename to deps/acelite/ace/config-sunos5.11.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.4-g++.h b/deps/acelite/ace/config-sunos5.4-g++.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.4-g++.h
rename to deps/acelite/ace/config-sunos5.4-g++.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.4-sunc++-4.x.h b/deps/acelite/ace/config-sunos5.4-sunc++-4.x.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.4-sunc++-4.x.h
rename to deps/acelite/ace/config-sunos5.4-sunc++-4.x.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.5.h b/deps/acelite/ace/config-sunos5.5.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.5.h
rename to deps/acelite/ace/config-sunos5.5.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.6.h b/deps/acelite/ace/config-sunos5.6.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.6.h
rename to deps/acelite/ace/config-sunos5.6.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.7.h b/deps/acelite/ace/config-sunos5.7.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.7.h
rename to deps/acelite/ace/config-sunos5.7.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.8.h b/deps/acelite/ace/config-sunos5.8.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.8.h
rename to deps/acelite/ace/config-sunos5.8.h
diff --git a/modules/worldengine/deps/acelite/ace/config-sunos5.9.h b/deps/acelite/ace/config-sunos5.9.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-sunos5.9.h
rename to deps/acelite/ace/config-sunos5.9.h
diff --git a/modules/worldengine/deps/acelite/ace/config-vxworks.h b/deps/acelite/ace/config-vxworks.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-vxworks.h
rename to deps/acelite/ace/config-vxworks.h
diff --git a/modules/worldengine/deps/acelite/ace/config-vxworks6.4.h b/deps/acelite/ace/config-vxworks6.4.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-vxworks6.4.h
rename to deps/acelite/ace/config-vxworks6.4.h
diff --git a/modules/worldengine/deps/acelite/ace/config-vxworks6.5.h b/deps/acelite/ace/config-vxworks6.5.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-vxworks6.5.h
rename to deps/acelite/ace/config-vxworks6.5.h
diff --git a/modules/worldengine/deps/acelite/ace/config-vxworks6.6.h b/deps/acelite/ace/config-vxworks6.6.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-vxworks6.6.h
rename to deps/acelite/ace/config-vxworks6.6.h
diff --git a/modules/worldengine/deps/acelite/ace/config-vxworks6.7.h b/deps/acelite/ace/config-vxworks6.7.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-vxworks6.7.h
rename to deps/acelite/ace/config-vxworks6.7.h
diff --git a/modules/worldengine/deps/acelite/ace/config-vxworks6.8.h b/deps/acelite/ace/config-vxworks6.8.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-vxworks6.8.h
rename to deps/acelite/ace/config-vxworks6.8.h
diff --git a/modules/worldengine/deps/acelite/ace/config-vxworks6.9.h b/deps/acelite/ace/config-vxworks6.9.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-vxworks6.9.h
rename to deps/acelite/ace/config-vxworks6.9.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-borland.h b/deps/acelite/ace/config-win32-borland.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-borland.h
rename to deps/acelite/ace/config-win32-borland.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-cegcc.h b/deps/acelite/ace/config-win32-cegcc.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-cegcc.h
rename to deps/acelite/ace/config-win32-cegcc.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-common.h b/deps/acelite/ace/config-win32-common.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-common.h
rename to deps/acelite/ace/config-win32-common.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-dmc.h b/deps/acelite/ace/config-win32-dmc.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-dmc.h
rename to deps/acelite/ace/config-win32-dmc.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-interix.h b/deps/acelite/ace/config-win32-interix.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-interix.h
rename to deps/acelite/ace/config-win32-interix.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-mingw.h b/deps/acelite/ace/config-win32-mingw.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-mingw.h
rename to deps/acelite/ace/config-win32-mingw.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-mingw64.h b/deps/acelite/ace/config-win32-mingw64.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-mingw64.h
rename to deps/acelite/ace/config-win32-mingw64.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc-10.h b/deps/acelite/ace/config-win32-msvc-10.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc-10.h
rename to deps/acelite/ace/config-win32-msvc-10.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc-11.h b/deps/acelite/ace/config-win32-msvc-11.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc-11.h
rename to deps/acelite/ace/config-win32-msvc-11.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc-12.h b/deps/acelite/ace/config-win32-msvc-12.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc-12.h
rename to deps/acelite/ace/config-win32-msvc-12.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc-14.h b/deps/acelite/ace/config-win32-msvc-14.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc-14.h
rename to deps/acelite/ace/config-win32-msvc-14.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc-7.h b/deps/acelite/ace/config-win32-msvc-7.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc-7.h
rename to deps/acelite/ace/config-win32-msvc-7.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc-8.h b/deps/acelite/ace/config-win32-msvc-8.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc-8.h
rename to deps/acelite/ace/config-win32-msvc-8.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc-9.h b/deps/acelite/ace/config-win32-msvc-9.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc-9.h
rename to deps/acelite/ace/config-win32-msvc-9.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32-msvc.h b/deps/acelite/ace/config-win32-msvc.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32-msvc.h
rename to deps/acelite/ace/config-win32-msvc.h
diff --git a/modules/worldengine/deps/acelite/ace/config-win32.h b/deps/acelite/ace/config-win32.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-win32.h
rename to deps/acelite/ace/config-win32.h
diff --git a/modules/worldengine/deps/acelite/ace/config-windows.h b/deps/acelite/ace/config-windows.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/config-windows.h
rename to deps/acelite/ace/config-windows.h
diff --git a/modules/worldengine/deps/acelite/ace/filecache.mpb b/deps/acelite/ace/filecache.mpb
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/filecache.mpb
rename to deps/acelite/ace/filecache.mpb
diff --git a/modules/worldengine/deps/acelite/ace/iosfwd.h b/deps/acelite/ace/iosfwd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/iosfwd.h
rename to deps/acelite/ace/iosfwd.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/arpa/os_inet.h b/deps/acelite/ace/os_include/arpa/os_inet.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/arpa/os_inet.h
rename to deps/acelite/ace/os_include/arpa/os_inet.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/net/os_if.h b/deps/acelite/ace/os_include/net/os_if.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/net/os_if.h
rename to deps/acelite/ace/os_include/net/os_if.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/netinet/os_in.h b/deps/acelite/ace/os_include/netinet/os_in.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/netinet/os_in.h
rename to deps/acelite/ace/os_include/netinet/os_in.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/netinet/os_tcp.h b/deps/acelite/ace/os_include/netinet/os_tcp.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/netinet/os_tcp.h
rename to deps/acelite/ace/os_include/netinet/os_tcp.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_aio.h b/deps/acelite/ace/os_include/os_aio.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_aio.h
rename to deps/acelite/ace/os_include/os_aio.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_assert.h b/deps/acelite/ace/os_include/os_assert.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_assert.h
rename to deps/acelite/ace/os_include/os_assert.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_byteswap.h b/deps/acelite/ace/os_include/os_byteswap.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_byteswap.h
rename to deps/acelite/ace/os_include/os_byteswap.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_complex.h b/deps/acelite/ace/os_include/os_complex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_complex.h
rename to deps/acelite/ace/os_include/os_complex.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_cpio.h b/deps/acelite/ace/os_include/os_cpio.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_cpio.h
rename to deps/acelite/ace/os_include/os_cpio.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_ctype.h b/deps/acelite/ace/os_include/os_ctype.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_ctype.h
rename to deps/acelite/ace/os_include/os_ctype.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_dirent.h b/deps/acelite/ace/os_include/os_dirent.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_dirent.h
rename to deps/acelite/ace/os_include/os_dirent.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_dlfcn.h b/deps/acelite/ace/os_include/os_dlfcn.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_dlfcn.h
rename to deps/acelite/ace/os_include/os_dlfcn.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_errno.h b/deps/acelite/ace/os_include/os_errno.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_errno.h
rename to deps/acelite/ace/os_include/os_errno.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_fcntl.h b/deps/acelite/ace/os_include/os_fcntl.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_fcntl.h
rename to deps/acelite/ace/os_include/os_fcntl.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_fenv.h b/deps/acelite/ace/os_include/os_fenv.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_fenv.h
rename to deps/acelite/ace/os_include/os_fenv.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_float.h b/deps/acelite/ace/os_include/os_float.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_float.h
rename to deps/acelite/ace/os_include/os_float.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_fmtmsg.h b/deps/acelite/ace/os_include/os_fmtmsg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_fmtmsg.h
rename to deps/acelite/ace/os_include/os_fmtmsg.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_fnmatch.h b/deps/acelite/ace/os_include/os_fnmatch.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_fnmatch.h
rename to deps/acelite/ace/os_include/os_fnmatch.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_ftw.h b/deps/acelite/ace/os_include/os_ftw.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_ftw.h
rename to deps/acelite/ace/os_include/os_ftw.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_glob.h b/deps/acelite/ace/os_include/os_glob.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_glob.h
rename to deps/acelite/ace/os_include/os_glob.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_grp.h b/deps/acelite/ace/os_include/os_grp.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_grp.h
rename to deps/acelite/ace/os_include/os_grp.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_iconv.h b/deps/acelite/ace/os_include/os_iconv.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_iconv.h
rename to deps/acelite/ace/os_include/os_iconv.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_ifaddrs.h b/deps/acelite/ace/os_include/os_ifaddrs.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_ifaddrs.h
rename to deps/acelite/ace/os_include/os_ifaddrs.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_intrin.h b/deps/acelite/ace/os_include/os_intrin.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_intrin.h
rename to deps/acelite/ace/os_include/os_intrin.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_inttypes.h b/deps/acelite/ace/os_include/os_inttypes.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_inttypes.h
rename to deps/acelite/ace/os_include/os_inttypes.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_iso646.h b/deps/acelite/ace/os_include/os_iso646.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_iso646.h
rename to deps/acelite/ace/os_include/os_iso646.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_kstat.h b/deps/acelite/ace/os_include/os_kstat.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_kstat.h
rename to deps/acelite/ace/os_include/os_kstat.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_langinfo.h b/deps/acelite/ace/os_include/os_langinfo.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_langinfo.h
rename to deps/acelite/ace/os_include/os_langinfo.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_libgen.h b/deps/acelite/ace/os_include/os_libgen.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_libgen.h
rename to deps/acelite/ace/os_include/os_libgen.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_limits.h b/deps/acelite/ace/os_include/os_limits.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_limits.h
rename to deps/acelite/ace/os_include/os_limits.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_local.h b/deps/acelite/ace/os_include/os_local.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_local.h
rename to deps/acelite/ace/os_include/os_local.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_math.h b/deps/acelite/ace/os_include/os_math.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_math.h
rename to deps/acelite/ace/os_include/os_math.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_monetary.h b/deps/acelite/ace/os_include/os_monetary.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_monetary.h
rename to deps/acelite/ace/os_include/os_monetary.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_mqueue.h b/deps/acelite/ace/os_include/os_mqueue.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_mqueue.h
rename to deps/acelite/ace/os_include/os_mqueue.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_ndbm.h b/deps/acelite/ace/os_include/os_ndbm.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_ndbm.h
rename to deps/acelite/ace/os_include/os_ndbm.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_netdb.h b/deps/acelite/ace/os_include/os_netdb.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_netdb.h
rename to deps/acelite/ace/os_include/os_netdb.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_nl_types.h b/deps/acelite/ace/os_include/os_nl_types.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_nl_types.h
rename to deps/acelite/ace/os_include/os_nl_types.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_pdh.h b/deps/acelite/ace/os_include/os_pdh.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_pdh.h
rename to deps/acelite/ace/os_include/os_pdh.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_pdhmsg.h b/deps/acelite/ace/os_include/os_pdhmsg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_pdhmsg.h
rename to deps/acelite/ace/os_include/os_pdhmsg.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_poll.h b/deps/acelite/ace/os_include/os_poll.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_poll.h
rename to deps/acelite/ace/os_include/os_poll.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_pthread.h b/deps/acelite/ace/os_include/os_pthread.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_pthread.h
rename to deps/acelite/ace/os_include/os_pthread.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_pwd.h b/deps/acelite/ace/os_include/os_pwd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_pwd.h
rename to deps/acelite/ace/os_include/os_pwd.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_regex.h b/deps/acelite/ace/os_include/os_regex.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_regex.h
rename to deps/acelite/ace/os_include/os_regex.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_sched.h b/deps/acelite/ace/os_include/os_sched.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_sched.h
rename to deps/acelite/ace/os_include/os_sched.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_search.h b/deps/acelite/ace/os_include/os_search.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_search.h
rename to deps/acelite/ace/os_include/os_search.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_semaphore.h b/deps/acelite/ace/os_include/os_semaphore.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_semaphore.h
rename to deps/acelite/ace/os_include/os_semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_setjmp.h b/deps/acelite/ace/os_include/os_setjmp.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_setjmp.h
rename to deps/acelite/ace/os_include/os_setjmp.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_signal.h b/deps/acelite/ace/os_include/os_signal.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_signal.h
rename to deps/acelite/ace/os_include/os_signal.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_spawn.h b/deps/acelite/ace/os_include/os_spawn.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_spawn.h
rename to deps/acelite/ace/os_include/os_spawn.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_stdarg.h b/deps/acelite/ace/os_include/os_stdarg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_stdarg.h
rename to deps/acelite/ace/os_include/os_stdarg.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_stdbool.h b/deps/acelite/ace/os_include/os_stdbool.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_stdbool.h
rename to deps/acelite/ace/os_include/os_stdbool.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_stddef.h b/deps/acelite/ace/os_include/os_stddef.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_stddef.h
rename to deps/acelite/ace/os_include/os_stddef.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_stdint.h b/deps/acelite/ace/os_include/os_stdint.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_stdint.h
rename to deps/acelite/ace/os_include/os_stdint.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_stdio.h b/deps/acelite/ace/os_include/os_stdio.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_stdio.h
rename to deps/acelite/ace/os_include/os_stdio.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_stdlib.h b/deps/acelite/ace/os_include/os_stdlib.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_stdlib.h
rename to deps/acelite/ace/os_include/os_stdlib.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_string.h b/deps/acelite/ace/os_include/os_string.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_string.h
rename to deps/acelite/ace/os_include/os_string.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_strings.h b/deps/acelite/ace/os_include/os_strings.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_strings.h
rename to deps/acelite/ace/os_include/os_strings.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_stropts.h b/deps/acelite/ace/os_include/os_stropts.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_stropts.h
rename to deps/acelite/ace/os_include/os_stropts.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_syslog.h b/deps/acelite/ace/os_include/os_syslog.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_syslog.h
rename to deps/acelite/ace/os_include/os_syslog.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_tar.h b/deps/acelite/ace/os_include/os_tar.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_tar.h
rename to deps/acelite/ace/os_include/os_tar.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_termios.h b/deps/acelite/ace/os_include/os_termios.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_termios.h
rename to deps/acelite/ace/os_include/os_termios.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_tgmath.h b/deps/acelite/ace/os_include/os_tgmath.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_tgmath.h
rename to deps/acelite/ace/os_include/os_tgmath.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_time.h b/deps/acelite/ace/os_include/os_time.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_time.h
rename to deps/acelite/ace/os_include/os_time.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_trace.h b/deps/acelite/ace/os_include/os_trace.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_trace.h
rename to deps/acelite/ace/os_include/os_trace.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_typeinfo.h b/deps/acelite/ace/os_include/os_typeinfo.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_typeinfo.h
rename to deps/acelite/ace/os_include/os_typeinfo.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_ucontext.h b/deps/acelite/ace/os_include/os_ucontext.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_ucontext.h
rename to deps/acelite/ace/os_include/os_ucontext.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_ulimit.h b/deps/acelite/ace/os_include/os_ulimit.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_ulimit.h
rename to deps/acelite/ace/os_include/os_ulimit.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_unistd.h b/deps/acelite/ace/os_include/os_unistd.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_unistd.h
rename to deps/acelite/ace/os_include/os_unistd.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_utime.h b/deps/acelite/ace/os_include/os_utime.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_utime.h
rename to deps/acelite/ace/os_include/os_utime.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_utmpx.h b/deps/acelite/ace/os_include/os_utmpx.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_utmpx.h
rename to deps/acelite/ace/os_include/os_utmpx.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_wchar.h b/deps/acelite/ace/os_include/os_wchar.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_wchar.h
rename to deps/acelite/ace/os_include/os_wchar.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_wctype.h b/deps/acelite/ace/os_include/os_wctype.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_wctype.h
rename to deps/acelite/ace/os_include/os_wctype.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/os_wordexp.h b/deps/acelite/ace/os_include/os_wordexp.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/os_wordexp.h
rename to deps/acelite/ace/os_include/os_wordexp.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_ipc.h b/deps/acelite/ace/os_include/sys/os_ipc.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_ipc.h
rename to deps/acelite/ace/os_include/sys/os_ipc.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_loadavg.h b/deps/acelite/ace/os_include/sys/os_loadavg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_loadavg.h
rename to deps/acelite/ace/os_include/sys/os_loadavg.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_mman.h b/deps/acelite/ace/os_include/sys/os_mman.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_mman.h
rename to deps/acelite/ace/os_include/sys/os_mman.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_msg.h b/deps/acelite/ace/os_include/sys/os_msg.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_msg.h
rename to deps/acelite/ace/os_include/sys/os_msg.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_pstat.h b/deps/acelite/ace/os_include/sys/os_pstat.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_pstat.h
rename to deps/acelite/ace/os_include/sys/os_pstat.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_resource.h b/deps/acelite/ace/os_include/sys/os_resource.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_resource.h
rename to deps/acelite/ace/os_include/sys/os_resource.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_select.h b/deps/acelite/ace/os_include/sys/os_select.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_select.h
rename to deps/acelite/ace/os_include/sys/os_select.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_sem.h b/deps/acelite/ace/os_include/sys/os_sem.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_sem.h
rename to deps/acelite/ace/os_include/sys/os_sem.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_shm.h b/deps/acelite/ace/os_include/sys/os_shm.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_shm.h
rename to deps/acelite/ace/os_include/sys/os_shm.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_socket.h b/deps/acelite/ace/os_include/sys/os_socket.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_socket.h
rename to deps/acelite/ace/os_include/sys/os_socket.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_stat.h b/deps/acelite/ace/os_include/sys/os_stat.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_stat.h
rename to deps/acelite/ace/os_include/sys/os_stat.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_statvfs.h b/deps/acelite/ace/os_include/sys/os_statvfs.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_statvfs.h
rename to deps/acelite/ace/os_include/sys/os_statvfs.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_sysctl.h b/deps/acelite/ace/os_include/sys/os_sysctl.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_sysctl.h
rename to deps/acelite/ace/os_include/sys/os_sysctl.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_sysinfo.h b/deps/acelite/ace/os_include/sys/os_sysinfo.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_sysinfo.h
rename to deps/acelite/ace/os_include/sys/os_sysinfo.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_time.h b/deps/acelite/ace/os_include/sys/os_time.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_time.h
rename to deps/acelite/ace/os_include/sys/os_time.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_timeb.h b/deps/acelite/ace/os_include/sys/os_timeb.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_timeb.h
rename to deps/acelite/ace/os_include/sys/os_timeb.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_times.h b/deps/acelite/ace/os_include/sys/os_times.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_times.h
rename to deps/acelite/ace/os_include/sys/os_times.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_types.h b/deps/acelite/ace/os_include/sys/os_types.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_types.h
rename to deps/acelite/ace/os_include/sys/os_types.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_uio.h b/deps/acelite/ace/os_include/sys/os_uio.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_uio.h
rename to deps/acelite/ace/os_include/sys/os_uio.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_un.h b/deps/acelite/ace/os_include/sys/os_un.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_un.h
rename to deps/acelite/ace/os_include/sys/os_un.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_utsname.h b/deps/acelite/ace/os_include/sys/os_utsname.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_utsname.h
rename to deps/acelite/ace/os_include/sys/os_utsname.h
diff --git a/modules/worldengine/deps/acelite/ace/os_include/sys/os_wait.h b/deps/acelite/ace/os_include/sys/os_wait.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/os_include/sys/os_wait.h
rename to deps/acelite/ace/os_include/sys/os_wait.h
diff --git a/modules/worldengine/deps/acelite/ace/other.mpb b/deps/acelite/ace/other.mpb
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/other.mpb
rename to deps/acelite/ace/other.mpb
diff --git a/modules/worldengine/deps/acelite/ace/post.h b/deps/acelite/ace/post.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/post.h
rename to deps/acelite/ace/post.h
diff --git a/modules/worldengine/deps/acelite/ace/pre.h b/deps/acelite/ace/pre.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/pre.h
rename to deps/acelite/ace/pre.h
diff --git a/modules/worldengine/deps/acelite/ace/streams.h b/deps/acelite/ace/streams.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/streams.h
rename to deps/acelite/ace/streams.h
diff --git a/modules/worldengine/deps/acelite/ace/svc_export.h b/deps/acelite/ace/svc_export.h
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/svc_export.h
rename to deps/acelite/ace/svc_export.h
diff --git a/modules/worldengine/deps/acelite/ace/svcconf.mpb b/deps/acelite/ace/svcconf.mpb
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/svcconf.mpb
rename to deps/acelite/ace/svcconf.mpb
diff --git a/modules/worldengine/deps/acelite/ace/svcconfgen.mpc b/deps/acelite/ace/svcconfgen.mpc
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/svcconfgen.mpc
rename to deps/acelite/ace/svcconfgen.mpc
diff --git a/modules/worldengine/deps/acelite/ace/token.mpb b/deps/acelite/ace/token.mpb
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/token.mpb
rename to deps/acelite/ace/token.mpb
diff --git a/modules/worldengine/deps/acelite/ace/uuid.mpb b/deps/acelite/ace/uuid.mpb
similarity index 100%
rename from modules/worldengine/deps/acelite/ace/uuid.mpb
rename to deps/acelite/ace/uuid.mpb
diff --git a/modules/worldengine/deps/bzip2/CMakeLists.txt b/deps/bzip2/CMakeLists.txt
similarity index 91%
rename from modules/worldengine/deps/bzip2/CMakeLists.txt
rename to deps/bzip2/CMakeLists.txt
index 4cf894419..c1c450ec6 100644
--- a/modules/worldengine/deps/bzip2/CMakeLists.txt
+++ b/deps/bzip2/CMakeLists.txt
@@ -15,7 +15,7 @@ set(bzip2_STAT_SRCS
 )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+  ${CMAKE_SOURCE_DIR}/deps/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
diff --git a/modules/worldengine/deps/bzip2/LICENSE b/deps/bzip2/LICENSE
similarity index 100%
rename from modules/worldengine/deps/bzip2/LICENSE
rename to deps/bzip2/LICENSE
diff --git a/modules/worldengine/deps/bzip2/README b/deps/bzip2/README
similarity index 100%
rename from modules/worldengine/deps/bzip2/README
rename to deps/bzip2/README
diff --git a/modules/worldengine/deps/bzip2/blocksort.c b/deps/bzip2/blocksort.c
similarity index 100%
rename from modules/worldengine/deps/bzip2/blocksort.c
rename to deps/bzip2/blocksort.c
diff --git a/modules/worldengine/deps/bzip2/bzlib.c b/deps/bzip2/bzlib.c
similarity index 100%
rename from modules/worldengine/deps/bzip2/bzlib.c
rename to deps/bzip2/bzlib.c
diff --git a/modules/worldengine/deps/bzip2/bzlib.h b/deps/bzip2/bzlib.h
similarity index 100%
rename from modules/worldengine/deps/bzip2/bzlib.h
rename to deps/bzip2/bzlib.h
diff --git a/modules/worldengine/deps/bzip2/bzlib_private.h b/deps/bzip2/bzlib_private.h
similarity index 100%
rename from modules/worldengine/deps/bzip2/bzlib_private.h
rename to deps/bzip2/bzlib_private.h
diff --git a/modules/worldengine/deps/bzip2/compress.c b/deps/bzip2/compress.c
similarity index 100%
rename from modules/worldengine/deps/bzip2/compress.c
rename to deps/bzip2/compress.c
diff --git a/modules/worldengine/deps/bzip2/crctable.c b/deps/bzip2/crctable.c
similarity index 100%
rename from modules/worldengine/deps/bzip2/crctable.c
rename to deps/bzip2/crctable.c
diff --git a/modules/worldengine/deps/bzip2/decompress.c b/deps/bzip2/decompress.c
similarity index 100%
rename from modules/worldengine/deps/bzip2/decompress.c
rename to deps/bzip2/decompress.c
diff --git a/modules/worldengine/deps/bzip2/huffman.c b/deps/bzip2/huffman.c
similarity index 100%
rename from modules/worldengine/deps/bzip2/huffman.c
rename to deps/bzip2/huffman.c
diff --git a/modules/worldengine/deps/bzip2/randtable.c b/deps/bzip2/randtable.c
similarity index 100%
rename from modules/worldengine/deps/bzip2/randtable.c
rename to deps/bzip2/randtable.c
diff --git a/modules/drassil/cmake-utils/.gitignore b/deps/drassil/cmake-utils/.gitignore
similarity index 100%
rename from modules/drassil/cmake-utils/.gitignore
rename to deps/drassil/cmake-utils/.gitignore
diff --git a/modules/drassil/cmake-utils/utils.cmake b/deps/drassil/cmake-utils/utils.cmake
similarity index 100%
rename from modules/drassil/cmake-utils/utils.cmake
rename to deps/drassil/cmake-utils/utils.cmake
diff --git a/modules/drassil/mysql-tools/.gitignore b/deps/drassil/mysql-tools/.gitignore
similarity index 100%
rename from modules/drassil/mysql-tools/.gitignore
rename to deps/drassil/mysql-tools/.gitignore
diff --git a/modules/drassil/mysql-tools/README b/deps/drassil/mysql-tools/README
similarity index 100%
rename from modules/drassil/mysql-tools/README
rename to deps/drassil/mysql-tools/README
diff --git a/modules/drassil/mysql-tools/bin/dump-parser b/deps/drassil/mysql-tools/bin/dump-parser
similarity index 100%
rename from modules/drassil/mysql-tools/bin/dump-parser
rename to deps/drassil/mysql-tools/bin/dump-parser
diff --git a/modules/drassil/mysql-tools/bin/mysql.exe b/deps/drassil/mysql-tools/bin/mysql.exe
similarity index 100%
rename from modules/drassil/mysql-tools/bin/mysql.exe
rename to deps/drassil/mysql-tools/bin/mysql.exe
diff --git a/modules/drassil/mysql-tools/bin/mysqldump.exe b/deps/drassil/mysql-tools/bin/mysqldump.exe
similarity index 100%
rename from modules/drassil/mysql-tools/bin/mysqldump.exe
rename to deps/drassil/mysql-tools/bin/mysqldump.exe
diff --git a/modules/drassil/mysql-tools/bin/mysqlimport.exe b/deps/drassil/mysql-tools/bin/mysqlimport.exe
similarity index 100%
rename from modules/drassil/mysql-tools/bin/mysqlimport.exe
rename to deps/drassil/mysql-tools/bin/mysqlimport.exe
diff --git a/modules/drassil/mysql-tools/build-dump-parser.sh b/deps/drassil/mysql-tools/build-dump-parser.sh
similarity index 100%
rename from modules/drassil/mysql-tools/build-dump-parser.sh
rename to deps/drassil/mysql-tools/build-dump-parser.sh
diff --git a/modules/drassil/mysql-tools/dump-parser.c b/deps/drassil/mysql-tools/dump-parser.c
similarity index 100%
rename from modules/drassil/mysql-tools/dump-parser.c
rename to deps/drassil/mysql-tools/dump-parser.c
diff --git a/modules/drassil/mysql-tools/mysql-config.dist b/deps/drassil/mysql-tools/mysql-config.dist
similarity index 100%
rename from modules/drassil/mysql-tools/mysql-config.dist
rename to deps/drassil/mysql-tools/mysql-config.dist
diff --git a/modules/drassil/mysql-tools/mysql-dump b/deps/drassil/mysql-tools/mysql-dump
similarity index 100%
rename from modules/drassil/mysql-tools/mysql-dump
rename to deps/drassil/mysql-tools/mysql-dump
diff --git a/modules/drassil/mysql-tools/mysql-import b/deps/drassil/mysql-tools/mysql-import
similarity index 100%
rename from modules/drassil/mysql-tools/mysql-import
rename to deps/drassil/mysql-tools/mysql-import
diff --git a/modules/drassil/mysql-tools/mysql-tools b/deps/drassil/mysql-tools/mysql-tools
similarity index 100%
rename from modules/drassil/mysql-tools/mysql-tools
rename to deps/drassil/mysql-tools/mysql-tools
diff --git a/modules/drassil/mysql-tools/shared-def b/deps/drassil/mysql-tools/shared-def
similarity index 100%
rename from modules/drassil/mysql-tools/shared-def
rename to deps/drassil/mysql-tools/shared-def
diff --git a/modules/worldengine/deps/g3dlite/CMakeLists.txt b/deps/g3dlite/CMakeLists.txt
similarity index 96%
rename from modules/worldengine/deps/g3dlite/CMakeLists.txt
rename to deps/g3dlite/CMakeLists.txt
index 8e75bdf17..120b8741e 100644
--- a/modules/worldengine/deps/g3dlite/CMakeLists.txt
+++ b/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/worldengine/deps/zlib
+    ${CMAKE_SOURCE_DIR}/deps/zlib
   )
 else()
   include_directories(
diff --git a/modules/worldengine/deps/g3dlite/Readme.txt b/deps/g3dlite/Readme.txt
similarity index 100%
rename from modules/worldengine/deps/g3dlite/Readme.txt
rename to deps/g3dlite/Readme.txt
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AABox.h b/deps/g3dlite/include/G3D/AABox.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/AABox.h
rename to deps/g3dlite/include/G3D/AABox.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Any.h b/deps/g3dlite/include/G3D/Any.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Any.h
rename to deps/g3dlite/include/G3D/Any.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AnyVal.h b/deps/g3dlite/include/G3D/AnyVal.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/AnyVal.h
rename to deps/g3dlite/include/G3D/AnyVal.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AreaMemoryManager.h b/deps/g3dlite/include/G3D/AreaMemoryManager.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/AreaMemoryManager.h
rename to deps/g3dlite/include/G3D/AreaMemoryManager.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Array.h b/deps/g3dlite/include/G3D/Array.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Array.h
rename to deps/g3dlite/include/G3D/Array.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AtomicInt32.h b/deps/g3dlite/include/G3D/AtomicInt32.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/AtomicInt32.h
rename to deps/g3dlite/include/G3D/AtomicInt32.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BinaryFormat.h b/deps/g3dlite/include/G3D/BinaryFormat.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/BinaryFormat.h
rename to deps/g3dlite/include/G3D/BinaryFormat.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BinaryInput.h b/deps/g3dlite/include/G3D/BinaryInput.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/BinaryInput.h
rename to deps/g3dlite/include/G3D/BinaryInput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BinaryOutput.h b/deps/g3dlite/include/G3D/BinaryOutput.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/BinaryOutput.h
rename to deps/g3dlite/include/G3D/BinaryOutput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BoundsTrait.h b/deps/g3dlite/include/G3D/BoundsTrait.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/BoundsTrait.h
rename to deps/g3dlite/include/G3D/BoundsTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Box.h b/deps/g3dlite/include/G3D/Box.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Box.h
rename to deps/g3dlite/include/G3D/Box.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Box2D.h b/deps/g3dlite/include/G3D/Box2D.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Box2D.h
rename to deps/g3dlite/include/G3D/Box2D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BumpMapPreprocess.h b/deps/g3dlite/include/G3D/BumpMapPreprocess.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/BumpMapPreprocess.h
rename to deps/g3dlite/include/G3D/BumpMapPreprocess.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Capsule.h b/deps/g3dlite/include/G3D/Capsule.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Capsule.h
rename to deps/g3dlite/include/G3D/Capsule.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/CollisionDetection.h b/deps/g3dlite/include/G3D/CollisionDetection.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/CollisionDetection.h
rename to deps/g3dlite/include/G3D/CollisionDetection.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color1.h b/deps/g3dlite/include/G3D/Color1.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Color1.h
rename to deps/g3dlite/include/G3D/Color1.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color1uint8.h b/deps/g3dlite/include/G3D/Color1uint8.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Color1uint8.h
rename to deps/g3dlite/include/G3D/Color1uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color3.h b/deps/g3dlite/include/G3D/Color3.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Color3.h
rename to deps/g3dlite/include/G3D/Color3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color3uint8.h b/deps/g3dlite/include/G3D/Color3uint8.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Color3uint8.h
rename to deps/g3dlite/include/G3D/Color3uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color4.h b/deps/g3dlite/include/G3D/Color4.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Color4.h
rename to deps/g3dlite/include/G3D/Color4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color4uint8.h b/deps/g3dlite/include/G3D/Color4uint8.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Color4uint8.h
rename to deps/g3dlite/include/G3D/Color4uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Cone.h b/deps/g3dlite/include/G3D/Cone.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Cone.h
rename to deps/g3dlite/include/G3D/Cone.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ConvexPolyhedron.h b/deps/g3dlite/include/G3D/ConvexPolyhedron.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/ConvexPolyhedron.h
rename to deps/g3dlite/include/G3D/ConvexPolyhedron.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/CoordinateFrame.h b/deps/g3dlite/include/G3D/CoordinateFrame.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/CoordinateFrame.h
rename to deps/g3dlite/include/G3D/CoordinateFrame.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Crypto.h b/deps/g3dlite/include/G3D/Crypto.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Crypto.h
rename to deps/g3dlite/include/G3D/Crypto.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Cylinder.h b/deps/g3dlite/include/G3D/Cylinder.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Cylinder.h
rename to deps/g3dlite/include/G3D/Cylinder.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/EqualsTrait.h b/deps/g3dlite/include/G3D/EqualsTrait.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/EqualsTrait.h
rename to deps/g3dlite/include/G3D/EqualsTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/FileSystem.h b/deps/g3dlite/include/G3D/FileSystem.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/FileSystem.h
rename to deps/g3dlite/include/G3D/FileSystem.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/G3D.h b/deps/g3dlite/include/G3D/G3D.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/G3D.h
rename to deps/g3dlite/include/G3D/G3D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/G3DAll.h b/deps/g3dlite/include/G3D/G3DAll.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/G3DAll.h
rename to deps/g3dlite/include/G3D/G3DAll.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/G3DGameUnits.h b/deps/g3dlite/include/G3D/G3DGameUnits.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/G3DGameUnits.h
rename to deps/g3dlite/include/G3D/G3DGameUnits.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GCamera.h b/deps/g3dlite/include/G3D/GCamera.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/GCamera.h
rename to deps/g3dlite/include/G3D/GCamera.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GImage.h b/deps/g3dlite/include/G3D/GImage.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/GImage.h
rename to deps/g3dlite/include/G3D/GImage.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GLight.h b/deps/g3dlite/include/G3D/GLight.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/GLight.h
rename to deps/g3dlite/include/G3D/GLight.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GMutex.h b/deps/g3dlite/include/G3D/GMutex.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/GMutex.h
rename to deps/g3dlite/include/G3D/GMutex.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GThread.h b/deps/g3dlite/include/G3D/GThread.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/GThread.h
rename to deps/g3dlite/include/G3D/GThread.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GUniqueID.h b/deps/g3dlite/include/G3D/GUniqueID.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/GUniqueID.h
rename to deps/g3dlite/include/G3D/GUniqueID.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/HashTrait.h b/deps/g3dlite/include/G3D/HashTrait.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/HashTrait.h
rename to deps/g3dlite/include/G3D/HashTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image1.h b/deps/g3dlite/include/G3D/Image1.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Image1.h
rename to deps/g3dlite/include/G3D/Image1.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image1uint8.h b/deps/g3dlite/include/G3D/Image1uint8.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Image1uint8.h
rename to deps/g3dlite/include/G3D/Image1uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image3.h b/deps/g3dlite/include/G3D/Image3.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Image3.h
rename to deps/g3dlite/include/G3D/Image3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image3uint8.h b/deps/g3dlite/include/G3D/Image3uint8.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Image3uint8.h
rename to deps/g3dlite/include/G3D/Image3uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image4.h b/deps/g3dlite/include/G3D/Image4.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Image4.h
rename to deps/g3dlite/include/G3D/Image4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image4uint8.h b/deps/g3dlite/include/G3D/Image4uint8.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Image4uint8.h
rename to deps/g3dlite/include/G3D/Image4uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ImageFormat.h b/deps/g3dlite/include/G3D/ImageFormat.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/ImageFormat.h
rename to deps/g3dlite/include/G3D/ImageFormat.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Intersect.h b/deps/g3dlite/include/G3D/Intersect.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Intersect.h
rename to deps/g3dlite/include/G3D/Intersect.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/KDTree.h b/deps/g3dlite/include/G3D/KDTree.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/KDTree.h
rename to deps/g3dlite/include/G3D/KDTree.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Line.h b/deps/g3dlite/include/G3D/Line.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Line.h
rename to deps/g3dlite/include/G3D/Line.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/LineSegment.h b/deps/g3dlite/include/G3D/LineSegment.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/LineSegment.h
rename to deps/g3dlite/include/G3D/LineSegment.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Log.h b/deps/g3dlite/include/G3D/Log.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Log.h
rename to deps/g3dlite/include/G3D/Log.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Map2D.h b/deps/g3dlite/include/G3D/Map2D.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Map2D.h
rename to deps/g3dlite/include/G3D/Map2D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix.h b/deps/g3dlite/include/G3D/Matrix.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Matrix.h
rename to deps/g3dlite/include/G3D/Matrix.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix2.h b/deps/g3dlite/include/G3D/Matrix2.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Matrix2.h
rename to deps/g3dlite/include/G3D/Matrix2.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h b/deps/g3dlite/include/G3D/Matrix3.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h
rename to deps/g3dlite/include/G3D/Matrix3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix4.h b/deps/g3dlite/include/G3D/Matrix4.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Matrix4.h
rename to deps/g3dlite/include/G3D/Matrix4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/MemoryManager.h b/deps/g3dlite/include/G3D/MemoryManager.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/MemoryManager.h
rename to deps/g3dlite/include/G3D/MemoryManager.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/MeshAlg.h b/deps/g3dlite/include/G3D/MeshAlg.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/MeshAlg.h
rename to deps/g3dlite/include/G3D/MeshAlg.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/MeshBuilder.h b/deps/g3dlite/include/G3D/MeshBuilder.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/MeshBuilder.h
rename to deps/g3dlite/include/G3D/MeshBuilder.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/NetAddress.h b/deps/g3dlite/include/G3D/NetAddress.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/NetAddress.h
rename to deps/g3dlite/include/G3D/NetAddress.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/NetworkDevice.h b/deps/g3dlite/include/G3D/NetworkDevice.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/NetworkDevice.h
rename to deps/g3dlite/include/G3D/NetworkDevice.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ParseError.h b/deps/g3dlite/include/G3D/ParseError.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/ParseError.h
rename to deps/g3dlite/include/G3D/ParseError.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrame.h b/deps/g3dlite/include/G3D/PhysicsFrame.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrame.h
rename to deps/g3dlite/include/G3D/PhysicsFrame.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrameSpline.h b/deps/g3dlite/include/G3D/PhysicsFrameSpline.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrameSpline.h
rename to deps/g3dlite/include/G3D/PhysicsFrameSpline.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Plane.h b/deps/g3dlite/include/G3D/Plane.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Plane.h
rename to deps/g3dlite/include/G3D/Plane.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PointHashGrid.h b/deps/g3dlite/include/G3D/PointHashGrid.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/PointHashGrid.h
rename to deps/g3dlite/include/G3D/PointHashGrid.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PointKDTree.h b/deps/g3dlite/include/G3D/PointKDTree.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/PointKDTree.h
rename to deps/g3dlite/include/G3D/PointKDTree.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Pointer.h b/deps/g3dlite/include/G3D/Pointer.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Pointer.h
rename to deps/g3dlite/include/G3D/Pointer.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PositionTrait.h b/deps/g3dlite/include/G3D/PositionTrait.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/PositionTrait.h
rename to deps/g3dlite/include/G3D/PositionTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PrecomputedRandom.h b/deps/g3dlite/include/G3D/PrecomputedRandom.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/PrecomputedRandom.h
rename to deps/g3dlite/include/G3D/PrecomputedRandom.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Quat.h b/deps/g3dlite/include/G3D/Quat.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Quat.h
rename to deps/g3dlite/include/G3D/Quat.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Queue.h b/deps/g3dlite/include/G3D/Queue.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Queue.h
rename to deps/g3dlite/include/G3D/Queue.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Random.h b/deps/g3dlite/include/G3D/Random.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Random.h
rename to deps/g3dlite/include/G3D/Random.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Ray.h b/deps/g3dlite/include/G3D/Ray.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Ray.h
rename to deps/g3dlite/include/G3D/Ray.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Rect2D.h b/deps/g3dlite/include/G3D/Rect2D.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Rect2D.h
rename to deps/g3dlite/include/G3D/Rect2D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ReferenceCount.h b/deps/g3dlite/include/G3D/ReferenceCount.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/ReferenceCount.h
rename to deps/g3dlite/include/G3D/ReferenceCount.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/RegistryUtil.h b/deps/g3dlite/include/G3D/RegistryUtil.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/RegistryUtil.h
rename to deps/g3dlite/include/G3D/RegistryUtil.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Set.h b/deps/g3dlite/include/G3D/Set.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Set.h
rename to deps/g3dlite/include/G3D/Set.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/SmallArray.h b/deps/g3dlite/include/G3D/SmallArray.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/SmallArray.h
rename to deps/g3dlite/include/G3D/SmallArray.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Sphere.h b/deps/g3dlite/include/G3D/Sphere.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Sphere.h
rename to deps/g3dlite/include/G3D/Sphere.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Spline.h b/deps/g3dlite/include/G3D/Spline.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Spline.h
rename to deps/g3dlite/include/G3D/Spline.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Stopwatch.h b/deps/g3dlite/include/G3D/Stopwatch.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Stopwatch.h
rename to deps/g3dlite/include/G3D/Stopwatch.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/System.h b/deps/g3dlite/include/G3D/System.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/System.h
rename to deps/g3dlite/include/G3D/System.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Table.h b/deps/g3dlite/include/G3D/Table.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Table.h
rename to deps/g3dlite/include/G3D/Table.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/TextInput.h b/deps/g3dlite/include/G3D/TextInput.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/TextInput.h
rename to deps/g3dlite/include/G3D/TextInput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/TextOutput.h b/deps/g3dlite/include/G3D/TextOutput.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/TextOutput.h
rename to deps/g3dlite/include/G3D/TextOutput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ThreadSet.h b/deps/g3dlite/include/G3D/ThreadSet.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/ThreadSet.h
rename to deps/g3dlite/include/G3D/ThreadSet.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Triangle.h b/deps/g3dlite/include/G3D/Triangle.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Triangle.h
rename to deps/g3dlite/include/G3D/Triangle.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/UprightFrame.h b/deps/g3dlite/include/G3D/UprightFrame.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/UprightFrame.h
rename to deps/g3dlite/include/G3D/UprightFrame.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector2.h b/deps/g3dlite/include/G3D/Vector2.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Vector2.h
rename to deps/g3dlite/include/G3D/Vector2.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector2int16.h b/deps/g3dlite/include/G3D/Vector2int16.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Vector2int16.h
rename to deps/g3dlite/include/G3D/Vector2int16.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector3.h b/deps/g3dlite/include/G3D/Vector3.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Vector3.h
rename to deps/g3dlite/include/G3D/Vector3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector3int16.h b/deps/g3dlite/include/G3D/Vector3int16.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Vector3int16.h
rename to deps/g3dlite/include/G3D/Vector3int16.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector3int32.h b/deps/g3dlite/include/G3D/Vector3int32.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Vector3int32.h
rename to deps/g3dlite/include/G3D/Vector3int32.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector4.h b/deps/g3dlite/include/G3D/Vector4.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Vector4.h
rename to deps/g3dlite/include/G3D/Vector4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector4int8.h b/deps/g3dlite/include/G3D/Vector4int8.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Vector4int8.h
rename to deps/g3dlite/include/G3D/Vector4int8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/WeakCache.h b/deps/g3dlite/include/G3D/WeakCache.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/WeakCache.h
rename to deps/g3dlite/include/G3D/WeakCache.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Welder.h b/deps/g3dlite/include/G3D/Welder.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/Welder.h
rename to deps/g3dlite/include/G3D/Welder.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/WrapMode.h b/deps/g3dlite/include/G3D/WrapMode.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/WrapMode.h
rename to deps/g3dlite/include/G3D/WrapMode.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/XML.h b/deps/g3dlite/include/G3D/XML.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/XML.h
rename to deps/g3dlite/include/G3D/XML.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/constants.h b/deps/g3dlite/include/G3D/constants.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/constants.h
rename to deps/g3dlite/include/G3D/constants.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/debug.h b/deps/g3dlite/include/G3D/debug.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/debug.h
rename to deps/g3dlite/include/G3D/debug.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/debugAssert.h b/deps/g3dlite/include/G3D/debugAssert.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/debugAssert.h
rename to deps/g3dlite/include/G3D/debugAssert.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/debugPrintf.h b/deps/g3dlite/include/G3D/debugPrintf.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/debugPrintf.h
rename to deps/g3dlite/include/G3D/debugPrintf.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/enumclass.h b/deps/g3dlite/include/G3D/enumclass.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/enumclass.h
rename to deps/g3dlite/include/G3D/enumclass.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/fileutils.h b/deps/g3dlite/include/G3D/fileutils.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/fileutils.h
rename to deps/g3dlite/include/G3D/fileutils.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/filter.h b/deps/g3dlite/include/G3D/filter.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/filter.h
rename to deps/g3dlite/include/G3D/filter.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/format.h b/deps/g3dlite/include/G3D/format.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/format.h
rename to deps/g3dlite/include/G3D/format.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/g3dfnmatch.h b/deps/g3dlite/include/G3D/g3dfnmatch.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/g3dfnmatch.h
rename to deps/g3dlite/include/G3D/g3dfnmatch.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/g3dmath.h b/deps/g3dlite/include/G3D/g3dmath.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/g3dmath.h
rename to deps/g3dlite/include/G3D/g3dmath.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/netheaders.h b/deps/g3dlite/include/G3D/netheaders.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/netheaders.h
rename to deps/g3dlite/include/G3D/netheaders.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/networkHelpers.h b/deps/g3dlite/include/G3D/networkHelpers.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/networkHelpers.h
rename to deps/g3dlite/include/G3D/networkHelpers.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/platform.h b/deps/g3dlite/include/G3D/platform.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/platform.h
rename to deps/g3dlite/include/G3D/platform.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/prompt.h b/deps/g3dlite/include/G3D/prompt.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/prompt.h
rename to deps/g3dlite/include/G3D/prompt.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/serialize.h b/deps/g3dlite/include/G3D/serialize.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/serialize.h
rename to deps/g3dlite/include/G3D/serialize.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/splinefunc.h b/deps/g3dlite/include/G3D/splinefunc.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/splinefunc.h
rename to deps/g3dlite/include/G3D/splinefunc.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/stringutils.h b/deps/g3dlite/include/G3D/stringutils.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/stringutils.h
rename to deps/g3dlite/include/G3D/stringutils.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/uint128.h b/deps/g3dlite/include/G3D/uint128.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/uint128.h
rename to deps/g3dlite/include/G3D/uint128.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/units.h b/deps/g3dlite/include/G3D/units.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/units.h
rename to deps/g3dlite/include/G3D/units.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/vectorMath.h b/deps/g3dlite/include/G3D/vectorMath.h
similarity index 100%
rename from modules/worldengine/deps/g3dlite/include/G3D/vectorMath.h
rename to deps/g3dlite/include/G3D/vectorMath.h
diff --git a/modules/worldengine/deps/g3dlite/source/AABox.cpp b/deps/g3dlite/source/AABox.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/AABox.cpp
rename to deps/g3dlite/source/AABox.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Any.cpp b/deps/g3dlite/source/Any.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Any.cpp
rename to deps/g3dlite/source/Any.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/AnyVal.cpp b/deps/g3dlite/source/AnyVal.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/AnyVal.cpp
rename to deps/g3dlite/source/AnyVal.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/AreaMemoryManager.cpp b/deps/g3dlite/source/AreaMemoryManager.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/AreaMemoryManager.cpp
rename to deps/g3dlite/source/AreaMemoryManager.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BinaryFormat.cpp b/deps/g3dlite/source/BinaryFormat.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/BinaryFormat.cpp
rename to deps/g3dlite/source/BinaryFormat.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BinaryInput.cpp b/deps/g3dlite/source/BinaryInput.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/BinaryInput.cpp
rename to deps/g3dlite/source/BinaryInput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BinaryOutput.cpp b/deps/g3dlite/source/BinaryOutput.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/BinaryOutput.cpp
rename to deps/g3dlite/source/BinaryOutput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Box.cpp b/deps/g3dlite/source/Box.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Box.cpp
rename to deps/g3dlite/source/Box.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Box2D.cpp b/deps/g3dlite/source/Box2D.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Box2D.cpp
rename to deps/g3dlite/source/Box2D.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BumpMapPreprocess.cpp b/deps/g3dlite/source/BumpMapPreprocess.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/BumpMapPreprocess.cpp
rename to deps/g3dlite/source/BumpMapPreprocess.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Capsule.cpp b/deps/g3dlite/source/Capsule.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Capsule.cpp
rename to deps/g3dlite/source/Capsule.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp b/deps/g3dlite/source/CollisionDetection.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp
rename to deps/g3dlite/source/CollisionDetection.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color1.cpp b/deps/g3dlite/source/Color1.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Color1.cpp
rename to deps/g3dlite/source/Color1.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color1uint8.cpp b/deps/g3dlite/source/Color1uint8.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Color1uint8.cpp
rename to deps/g3dlite/source/Color1uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color3.cpp b/deps/g3dlite/source/Color3.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Color3.cpp
rename to deps/g3dlite/source/Color3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color3uint8.cpp b/deps/g3dlite/source/Color3uint8.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Color3uint8.cpp
rename to deps/g3dlite/source/Color3uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color4.cpp b/deps/g3dlite/source/Color4.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Color4.cpp
rename to deps/g3dlite/source/Color4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color4uint8.cpp b/deps/g3dlite/source/Color4uint8.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Color4uint8.cpp
rename to deps/g3dlite/source/Color4uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Cone.cpp b/deps/g3dlite/source/Cone.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Cone.cpp
rename to deps/g3dlite/source/Cone.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ConvexPolyhedron.cpp b/deps/g3dlite/source/ConvexPolyhedron.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/ConvexPolyhedron.cpp
rename to deps/g3dlite/source/ConvexPolyhedron.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/CoordinateFrame.cpp b/deps/g3dlite/source/CoordinateFrame.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/CoordinateFrame.cpp
rename to deps/g3dlite/source/CoordinateFrame.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Crypto.cpp b/deps/g3dlite/source/Crypto.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Crypto.cpp
rename to deps/g3dlite/source/Crypto.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Crypto_md5.cpp b/deps/g3dlite/source/Crypto_md5.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Crypto_md5.cpp
rename to deps/g3dlite/source/Crypto_md5.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Cylinder.cpp b/deps/g3dlite/source/Cylinder.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Cylinder.cpp
rename to deps/g3dlite/source/Cylinder.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/FileSystem.cpp b/deps/g3dlite/source/FileSystem.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/FileSystem.cpp
rename to deps/g3dlite/source/FileSystem.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GCamera.cpp b/deps/g3dlite/source/GCamera.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GCamera.cpp
rename to deps/g3dlite/source/GCamera.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage.cpp b/deps/g3dlite/source/GImage.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GImage.cpp
rename to deps/g3dlite/source/GImage.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_bayer.cpp b/deps/g3dlite/source/GImage_bayer.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GImage_bayer.cpp
rename to deps/g3dlite/source/GImage_bayer.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_bmp.cpp b/deps/g3dlite/source/GImage_bmp.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GImage_bmp.cpp
rename to deps/g3dlite/source/GImage_bmp.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_jpeg.cpp b/deps/g3dlite/source/GImage_jpeg.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GImage_jpeg.cpp
rename to deps/g3dlite/source/GImage_jpeg.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_png.cpp b/deps/g3dlite/source/GImage_png.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GImage_png.cpp
rename to deps/g3dlite/source/GImage_png.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_ppm.cpp b/deps/g3dlite/source/GImage_ppm.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GImage_ppm.cpp
rename to deps/g3dlite/source/GImage_ppm.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_tga.cpp b/deps/g3dlite/source/GImage_tga.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GImage_tga.cpp
rename to deps/g3dlite/source/GImage_tga.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GLight.cpp b/deps/g3dlite/source/GLight.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GLight.cpp
rename to deps/g3dlite/source/GLight.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GThread.cpp b/deps/g3dlite/source/GThread.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GThread.cpp
rename to deps/g3dlite/source/GThread.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GUniqueID.cpp b/deps/g3dlite/source/GUniqueID.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/GUniqueID.cpp
rename to deps/g3dlite/source/GUniqueID.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image1.cpp b/deps/g3dlite/source/Image1.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Image1.cpp
rename to deps/g3dlite/source/Image1.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image1uint8.cpp b/deps/g3dlite/source/Image1uint8.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Image1uint8.cpp
rename to deps/g3dlite/source/Image1uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image3.cpp b/deps/g3dlite/source/Image3.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Image3.cpp
rename to deps/g3dlite/source/Image3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image3uint8.cpp b/deps/g3dlite/source/Image3uint8.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Image3uint8.cpp
rename to deps/g3dlite/source/Image3uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image4.cpp b/deps/g3dlite/source/Image4.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Image4.cpp
rename to deps/g3dlite/source/Image4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image4uint8.cpp b/deps/g3dlite/source/Image4uint8.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Image4uint8.cpp
rename to deps/g3dlite/source/Image4uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ImageFormat.cpp b/deps/g3dlite/source/ImageFormat.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/ImageFormat.cpp
rename to deps/g3dlite/source/ImageFormat.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ImageFormat_convert.cpp b/deps/g3dlite/source/ImageFormat_convert.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/ImageFormat_convert.cpp
rename to deps/g3dlite/source/ImageFormat_convert.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Intersect.cpp b/deps/g3dlite/source/Intersect.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Intersect.cpp
rename to deps/g3dlite/source/Intersect.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Line.cpp b/deps/g3dlite/source/Line.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Line.cpp
rename to deps/g3dlite/source/Line.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/LineSegment.cpp b/deps/g3dlite/source/LineSegment.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/LineSegment.cpp
rename to deps/g3dlite/source/LineSegment.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Log.cpp b/deps/g3dlite/source/Log.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Log.cpp
rename to deps/g3dlite/source/Log.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Matrix.cpp b/deps/g3dlite/source/Matrix.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Matrix.cpp
rename to deps/g3dlite/source/Matrix.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Matrix3.cpp b/deps/g3dlite/source/Matrix3.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Matrix3.cpp
rename to deps/g3dlite/source/Matrix3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Matrix4.cpp b/deps/g3dlite/source/Matrix4.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Matrix4.cpp
rename to deps/g3dlite/source/Matrix4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MemoryManager.cpp b/deps/g3dlite/source/MemoryManager.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/MemoryManager.cpp
rename to deps/g3dlite/source/MemoryManager.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshAlg.cpp b/deps/g3dlite/source/MeshAlg.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/MeshAlg.cpp
rename to deps/g3dlite/source/MeshAlg.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshAlgAdjacency.cpp b/deps/g3dlite/source/MeshAlgAdjacency.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/MeshAlgAdjacency.cpp
rename to deps/g3dlite/source/MeshAlgAdjacency.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshAlgWeld.cpp b/deps/g3dlite/source/MeshAlgWeld.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/MeshAlgWeld.cpp
rename to deps/g3dlite/source/MeshAlgWeld.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshBuilder.cpp b/deps/g3dlite/source/MeshBuilder.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/MeshBuilder.cpp
rename to deps/g3dlite/source/MeshBuilder.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/NetAddress.cpp b/deps/g3dlite/source/NetAddress.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/NetAddress.cpp
rename to deps/g3dlite/source/NetAddress.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/NetworkDevice.cpp b/deps/g3dlite/source/NetworkDevice.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/NetworkDevice.cpp
rename to deps/g3dlite/source/NetworkDevice.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/PhysicsFrame.cpp b/deps/g3dlite/source/PhysicsFrame.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/PhysicsFrame.cpp
rename to deps/g3dlite/source/PhysicsFrame.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/PhysicsFrameSpline.cpp b/deps/g3dlite/source/PhysicsFrameSpline.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/PhysicsFrameSpline.cpp
rename to deps/g3dlite/source/PhysicsFrameSpline.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Plane.cpp b/deps/g3dlite/source/Plane.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Plane.cpp
rename to deps/g3dlite/source/Plane.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/PrecomputedRandom.cpp b/deps/g3dlite/source/PrecomputedRandom.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/PrecomputedRandom.cpp
rename to deps/g3dlite/source/PrecomputedRandom.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Quat.cpp b/deps/g3dlite/source/Quat.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Quat.cpp
rename to deps/g3dlite/source/Quat.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Random.cpp b/deps/g3dlite/source/Random.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Random.cpp
rename to deps/g3dlite/source/Random.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Ray.cpp b/deps/g3dlite/source/Ray.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Ray.cpp
rename to deps/g3dlite/source/Ray.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Rect2D.cpp b/deps/g3dlite/source/Rect2D.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Rect2D.cpp
rename to deps/g3dlite/source/Rect2D.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ReferenceCount.cpp b/deps/g3dlite/source/ReferenceCount.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/ReferenceCount.cpp
rename to deps/g3dlite/source/ReferenceCount.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/RegistryUtil.cpp b/deps/g3dlite/source/RegistryUtil.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/RegistryUtil.cpp
rename to deps/g3dlite/source/RegistryUtil.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Sphere.cpp b/deps/g3dlite/source/Sphere.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Sphere.cpp
rename to deps/g3dlite/source/Sphere.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/SplineBase.cpp b/deps/g3dlite/source/SplineBase.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/SplineBase.cpp
rename to deps/g3dlite/source/SplineBase.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Stopwatch.cpp b/deps/g3dlite/source/Stopwatch.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Stopwatch.cpp
rename to deps/g3dlite/source/Stopwatch.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/System.cpp b/deps/g3dlite/source/System.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/System.cpp
rename to deps/g3dlite/source/System.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/TextInput.cpp b/deps/g3dlite/source/TextInput.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/TextInput.cpp
rename to deps/g3dlite/source/TextInput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/TextOutput.cpp b/deps/g3dlite/source/TextOutput.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/TextOutput.cpp
rename to deps/g3dlite/source/TextOutput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ThreadSet.cpp b/deps/g3dlite/source/ThreadSet.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/ThreadSet.cpp
rename to deps/g3dlite/source/ThreadSet.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Triangle.cpp b/deps/g3dlite/source/Triangle.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Triangle.cpp
rename to deps/g3dlite/source/Triangle.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/UprightFrame.cpp b/deps/g3dlite/source/UprightFrame.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/UprightFrame.cpp
rename to deps/g3dlite/source/UprightFrame.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector2.cpp b/deps/g3dlite/source/Vector2.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Vector2.cpp
rename to deps/g3dlite/source/Vector2.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector2int16.cpp b/deps/g3dlite/source/Vector2int16.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Vector2int16.cpp
rename to deps/g3dlite/source/Vector2int16.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector3.cpp b/deps/g3dlite/source/Vector3.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Vector3.cpp
rename to deps/g3dlite/source/Vector3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector3int16.cpp b/deps/g3dlite/source/Vector3int16.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Vector3int16.cpp
rename to deps/g3dlite/source/Vector3int16.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector3int32.cpp b/deps/g3dlite/source/Vector3int32.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Vector3int32.cpp
rename to deps/g3dlite/source/Vector3int32.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector4.cpp b/deps/g3dlite/source/Vector4.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Vector4.cpp
rename to deps/g3dlite/source/Vector4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector4int8.cpp b/deps/g3dlite/source/Vector4int8.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Vector4int8.cpp
rename to deps/g3dlite/source/Vector4int8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Welder.cpp b/deps/g3dlite/source/Welder.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/Welder.cpp
rename to deps/g3dlite/source/Welder.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/WinMain.cpp b/deps/g3dlite/source/WinMain.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/WinMain.cpp
rename to deps/g3dlite/source/WinMain.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/XML.cpp b/deps/g3dlite/source/XML.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/XML.cpp
rename to deps/g3dlite/source/XML.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/constants.cpp b/deps/g3dlite/source/constants.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/constants.cpp
rename to deps/g3dlite/source/constants.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/debugAssert.cpp b/deps/g3dlite/source/debugAssert.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/debugAssert.cpp
rename to deps/g3dlite/source/debugAssert.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/fileutils.cpp b/deps/g3dlite/source/fileutils.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/fileutils.cpp
rename to deps/g3dlite/source/fileutils.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/filter.cpp b/deps/g3dlite/source/filter.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/filter.cpp
rename to deps/g3dlite/source/filter.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/format.cpp b/deps/g3dlite/source/format.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/format.cpp
rename to deps/g3dlite/source/format.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/g3dfnmatch.cpp b/deps/g3dlite/source/g3dfnmatch.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/g3dfnmatch.cpp
rename to deps/g3dlite/source/g3dfnmatch.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/g3dmath.cpp b/deps/g3dlite/source/g3dmath.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/g3dmath.cpp
rename to deps/g3dlite/source/g3dmath.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/license.cpp b/deps/g3dlite/source/license.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/license.cpp
rename to deps/g3dlite/source/license.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/prompt.cpp b/deps/g3dlite/source/prompt.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/prompt.cpp
rename to deps/g3dlite/source/prompt.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/stringutils.cpp b/deps/g3dlite/source/stringutils.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/stringutils.cpp
rename to deps/g3dlite/source/stringutils.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/uint128.cpp b/deps/g3dlite/source/uint128.cpp
similarity index 100%
rename from modules/worldengine/deps/g3dlite/source/uint128.cpp
rename to deps/g3dlite/source/uint128.cpp
diff --git a/modules/worldengine/deps/gsoap/CMakeLists.txt b/deps/gsoap/CMakeLists.txt
similarity index 100%
rename from modules/worldengine/deps/gsoap/CMakeLists.txt
rename to deps/gsoap/CMakeLists.txt
diff --git a/modules/worldengine/deps/gsoap/gsoap.stub b/deps/gsoap/gsoap.stub
similarity index 100%
rename from modules/worldengine/deps/gsoap/gsoap.stub
rename to deps/gsoap/gsoap.stub
diff --git a/modules/worldengine/deps/gsoap/soapC.cpp b/deps/gsoap/soapC.cpp
similarity index 100%
rename from modules/worldengine/deps/gsoap/soapC.cpp
rename to deps/gsoap/soapC.cpp
diff --git a/modules/worldengine/deps/gsoap/soapH.h b/deps/gsoap/soapH.h
similarity index 100%
rename from modules/worldengine/deps/gsoap/soapH.h
rename to deps/gsoap/soapH.h
diff --git a/modules/worldengine/deps/gsoap/soapServer.cpp b/deps/gsoap/soapServer.cpp
similarity index 100%
rename from modules/worldengine/deps/gsoap/soapServer.cpp
rename to deps/gsoap/soapServer.cpp
diff --git a/modules/worldengine/deps/gsoap/soapStub.h b/deps/gsoap/soapStub.h
similarity index 100%
rename from modules/worldengine/deps/gsoap/soapStub.h
rename to deps/gsoap/soapStub.h
diff --git a/modules/worldengine/deps/gsoap/stdsoap2.cpp b/deps/gsoap/stdsoap2.cpp
similarity index 100%
rename from modules/worldengine/deps/gsoap/stdsoap2.cpp
rename to deps/gsoap/stdsoap2.cpp
diff --git a/modules/worldengine/deps/gsoap/stdsoap2.h b/deps/gsoap/stdsoap2.h
similarity index 100%
rename from modules/worldengine/deps/gsoap/stdsoap2.h
rename to deps/gsoap/stdsoap2.h
diff --git a/modules/worldengine/deps/gsoap/tc_upgrades.txt b/deps/gsoap/tc_upgrades.txt
similarity index 100%
rename from modules/worldengine/deps/gsoap/tc_upgrades.txt
rename to deps/gsoap/tc_upgrades.txt
diff --git a/modules/hw-core/bash-lib-event/src/hooks.sh b/deps/hw-core/bash-lib-event/src/hooks.sh
similarity index 100%
rename from modules/hw-core/bash-lib-event/src/hooks.sh
rename to deps/hw-core/bash-lib-event/src/hooks.sh
diff --git a/modules/hw-core/bash-lib-git/bin/git-subtree-list b/deps/hw-core/bash-lib-git/bin/git-subtree-list
old mode 100755
new mode 100644
similarity index 100%
rename from modules/hw-core/bash-lib-git/bin/git-subtree-list
rename to deps/hw-core/bash-lib-git/bin/git-subtree-list
diff --git a/modules/hw-core/bash-lib-git/src/subtree.sh b/deps/hw-core/bash-lib-git/src/subtree.sh
similarity index 100%
rename from modules/hw-core/bash-lib-git/src/subtree.sh
rename to deps/hw-core/bash-lib-git/src/subtree.sh
diff --git a/modules/worldengine/deps/jemalloc/CMakeLists.txt b/deps/jemalloc/CMakeLists.txt
similarity index 93%
rename from modules/worldengine/deps/jemalloc/CMakeLists.txt
rename to deps/jemalloc/CMakeLists.txt
index 7bb7d5551..8e937b67c 100644
--- a/modules/worldengine/deps/jemalloc/CMakeLists.txt
+++ b/deps/jemalloc/CMakeLists.txt
@@ -27,12 +27,12 @@
     set(JEM_MADFREE_DEF "#undef")
   endif()
 
-  # Create the header, so we can use it
-  configure_file(
-    "${CMAKE_SOURCE_DIR}/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake"
-    "${BUILDDIR}/jemalloc_internal_defs.h"
-    @ONLY
-  )
+# Create the header, so we can use it
+configure_file(
+  "${CMAKE_SOURCE_DIR}/deps/jemalloc/jemalloc_defs.h.in.cmake"
+  "${BUILDDIR}/jemalloc_defs.h"
+  @ONLY
+)
 
   # Done, let's continue
   set(jemalloc_STAT_SRC
diff --git a/modules/worldengine/deps/jemalloc/COPYING b/deps/jemalloc/COPYING
similarity index 100%
rename from modules/worldengine/deps/jemalloc/COPYING
rename to deps/jemalloc/COPYING
diff --git a/modules/worldengine/deps/jemalloc/ChangeLog b/deps/jemalloc/ChangeLog
similarity index 100%
rename from modules/worldengine/deps/jemalloc/ChangeLog
rename to deps/jemalloc/ChangeLog
diff --git a/modules/worldengine/deps/jemalloc/README b/deps/jemalloc/README
similarity index 100%
rename from modules/worldengine/deps/jemalloc/README
rename to deps/jemalloc/README
diff --git a/modules/worldengine/deps/jemalloc/TC_NOTE.txt b/deps/jemalloc/TC_NOTE.txt
similarity index 100%
rename from modules/worldengine/deps/jemalloc/TC_NOTE.txt
rename to deps/jemalloc/TC_NOTE.txt
diff --git a/modules/worldengine/deps/jemalloc/VERSION b/deps/jemalloc/VERSION
similarity index 100%
rename from modules/worldengine/deps/jemalloc/VERSION
rename to deps/jemalloc/VERSION
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena.h b/deps/jemalloc/include/jemalloc/internal/arena.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena.h
rename to deps/jemalloc/include/jemalloc/internal/arena.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_externs.h b/deps/jemalloc/include/jemalloc/internal/arena_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_externs.h
rename to deps/jemalloc/include/jemalloc/internal/arena_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h b/deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h
rename to deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h b/deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h
rename to deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_structs_a.h b/deps/jemalloc/include/jemalloc/internal/arena_structs_a.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_structs_a.h
rename to deps/jemalloc/include/jemalloc/internal/arena_structs_a.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_structs_b.h b/deps/jemalloc/include/jemalloc/internal/arena_structs_b.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_structs_b.h
rename to deps/jemalloc/include/jemalloc/internal/arena_structs_b.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_types.h b/deps/jemalloc/include/jemalloc/internal/arena_types.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena_types.h
rename to deps/jemalloc/include/jemalloc/internal/arena_types.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/assert.h b/deps/jemalloc/include/jemalloc/internal/assert.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/assert.h
rename to deps/jemalloc/include/jemalloc/internal/assert.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic.h b/deps/jemalloc/include/jemalloc/internal/atomic.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic.h
rename to deps/jemalloc/include/jemalloc/internal/atomic.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_c11.h b/deps/jemalloc/include/jemalloc/internal/atomic_c11.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_c11.h
rename to deps/jemalloc/include/jemalloc/internal/atomic_c11.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h b/deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h
rename to deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h b/deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h
rename to deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_msvc.h b/deps/jemalloc/include/jemalloc/internal/atomic_msvc.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic_msvc.h
rename to deps/jemalloc/include/jemalloc/internal/atomic_msvc.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/background_thread_externs.h b/deps/jemalloc/include/jemalloc/internal/background_thread_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/background_thread_externs.h
rename to deps/jemalloc/include/jemalloc/internal/background_thread_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h b/deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h
rename to deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/background_thread_structs.h b/deps/jemalloc/include/jemalloc/internal/background_thread_structs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/background_thread_structs.h
rename to deps/jemalloc/include/jemalloc/internal/background_thread_structs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/base.h b/deps/jemalloc/include/jemalloc/internal/base.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/base.h
rename to deps/jemalloc/include/jemalloc/internal/base.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_externs.h b/deps/jemalloc/include/jemalloc/internal/base_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_externs.h
rename to deps/jemalloc/include/jemalloc/internal/base_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_inlines.h b/deps/jemalloc/include/jemalloc/internal/base_inlines.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_inlines.h
rename to deps/jemalloc/include/jemalloc/internal/base_inlines.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_structs.h b/deps/jemalloc/include/jemalloc/internal/base_structs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_structs.h
rename to deps/jemalloc/include/jemalloc/internal/base_structs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_types.h b/deps/jemalloc/include/jemalloc/internal/base_types.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/base_types.h
rename to deps/jemalloc/include/jemalloc/internal/base_types.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/bit_util.h b/deps/jemalloc/include/jemalloc/internal/bit_util.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/bit_util.h
rename to deps/jemalloc/include/jemalloc/internal/bit_util.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/bitmap.h b/deps/jemalloc/include/jemalloc/internal/bitmap.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/bitmap.h
rename to deps/jemalloc/include/jemalloc/internal/bitmap.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk.h b/deps/jemalloc/include/jemalloc/internal/chunk.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk.h
rename to deps/jemalloc/include/jemalloc/internal/chunk.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk_dss.h b/deps/jemalloc/include/jemalloc/internal/chunk_dss.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk_dss.h
rename to deps/jemalloc/include/jemalloc/internal/chunk_dss.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk_mmap.h b/deps/jemalloc/include/jemalloc/internal/chunk_mmap.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk_mmap.h
rename to deps/jemalloc/include/jemalloc/internal/chunk_mmap.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ckh.h b/deps/jemalloc/include/jemalloc/internal/ckh.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/ckh.h
rename to deps/jemalloc/include/jemalloc/internal/ckh.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ctl.h b/deps/jemalloc/include/jemalloc/internal/ctl.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/ctl.h
rename to deps/jemalloc/include/jemalloc/internal/ctl.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent.h b/deps/jemalloc/include/jemalloc/internal/extent.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent.h
rename to deps/jemalloc/include/jemalloc/internal/extent.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_dss.h b/deps/jemalloc/include/jemalloc/internal/extent_dss.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_dss.h
rename to deps/jemalloc/include/jemalloc/internal/extent_dss.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_externs.h b/deps/jemalloc/include/jemalloc/internal/extent_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_externs.h
rename to deps/jemalloc/include/jemalloc/internal/extent_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_inlines.h b/deps/jemalloc/include/jemalloc/internal/extent_inlines.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_inlines.h
rename to deps/jemalloc/include/jemalloc/internal/extent_inlines.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_mmap.h b/deps/jemalloc/include/jemalloc/internal/extent_mmap.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_mmap.h
rename to deps/jemalloc/include/jemalloc/internal/extent_mmap.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_structs.h b/deps/jemalloc/include/jemalloc/internal/extent_structs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_structs.h
rename to deps/jemalloc/include/jemalloc/internal/extent_structs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_types.h b/deps/jemalloc/include/jemalloc/internal/extent_types.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent_types.h
rename to deps/jemalloc/include/jemalloc/internal/extent_types.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/hash.h b/deps/jemalloc/include/jemalloc/internal/hash.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/hash.h
rename to deps/jemalloc/include/jemalloc/internal/hash.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/hooks.h b/deps/jemalloc/include/jemalloc/internal/hooks.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/hooks.h
rename to deps/jemalloc/include/jemalloc/internal/hooks.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/huge.h b/deps/jemalloc/include/jemalloc/internal/huge.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/huge.h
rename to deps/jemalloc/include/jemalloc/internal/huge.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in b/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in
rename to deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/large_externs.h b/deps/jemalloc/include/jemalloc/internal/large_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/large_externs.h
rename to deps/jemalloc/include/jemalloc/internal/large_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/malloc_io.h b/deps/jemalloc/include/jemalloc/internal/malloc_io.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/malloc_io.h
rename to deps/jemalloc/include/jemalloc/internal/malloc_io.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/mb.h b/deps/jemalloc/include/jemalloc/internal/mb.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/mb.h
rename to deps/jemalloc/include/jemalloc/internal/mb.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/mutex.h b/deps/jemalloc/include/jemalloc/internal/mutex.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/mutex.h
rename to deps/jemalloc/include/jemalloc/internal/mutex.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/mutex_pool.h b/deps/jemalloc/include/jemalloc/internal/mutex_pool.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/mutex_pool.h
rename to deps/jemalloc/include/jemalloc/internal/mutex_pool.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/mutex_prof.h b/deps/jemalloc/include/jemalloc/internal/mutex_prof.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/mutex_prof.h
rename to deps/jemalloc/include/jemalloc/internal/mutex_prof.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/nstime.h b/deps/jemalloc/include/jemalloc/internal/nstime.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/nstime.h
rename to deps/jemalloc/include/jemalloc/internal/nstime.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/pages.h b/deps/jemalloc/include/jemalloc/internal/pages.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/pages.h
rename to deps/jemalloc/include/jemalloc/internal/pages.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ph.h b/deps/jemalloc/include/jemalloc/internal/ph.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/ph.h
rename to deps/jemalloc/include/jemalloc/internal/ph.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/private_namespace.h b/deps/jemalloc/include/jemalloc/internal/private_namespace.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/private_namespace.h
rename to deps/jemalloc/include/jemalloc/internal/private_namespace.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prng.h b/deps/jemalloc/include/jemalloc/internal/prng.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/prng.h
rename to deps/jemalloc/include/jemalloc/internal/prng.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof.h b/deps/jemalloc/include/jemalloc/internal/prof.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof.h
rename to deps/jemalloc/include/jemalloc/internal/prof.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_externs.h b/deps/jemalloc/include/jemalloc/internal/prof_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_externs.h
rename to deps/jemalloc/include/jemalloc/internal/prof_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h b/deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h
rename to deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h b/deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h
rename to deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_structs.h b/deps/jemalloc/include/jemalloc/internal/prof_structs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_structs.h
rename to deps/jemalloc/include/jemalloc/internal/prof_structs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_types.h b/deps/jemalloc/include/jemalloc/internal/prof_types.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof_types.h
rename to deps/jemalloc/include/jemalloc/internal/prof_types.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ql.h b/deps/jemalloc/include/jemalloc/internal/ql.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/ql.h
rename to deps/jemalloc/include/jemalloc/internal/ql.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/qr.h b/deps/jemalloc/include/jemalloc/internal/qr.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/qr.h
rename to deps/jemalloc/include/jemalloc/internal/qr.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/quarantine.h b/deps/jemalloc/include/jemalloc/internal/quarantine.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/quarantine.h
rename to deps/jemalloc/include/jemalloc/internal/quarantine.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/rb.h b/deps/jemalloc/include/jemalloc/internal/rb.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/rb.h
rename to deps/jemalloc/include/jemalloc/internal/rb.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/rtree.h b/deps/jemalloc/include/jemalloc/internal/rtree.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/rtree.h
rename to deps/jemalloc/include/jemalloc/internal/rtree.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/rtree_tsd.h b/deps/jemalloc/include/jemalloc/internal/rtree_tsd.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/rtree_tsd.h
rename to deps/jemalloc/include/jemalloc/internal/rtree_tsd.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/size_classes.h b/deps/jemalloc/include/jemalloc/internal/size_classes.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/size_classes.h
rename to deps/jemalloc/include/jemalloc/internal/size_classes.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/smoothstep.h b/deps/jemalloc/include/jemalloc/internal/smoothstep.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/smoothstep.h
rename to deps/jemalloc/include/jemalloc/internal/smoothstep.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/spin.h b/deps/jemalloc/include/jemalloc/internal/spin.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/spin.h
rename to deps/jemalloc/include/jemalloc/internal/spin.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/stats.h b/deps/jemalloc/include/jemalloc/internal/stats.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/stats.h
rename to deps/jemalloc/include/jemalloc/internal/stats.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/stats_tsd.h b/deps/jemalloc/include/jemalloc/internal/stats_tsd.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/stats_tsd.h
rename to deps/jemalloc/include/jemalloc/internal/stats_tsd.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/sz.h b/deps/jemalloc/include/jemalloc/internal/sz.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/sz.h
rename to deps/jemalloc/include/jemalloc/internal/sz.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache.h b/deps/jemalloc/include/jemalloc/internal/tcache.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache.h
rename to deps/jemalloc/include/jemalloc/internal/tcache.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_externs.h b/deps/jemalloc/include/jemalloc/internal/tcache_externs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_externs.h
rename to deps/jemalloc/include/jemalloc/internal/tcache_externs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_inlines.h b/deps/jemalloc/include/jemalloc/internal/tcache_inlines.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_inlines.h
rename to deps/jemalloc/include/jemalloc/internal/tcache_inlines.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_structs.h b/deps/jemalloc/include/jemalloc/internal/tcache_structs.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_structs.h
rename to deps/jemalloc/include/jemalloc/internal/tcache_structs.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_types.h b/deps/jemalloc/include/jemalloc/internal/tcache_types.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache_types.h
rename to deps/jemalloc/include/jemalloc/internal/tcache_types.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ticker.h b/deps/jemalloc/include/jemalloc/internal/ticker.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/ticker.h
rename to deps/jemalloc/include/jemalloc/internal/ticker.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd.h b/deps/jemalloc/include/jemalloc/internal/tsd.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd.h
rename to deps/jemalloc/include/jemalloc/internal/tsd.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_generic.h b/deps/jemalloc/include/jemalloc/internal/tsd_generic.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_generic.h
rename to deps/jemalloc/include/jemalloc/internal/tsd_generic.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h b/deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h
rename to deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_tls.h b/deps/jemalloc/include/jemalloc/internal/tsd_tls.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_tls.h
rename to deps/jemalloc/include/jemalloc/internal/tsd_tls.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_types.h b/deps/jemalloc/include/jemalloc/internal/tsd_types.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_types.h
rename to deps/jemalloc/include/jemalloc/internal/tsd_types.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_win.h b/deps/jemalloc/include/jemalloc/internal/tsd_win.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd_win.h
rename to deps/jemalloc/include/jemalloc/internal/tsd_win.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/util.h b/deps/jemalloc/include/jemalloc/internal/util.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/util.h
rename to deps/jemalloc/include/jemalloc/internal/util.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/witness.h b/deps/jemalloc/include/jemalloc/internal/witness.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/internal/witness.h
rename to deps/jemalloc/include/jemalloc/internal/witness.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/jemalloc.h b/deps/jemalloc/include/jemalloc/jemalloc.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/jemalloc/jemalloc.h
rename to deps/jemalloc/include/jemalloc/jemalloc.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/C99/stdbool.h b/deps/jemalloc/include/msvc_compat/C99/stdbool.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/msvc_compat/C99/stdbool.h
rename to deps/jemalloc/include/msvc_compat/C99/stdbool.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/C99/stdint.h b/deps/jemalloc/include/msvc_compat/C99/stdint.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/msvc_compat/C99/stdint.h
rename to deps/jemalloc/include/msvc_compat/C99/stdint.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/inttypes.h b/deps/jemalloc/include/msvc_compat/inttypes.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/msvc_compat/inttypes.h
rename to deps/jemalloc/include/msvc_compat/inttypes.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/stdbool.h b/deps/jemalloc/include/msvc_compat/stdbool.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/msvc_compat/stdbool.h
rename to deps/jemalloc/include/msvc_compat/stdbool.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/stdint.h b/deps/jemalloc/include/msvc_compat/stdint.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/msvc_compat/stdint.h
rename to deps/jemalloc/include/msvc_compat/stdint.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/strings.h b/deps/jemalloc/include/msvc_compat/strings.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/msvc_compat/strings.h
rename to deps/jemalloc/include/msvc_compat/strings.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/windows_extra.h b/deps/jemalloc/include/msvc_compat/windows_extra.h
similarity index 100%
rename from modules/worldengine/deps/jemalloc/include/msvc_compat/windows_extra.h
rename to deps/jemalloc/include/msvc_compat/windows_extra.h
diff --git a/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake b/deps/jemalloc/jemalloc_defs.h.in.cmake
similarity index 100%
rename from modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake
rename to deps/jemalloc/jemalloc_defs.h.in.cmake
diff --git a/modules/worldengine/deps/jemalloc/src/arena.c b/deps/jemalloc/src/arena.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/arena.c
rename to deps/jemalloc/src/arena.c
diff --git a/modules/worldengine/deps/jemalloc/src/atomic.c b/deps/jemalloc/src/atomic.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/atomic.c
rename to deps/jemalloc/src/atomic.c
diff --git a/modules/worldengine/deps/jemalloc/src/background_thread.c b/deps/jemalloc/src/background_thread.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/background_thread.c
rename to deps/jemalloc/src/background_thread.c
diff --git a/modules/worldengine/deps/jemalloc/src/base.c b/deps/jemalloc/src/base.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/base.c
rename to deps/jemalloc/src/base.c
diff --git a/modules/worldengine/deps/jemalloc/src/bitmap.c b/deps/jemalloc/src/bitmap.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/bitmap.c
rename to deps/jemalloc/src/bitmap.c
diff --git a/modules/worldengine/deps/jemalloc/src/chunk.c b/deps/jemalloc/src/chunk.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/chunk.c
rename to deps/jemalloc/src/chunk.c
diff --git a/modules/worldengine/deps/jemalloc/src/chunk_dss.c b/deps/jemalloc/src/chunk_dss.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/chunk_dss.c
rename to deps/jemalloc/src/chunk_dss.c
diff --git a/modules/worldengine/deps/jemalloc/src/chunk_mmap.c b/deps/jemalloc/src/chunk_mmap.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/chunk_mmap.c
rename to deps/jemalloc/src/chunk_mmap.c
diff --git a/modules/worldengine/deps/jemalloc/src/ckh.c b/deps/jemalloc/src/ckh.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/ckh.c
rename to deps/jemalloc/src/ckh.c
diff --git a/modules/worldengine/deps/jemalloc/src/ctl.c b/deps/jemalloc/src/ctl.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/ctl.c
rename to deps/jemalloc/src/ctl.c
diff --git a/modules/worldengine/deps/jemalloc/src/extent.c b/deps/jemalloc/src/extent.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/extent.c
rename to deps/jemalloc/src/extent.c
diff --git a/modules/worldengine/deps/jemalloc/src/extent_dss.c b/deps/jemalloc/src/extent_dss.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/extent_dss.c
rename to deps/jemalloc/src/extent_dss.c
diff --git a/modules/worldengine/deps/jemalloc/src/extent_mmap.c b/deps/jemalloc/src/extent_mmap.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/extent_mmap.c
rename to deps/jemalloc/src/extent_mmap.c
diff --git a/modules/worldengine/deps/jemalloc/src/hash.c b/deps/jemalloc/src/hash.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/hash.c
rename to deps/jemalloc/src/hash.c
diff --git a/modules/worldengine/deps/jemalloc/src/hooks.c b/deps/jemalloc/src/hooks.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/hooks.c
rename to deps/jemalloc/src/hooks.c
diff --git a/modules/worldengine/deps/jemalloc/src/huge.c b/deps/jemalloc/src/huge.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/huge.c
rename to deps/jemalloc/src/huge.c
diff --git a/modules/worldengine/deps/jemalloc/src/jemalloc.c b/deps/jemalloc/src/jemalloc.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/jemalloc.c
rename to deps/jemalloc/src/jemalloc.c
diff --git a/modules/worldengine/deps/jemalloc/src/jemalloc_cpp.cpp b/deps/jemalloc/src/jemalloc_cpp.cpp
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/jemalloc_cpp.cpp
rename to deps/jemalloc/src/jemalloc_cpp.cpp
diff --git a/modules/worldengine/deps/jemalloc/src/large.c b/deps/jemalloc/src/large.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/large.c
rename to deps/jemalloc/src/large.c
diff --git a/modules/worldengine/deps/jemalloc/src/malloc_io.c b/deps/jemalloc/src/malloc_io.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/malloc_io.c
rename to deps/jemalloc/src/malloc_io.c
diff --git a/modules/worldengine/deps/jemalloc/src/mb.c b/deps/jemalloc/src/mb.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/mb.c
rename to deps/jemalloc/src/mb.c
diff --git a/modules/worldengine/deps/jemalloc/src/mutex.c b/deps/jemalloc/src/mutex.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/mutex.c
rename to deps/jemalloc/src/mutex.c
diff --git a/modules/worldengine/deps/jemalloc/src/mutex_pool.c b/deps/jemalloc/src/mutex_pool.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/mutex_pool.c
rename to deps/jemalloc/src/mutex_pool.c
diff --git a/modules/worldengine/deps/jemalloc/src/nstime.c b/deps/jemalloc/src/nstime.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/nstime.c
rename to deps/jemalloc/src/nstime.c
diff --git a/modules/worldengine/deps/jemalloc/src/pages.c b/deps/jemalloc/src/pages.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/pages.c
rename to deps/jemalloc/src/pages.c
diff --git a/modules/worldengine/deps/jemalloc/src/prng.c b/deps/jemalloc/src/prng.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/prng.c
rename to deps/jemalloc/src/prng.c
diff --git a/modules/worldengine/deps/jemalloc/src/prof.c b/deps/jemalloc/src/prof.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/prof.c
rename to deps/jemalloc/src/prof.c
diff --git a/modules/worldengine/deps/jemalloc/src/quarantine.c b/deps/jemalloc/src/quarantine.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/quarantine.c
rename to deps/jemalloc/src/quarantine.c
diff --git a/modules/worldengine/deps/jemalloc/src/rtree.c b/deps/jemalloc/src/rtree.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/rtree.c
rename to deps/jemalloc/src/rtree.c
diff --git a/modules/worldengine/deps/jemalloc/src/spin.c b/deps/jemalloc/src/spin.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/spin.c
rename to deps/jemalloc/src/spin.c
diff --git a/modules/worldengine/deps/jemalloc/src/stats.c b/deps/jemalloc/src/stats.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/stats.c
rename to deps/jemalloc/src/stats.c
diff --git a/modules/worldengine/deps/jemalloc/src/sz.c b/deps/jemalloc/src/sz.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/sz.c
rename to deps/jemalloc/src/sz.c
diff --git a/modules/worldengine/deps/jemalloc/src/tcache.c b/deps/jemalloc/src/tcache.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/tcache.c
rename to deps/jemalloc/src/tcache.c
diff --git a/modules/worldengine/deps/jemalloc/src/ticker.c b/deps/jemalloc/src/ticker.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/ticker.c
rename to deps/jemalloc/src/ticker.c
diff --git a/modules/worldengine/deps/jemalloc/src/tsd.c b/deps/jemalloc/src/tsd.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/tsd.c
rename to deps/jemalloc/src/tsd.c
diff --git a/modules/worldengine/deps/jemalloc/src/util.c b/deps/jemalloc/src/util.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/util.c
rename to deps/jemalloc/src/util.c
diff --git a/modules/worldengine/deps/jemalloc/src/witness.c b/deps/jemalloc/src/witness.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/witness.c
rename to deps/jemalloc/src/witness.c
diff --git a/modules/worldengine/deps/jemalloc/src/zone.c b/deps/jemalloc/src/zone.c
similarity index 100%
rename from modules/worldengine/deps/jemalloc/src/zone.c
rename to deps/jemalloc/src/zone.c
diff --git a/modules/worldengine/deps/libmpq/AUTHORS b/deps/libmpq/AUTHORS
similarity index 100%
rename from modules/worldengine/deps/libmpq/AUTHORS
rename to deps/libmpq/AUTHORS
diff --git a/modules/worldengine/deps/libmpq/CMakeLists.txt b/deps/libmpq/CMakeLists.txt
similarity index 78%
rename from modules/worldengine/deps/libmpq/CMakeLists.txt
rename to deps/libmpq/CMakeLists.txt
index c3e20934d..34e1c3521 100644
--- a/modules/worldengine/deps/libmpq/CMakeLists.txt
+++ b/deps/libmpq/CMakeLists.txt
@@ -17,15 +17,15 @@ set(mpq_STAT_SRCS
 if( UNIX )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
+    ${CMAKE_SOURCE_DIR}/deps/zlib
+    ${CMAKE_SOURCE_DIR}/deps/bzip2
   )
 elseif( WIN32 )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/win
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2
+    ${CMAKE_SOURCE_DIR}/deps/zlib
+    ${CMAKE_SOURCE_DIR}/deps/bzip2
   )
 endif()
 
diff --git a/modules/worldengine/deps/libmpq/COPYING b/deps/libmpq/COPYING
similarity index 100%
rename from modules/worldengine/deps/libmpq/COPYING
rename to deps/libmpq/COPYING
diff --git a/modules/worldengine/deps/libmpq/FAQ b/deps/libmpq/FAQ
similarity index 100%
rename from modules/worldengine/deps/libmpq/FAQ
rename to deps/libmpq/FAQ
diff --git a/modules/worldengine/deps/libmpq/INSTALL b/deps/libmpq/INSTALL
similarity index 100%
rename from modules/worldengine/deps/libmpq/INSTALL
rename to deps/libmpq/INSTALL
diff --git a/modules/worldengine/deps/libmpq/Makefile.am b/deps/libmpq/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/Makefile.am
rename to deps/libmpq/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/NEWS b/deps/libmpq/NEWS
similarity index 100%
rename from modules/worldengine/deps/libmpq/NEWS
rename to deps/libmpq/NEWS
diff --git a/modules/worldengine/deps/libmpq/README b/deps/libmpq/README
similarity index 100%
rename from modules/worldengine/deps/libmpq/README
rename to deps/libmpq/README
diff --git a/modules/worldengine/deps/libmpq/THANKS b/deps/libmpq/THANKS
similarity index 100%
rename from modules/worldengine/deps/libmpq/THANKS
rename to deps/libmpq/THANKS
diff --git a/modules/worldengine/deps/libmpq/TODO b/deps/libmpq/TODO
similarity index 100%
rename from modules/worldengine/deps/libmpq/TODO
rename to deps/libmpq/TODO
diff --git a/modules/worldengine/deps/libmpq/autogen.sh b/deps/libmpq/autogen.sh
similarity index 100%
rename from modules/worldengine/deps/libmpq/autogen.sh
rename to deps/libmpq/autogen.sh
diff --git a/modules/worldengine/deps/libmpq/bindings/Makefile.am b/deps/libmpq/bindings/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/bindings/Makefile.am
rename to deps/libmpq/bindings/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/bindings/d/Makefile.am b/deps/libmpq/bindings/d/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/bindings/d/Makefile.am
rename to deps/libmpq/bindings/d/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/bindings/d/dsss.conf b/deps/libmpq/bindings/d/dsss.conf
similarity index 100%
rename from modules/worldengine/deps/libmpq/bindings/d/dsss.conf
rename to deps/libmpq/bindings/d/dsss.conf
diff --git a/modules/worldengine/deps/libmpq/bindings/d/mpq.d b/deps/libmpq/bindings/d/mpq.d
similarity index 100%
rename from modules/worldengine/deps/libmpq/bindings/d/mpq.d
rename to deps/libmpq/bindings/d/mpq.d
diff --git a/modules/worldengine/deps/libmpq/bindings/python/Makefile.am b/deps/libmpq/bindings/python/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/bindings/python/Makefile.am
rename to deps/libmpq/bindings/python/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/bindings/python/mpq-info b/deps/libmpq/bindings/python/mpq-info
similarity index 100%
rename from modules/worldengine/deps/libmpq/bindings/python/mpq-info
rename to deps/libmpq/bindings/python/mpq-info
diff --git a/modules/worldengine/deps/libmpq/bindings/python/mpq.py b/deps/libmpq/bindings/python/mpq.py
similarity index 100%
rename from modules/worldengine/deps/libmpq/bindings/python/mpq.py
rename to deps/libmpq/bindings/python/mpq.py
diff --git a/modules/worldengine/deps/libmpq/config.h b/deps/libmpq/config.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/config.h
rename to deps/libmpq/config.h
diff --git a/modules/worldengine/deps/libmpq/configure.ac b/deps/libmpq/configure.ac
similarity index 100%
rename from modules/worldengine/deps/libmpq/configure.ac
rename to deps/libmpq/configure.ac
diff --git a/modules/worldengine/deps/libmpq/debian/changelog b/deps/libmpq/debian/changelog
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/changelog
rename to deps/libmpq/debian/changelog
diff --git a/modules/worldengine/deps/libmpq/debian/compat b/deps/libmpq/debian/compat
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/compat
rename to deps/libmpq/debian/compat
diff --git a/modules/worldengine/deps/libmpq/debian/control b/deps/libmpq/debian/control
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/control
rename to deps/libmpq/debian/control
diff --git a/modules/worldengine/deps/libmpq/debian/copyright b/deps/libmpq/debian/copyright
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/copyright
rename to deps/libmpq/debian/copyright
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq-dev.dirs b/deps/libmpq/debian/libmpq-dev.dirs
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/libmpq-dev.dirs
rename to deps/libmpq/debian/libmpq-dev.dirs
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq-dev.install b/deps/libmpq/debian/libmpq-dev.install
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/libmpq-dev.install
rename to deps/libmpq/debian/libmpq-dev.install
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq0.dirs b/deps/libmpq/debian/libmpq0.dirs
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/libmpq0.dirs
rename to deps/libmpq/debian/libmpq0.dirs
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq0.docs b/deps/libmpq/debian/libmpq0.docs
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/libmpq0.docs
rename to deps/libmpq/debian/libmpq0.docs
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq0.install b/deps/libmpq/debian/libmpq0.install
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/libmpq0.install
rename to deps/libmpq/debian/libmpq0.install
diff --git a/modules/worldengine/deps/libmpq/debian/python-mpq.install b/deps/libmpq/debian/python-mpq.install
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/python-mpq.install
rename to deps/libmpq/debian/python-mpq.install
diff --git a/modules/worldengine/deps/libmpq/debian/rules b/deps/libmpq/debian/rules
similarity index 100%
rename from modules/worldengine/deps/libmpq/debian/rules
rename to deps/libmpq/debian/rules
diff --git a/modules/worldengine/deps/libmpq/doc/Makefile.am b/deps/libmpq/doc/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/Makefile.am
rename to deps/libmpq/doc/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/doc/man1/Makefile.am b/deps/libmpq/doc/man1/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man1/Makefile.am
rename to deps/libmpq/doc/man1/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/doc/man1/libmpq-config.1 b/deps/libmpq/doc/man1/libmpq-config.1
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man1/libmpq-config.1
rename to deps/libmpq/doc/man1/libmpq-config.1
diff --git a/modules/worldengine/deps/libmpq/doc/man3/Makefile.am b/deps/libmpq/doc/man3/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/Makefile.am
rename to deps/libmpq/doc/man3/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq.3 b/deps/libmpq/doc/man3/libmpq.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq.3
rename to deps/libmpq/doc/man3/libmpq.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_close.3 b/deps/libmpq/doc/man3/libmpq__archive_close.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_close.3
rename to deps/libmpq/doc/man3/libmpq__archive_close.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_files.3 b/deps/libmpq/doc/man3/libmpq__archive_files.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_files.3
rename to deps/libmpq/doc/man3/libmpq__archive_files.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_offset.3 b/deps/libmpq/doc/man3/libmpq__archive_offset.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_offset.3
rename to deps/libmpq/doc/man3/libmpq__archive_offset.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_open.3 b/deps/libmpq/doc/man3/libmpq__archive_open.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_open.3
rename to deps/libmpq/doc/man3/libmpq__archive_open.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_packed_size.3 b/deps/libmpq/doc/man3/libmpq__archive_packed_size.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_packed_size.3
rename to deps/libmpq/doc/man3/libmpq__archive_packed_size.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_unpacked_size.3 b/deps/libmpq/doc/man3/libmpq__archive_unpacked_size.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_unpacked_size.3
rename to deps/libmpq/doc/man3/libmpq__archive_unpacked_size.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_version.3 b/deps/libmpq/doc/man3/libmpq__archive_version.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_version.3
rename to deps/libmpq/doc/man3/libmpq__archive_version.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_close_offset.3 b/deps/libmpq/doc/man3/libmpq__block_close_offset.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__block_close_offset.3
rename to deps/libmpq/doc/man3/libmpq__block_close_offset.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_open_offset.3 b/deps/libmpq/doc/man3/libmpq__block_open_offset.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__block_open_offset.3
rename to deps/libmpq/doc/man3/libmpq__block_open_offset.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_read.3 b/deps/libmpq/doc/man3/libmpq__block_read.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__block_read.3
rename to deps/libmpq/doc/man3/libmpq__block_read.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_unpacked_size.3 b/deps/libmpq/doc/man3/libmpq__block_unpacked_size.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__block_unpacked_size.3
rename to deps/libmpq/doc/man3/libmpq__block_unpacked_size.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_blocks.3 b/deps/libmpq/doc/man3/libmpq__file_blocks.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_blocks.3
rename to deps/libmpq/doc/man3/libmpq__file_blocks.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_compressed.3 b/deps/libmpq/doc/man3/libmpq__file_compressed.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_compressed.3
rename to deps/libmpq/doc/man3/libmpq__file_compressed.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_encrypted.3 b/deps/libmpq/doc/man3/libmpq__file_encrypted.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_encrypted.3
rename to deps/libmpq/doc/man3/libmpq__file_encrypted.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_imploded.3 b/deps/libmpq/doc/man3/libmpq__file_imploded.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_imploded.3
rename to deps/libmpq/doc/man3/libmpq__file_imploded.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_number.3 b/deps/libmpq/doc/man3/libmpq__file_number.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_number.3
rename to deps/libmpq/doc/man3/libmpq__file_number.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_offset.3 b/deps/libmpq/doc/man3/libmpq__file_offset.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_offset.3
rename to deps/libmpq/doc/man3/libmpq__file_offset.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_packed_size.3 b/deps/libmpq/doc/man3/libmpq__file_packed_size.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_packed_size.3
rename to deps/libmpq/doc/man3/libmpq__file_packed_size.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_read.3 b/deps/libmpq/doc/man3/libmpq__file_read.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_read.3
rename to deps/libmpq/doc/man3/libmpq__file_read.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_unpacked_size.3 b/deps/libmpq/doc/man3/libmpq__file_unpacked_size.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__file_unpacked_size.3
rename to deps/libmpq/doc/man3/libmpq__file_unpacked_size.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__strerror.3 b/deps/libmpq/doc/man3/libmpq__strerror.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__strerror.3
rename to deps/libmpq/doc/man3/libmpq__strerror.3
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq__version.3 b/deps/libmpq/doc/man3/libmpq__version.3
similarity index 100%
rename from modules/worldengine/deps/libmpq/doc/man3/libmpq__version.3
rename to deps/libmpq/doc/man3/libmpq__version.3
diff --git a/modules/worldengine/deps/libmpq/libmpq-config.in b/deps/libmpq/libmpq-config.in
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq-config.in
rename to deps/libmpq/libmpq-config.in
diff --git a/modules/worldengine/deps/libmpq/libmpq.pc.in b/deps/libmpq/libmpq.pc.in
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq.pc.in
rename to deps/libmpq/libmpq.pc.in
diff --git a/modules/worldengine/deps/libmpq/libmpq/Makefile.am b/deps/libmpq/libmpq/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/Makefile.am
rename to deps/libmpq/libmpq/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/libmpq/common.c b/deps/libmpq/libmpq/common.c
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/common.c
rename to deps/libmpq/libmpq/common.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/common.h b/deps/libmpq/libmpq/common.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/common.h
rename to deps/libmpq/libmpq/common.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/crypt_buf.h b/deps/libmpq/libmpq/crypt_buf.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/crypt_buf.h
rename to deps/libmpq/libmpq/crypt_buf.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/explode.c b/deps/libmpq/libmpq/explode.c
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/explode.c
rename to deps/libmpq/libmpq/explode.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/explode.h b/deps/libmpq/libmpq/explode.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/explode.h
rename to deps/libmpq/libmpq/explode.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/extract.c b/deps/libmpq/libmpq/extract.c
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/extract.c
rename to deps/libmpq/libmpq/extract.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/extract.h b/deps/libmpq/libmpq/extract.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/extract.h
rename to deps/libmpq/libmpq/extract.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/huffman.c b/deps/libmpq/libmpq/huffman.c
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/huffman.c
rename to deps/libmpq/libmpq/huffman.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/huffman.h b/deps/libmpq/libmpq/huffman.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/huffman.h
rename to deps/libmpq/libmpq/huffman.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/mpq-internal.h b/deps/libmpq/libmpq/mpq-internal.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/mpq-internal.h
rename to deps/libmpq/libmpq/mpq-internal.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/mpq.c b/deps/libmpq/libmpq/mpq.c
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/mpq.c
rename to deps/libmpq/libmpq/mpq.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/mpq.h b/deps/libmpq/libmpq/mpq.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/mpq.h
rename to deps/libmpq/libmpq/mpq.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/pack_begin.h b/deps/libmpq/libmpq/pack_begin.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/pack_begin.h
rename to deps/libmpq/libmpq/pack_begin.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/pack_end.h b/deps/libmpq/libmpq/pack_end.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/pack_end.h
rename to deps/libmpq/libmpq/pack_end.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/platform.h b/deps/libmpq/libmpq/platform.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/platform.h
rename to deps/libmpq/libmpq/platform.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/wave.c b/deps/libmpq/libmpq/wave.c
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/wave.c
rename to deps/libmpq/libmpq/wave.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/wave.h b/deps/libmpq/libmpq/wave.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/libmpq/wave.h
rename to deps/libmpq/libmpq/wave.h
diff --git a/modules/worldengine/deps/libmpq/tools/Makefile.am b/deps/libmpq/tools/Makefile.am
similarity index 100%
rename from modules/worldengine/deps/libmpq/tools/Makefile.am
rename to deps/libmpq/tools/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/tools/crypt_buf_gen.c b/deps/libmpq/tools/crypt_buf_gen.c
similarity index 100%
rename from modules/worldengine/deps/libmpq/tools/crypt_buf_gen.c
rename to deps/libmpq/tools/crypt_buf_gen.c
diff --git a/modules/worldengine/deps/libmpq/win/config.h b/deps/libmpq/win/config.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/win/config.h
rename to deps/libmpq/win/config.h
diff --git a/modules/worldengine/deps/libmpq/win/dirent.h b/deps/libmpq/win/dirent.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/win/dirent.h
rename to deps/libmpq/win/dirent.h
diff --git a/modules/worldengine/deps/libmpq/win/stdint.h b/deps/libmpq/win/stdint.h
similarity index 100%
rename from modules/worldengine/deps/libmpq/win/stdint.h
rename to deps/libmpq/win/stdint.h
diff --git a/modules/worldengine/deps/mysqllite/CMakeLists.txt b/deps/mysqllite/CMakeLists.txt
similarity index 99%
rename from modules/worldengine/deps/mysqllite/CMakeLists.txt
rename to deps/mysqllite/CMakeLists.txt
index 29fda1813..8d169d56f 100644
--- a/modules/worldengine/deps/mysqllite/CMakeLists.txt
+++ b/deps/mysqllite/CMakeLists.txt
@@ -54,7 +54,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib
+  ${CMAKE_SOURCE_DIR}/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/COPYING b/deps/mysqllite/COPYING
similarity index 100%
rename from modules/worldengine/deps/mysqllite/COPYING
rename to deps/mysqllite/COPYING
diff --git a/modules/worldengine/deps/mysqllite/README b/deps/mysqllite/README
similarity index 100%
rename from modules/worldengine/deps/mysqllite/README
rename to deps/mysqllite/README
diff --git a/modules/worldengine/deps/mysqllite/VERSION b/deps/mysqllite/VERSION
similarity index 100%
rename from modules/worldengine/deps/mysqllite/VERSION
rename to deps/mysqllite/VERSION
diff --git a/modules/worldengine/deps/mysqllite/cmake/character_sets.cmake b/deps/mysqllite/cmake/character_sets.cmake
similarity index 100%
rename from modules/worldengine/deps/mysqllite/cmake/character_sets.cmake
rename to deps/mysqllite/cmake/character_sets.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/mysql_version.cmake b/deps/mysqllite/cmake/mysql_version.cmake
similarity index 100%
rename from modules/worldengine/deps/mysqllite/cmake/mysql_version.cmake
rename to deps/mysqllite/cmake/mysql_version.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/os/Windows.cmake b/deps/mysqllite/cmake/os/Windows.cmake
similarity index 100%
rename from modules/worldengine/deps/mysqllite/cmake/os/Windows.cmake
rename to deps/mysqllite/cmake/os/Windows.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/os/WindowsCache.cmake b/deps/mysqllite/cmake/os/WindowsCache.cmake
similarity index 100%
rename from modules/worldengine/deps/mysqllite/cmake/os/WindowsCache.cmake
rename to deps/mysqllite/cmake/os/WindowsCache.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/stack_direction.c b/deps/mysqllite/cmake/stack_direction.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/cmake/stack_direction.c
rename to deps/mysqllite/cmake/stack_direction.c
diff --git a/modules/worldengine/deps/mysqllite/cmake/versioninfo.rc.in b/deps/mysqllite/cmake/versioninfo.rc.in
similarity index 100%
rename from modules/worldengine/deps/mysqllite/cmake/versioninfo.rc.in
rename to deps/mysqllite/cmake/versioninfo.rc.in
diff --git a/modules/worldengine/deps/mysqllite/config.h.cmake b/deps/mysqllite/config.h.cmake
similarity index 100%
rename from modules/worldengine/deps/mysqllite/config.h.cmake
rename to deps/mysqllite/config.h.cmake
diff --git a/modules/worldengine/deps/mysqllite/configure.cmake b/deps/mysqllite/configure.cmake
similarity index 100%
rename from modules/worldengine/deps/mysqllite/configure.cmake
rename to deps/mysqllite/configure.cmake
diff --git a/modules/worldengine/deps/mysqllite/dbug/dbug.c b/deps/mysqllite/dbug/dbug.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/dbug/dbug.c
rename to deps/mysqllite/dbug/dbug.c
diff --git a/modules/worldengine/deps/mysqllite/dbug/dbug_long.h b/deps/mysqllite/dbug/dbug_long.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/dbug/dbug_long.h
rename to deps/mysqllite/dbug/dbug_long.h
diff --git a/modules/worldengine/deps/mysqllite/dbug/monty.doc b/deps/mysqllite/dbug/monty.doc
similarity index 100%
rename from modules/worldengine/deps/mysqllite/dbug/monty.doc
rename to deps/mysqllite/dbug/monty.doc
diff --git a/modules/worldengine/deps/mysqllite/dbug/user.r b/deps/mysqllite/dbug/user.r
similarity index 100%
rename from modules/worldengine/deps/mysqllite/dbug/user.r
rename to deps/mysqllite/dbug/user.r
diff --git a/modules/worldengine/deps/mysqllite/include/decimal.h b/deps/mysqllite/include/decimal.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/decimal.h
rename to deps/mysqllite/include/decimal.h
diff --git a/modules/worldengine/deps/mysqllite/include/errmsg.h b/deps/mysqllite/include/errmsg.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/errmsg.h
rename to deps/mysqllite/include/errmsg.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/atomic/gcc_builtins.h b/deps/mysqllite/include/internal/atomic/gcc_builtins.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/atomic/gcc_builtins.h
rename to deps/mysqllite/include/internal/atomic/gcc_builtins.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/atomic/generic-msvc.h b/deps/mysqllite/include/internal/atomic/generic-msvc.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/atomic/generic-msvc.h
rename to deps/mysqllite/include/internal/atomic/generic-msvc.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/atomic/nolock.h b/deps/mysqllite/include/internal/atomic/nolock.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/atomic/nolock.h
rename to deps/mysqllite/include/internal/atomic/nolock.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/atomic/rwlock.h b/deps/mysqllite/include/internal/atomic/rwlock.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/atomic/rwlock.h
rename to deps/mysqllite/include/internal/atomic/rwlock.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/atomic/solaris.h b/deps/mysqllite/include/internal/atomic/solaris.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/atomic/solaris.h
rename to deps/mysqllite/include/internal/atomic/solaris.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/atomic/x86-gcc.h b/deps/mysqllite/include/internal/atomic/x86-gcc.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/atomic/x86-gcc.h
rename to deps/mysqllite/include/internal/atomic/x86-gcc.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/base64.h b/deps/mysqllite/include/internal/base64.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/base64.h
rename to deps/mysqllite/include/internal/base64.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/hash.h b/deps/mysqllite/include/internal/hash.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/hash.h
rename to deps/mysqllite/include/internal/hash.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/lf.h b/deps/mysqllite/include/internal/lf.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/lf.h
rename to deps/mysqllite/include/internal/lf.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_aes.h b/deps/mysqllite/include/internal/my_aes.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_aes.h
rename to deps/mysqllite/include/internal/my_aes.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_alarm.h b/deps/mysqllite/include/internal/my_alarm.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_alarm.h
rename to deps/mysqllite/include/internal/my_alarm.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_atomic.h b/deps/mysqllite/include/internal/my_atomic.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_atomic.h
rename to deps/mysqllite/include/internal/my_atomic.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_base.h b/deps/mysqllite/include/internal/my_base.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_base.h
rename to deps/mysqllite/include/internal/my_base.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_bit.h b/deps/mysqllite/include/internal/my_bit.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_bit.h
rename to deps/mysqllite/include/internal/my_bit.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_bitmap.h b/deps/mysqllite/include/internal/my_bitmap.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_bitmap.h
rename to deps/mysqllite/include/internal/my_bitmap.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_handler.h b/deps/mysqllite/include/internal/my_handler.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_handler.h
rename to deps/mysqllite/include/internal/my_handler.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_libwrap.h b/deps/mysqllite/include/internal/my_libwrap.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_libwrap.h
rename to deps/mysqllite/include/internal/my_libwrap.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_md5.h b/deps/mysqllite/include/internal/my_md5.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_md5.h
rename to deps/mysqllite/include/internal/my_md5.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_nosys.h b/deps/mysqllite/include/internal/my_nosys.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_nosys.h
rename to deps/mysqllite/include/internal/my_nosys.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_rdtsc.h b/deps/mysqllite/include/internal/my_rdtsc.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_rdtsc.h
rename to deps/mysqllite/include/internal/my_rdtsc.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_stacktrace.h b/deps/mysqllite/include/internal/my_stacktrace.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_stacktrace.h
rename to deps/mysqllite/include/internal/my_stacktrace.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_time.h b/deps/mysqllite/include/internal/my_time.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_time.h
rename to deps/mysqllite/include/internal/my_time.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_tree.h b/deps/mysqllite/include/internal/my_tree.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_tree.h
rename to deps/mysqllite/include/internal/my_tree.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/my_uctype.h b/deps/mysqllite/include/internal/my_uctype.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/my_uctype.h
rename to deps/mysqllite/include/internal/my_uctype.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/myisampack.h b/deps/mysqllite/include/internal/myisampack.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/myisampack.h
rename to deps/mysqllite/include/internal/myisampack.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/mysql_version.h.in b/deps/mysqllite/include/internal/mysql_version.h.in
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/mysql_version.h.in
rename to deps/mysqllite/include/internal/mysql_version.h.in
diff --git a/modules/worldengine/deps/mysqllite/include/internal/mysys_err.h b/deps/mysqllite/include/internal/mysys_err.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/mysys_err.h
rename to deps/mysqllite/include/internal/mysys_err.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/password.h b/deps/mysqllite/include/internal/password.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/password.h
rename to deps/mysqllite/include/internal/password.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/probes_mysql.h b/deps/mysqllite/include/internal/probes_mysql.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/probes_mysql.h
rename to deps/mysqllite/include/internal/probes_mysql.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/probes_mysql_nodtrace.h b/deps/mysqllite/include/internal/probes_mysql_nodtrace.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/probes_mysql_nodtrace.h
rename to deps/mysqllite/include/internal/probes_mysql_nodtrace.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/queues.h b/deps/mysqllite/include/internal/queues.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/queues.h
rename to deps/mysqllite/include/internal/queues.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/rijndael.h b/deps/mysqllite/include/internal/rijndael.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/rijndael.h
rename to deps/mysqllite/include/internal/rijndael.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/sha1.h b/deps/mysqllite/include/internal/sha1.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/sha1.h
rename to deps/mysqllite/include/internal/sha1.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/t_ctype.h b/deps/mysqllite/include/internal/t_ctype.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/t_ctype.h
rename to deps/mysqllite/include/internal/t_ctype.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/thr_alarm.h b/deps/mysqllite/include/internal/thr_alarm.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/thr_alarm.h
rename to deps/mysqllite/include/internal/thr_alarm.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/thr_lock.h b/deps/mysqllite/include/internal/thr_lock.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/thr_lock.h
rename to deps/mysqllite/include/internal/thr_lock.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/violite.h b/deps/mysqllite/include/internal/violite.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/internal/violite.h
rename to deps/mysqllite/include/internal/violite.h
diff --git a/modules/worldengine/deps/mysqllite/include/keycache.h b/deps/mysqllite/include/keycache.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/keycache.h
rename to deps/mysqllite/include/keycache.h
diff --git a/modules/worldengine/deps/mysqllite/include/m_ctype.h b/deps/mysqllite/include/m_ctype.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/m_ctype.h
rename to deps/mysqllite/include/m_ctype.h
diff --git a/modules/worldengine/deps/mysqllite/include/m_string.h b/deps/mysqllite/include/m_string.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/m_string.h
rename to deps/mysqllite/include/m_string.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_alloc.h b/deps/mysqllite/include/my_alloc.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_alloc.h
rename to deps/mysqllite/include/my_alloc.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_attribute.h b/deps/mysqllite/include/my_attribute.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_attribute.h
rename to deps/mysqllite/include/my_attribute.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_compiler.h b/deps/mysqllite/include/my_compiler.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_compiler.h
rename to deps/mysqllite/include/my_compiler.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_dbug.h b/deps/mysqllite/include/my_dbug.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_dbug.h
rename to deps/mysqllite/include/my_dbug.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_dir.h b/deps/mysqllite/include/my_dir.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_dir.h
rename to deps/mysqllite/include/my_dir.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_getopt.h b/deps/mysqllite/include/my_getopt.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_getopt.h
rename to deps/mysqllite/include/my_getopt.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_global.h b/deps/mysqllite/include/my_global.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_global.h
rename to deps/mysqllite/include/my_global.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_list.h b/deps/mysqllite/include/my_list.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_list.h
rename to deps/mysqllite/include/my_list.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_net.h b/deps/mysqllite/include/my_net.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_net.h
rename to deps/mysqllite/include/my_net.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_pthread.h b/deps/mysqllite/include/my_pthread.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_pthread.h
rename to deps/mysqllite/include/my_pthread.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_sys.h b/deps/mysqllite/include/my_sys.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_sys.h
rename to deps/mysqllite/include/my_sys.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_xml.h b/deps/mysqllite/include/my_xml.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/my_xml.h
rename to deps/mysqllite/include/my_xml.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql.h b/deps/mysqllite/include/mysql.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql.h
rename to deps/mysqllite/include/mysql.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/client_plugin.h b/deps/mysqllite/include/mysql/client_plugin.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/client_plugin.h
rename to deps/mysqllite/include/mysql/client_plugin.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/innodb_priv.h b/deps/mysqllite/include/mysql/innodb_priv.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/innodb_priv.h
rename to deps/mysqllite/include/mysql/innodb_priv.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/plugin.h b/deps/mysqllite/include/mysql/plugin.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/plugin.h
rename to deps/mysqllite/include/mysql/plugin.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/plugin_audit.h b/deps/mysqllite/include/mysql/plugin_audit.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/plugin_audit.h
rename to deps/mysqllite/include/mysql/plugin_audit.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/plugin_auth.h b/deps/mysqllite/include/mysql/plugin_auth.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/plugin_auth.h
rename to deps/mysqllite/include/mysql/plugin_auth.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/plugin_auth_common.h b/deps/mysqllite/include/mysql/plugin_auth_common.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/plugin_auth_common.h
rename to deps/mysqllite/include/mysql/plugin_auth_common.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/plugin_ftparser.h b/deps/mysqllite/include/mysql/plugin_ftparser.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/plugin_ftparser.h
rename to deps/mysqllite/include/mysql/plugin_ftparser.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/psi/mysql_file.h b/deps/mysqllite/include/mysql/psi/mysql_file.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/psi/mysql_file.h
rename to deps/mysqllite/include/mysql/psi/mysql_file.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/psi/mysql_thread.h b/deps/mysqllite/include/mysql/psi/mysql_thread.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/psi/mysql_thread.h
rename to deps/mysqllite/include/mysql/psi/mysql_thread.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/psi/psi.h b/deps/mysqllite/include/mysql/psi/psi.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/psi/psi.h
rename to deps/mysqllite/include/mysql/psi/psi.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/psi/psi_abi_v1.h b/deps/mysqllite/include/mysql/psi/psi_abi_v1.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/psi/psi_abi_v1.h
rename to deps/mysqllite/include/mysql/psi/psi_abi_v1.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/psi/psi_abi_v2.h b/deps/mysqllite/include/mysql/psi/psi_abi_v2.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/psi/psi_abi_v2.h
rename to deps/mysqllite/include/mysql/psi/psi_abi_v2.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/service_my_snprintf.h b/deps/mysqllite/include/mysql/service_my_snprintf.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/service_my_snprintf.h
rename to deps/mysqllite/include/mysql/service_my_snprintf.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/service_thd_alloc.h b/deps/mysqllite/include/mysql/service_thd_alloc.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/service_thd_alloc.h
rename to deps/mysqllite/include/mysql/service_thd_alloc.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/service_thd_wait.h b/deps/mysqllite/include/mysql/service_thd_wait.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/service_thd_wait.h
rename to deps/mysqllite/include/mysql/service_thd_wait.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/service_thread_scheduler.h b/deps/mysqllite/include/mysql/service_thread_scheduler.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/service_thread_scheduler.h
rename to deps/mysqllite/include/mysql/service_thread_scheduler.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql/services.h b/deps/mysqllite/include/mysql/services.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql/services.h
rename to deps/mysqllite/include/mysql/services.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql_com.h b/deps/mysqllite/include/mysql_com.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql_com.h
rename to deps/mysqllite/include/mysql_com.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql_embed.h b/deps/mysqllite/include/mysql_embed.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql_embed.h
rename to deps/mysqllite/include/mysql_embed.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql_time.h b/deps/mysqllite/include/mysql_time.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysql_time.h
rename to deps/mysqllite/include/mysql_time.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysqld_ername.h b/deps/mysqllite/include/mysqld_ername.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysqld_ername.h
rename to deps/mysqllite/include/mysqld_ername.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysqld_error.h b/deps/mysqllite/include/mysqld_error.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/mysqld_error.h
rename to deps/mysqllite/include/mysqld_error.h
diff --git a/modules/worldengine/deps/mysqllite/include/plugin.h b/deps/mysqllite/include/plugin.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/plugin.h
rename to deps/mysqllite/include/plugin.h
diff --git a/modules/worldengine/deps/mysqllite/include/plugin_audit.h b/deps/mysqllite/include/plugin_audit.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/plugin_audit.h
rename to deps/mysqllite/include/plugin_audit.h
diff --git a/modules/worldengine/deps/mysqllite/include/plugin_ftparser.h b/deps/mysqllite/include/plugin_ftparser.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/plugin_ftparser.h
rename to deps/mysqllite/include/plugin_ftparser.h
diff --git a/modules/worldengine/deps/mysqllite/include/sql_common.h b/deps/mysqllite/include/sql_common.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/sql_common.h
rename to deps/mysqllite/include/sql_common.h
diff --git a/modules/worldengine/deps/mysqllite/include/sql_state.h b/deps/mysqllite/include/sql_state.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/sql_state.h
rename to deps/mysqllite/include/sql_state.h
diff --git a/modules/worldengine/deps/mysqllite/include/sslopt-case.h b/deps/mysqllite/include/sslopt-case.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/sslopt-case.h
rename to deps/mysqllite/include/sslopt-case.h
diff --git a/modules/worldengine/deps/mysqllite/include/sslopt-longopts.h b/deps/mysqllite/include/sslopt-longopts.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/sslopt-longopts.h
rename to deps/mysqllite/include/sslopt-longopts.h
diff --git a/modules/worldengine/deps/mysqllite/include/sslopt-vars.h b/deps/mysqllite/include/sslopt-vars.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/sslopt-vars.h
rename to deps/mysqllite/include/sslopt-vars.h
diff --git a/modules/worldengine/deps/mysqllite/include/typelib.h b/deps/mysqllite/include/typelib.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/include/typelib.h
rename to deps/mysqllite/include/typelib.h
diff --git a/modules/worldengine/deps/mysqllite/libmysql/client_settings.h b/deps/mysqllite/libmysql/client_settings.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/libmysql/client_settings.h
rename to deps/mysqllite/libmysql/client_settings.h
diff --git a/modules/worldengine/deps/mysqllite/libmysql/errmsg.c b/deps/mysqllite/libmysql/errmsg.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/libmysql/errmsg.c
rename to deps/mysqllite/libmysql/errmsg.c
diff --git a/modules/worldengine/deps/mysqllite/libmysql/get_password.c b/deps/mysqllite/libmysql/get_password.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/libmysql/get_password.c
rename to deps/mysqllite/libmysql/get_password.c
diff --git a/modules/worldengine/deps/mysqllite/libmysql/libmysql.c b/deps/mysqllite/libmysql/libmysql.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/libmysql/libmysql.c
rename to deps/mysqllite/libmysql/libmysql.c
diff --git a/modules/worldengine/deps/mysqllite/libmysql/libmysql_exports.def b/deps/mysqllite/libmysql/libmysql_exports.def
similarity index 100%
rename from modules/worldengine/deps/mysqllite/libmysql/libmysql_exports.def
rename to deps/mysqllite/libmysql/libmysql_exports.def
diff --git a/modules/worldengine/deps/mysqllite/mysys/ChangeLog b/deps/mysqllite/mysys/ChangeLog
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/ChangeLog
rename to deps/mysqllite/mysys/ChangeLog
diff --git a/modules/worldengine/deps/mysqllite/mysys/array.c b/deps/mysqllite/mysys/array.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/array.c
rename to deps/mysqllite/mysys/array.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/base64.c b/deps/mysqllite/mysys/base64.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/base64.c
rename to deps/mysqllite/mysys/base64.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/charset-def.c b/deps/mysqllite/mysys/charset-def.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/charset-def.c
rename to deps/mysqllite/mysys/charset-def.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/charset.c b/deps/mysqllite/mysys/charset.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/charset.c
rename to deps/mysqllite/mysys/charset.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/checksum.c b/deps/mysqllite/mysys/checksum.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/checksum.c
rename to deps/mysqllite/mysys/checksum.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/default.c b/deps/mysqllite/mysys/default.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/default.c
rename to deps/mysqllite/mysys/default.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/errors.c b/deps/mysqllite/mysys/errors.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/errors.c
rename to deps/mysqllite/mysys/errors.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/hash.c b/deps/mysqllite/mysys/hash.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/hash.c
rename to deps/mysqllite/mysys/hash.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/lf_alloc-pin.c b/deps/mysqllite/mysys/lf_alloc-pin.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/lf_alloc-pin.c
rename to deps/mysqllite/mysys/lf_alloc-pin.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/lf_dynarray.c b/deps/mysqllite/mysys/lf_dynarray.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/lf_dynarray.c
rename to deps/mysqllite/mysys/lf_dynarray.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/lf_hash.c b/deps/mysqllite/mysys/lf_hash.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/lf_hash.c
rename to deps/mysqllite/mysys/lf_hash.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/list.c b/deps/mysqllite/mysys/list.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/list.c
rename to deps/mysqllite/mysys/list.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/md5.c b/deps/mysqllite/mysys/md5.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/md5.c
rename to deps/mysqllite/mysys/md5.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_arr_appstr.c b/deps/mysqllite/mysys/mf_arr_appstr.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_arr_appstr.c
rename to deps/mysqllite/mysys/mf_arr_appstr.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_cache.c b/deps/mysqllite/mysys/mf_cache.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_cache.c
rename to deps/mysqllite/mysys/mf_cache.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_dirname.c b/deps/mysqllite/mysys/mf_dirname.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_dirname.c
rename to deps/mysqllite/mysys/mf_dirname.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_fn_ext.c b/deps/mysqllite/mysys/mf_fn_ext.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_fn_ext.c
rename to deps/mysqllite/mysys/mf_fn_ext.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_format.c b/deps/mysqllite/mysys/mf_format.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_format.c
rename to deps/mysqllite/mysys/mf_format.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_getdate.c b/deps/mysqllite/mysys/mf_getdate.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_getdate.c
rename to deps/mysqllite/mysys/mf_getdate.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_iocache.c b/deps/mysqllite/mysys/mf_iocache.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_iocache.c
rename to deps/mysqllite/mysys/mf_iocache.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_iocache2.c b/deps/mysqllite/mysys/mf_iocache2.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_iocache2.c
rename to deps/mysqllite/mysys/mf_iocache2.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_keycache.c b/deps/mysqllite/mysys/mf_keycache.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_keycache.c
rename to deps/mysqllite/mysys/mf_keycache.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_keycaches.c b/deps/mysqllite/mysys/mf_keycaches.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_keycaches.c
rename to deps/mysqllite/mysys/mf_keycaches.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_loadpath.c b/deps/mysqllite/mysys/mf_loadpath.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_loadpath.c
rename to deps/mysqllite/mysys/mf_loadpath.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_pack.c b/deps/mysqllite/mysys/mf_pack.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_pack.c
rename to deps/mysqllite/mysys/mf_pack.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_path.c b/deps/mysqllite/mysys/mf_path.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_path.c
rename to deps/mysqllite/mysys/mf_path.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_qsort.c b/deps/mysqllite/mysys/mf_qsort.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_qsort.c
rename to deps/mysqllite/mysys/mf_qsort.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_qsort2.c b/deps/mysqllite/mysys/mf_qsort2.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_qsort2.c
rename to deps/mysqllite/mysys/mf_qsort2.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_radix.c b/deps/mysqllite/mysys/mf_radix.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_radix.c
rename to deps/mysqllite/mysys/mf_radix.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_same.c b/deps/mysqllite/mysys/mf_same.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_same.c
rename to deps/mysqllite/mysys/mf_same.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_sort.c b/deps/mysqllite/mysys/mf_sort.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_sort.c
rename to deps/mysqllite/mysys/mf_sort.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_soundex.c b/deps/mysqllite/mysys/mf_soundex.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_soundex.c
rename to deps/mysqllite/mysys/mf_soundex.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_tempdir.c b/deps/mysqllite/mysys/mf_tempdir.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_tempdir.c
rename to deps/mysqllite/mysys/mf_tempdir.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_tempfile.c b/deps/mysqllite/mysys/mf_tempfile.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_tempfile.c
rename to deps/mysqllite/mysys/mf_tempfile.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_unixpath.c b/deps/mysqllite/mysys/mf_unixpath.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_unixpath.c
rename to deps/mysqllite/mysys/mf_unixpath.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_wcomp.c b/deps/mysqllite/mysys/mf_wcomp.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mf_wcomp.c
rename to deps/mysqllite/mysys/mf_wcomp.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mulalloc.c b/deps/mysqllite/mysys/mulalloc.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mulalloc.c
rename to deps/mysqllite/mysys/mulalloc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_access.c b/deps/mysqllite/mysys/my_access.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_access.c
rename to deps/mysqllite/mysys/my_access.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_aes.c b/deps/mysqllite/mysys/my_aes.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_aes.c
rename to deps/mysqllite/mysys/my_aes.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_alarm.c b/deps/mysqllite/mysys/my_alarm.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_alarm.c
rename to deps/mysqllite/mysys/my_alarm.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_alloc.c b/deps/mysqllite/mysys/my_alloc.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_alloc.c
rename to deps/mysqllite/mysys/my_alloc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_atomic.c b/deps/mysqllite/mysys/my_atomic.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_atomic.c
rename to deps/mysqllite/mysys/my_atomic.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_bit.c b/deps/mysqllite/mysys/my_bit.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_bit.c
rename to deps/mysqllite/mysys/my_bit.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_bitmap.c b/deps/mysqllite/mysys/my_bitmap.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_bitmap.c
rename to deps/mysqllite/mysys/my_bitmap.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_chsize.c b/deps/mysqllite/mysys/my_chsize.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_chsize.c
rename to deps/mysqllite/mysys/my_chsize.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_compress.c b/deps/mysqllite/mysys/my_compress.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_compress.c
rename to deps/mysqllite/mysys/my_compress.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_conio.c b/deps/mysqllite/mysys/my_conio.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_conio.c
rename to deps/mysqllite/mysys/my_conio.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_copy.c b/deps/mysqllite/mysys/my_copy.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_copy.c
rename to deps/mysqllite/mysys/my_copy.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_create.c b/deps/mysqllite/mysys/my_create.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_create.c
rename to deps/mysqllite/mysys/my_create.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_delete.c b/deps/mysqllite/mysys/my_delete.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_delete.c
rename to deps/mysqllite/mysys/my_delete.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_div.c b/deps/mysqllite/mysys/my_div.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_div.c
rename to deps/mysqllite/mysys/my_div.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_error.c b/deps/mysqllite/mysys/my_error.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_error.c
rename to deps/mysqllite/mysys/my_error.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_file.c b/deps/mysqllite/mysys/my_file.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_file.c
rename to deps/mysqllite/mysys/my_file.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_fopen.c b/deps/mysqllite/mysys/my_fopen.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_fopen.c
rename to deps/mysqllite/mysys/my_fopen.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_fstream.c b/deps/mysqllite/mysys/my_fstream.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_fstream.c
rename to deps/mysqllite/mysys/my_fstream.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_gethostbyname.c b/deps/mysqllite/mysys/my_gethostbyname.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_gethostbyname.c
rename to deps/mysqllite/mysys/my_gethostbyname.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_gethwaddr.c b/deps/mysqllite/mysys/my_gethwaddr.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_gethwaddr.c
rename to deps/mysqllite/mysys/my_gethwaddr.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getncpus.c b/deps/mysqllite/mysys/my_getncpus.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_getncpus.c
rename to deps/mysqllite/mysys/my_getncpus.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getopt.c b/deps/mysqllite/mysys/my_getopt.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_getopt.c
rename to deps/mysqllite/mysys/my_getopt.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getpagesize.c b/deps/mysqllite/mysys/my_getpagesize.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_getpagesize.c
rename to deps/mysqllite/mysys/my_getpagesize.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getsystime.c b/deps/mysqllite/mysys/my_getsystime.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_getsystime.c
rename to deps/mysqllite/mysys/my_getsystime.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getwd.c b/deps/mysqllite/mysys/my_getwd.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_getwd.c
rename to deps/mysqllite/mysys/my_getwd.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_handler.c b/deps/mysqllite/mysys/my_handler.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_handler.c
rename to deps/mysqllite/mysys/my_handler.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_handler_errors.h b/deps/mysqllite/mysys/my_handler_errors.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_handler_errors.h
rename to deps/mysqllite/mysys/my_handler_errors.h
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_init.c b/deps/mysqllite/mysys/my_init.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_init.c
rename to deps/mysqllite/mysys/my_init.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_largepage.c b/deps/mysqllite/mysys/my_largepage.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_largepage.c
rename to deps/mysqllite/mysys/my_largepage.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_lib.c b/deps/mysqllite/mysys/my_lib.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_lib.c
rename to deps/mysqllite/mysys/my_lib.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_libwrap.c b/deps/mysqllite/mysys/my_libwrap.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_libwrap.c
rename to deps/mysqllite/mysys/my_libwrap.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_lock.c b/deps/mysqllite/mysys/my_lock.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_lock.c
rename to deps/mysqllite/mysys/my_lock.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_lockmem.c b/deps/mysqllite/mysys/my_lockmem.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_lockmem.c
rename to deps/mysqllite/mysys/my_lockmem.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_malloc.c b/deps/mysqllite/mysys/my_malloc.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_malloc.c
rename to deps/mysqllite/mysys/my_malloc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_memmem.c b/deps/mysqllite/mysys/my_memmem.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_memmem.c
rename to deps/mysqllite/mysys/my_memmem.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_mess.c b/deps/mysqllite/mysys/my_mess.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_mess.c
rename to deps/mysqllite/mysys/my_mess.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_mkdir.c b/deps/mysqllite/mysys/my_mkdir.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_mkdir.c
rename to deps/mysqllite/mysys/my_mkdir.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_mmap.c b/deps/mysqllite/mysys/my_mmap.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_mmap.c
rename to deps/mysqllite/mysys/my_mmap.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_new.cc b/deps/mysqllite/mysys/my_new.cc
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_new.cc
rename to deps/mysqllite/mysys/my_new.cc
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_once.c b/deps/mysqllite/mysys/my_once.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_once.c
rename to deps/mysqllite/mysys/my_once.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_open.c b/deps/mysqllite/mysys/my_open.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_open.c
rename to deps/mysqllite/mysys/my_open.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_port.c b/deps/mysqllite/mysys/my_port.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_port.c
rename to deps/mysqllite/mysys/my_port.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_pread.c b/deps/mysqllite/mysys/my_pread.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_pread.c
rename to deps/mysqllite/mysys/my_pread.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_pthread.c b/deps/mysqllite/mysys/my_pthread.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_pthread.c
rename to deps/mysqllite/mysys/my_pthread.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_quick.c b/deps/mysqllite/mysys/my_quick.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_quick.c
rename to deps/mysqllite/mysys/my_quick.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_rdtsc.c b/deps/mysqllite/mysys/my_rdtsc.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_rdtsc.c
rename to deps/mysqllite/mysys/my_rdtsc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_read.c b/deps/mysqllite/mysys/my_read.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_read.c
rename to deps/mysqllite/mysys/my_read.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_redel.c b/deps/mysqllite/mysys/my_redel.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_redel.c
rename to deps/mysqllite/mysys/my_redel.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_rename.c b/deps/mysqllite/mysys/my_rename.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_rename.c
rename to deps/mysqllite/mysys/my_rename.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_seek.c b/deps/mysqllite/mysys/my_seek.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_seek.c
rename to deps/mysqllite/mysys/my_seek.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_sleep.c b/deps/mysqllite/mysys/my_sleep.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_sleep.c
rename to deps/mysqllite/mysys/my_sleep.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_static.c b/deps/mysqllite/mysys/my_static.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_static.c
rename to deps/mysqllite/mysys/my_static.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_static.h b/deps/mysqllite/mysys/my_static.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_static.h
rename to deps/mysqllite/mysys/my_static.h
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_symlink.c b/deps/mysqllite/mysys/my_symlink.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_symlink.c
rename to deps/mysqllite/mysys/my_symlink.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_symlink2.c b/deps/mysqllite/mysys/my_symlink2.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_symlink2.c
rename to deps/mysqllite/mysys/my_symlink2.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_sync.c b/deps/mysqllite/mysys/my_sync.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_sync.c
rename to deps/mysqllite/mysys/my_sync.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_thr_init.c b/deps/mysqllite/mysys/my_thr_init.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_thr_init.c
rename to deps/mysqllite/mysys/my_thr_init.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_wincond.c b/deps/mysqllite/mysys/my_wincond.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_wincond.c
rename to deps/mysqllite/mysys/my_wincond.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_windac.c b/deps/mysqllite/mysys/my_windac.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_windac.c
rename to deps/mysqllite/mysys/my_windac.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_winerr.c b/deps/mysqllite/mysys/my_winerr.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_winerr.c
rename to deps/mysqllite/mysys/my_winerr.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_winfile.c b/deps/mysqllite/mysys/my_winfile.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_winfile.c
rename to deps/mysqllite/mysys/my_winfile.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_winthread.c b/deps/mysqllite/mysys/my_winthread.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_winthread.c
rename to deps/mysqllite/mysys/my_winthread.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_write.c b/deps/mysqllite/mysys/my_write.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/my_write.c
rename to deps/mysqllite/mysys/my_write.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mysys_priv.h b/deps/mysqllite/mysys/mysys_priv.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/mysys_priv.h
rename to deps/mysqllite/mysys/mysys_priv.h
diff --git a/modules/worldengine/deps/mysqllite/mysys/ptr_cmp.c b/deps/mysqllite/mysys/ptr_cmp.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/ptr_cmp.c
rename to deps/mysqllite/mysys/ptr_cmp.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/queues.c b/deps/mysqllite/mysys/queues.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/queues.c
rename to deps/mysqllite/mysys/queues.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/rijndael.c b/deps/mysqllite/mysys/rijndael.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/rijndael.c
rename to deps/mysqllite/mysys/rijndael.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/sha1.c b/deps/mysqllite/mysys/sha1.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/sha1.c
rename to deps/mysqllite/mysys/sha1.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/stacktrace.c b/deps/mysqllite/mysys/stacktrace.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/stacktrace.c
rename to deps/mysqllite/mysys/stacktrace.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/string.c b/deps/mysqllite/mysys/string.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/string.c
rename to deps/mysqllite/mysys/string.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_alarm.c b/deps/mysqllite/mysys/thr_alarm.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/thr_alarm.c
rename to deps/mysqllite/mysys/thr_alarm.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_lock.c b/deps/mysqllite/mysys/thr_lock.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/thr_lock.c
rename to deps/mysqllite/mysys/thr_lock.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_mutex.c b/deps/mysqllite/mysys/thr_mutex.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/thr_mutex.c
rename to deps/mysqllite/mysys/thr_mutex.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_rwlock.c b/deps/mysqllite/mysys/thr_rwlock.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/thr_rwlock.c
rename to deps/mysqllite/mysys/thr_rwlock.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/tree.c b/deps/mysqllite/mysys/tree.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/tree.c
rename to deps/mysqllite/mysys/tree.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/typelib.c b/deps/mysqllite/mysys/typelib.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/mysys/typelib.c
rename to deps/mysqllite/mysys/typelib.c
diff --git a/modules/worldengine/deps/mysqllite/sql-common/client.c b/deps/mysqllite/sql-common/client.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/sql-common/client.c
rename to deps/mysqllite/sql-common/client.c
diff --git a/modules/worldengine/deps/mysqllite/sql-common/client_plugin.c b/deps/mysqllite/sql-common/client_plugin.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/sql-common/client_plugin.c
rename to deps/mysqllite/sql-common/client_plugin.c
diff --git a/modules/worldengine/deps/mysqllite/sql-common/my_time.c b/deps/mysqllite/sql-common/my_time.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/sql-common/my_time.c
rename to deps/mysqllite/sql-common/my_time.c
diff --git a/modules/worldengine/deps/mysqllite/sql-common/pack.c b/deps/mysqllite/sql-common/pack.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/sql-common/pack.c
rename to deps/mysqllite/sql-common/pack.c
diff --git a/modules/worldengine/deps/mysqllite/sql/net_serv.cc b/deps/mysqllite/sql/net_serv.cc
similarity index 100%
rename from modules/worldengine/deps/mysqllite/sql/net_serv.cc
rename to deps/mysqllite/sql/net_serv.cc
diff --git a/modules/worldengine/deps/mysqllite/sql/password.c b/deps/mysqllite/sql/password.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/sql/password.c
rename to deps/mysqllite/sql/password.c
diff --git a/modules/worldengine/deps/mysqllite/strings/CHARSET_INFO.txt b/deps/mysqllite/strings/CHARSET_INFO.txt
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/CHARSET_INFO.txt
rename to deps/mysqllite/strings/CHARSET_INFO.txt
diff --git a/modules/worldengine/deps/mysqllite/strings/README b/deps/mysqllite/strings/README
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/README
rename to deps/mysqllite/strings/README
diff --git a/modules/worldengine/deps/mysqllite/strings/bchange.c b/deps/mysqllite/strings/bchange.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/bchange.c
rename to deps/mysqllite/strings/bchange.c
diff --git a/modules/worldengine/deps/mysqllite/strings/bmove_upp.c b/deps/mysqllite/strings/bmove_upp.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/bmove_upp.c
rename to deps/mysqllite/strings/bmove_upp.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-big5.c b/deps/mysqllite/strings/ctype-big5.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-big5.c
rename to deps/mysqllite/strings/ctype-big5.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-bin.c b/deps/mysqllite/strings/ctype-bin.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-bin.c
rename to deps/mysqllite/strings/ctype-bin.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-cp932.c b/deps/mysqllite/strings/ctype-cp932.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-cp932.c
rename to deps/mysqllite/strings/ctype-cp932.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-czech.c b/deps/mysqllite/strings/ctype-czech.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-czech.c
rename to deps/mysqllite/strings/ctype-czech.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-euc_kr.c b/deps/mysqllite/strings/ctype-euc_kr.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-euc_kr.c
rename to deps/mysqllite/strings/ctype-euc_kr.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-extra.c b/deps/mysqllite/strings/ctype-extra.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-extra.c
rename to deps/mysqllite/strings/ctype-extra.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-gb2312.c b/deps/mysqllite/strings/ctype-gb2312.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-gb2312.c
rename to deps/mysqllite/strings/ctype-gb2312.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-gbk.c b/deps/mysqllite/strings/ctype-gbk.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-gbk.c
rename to deps/mysqllite/strings/ctype-gbk.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-latin1.c b/deps/mysqllite/strings/ctype-latin1.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-latin1.c
rename to deps/mysqllite/strings/ctype-latin1.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-mb.c b/deps/mysqllite/strings/ctype-mb.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-mb.c
rename to deps/mysqllite/strings/ctype-mb.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-simple.c b/deps/mysqllite/strings/ctype-simple.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-simple.c
rename to deps/mysqllite/strings/ctype-simple.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-tis620.c b/deps/mysqllite/strings/ctype-tis620.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-tis620.c
rename to deps/mysqllite/strings/ctype-tis620.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-uca.c b/deps/mysqllite/strings/ctype-uca.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-uca.c
rename to deps/mysqllite/strings/ctype-uca.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-ucs2.c b/deps/mysqllite/strings/ctype-ucs2.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-ucs2.c
rename to deps/mysqllite/strings/ctype-ucs2.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-utf8.c b/deps/mysqllite/strings/ctype-utf8.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-utf8.c
rename to deps/mysqllite/strings/ctype-utf8.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-win1250ch.c b/deps/mysqllite/strings/ctype-win1250ch.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype-win1250ch.c
rename to deps/mysqllite/strings/ctype-win1250ch.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype.c b/deps/mysqllite/strings/ctype.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/ctype.c
rename to deps/mysqllite/strings/ctype.c
diff --git a/modules/worldengine/deps/mysqllite/strings/decimal.c b/deps/mysqllite/strings/decimal.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/decimal.c
rename to deps/mysqllite/strings/decimal.c
diff --git a/modules/worldengine/deps/mysqllite/strings/dtoa.c b/deps/mysqllite/strings/dtoa.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/dtoa.c
rename to deps/mysqllite/strings/dtoa.c
diff --git a/modules/worldengine/deps/mysqllite/strings/int2str.c b/deps/mysqllite/strings/int2str.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/int2str.c
rename to deps/mysqllite/strings/int2str.c
diff --git a/modules/worldengine/deps/mysqllite/strings/is_prefix.c b/deps/mysqllite/strings/is_prefix.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/is_prefix.c
rename to deps/mysqllite/strings/is_prefix.c
diff --git a/modules/worldengine/deps/mysqllite/strings/latin2.def b/deps/mysqllite/strings/latin2.def
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/latin2.def
rename to deps/mysqllite/strings/latin2.def
diff --git a/modules/worldengine/deps/mysqllite/strings/llstr.c b/deps/mysqllite/strings/llstr.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/llstr.c
rename to deps/mysqllite/strings/llstr.c
diff --git a/modules/worldengine/deps/mysqllite/strings/longlong2str.c b/deps/mysqllite/strings/longlong2str.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/longlong2str.c
rename to deps/mysqllite/strings/longlong2str.c
diff --git a/modules/worldengine/deps/mysqllite/strings/my_strchr.c b/deps/mysqllite/strings/my_strchr.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/my_strchr.c
rename to deps/mysqllite/strings/my_strchr.c
diff --git a/modules/worldengine/deps/mysqllite/strings/my_strtoll10.c b/deps/mysqllite/strings/my_strtoll10.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/my_strtoll10.c
rename to deps/mysqllite/strings/my_strtoll10.c
diff --git a/modules/worldengine/deps/mysqllite/strings/my_vsnprintf.c b/deps/mysqllite/strings/my_vsnprintf.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/my_vsnprintf.c
rename to deps/mysqllite/strings/my_vsnprintf.c
diff --git a/modules/worldengine/deps/mysqllite/strings/str2int.c b/deps/mysqllite/strings/str2int.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/str2int.c
rename to deps/mysqllite/strings/str2int.c
diff --git a/modules/worldengine/deps/mysqllite/strings/str_alloc.c b/deps/mysqllite/strings/str_alloc.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/str_alloc.c
rename to deps/mysqllite/strings/str_alloc.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strappend.c b/deps/mysqllite/strings/strappend.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strappend.c
rename to deps/mysqllite/strings/strappend.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strcend.c b/deps/mysqllite/strings/strcend.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strcend.c
rename to deps/mysqllite/strings/strcend.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strcont.c b/deps/mysqllite/strings/strcont.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strcont.c
rename to deps/mysqllite/strings/strcont.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strend.c b/deps/mysqllite/strings/strend.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strend.c
rename to deps/mysqllite/strings/strend.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strfill.c b/deps/mysqllite/strings/strfill.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strfill.c
rename to deps/mysqllite/strings/strfill.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strmake.c b/deps/mysqllite/strings/strmake.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strmake.c
rename to deps/mysqllite/strings/strmake.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strmov.c b/deps/mysqllite/strings/strmov.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strmov.c
rename to deps/mysqllite/strings/strmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strnlen.c b/deps/mysqllite/strings/strnlen.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strnlen.c
rename to deps/mysqllite/strings/strnlen.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strnmov.c b/deps/mysqllite/strings/strnmov.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strnmov.c
rename to deps/mysqllite/strings/strnmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strxmov.c b/deps/mysqllite/strings/strxmov.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strxmov.c
rename to deps/mysqllite/strings/strxmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strxnmov.c b/deps/mysqllite/strings/strxnmov.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/strxnmov.c
rename to deps/mysqllite/strings/strxnmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/t_ctype.h b/deps/mysqllite/strings/t_ctype.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/t_ctype.h
rename to deps/mysqllite/strings/t_ctype.h
diff --git a/modules/worldengine/deps/mysqllite/strings/xml.c b/deps/mysqllite/strings/xml.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/strings/xml.c
rename to deps/mysqllite/strings/xml.c
diff --git a/modules/worldengine/deps/mysqllite/vio/vio.c b/deps/mysqllite/vio/vio.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/vio/vio.c
rename to deps/mysqllite/vio/vio.c
diff --git a/modules/worldengine/deps/mysqllite/vio/vio_priv.h b/deps/mysqllite/vio/vio_priv.h
similarity index 100%
rename from modules/worldengine/deps/mysqllite/vio/vio_priv.h
rename to deps/mysqllite/vio/vio_priv.h
diff --git a/modules/worldengine/deps/mysqllite/vio/viosocket.c b/deps/mysqllite/vio/viosocket.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/vio/viosocket.c
rename to deps/mysqllite/vio/viosocket.c
diff --git a/modules/worldengine/deps/mysqllite/vio/viossl.c b/deps/mysqllite/vio/viossl.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/vio/viossl.c
rename to deps/mysqllite/vio/viossl.c
diff --git a/modules/worldengine/deps/mysqllite/vio/viosslfactories.c b/deps/mysqllite/vio/viosslfactories.c
similarity index 100%
rename from modules/worldengine/deps/mysqllite/vio/viosslfactories.c
rename to deps/mysqllite/vio/viosslfactories.c
diff --git a/modules/worldengine/deps/recastnavigation/CMakeLists.txt b/deps/recastnavigation/CMakeLists.txt
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/CMakeLists.txt
rename to deps/recastnavigation/CMakeLists.txt
diff --git a/modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt b/deps/recastnavigation/Detour/CMakeLists.txt
similarity index 92%
rename from modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt
rename to deps/recastnavigation/Detour/CMakeLists.txt
index 12be71d32..be271211b 100644
--- a/modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt
+++ b/deps/recastnavigation/Detour/CMakeLists.txt
@@ -17,6 +17,12 @@ set(Detour_STAT_SRCS
     Source/DetourNode.cpp 
 )
 
+if(WIN32)
+  include_directories(
+    ${CMAKE_SOURCE_DIR}/deps/zlib
+  )
+endif()
+
 add_library(Detour STATIC ${Detour_STAT_SRCS})
 
 target_include_directories(Detour
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourAlloc.h b/deps/recastnavigation/Detour/Include/DetourAlloc.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourAlloc.h
rename to deps/recastnavigation/Detour/Include/DetourAlloc.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourAssert.h b/deps/recastnavigation/Detour/Include/DetourAssert.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourAssert.h
rename to deps/recastnavigation/Detour/Include/DetourAssert.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourCommon.h b/deps/recastnavigation/Detour/Include/DetourCommon.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourCommon.h
rename to deps/recastnavigation/Detour/Include/DetourCommon.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourMath.h b/deps/recastnavigation/Detour/Include/DetourMath.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourMath.h
rename to deps/recastnavigation/Detour/Include/DetourMath.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourNavMesh.h b/deps/recastnavigation/Detour/Include/DetourNavMesh.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourNavMesh.h
rename to deps/recastnavigation/Detour/Include/DetourNavMesh.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourNavMeshBuilder.h b/deps/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
rename to deps/recastnavigation/Detour/Include/DetourNavMeshBuilder.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourNavMeshQuery.h b/deps/recastnavigation/Detour/Include/DetourNavMeshQuery.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourNavMeshQuery.h
rename to deps/recastnavigation/Detour/Include/DetourNavMeshQuery.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourNode.h b/deps/recastnavigation/Detour/Include/DetourNode.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourNode.h
rename to deps/recastnavigation/Detour/Include/DetourNode.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Include/DetourStatus.h b/deps/recastnavigation/Detour/Include/DetourStatus.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Include/DetourStatus.h
rename to deps/recastnavigation/Detour/Include/DetourStatus.h
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Source/DetourAlloc.cpp b/deps/recastnavigation/Detour/Source/DetourAlloc.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Source/DetourAlloc.cpp
rename to deps/recastnavigation/Detour/Source/DetourAlloc.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Source/DetourCommon.cpp b/deps/recastnavigation/Detour/Source/DetourCommon.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Source/DetourCommon.cpp
rename to deps/recastnavigation/Detour/Source/DetourCommon.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Source/DetourNavMesh.cpp b/deps/recastnavigation/Detour/Source/DetourNavMesh.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Source/DetourNavMesh.cpp
rename to deps/recastnavigation/Detour/Source/DetourNavMesh.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp b/deps/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
rename to deps/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp b/deps/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
rename to deps/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Detour/Source/DetourNode.cpp b/deps/recastnavigation/Detour/Source/DetourNode.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Detour/Source/DetourNode.cpp
rename to deps/recastnavigation/Detour/Source/DetourNode.cpp
diff --git a/modules/worldengine/deps/recastnavigation/License.txt b/deps/recastnavigation/License.txt
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/License.txt
rename to deps/recastnavigation/License.txt
diff --git a/modules/worldengine/deps/recastnavigation/README.md b/deps/recastnavigation/README.md
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/README.md
rename to deps/recastnavigation/README.md
diff --git a/modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt b/deps/recastnavigation/Recast/CMakeLists.txt
similarity index 92%
rename from modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt
rename to deps/recastnavigation/Recast/CMakeLists.txt
index 1eac4e753..30265cb7e 100644
--- a/modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt
+++ b/deps/recastnavigation/Recast/CMakeLists.txt
@@ -21,6 +21,12 @@ set(Recast_STAT_SRCS
     Source/RecastRegion.cpp 
 )
 
+if(WIN32)
+  include_directories(
+    ${CMAKE_SOURCE_DIR}/deps/zlib
+  )
+endif()
+
 add_library(Recast STATIC ${Recast_STAT_SRCS})
 
 target_include_directories(Recast
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Include/Recast.h b/deps/recastnavigation/Recast/Include/Recast.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Include/Recast.h
rename to deps/recastnavigation/Recast/Include/Recast.h
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Include/RecastAlloc.h b/deps/recastnavigation/Recast/Include/RecastAlloc.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Include/RecastAlloc.h
rename to deps/recastnavigation/Recast/Include/RecastAlloc.h
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Include/RecastAssert.h b/deps/recastnavigation/Recast/Include/RecastAssert.h
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Include/RecastAssert.h
rename to deps/recastnavigation/Recast/Include/RecastAssert.h
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/Recast.cpp b/deps/recastnavigation/Recast/Source/Recast.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/Recast.cpp
rename to deps/recastnavigation/Recast/Source/Recast.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastAlloc.cpp b/deps/recastnavigation/Recast/Source/RecastAlloc.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastAlloc.cpp
rename to deps/recastnavigation/Recast/Source/RecastAlloc.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastArea.cpp b/deps/recastnavigation/Recast/Source/RecastArea.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastArea.cpp
rename to deps/recastnavigation/Recast/Source/RecastArea.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastContour.cpp b/deps/recastnavigation/Recast/Source/RecastContour.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastContour.cpp
rename to deps/recastnavigation/Recast/Source/RecastContour.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastFilter.cpp b/deps/recastnavigation/Recast/Source/RecastFilter.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastFilter.cpp
rename to deps/recastnavigation/Recast/Source/RecastFilter.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastLayers.cpp b/deps/recastnavigation/Recast/Source/RecastLayers.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastLayers.cpp
rename to deps/recastnavigation/Recast/Source/RecastLayers.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastMesh.cpp b/deps/recastnavigation/Recast/Source/RecastMesh.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastMesh.cpp
rename to deps/recastnavigation/Recast/Source/RecastMesh.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastMeshDetail.cpp b/deps/recastnavigation/Recast/Source/RecastMeshDetail.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastMeshDetail.cpp
rename to deps/recastnavigation/Recast/Source/RecastMeshDetail.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastRasterization.cpp b/deps/recastnavigation/Recast/Source/RecastRasterization.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastRasterization.cpp
rename to deps/recastnavigation/Recast/Source/RecastRasterization.cpp
diff --git a/modules/worldengine/deps/recastnavigation/Recast/Source/RecastRegion.cpp b/deps/recastnavigation/Recast/Source/RecastRegion.cpp
similarity index 100%
rename from modules/worldengine/deps/recastnavigation/Recast/Source/RecastRegion.cpp
rename to deps/recastnavigation/Recast/Source/RecastRegion.cpp
diff --git a/modules/worldengine/deps/utf8cpp/utf8.h b/deps/utf8cpp/utf8.h
similarity index 100%
rename from modules/worldengine/deps/utf8cpp/utf8.h
rename to deps/utf8cpp/utf8.h
diff --git a/modules/worldengine/deps/utf8cpp/utf8/checked.h b/deps/utf8cpp/utf8/checked.h
similarity index 100%
rename from modules/worldengine/deps/utf8cpp/utf8/checked.h
rename to deps/utf8cpp/utf8/checked.h
diff --git a/modules/worldengine/deps/utf8cpp/utf8/core.h b/deps/utf8cpp/utf8/core.h
similarity index 100%
rename from modules/worldengine/deps/utf8cpp/utf8/core.h
rename to deps/utf8cpp/utf8/core.h
diff --git a/modules/worldengine/deps/utf8cpp/utf8/unchecked.h b/deps/utf8cpp/utf8/unchecked.h
similarity index 100%
rename from modules/worldengine/deps/utf8cpp/utf8/unchecked.h
rename to deps/utf8cpp/utf8/unchecked.h
diff --git a/modules/worldengine/deps/zlib/CMakeLists.txt b/deps/zlib/CMakeLists.txt
similarity index 100%
rename from modules/worldengine/deps/zlib/CMakeLists.txt
rename to deps/zlib/CMakeLists.txt
diff --git a/modules/worldengine/deps/zlib/adler32.c b/deps/zlib/adler32.c
similarity index 100%
rename from modules/worldengine/deps/zlib/adler32.c
rename to deps/zlib/adler32.c
diff --git a/modules/worldengine/deps/zlib/compress.c b/deps/zlib/compress.c
similarity index 100%
rename from modules/worldengine/deps/zlib/compress.c
rename to deps/zlib/compress.c
diff --git a/modules/worldengine/deps/zlib/crc32.c b/deps/zlib/crc32.c
similarity index 100%
rename from modules/worldengine/deps/zlib/crc32.c
rename to deps/zlib/crc32.c
diff --git a/modules/worldengine/deps/zlib/crc32.h b/deps/zlib/crc32.h
similarity index 100%
rename from modules/worldengine/deps/zlib/crc32.h
rename to deps/zlib/crc32.h
diff --git a/modules/worldengine/deps/zlib/deflate.c b/deps/zlib/deflate.c
similarity index 100%
rename from modules/worldengine/deps/zlib/deflate.c
rename to deps/zlib/deflate.c
diff --git a/modules/worldengine/deps/zlib/deflate.h b/deps/zlib/deflate.h
similarity index 100%
rename from modules/worldengine/deps/zlib/deflate.h
rename to deps/zlib/deflate.h
diff --git a/modules/worldengine/deps/zlib/example.c b/deps/zlib/example.c
similarity index 100%
rename from modules/worldengine/deps/zlib/example.c
rename to deps/zlib/example.c
diff --git a/modules/worldengine/deps/zlib/gzclose.c b/deps/zlib/gzclose.c
similarity index 100%
rename from modules/worldengine/deps/zlib/gzclose.c
rename to deps/zlib/gzclose.c
diff --git a/modules/worldengine/deps/zlib/gzguts.h b/deps/zlib/gzguts.h
similarity index 100%
rename from modules/worldengine/deps/zlib/gzguts.h
rename to deps/zlib/gzguts.h
diff --git a/modules/worldengine/deps/zlib/gzlib.c b/deps/zlib/gzlib.c
similarity index 100%
rename from modules/worldengine/deps/zlib/gzlib.c
rename to deps/zlib/gzlib.c
diff --git a/modules/worldengine/deps/zlib/gzread.c b/deps/zlib/gzread.c
similarity index 100%
rename from modules/worldengine/deps/zlib/gzread.c
rename to deps/zlib/gzread.c
diff --git a/modules/worldengine/deps/zlib/gzwrite.c b/deps/zlib/gzwrite.c
similarity index 100%
rename from modules/worldengine/deps/zlib/gzwrite.c
rename to deps/zlib/gzwrite.c
diff --git a/modules/worldengine/deps/zlib/infback.c b/deps/zlib/infback.c
similarity index 100%
rename from modules/worldengine/deps/zlib/infback.c
rename to deps/zlib/infback.c
diff --git a/modules/worldengine/deps/zlib/inffast.c b/deps/zlib/inffast.c
similarity index 100%
rename from modules/worldengine/deps/zlib/inffast.c
rename to deps/zlib/inffast.c
diff --git a/modules/worldengine/deps/zlib/inffast.h b/deps/zlib/inffast.h
similarity index 100%
rename from modules/worldengine/deps/zlib/inffast.h
rename to deps/zlib/inffast.h
diff --git a/modules/worldengine/deps/zlib/inffixed.h b/deps/zlib/inffixed.h
similarity index 100%
rename from modules/worldengine/deps/zlib/inffixed.h
rename to deps/zlib/inffixed.h
diff --git a/modules/worldengine/deps/zlib/inflate.c b/deps/zlib/inflate.c
similarity index 100%
rename from modules/worldengine/deps/zlib/inflate.c
rename to deps/zlib/inflate.c
diff --git a/modules/worldengine/deps/zlib/inflate.h b/deps/zlib/inflate.h
similarity index 100%
rename from modules/worldengine/deps/zlib/inflate.h
rename to deps/zlib/inflate.h
diff --git a/modules/worldengine/deps/zlib/inftrees.c b/deps/zlib/inftrees.c
similarity index 100%
rename from modules/worldengine/deps/zlib/inftrees.c
rename to deps/zlib/inftrees.c
diff --git a/modules/worldengine/deps/zlib/inftrees.h b/deps/zlib/inftrees.h
similarity index 100%
rename from modules/worldengine/deps/zlib/inftrees.h
rename to deps/zlib/inftrees.h
diff --git a/modules/worldengine/deps/zlib/minigzip.c b/deps/zlib/minigzip.c
similarity index 100%
rename from modules/worldengine/deps/zlib/minigzip.c
rename to deps/zlib/minigzip.c
diff --git a/modules/worldengine/deps/zlib/trees.c b/deps/zlib/trees.c
similarity index 100%
rename from modules/worldengine/deps/zlib/trees.c
rename to deps/zlib/trees.c
diff --git a/modules/worldengine/deps/zlib/trees.h b/deps/zlib/trees.h
similarity index 100%
rename from modules/worldengine/deps/zlib/trees.h
rename to deps/zlib/trees.h
diff --git a/modules/worldengine/deps/zlib/uncompr.c b/deps/zlib/uncompr.c
similarity index 100%
rename from modules/worldengine/deps/zlib/uncompr.c
rename to deps/zlib/uncompr.c
diff --git a/modules/worldengine/deps/zlib/zconf.h b/deps/zlib/zconf.h
similarity index 100%
rename from modules/worldengine/deps/zlib/zconf.h
rename to deps/zlib/zconf.h
diff --git a/modules/worldengine/deps/zlib/zlib.h b/deps/zlib/zlib.h
similarity index 100%
rename from modules/worldengine/deps/zlib/zlib.h
rename to deps/zlib/zlib.h
diff --git a/modules/worldengine/deps/zlib/zutil.c b/deps/zlib/zutil.c
similarity index 100%
rename from modules/worldengine/deps/zlib/zutil.c
rename to deps/zlib/zutil.c
diff --git a/modules/worldengine/deps/zlib/zutil.h b/deps/zlib/zutil.h
similarity index 100%
rename from modules/worldengine/deps/zlib/zutil.h
rename to deps/zlib/zutil.h
diff --git a/env/dist/.gitkeep b/env/dist/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/env/user/.gitkeep b/env/user/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/install.sh b/install.sh
index 8be9c9970..af88b78e1 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
 CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PATH_APPS="$CUR_PATH/apps/"
 PATH_MODULES="$CUR_PATH/modules/"
-[ ! -d $PATH_MODULES/drassil/joiner ] && git clone https://github.com/drassil/joiner $PATH_MODULES/drassil/joiner -b master
-source "$PATH_MODULES/drassil/joiner/joiner.sh"
+[ ! -d $PATH_APPS/drassil/joiner ] && git clone https://github.com/drassil/joiner $PATH_APPS/drassil/joiner -b master
+source "$PATH_APPS/drassil/joiner/joiner.sh"
 
 
 # installing repository dependencies
@@ -12,4 +13,4 @@ if [[ $1 == "dev" ]]; then
 fi
 
 
-source "$CUR_PATH/bin/installer/main.sh"
+source "$CUR_PATH/apps/installer/main.sh"
diff --git a/modules/.gitkeep b/modules/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/acore/extractors/mmaps_generator/CMakeLists.txt b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
deleted file mode 100644
index 9beb46eb2..000000000
--- a/modules/acore/extractors/mmaps_generator/CMakeLists.txt
+++ /dev/null
@@ -1,140 +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.
-
-file(GLOB_RECURSE mmap_gen_sources *.cpp *.h)
-
-set(mmap_gen_Includes
-  ${CMAKE_BINARY_DIR}
-  ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
-  ${OPENSSL_INCLUDE_DIR}
-  ${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/src/
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/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}/modules/acore/game-framework/src/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
-)
-
-if( WIN32 )
-  set(mmap_gen_Includes
-    ${mmap_gen_Includes}
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
-    )
-endif()
-
-include_directories(${mmap_gen_Includes})
-
-add_executable(mmaps_generator ${mmap_gen_sources})
-
-target_link_libraries(mmaps_generator
-  shared
-  collision
-  g3dlib
-  Recast
-  Detour
-  ${ACE_LIBRARY}
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${BZIP2_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-)
-
-if( UNIX )
-  install(TARGETS mmaps_generator DESTINATION bin)
-elseif( WIN32 )
-  install(TARGETS mmaps_generator DESTINATION "${CMAKE_INSTALL_PREFIX}")
-endif()
diff --git a/modules/acore/game-framework/CMakeLists.txt b/modules/acore/game-framework/CMakeLists.txt
deleted file mode 100644
index 4b43d67e3..000000000
--- a/modules/acore/game-framework/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-add_subdirectory(src)
diff --git a/modules/acore/game-framework/LICENSE-AGPL3 b/modules/acore/game-framework/LICENSE-AGPL3
deleted file mode 100644
index dbbe35581..000000000
--- a/modules/acore/game-framework/LICENSE-AGPL3
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/modules/acore/game-framework/src/CMakeLists.txt b/modules/acore/game-framework/src/CMakeLists.txt
deleted file mode 100644
index 94b4628ba..000000000
--- a/modules/acore/game-framework/src/CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-if( USE_COREPCH )
-  include_directories(${CMAKE_CURRENT_BINARY_DIR})
-endif()
-
-file(GLOB_RECURSE sources_Addons Addons/*.cpp Addons/*.h)
-file(GLOB sources_localdir *.cpp *.h)
-
-# Build gamefw sourcelist
-#
-
-if (USE_COREPCH)
-  set(gamefw_STAT_PCH_HDR PrecompiledHeaders/gamefwPCH.h)
-  set(gamefw_STAT_PCH_SRC PrecompiledHeaders/gamefwPCH.cpp)
-endif()
-
-set(gamefw_STAT_SRCS
-  ${gamefw_STAT_SRCS}
-  ${sources_Addons}
-  ${sources_localdir}
-)
-
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${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/src/
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/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}/Addons
-  ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
-  ${OPENSSL_INCLUDE_DIR}
-)
-
-add_library(gamefw STATIC
-  ${gamefw_STAT_SRCS}
-  ${gamefw_STAT_PCH_SRC}
-)
-
-target_link_libraries(gamefw
-  ${ACE_LIBRARY}
-)
-
-# Generate precompiled header
-if (USE_COREPCH)
-  add_cxx_pch(gamefw ${gamefw_STAT_PCH_HDR} ${gamefw_STAT_PCH_SRC})
-endif ()
diff --git a/modules/acore/game-framework/src/PrecompiledHeaders/gamefwPCH.cpp b/modules/acore/game-framework/src/PrecompiledHeaders/gamefwPCH.cpp
deleted file mode 100644
index 7b1c00bd6..000000000
--- a/modules/acore/game-framework/src/PrecompiledHeaders/gamefwPCH.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "gamefwPCH.h"
diff --git a/modules/acore/game-framework/src/PrecompiledHeaders/gamefwPCH.h b/modules/acore/game-framework/src/PrecompiledHeaders/gamefwPCH.h
deleted file mode 100644
index 6c1fefefb..000000000
--- a/modules/acore/game-framework/src/PrecompiledHeaders/gamefwPCH.h
+++ /dev/null
@@ -1,3 +0,0 @@
-//add here most rarely modified headers to speed up debug build compilation
-
-
diff --git a/modules/worldengine/lib-collision/CMakeLists.txt b/modules/worldengine/lib-collision/CMakeLists.txt
deleted file mode 100644
index 4b43d67e3..000000000
--- a/modules/worldengine/lib-collision/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-add_subdirectory(src)
diff --git a/modules/worldengine/lib-collision/LICENSE-AGPL3 b/modules/worldengine/lib-collision/LICENSE-AGPL3
deleted file mode 100644
index dbbe35581..000000000
--- a/modules/worldengine/lib-collision/LICENSE-AGPL3
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/modules/worldengine/lib-collision/src/CMakeLists.txt b/modules/worldengine/lib-collision/src/CMakeLists.txt
deleted file mode 100644
index 57db910a2..000000000
--- a/modules/worldengine/lib-collision/src/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}/modules/worldengine/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour/Include
-  ${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}/modules/acore/game-framework/src/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/modules/worldengine/nucleus/CMakeLists.txt b/modules/worldengine/nucleus/CMakeLists.txt
deleted file mode 100644
index febd4f0ab..000000000
--- a/modules/worldengine/nucleus/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(src)
diff --git a/modules/worldengine/nucleus/LICENSE-AGPL3 b/modules/worldengine/nucleus/LICENSE-AGPL3
deleted file mode 100644
index dbbe35581..000000000
--- a/modules/worldengine/nucleus/LICENSE-AGPL3
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/modules/worldengine/nucleus/src/cmake/macros/CheckPlatform.cmake b/modules/worldengine/nucleus/src/cmake/macros/CheckPlatform.cmake
deleted file mode 100644
index 8c7513ff0..000000000
--- a/modules/worldengine/nucleus/src/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/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/src/CMakeLists.txt b/src/CMakeLists.txt
index 4d106ab3a..12df31174 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}/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h
-  )
-  add_subdirectory(game)
-  add_subdirectory(authserver)
-  add_subdirectory(scripts)
-  add_subdirectory(worldserver)
+  add_subdirectory(server)
 endif()
diff --git a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake b/src/cmake/compiler/clang/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
rename to src/cmake/compiler/clang/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake b/src/cmake/compiler/gcc/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake
rename to src/cmake/compiler/gcc/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/compiler/icc/settings.cmake b/src/cmake/compiler/icc/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/compiler/icc/settings.cmake
rename to src/cmake/compiler/icc/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake b/src/cmake/compiler/mingw/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake
rename to src/cmake/compiler/mingw/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake b/src/cmake/compiler/msvc/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake
rename to src/cmake/compiler/msvc/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/CheckBuildDir.cmake b/src/cmake/macros/CheckBuildDir.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/CheckBuildDir.cmake
rename to src/cmake/macros/CheckBuildDir.cmake
diff --git a/src/cmake/macros/CheckPlatform.cmake b/src/cmake/macros/CheckPlatform.cmake
new file mode 100644
index 000000000..5ef5f6d9a
--- /dev/null
+++ b/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}/src/cmake/platform/settings.cmake")
+
+if(WIN32)
+  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/win/settings.cmake")
+elseif(UNIX)
+  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/unix/settings.cmake")
+endif()
+
+include("${CMAKE_SOURCE_DIR}/src/cmake/platform/after_platform.cmake")
diff --git a/modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake b/src/cmake/macros/EnsureVersion.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake
rename to src/cmake/macros/EnsureVersion.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindACE.cmake b/src/cmake/macros/FindACE.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/FindACE.cmake
rename to src/cmake/macros/FindACE.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindGit.cmake b/src/cmake/macros/FindGit.cmake
similarity index 94%
rename from modules/worldengine/nucleus/src/cmake/macros/FindGit.cmake
rename to src/cmake/macros/FindGit.cmake
index ca37cd7d6..a37370c84 100644
--- a/modules/worldengine/nucleus/src/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}/modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake)
+include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake)
 
 set(_REQUIRED_GIT_VERSION "1.7")
 
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindGperftools.cmake b/src/cmake/macros/FindGperftools.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/FindGperftools.cmake
rename to src/cmake/macros/FindGperftools.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake
rename to src/cmake/macros/FindMySQL.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindOpenSSL.cmake b/src/cmake/macros/FindOpenSSL.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/FindOpenSSL.cmake
rename to src/cmake/macros/FindOpenSSL.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindPCHSupport.cmake b/src/cmake/macros/FindPCHSupport.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/FindPCHSupport.cmake
rename to src/cmake/macros/FindPCHSupport.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindReadline.cmake b/src/cmake/macros/FindReadline.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/macros/FindReadline.cmake
rename to src/cmake/macros/FindReadline.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake b/src/cmake/platform/after_platform.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake
rename to src/cmake/platform/after_platform.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/platform/cmake_uninstall.in.cmake b/src/cmake/platform/cmake_uninstall.in.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/platform/cmake_uninstall.in.cmake
rename to src/cmake/platform/cmake_uninstall.in.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/platform/settings.cmake b/src/cmake/platform/settings.cmake
similarity index 100%
rename from modules/worldengine/nucleus/src/cmake/platform/settings.cmake
rename to src/cmake/platform/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake b/src/cmake/platform/unix/settings.cmake
similarity index 75%
rename from modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake
rename to src/cmake/platform/unix/settings.cmake
index 632df48fe..34ac006d6 100644
--- a/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake
+++ b/src/cmake/platform/unix/settings.cmake
@@ -20,7 +20,7 @@ endif()
 
 # configure uninstaller
 configure_file(
-  "${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/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}/modules/worldengine/nucleus/src/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}/modules/worldengine/nucleus/src/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}/modules/worldengine/nucleus/src/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/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake b/src/cmake/platform/win/settings.cmake
similarity index 64%
rename from modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake
rename to src/cmake/platform/win/settings.cmake
index 319164f76..78aa97b0b 100644
--- a/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake
+++ b/src/cmake/platform/win/settings.cmake
@@ -2,13 +2,13 @@
 option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 0)
 
 # Package overloads
-set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite)
+set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/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/worldengine/deps/mysqllite/include)
+  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/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/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/msvc/settings.cmake)
 elseif ( MINGW )
-  include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/mingw/settings.cmake)
 endif()
diff --git a/modules/worldengine/nucleus/src/AutoPtr.h b/src/common/AutoPtr.h
similarity index 100%
rename from modules/worldengine/nucleus/src/AutoPtr.h
rename to src/common/AutoPtr.h
diff --git a/modules/worldengine/nucleus/src/CMakeLists.txt b/src/common/CMakeLists.txt
similarity index 90%
rename from modules/worldengine/nucleus/src/CMakeLists.txt
rename to src/common/CMakeLists.txt
index a7f3f81eb..9a44d3302 100644
--- a/modules/worldengine/nucleus/src/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -56,10 +56,10 @@ set(shared_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${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}/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/deps/sockets/include
+  ${CMAKE_SOURCE_DIR}/deps/utf8cpp
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Configuration
@@ -72,7 +72,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}
@@ -91,3 +91,5 @@ target_link_libraries(shared
 if (USE_COREPCH)
   add_cxx_pch(shared ${shared_STAT_PCH_HDR} ${shared_STAT_PCH_SRC})
 endif ()
+
+add_subdirectory(Collision)
\ No newline at end of file
diff --git a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchy.cpp b/src/common/Collision/BoundingIntervalHierarchy.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/BoundingIntervalHierarchy.cpp
rename to src/common/Collision/BoundingIntervalHierarchy.cpp
diff --git a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/BoundingIntervalHierarchy.h
rename to src/common/Collision/BoundingIntervalHierarchy.h
diff --git a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/BoundingIntervalHierarchyWrapper.h
rename to src/common/Collision/BoundingIntervalHierarchyWrapper.h
diff --git a/src/common/Collision/CMakeLists.txt b/src/common/Collision/CMakeLists.txt
new file mode 100644
index 000000000..a1c6b8b84
--- /dev/null
+++ b/src/common/Collision/CMakeLists.txt
@@ -0,0 +1,93 @@
+# 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/Include
+  ${CMAKE_SOURCE_DIR}/src/common/
+  ${CMAKE_SOURCE_DIR}/src/common/Configuration
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Database
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic
+  ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference
+  ${CMAKE_SOURCE_DIR}/src/common/Logging
+  ${CMAKE_SOURCE_DIR}/src/common/Threading
+  ${CMAKE_SOURCE_DIR}/src/common/Packets
+  ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/common/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/Addons
+  ${CMAKE_SOURCE_DIR}/src/server/game/Conditions
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates
+  ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit
+  ${CMAKE_SOURCE_DIR}/src/server/game/Combat
+  ${CMAKE_SOURCE_DIR}/src/server/game/Loot
+  ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous
+  ${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/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/game/DataStores
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Spline
+  ${CMAKE_SOURCE_DIR}/src/server/game/Movement
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server
+  ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol
+  ${CMAKE_SOURCE_DIR}/src/server/game/World
+  ${CMAKE_SOURCE_DIR}/src/server/game/Spells
+  ${CMAKE_SOURCE_DIR}/src/server/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/modules/worldengine/lib-collision/src/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/DynamicTree.cpp
rename to src/common/Collision/DynamicTree.cpp
diff --git a/modules/worldengine/lib-collision/src/DynamicTree.h b/src/common/Collision/DynamicTree.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/DynamicTree.h
rename to src/common/Collision/DynamicTree.h
diff --git a/modules/worldengine/lib-collision/src/Management/IMMAPManager.h b/src/common/Collision/Management/IMMAPManager.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/IMMAPManager.h
rename to src/common/Collision/Management/IMMAPManager.h
diff --git a/modules/worldengine/lib-collision/src/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/IVMapManager.h
rename to src/common/Collision/Management/IVMapManager.h
diff --git a/modules/worldengine/lib-collision/src/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/MMapFactory.cpp
rename to src/common/Collision/Management/MMapFactory.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/MMapFactory.h
rename to src/common/Collision/Management/MMapFactory.h
diff --git a/modules/worldengine/lib-collision/src/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/MMapManager.cpp
rename to src/common/Collision/Management/MMapManager.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/MMapManager.h
rename to src/common/Collision/Management/MMapManager.h
diff --git a/modules/worldengine/lib-collision/src/Management/VMapFactory.cpp b/src/common/Collision/Management/VMapFactory.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/VMapFactory.cpp
rename to src/common/Collision/Management/VMapFactory.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/VMapFactory.h b/src/common/Collision/Management/VMapFactory.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/VMapFactory.h
rename to src/common/Collision/Management/VMapFactory.h
diff --git a/modules/worldengine/lib-collision/src/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/VMapManager2.cpp
rename to src/common/Collision/Management/VMapManager2.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Management/VMapManager2.h
rename to src/common/Collision/Management/VMapManager2.h
diff --git a/modules/worldengine/lib-collision/src/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Maps/MapTree.cpp
rename to src/common/Collision/Maps/MapTree.cpp
diff --git a/modules/worldengine/lib-collision/src/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Maps/MapTree.h
rename to src/common/Collision/Maps/MapTree.h
diff --git a/modules/worldengine/lib-collision/src/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Maps/TileAssembler.cpp
rename to src/common/Collision/Maps/TileAssembler.cpp
diff --git a/modules/worldengine/lib-collision/src/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Maps/TileAssembler.h
rename to src/common/Collision/Maps/TileAssembler.h
diff --git a/modules/worldengine/lib-collision/src/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Models/GameObjectModel.cpp
rename to src/common/Collision/Models/GameObjectModel.cpp
diff --git a/modules/worldengine/lib-collision/src/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Models/GameObjectModel.h
rename to src/common/Collision/Models/GameObjectModel.h
diff --git a/modules/worldengine/lib-collision/src/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Models/ModelInstance.cpp
rename to src/common/Collision/Models/ModelInstance.cpp
diff --git a/modules/worldengine/lib-collision/src/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Models/ModelInstance.h
rename to src/common/Collision/Models/ModelInstance.h
diff --git a/modules/worldengine/lib-collision/src/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/Models/WorldModel.cpp
rename to src/common/Collision/Models/WorldModel.cpp
diff --git a/modules/worldengine/lib-collision/src/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/Models/WorldModel.h
rename to src/common/Collision/Models/WorldModel.h
diff --git a/modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.cpp b/src/common/Collision/PrecompiledHeaders/collisionPCH.cpp
similarity index 100%
rename from modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.cpp
rename to src/common/Collision/PrecompiledHeaders/collisionPCH.cpp
diff --git a/modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.h b/src/common/Collision/PrecompiledHeaders/collisionPCH.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.h
rename to src/common/Collision/PrecompiledHeaders/collisionPCH.h
diff --git a/modules/worldengine/lib-collision/src/RegularGrid.h b/src/common/Collision/RegularGrid.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/RegularGrid.h
rename to src/common/Collision/RegularGrid.h
diff --git a/modules/worldengine/lib-collision/src/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/VMapDefinitions.h
rename to src/common/Collision/VMapDefinitions.h
diff --git a/modules/worldengine/lib-collision/src/VMapTools.h b/src/common/Collision/VMapTools.h
similarity index 100%
rename from modules/worldengine/lib-collision/src/VMapTools.h
rename to src/common/Collision/VMapTools.h
diff --git a/modules/worldengine/nucleus/src/Common.cpp b/src/common/Common.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Common.cpp
rename to src/common/Common.cpp
diff --git a/modules/worldengine/nucleus/src/Common.h b/src/common/Common.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Common.h
rename to src/common/Common.h
diff --git a/modules/worldengine/nucleus/src/CompilerDefs.h b/src/common/CompilerDefs.h
similarity index 100%
rename from modules/worldengine/nucleus/src/CompilerDefs.h
rename to src/common/CompilerDefs.h
diff --git a/modules/worldengine/nucleus/src/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Configuration/Config.cpp
rename to src/common/Configuration/Config.cpp
diff --git a/modules/worldengine/nucleus/src/Configuration/Config.h b/src/common/Configuration/Config.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Configuration/Config.h
rename to src/common/Configuration/Config.h
diff --git a/modules/worldengine/nucleus/src/Containers.h b/src/common/Containers.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Containers.h
rename to src/common/Containers.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/ARC4.cpp b/src/common/Cryptography/ARC4.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/ARC4.cpp
rename to src/common/Cryptography/ARC4.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/ARC4.h b/src/common/Cryptography/ARC4.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/ARC4.h
rename to src/common/Cryptography/ARC4.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.cpp b/src/common/Cryptography/Authentication/AuthCrypt.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.cpp
rename to src/common/Cryptography/Authentication/AuthCrypt.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.h b/src/common/Cryptography/Authentication/AuthCrypt.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.h
rename to src/common/Cryptography/Authentication/AuthCrypt.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/BigNumber.cpp
rename to src/common/Cryptography/BigNumber.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/BigNumber.h
rename to src/common/Cryptography/BigNumber.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.cpp b/src/common/Cryptography/HMACSHA1.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/HMACSHA1.cpp
rename to src/common/Cryptography/HMACSHA1.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.h b/src/common/Cryptography/HMACSHA1.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/HMACSHA1.h
rename to src/common/Cryptography/HMACSHA1.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.cpp
rename to src/common/Cryptography/OpenSSLCrypto.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.h b/src/common/Cryptography/OpenSSLCrypto.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.h
rename to src/common/Cryptography/OpenSSLCrypto.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/SHA1.cpp b/src/common/Cryptography/SHA1.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/SHA1.cpp
rename to src/common/Cryptography/SHA1.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/SHA1.h b/src/common/Cryptography/SHA1.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/SHA1.h
rename to src/common/Cryptography/SHA1.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/WardenKeyGeneration.h b/src/common/Cryptography/WardenKeyGeneration.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Cryptography/WardenKeyGeneration.h
rename to src/common/Cryptography/WardenKeyGeneration.h
diff --git a/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/DataStores/DBCFileLoader.cpp
rename to src/common/DataStores/DBCFileLoader.cpp
diff --git a/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h
similarity index 100%
rename from modules/worldengine/nucleus/src/DataStores/DBCFileLoader.h
rename to src/common/DataStores/DBCFileLoader.h
diff --git a/modules/worldengine/nucleus/src/DataStores/DBCStore.h b/src/common/DataStores/DBCStore.h
similarity index 100%
rename from modules/worldengine/nucleus/src/DataStores/DBCStore.h
rename to src/common/DataStores/DBCStore.h
diff --git a/modules/worldengine/nucleus/src/Database/AdhocStatement.cpp b/src/common/Database/AdhocStatement.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/AdhocStatement.cpp
rename to src/common/Database/AdhocStatement.cpp
diff --git a/modules/worldengine/nucleus/src/Database/AdhocStatement.h b/src/common/Database/AdhocStatement.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/AdhocStatement.h
rename to src/common/Database/AdhocStatement.h
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseEnv.h b/src/common/Database/DatabaseEnv.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/DatabaseEnv.h
rename to src/common/Database/DatabaseEnv.h
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseWorker.cpp b/src/common/Database/DatabaseWorker.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/DatabaseWorker.cpp
rename to src/common/Database/DatabaseWorker.cpp
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseWorker.h b/src/common/Database/DatabaseWorker.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/DatabaseWorker.h
rename to src/common/Database/DatabaseWorker.h
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h b/src/common/Database/DatabaseWorkerPool.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h
rename to src/common/Database/DatabaseWorkerPool.h
diff --git a/modules/worldengine/nucleus/src/Database/Field.cpp b/src/common/Database/Field.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Field.cpp
rename to src/common/Database/Field.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Field.h b/src/common/Database/Field.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Field.h
rename to src/common/Database/Field.h
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp b/src/common/Database/Implementation/CharacterDatabase.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp
rename to src/common/Database/Implementation/CharacterDatabase.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h b/src/common/Database/Implementation/CharacterDatabase.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h
rename to src/common/Database/Implementation/CharacterDatabase.h
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.cpp b/src/common/Database/Implementation/LoginDatabase.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.cpp
rename to src/common/Database/Implementation/LoginDatabase.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.h b/src/common/Database/Implementation/LoginDatabase.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.h
rename to src/common/Database/Implementation/LoginDatabase.h
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.cpp b/src/common/Database/Implementation/WorldDatabase.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.cpp
rename to src/common/Database/Implementation/WorldDatabase.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.h b/src/common/Database/Implementation/WorldDatabase.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.h
rename to src/common/Database/Implementation/WorldDatabase.h
diff --git a/modules/worldengine/nucleus/src/Database/MySQLConnection.cpp b/src/common/Database/MySQLConnection.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/MySQLConnection.cpp
rename to src/common/Database/MySQLConnection.cpp
diff --git a/modules/worldengine/nucleus/src/Database/MySQLConnection.h b/src/common/Database/MySQLConnection.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/MySQLConnection.h
rename to src/common/Database/MySQLConnection.h
diff --git a/modules/worldengine/nucleus/src/Database/MySQLThreading.h b/src/common/Database/MySQLThreading.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/MySQLThreading.h
rename to src/common/Database/MySQLThreading.h
diff --git a/modules/worldengine/nucleus/src/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/PreparedStatement.cpp
rename to src/common/Database/PreparedStatement.cpp
diff --git a/modules/worldengine/nucleus/src/Database/PreparedStatement.h b/src/common/Database/PreparedStatement.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/PreparedStatement.h
rename to src/common/Database/PreparedStatement.h
diff --git a/modules/worldengine/nucleus/src/Database/QueryHolder.cpp b/src/common/Database/QueryHolder.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/QueryHolder.cpp
rename to src/common/Database/QueryHolder.cpp
diff --git a/modules/worldengine/nucleus/src/Database/QueryHolder.h b/src/common/Database/QueryHolder.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/QueryHolder.h
rename to src/common/Database/QueryHolder.h
diff --git a/modules/worldengine/nucleus/src/Database/QueryResult.cpp b/src/common/Database/QueryResult.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/QueryResult.cpp
rename to src/common/Database/QueryResult.cpp
diff --git a/modules/worldengine/nucleus/src/Database/QueryResult.h b/src/common/Database/QueryResult.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/QueryResult.h
rename to src/common/Database/QueryResult.h
diff --git a/modules/worldengine/nucleus/src/Database/SQLOperation.h b/src/common/Database/SQLOperation.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/SQLOperation.h
rename to src/common/Database/SQLOperation.h
diff --git a/modules/worldengine/nucleus/src/Database/Transaction.cpp b/src/common/Database/Transaction.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Transaction.cpp
rename to src/common/Database/Transaction.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Transaction.h b/src/common/Database/Transaction.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Database/Transaction.h
rename to src/common/Database/Transaction.h
diff --git a/modules/worldengine/nucleus/src/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Debugging/Errors.cpp
rename to src/common/Debugging/Errors.cpp
diff --git a/modules/worldengine/nucleus/src/Debugging/Errors.h b/src/common/Debugging/Errors.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Debugging/Errors.h
rename to src/common/Debugging/Errors.h
diff --git a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp
rename to src/common/Debugging/WheatyExceptionReport.cpp
diff --git a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h
rename to src/common/Debugging/WheatyExceptionReport.h
diff --git a/modules/worldengine/nucleus/src/Define.h b/src/common/Define.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Define.h
rename to src/common/Define.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/FactoryHolder.h b/src/common/Dynamic/FactoryHolder.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/FactoryHolder.h
rename to src/common/Dynamic/FactoryHolder.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/HashNamespace.h b/src/common/Dynamic/HashNamespace.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/HashNamespace.h
rename to src/common/Dynamic/HashNamespace.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/LinkedList.h b/src/common/Dynamic/LinkedList.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/LinkedList.h
rename to src/common/Dynamic/LinkedList.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/LinkedReference/RefManager.h b/src/common/Dynamic/LinkedReference/RefManager.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/LinkedReference/RefManager.h
rename to src/common/Dynamic/LinkedReference/RefManager.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/LinkedReference/Reference.h b/src/common/Dynamic/LinkedReference/Reference.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/LinkedReference/Reference.h
rename to src/common/Dynamic/LinkedReference/Reference.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/ObjectRegistry.h b/src/common/Dynamic/ObjectRegistry.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/ObjectRegistry.h
rename to src/common/Dynamic/ObjectRegistry.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/TypeContainer.h
rename to src/common/Dynamic/TypeContainer.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctions.h
rename to src/common/Dynamic/TypeContainerFunctions.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctionsPtr.h
rename to src/common/Dynamic/TypeContainerFunctionsPtr.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainerVisitor.h b/src/common/Dynamic/TypeContainerVisitor.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/TypeContainerVisitor.h
rename to src/common/Dynamic/TypeContainerVisitor.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeList.h b/src/common/Dynamic/TypeList.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/TypeList.h
rename to src/common/Dynamic/TypeList.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/UnorderedMap.h b/src/common/Dynamic/UnorderedMap.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/UnorderedMap.h
rename to src/common/Dynamic/UnorderedMap.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/UnorderedSet.h b/src/common/Dynamic/UnorderedSet.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Dynamic/UnorderedSet.h
rename to src/common/Dynamic/UnorderedSet.h
diff --git a/modules/worldengine/nucleus/src/Logging/Log.cpp b/src/common/Logging/Log.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Logging/Log.cpp
rename to src/common/Logging/Log.cpp
diff --git a/modules/worldengine/nucleus/src/Logging/Log.h b/src/common/Logging/Log.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Logging/Log.h
rename to src/common/Logging/Log.h
diff --git a/modules/worldengine/nucleus/src/Packets/ByteBuffer.cpp b/src/common/Packets/ByteBuffer.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Packets/ByteBuffer.cpp
rename to src/common/Packets/ByteBuffer.cpp
diff --git a/modules/worldengine/nucleus/src/Packets/ByteBuffer.h b/src/common/Packets/ByteBuffer.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Packets/ByteBuffer.h
rename to src/common/Packets/ByteBuffer.h
diff --git a/modules/worldengine/nucleus/src/Packets/WorldPacket.h b/src/common/Packets/WorldPacket.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Packets/WorldPacket.h
rename to src/common/Packets/WorldPacket.h
diff --git a/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.cpp b/src/common/PrecompiledHeaders/sharedPCH.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.cpp
rename to src/common/PrecompiledHeaders/sharedPCH.cpp
diff --git a/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.h b/src/common/PrecompiledHeaders/sharedPCH.h
similarity index 100%
rename from modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.h
rename to src/common/PrecompiledHeaders/sharedPCH.h
diff --git a/modules/worldengine/nucleus/src/SystemConfig.h b/src/common/SystemConfig.h
similarity index 100%
rename from modules/worldengine/nucleus/src/SystemConfig.h
rename to src/common/SystemConfig.h
diff --git a/modules/worldengine/nucleus/src/Threading/Callback.h b/src/common/Threading/Callback.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Threading/Callback.h
rename to src/common/Threading/Callback.h
diff --git a/modules/worldengine/nucleus/src/Threading/DelayExecutor.cpp b/src/common/Threading/DelayExecutor.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Threading/DelayExecutor.cpp
rename to src/common/Threading/DelayExecutor.cpp
diff --git a/modules/worldengine/nucleus/src/Threading/DelayExecutor.h b/src/common/Threading/DelayExecutor.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Threading/DelayExecutor.h
rename to src/common/Threading/DelayExecutor.h
diff --git a/modules/worldengine/nucleus/src/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Threading/LockedQueue.h
rename to src/common/Threading/LockedQueue.h
diff --git a/modules/worldengine/nucleus/src/Threading/Threading.cpp b/src/common/Threading/Threading.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Threading/Threading.cpp
rename to src/common/Threading/Threading.cpp
diff --git a/modules/worldengine/nucleus/src/Threading/Threading.h b/src/common/Threading/Threading.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Threading/Threading.h
rename to src/common/Threading/Threading.h
diff --git a/modules/worldengine/nucleus/src/Utilities/ByteConverter.h b/src/common/Utilities/ByteConverter.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/ByteConverter.h
rename to src/common/Utilities/ByteConverter.h
diff --git a/modules/worldengine/nucleus/src/Utilities/EventProcessor.cpp b/src/common/Utilities/EventProcessor.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/EventProcessor.cpp
rename to src/common/Utilities/EventProcessor.cpp
diff --git a/modules/worldengine/nucleus/src/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/EventProcessor.h
rename to src/common/Utilities/EventProcessor.h
diff --git a/modules/worldengine/nucleus/src/Utilities/ServiceWin32.cpp b/src/common/Utilities/ServiceWin32.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/ServiceWin32.cpp
rename to src/common/Utilities/ServiceWin32.cpp
diff --git a/modules/worldengine/nucleus/src/Utilities/ServiceWin32.h b/src/common/Utilities/ServiceWin32.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/ServiceWin32.h
rename to src/common/Utilities/ServiceWin32.h
diff --git a/modules/worldengine/nucleus/src/Utilities/SignalHandler.h b/src/common/Utilities/SignalHandler.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/SignalHandler.h
rename to src/common/Utilities/SignalHandler.h
diff --git a/modules/worldengine/nucleus/src/Utilities/StringFormat.h b/src/common/Utilities/StringFormat.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/StringFormat.h
rename to src/common/Utilities/StringFormat.h
diff --git a/modules/worldengine/nucleus/src/Utilities/Timer.h b/src/common/Utilities/Timer.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/Timer.h
rename to src/common/Utilities/Timer.h
diff --git a/modules/worldengine/nucleus/src/Utilities/Util.cpp b/src/common/Utilities/Util.cpp
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/Util.cpp
rename to src/common/Utilities/Util.cpp
diff --git a/modules/worldengine/nucleus/src/Utilities/Util.h b/src/common/Utilities/Util.h
similarity index 100%
rename from modules/worldengine/nucleus/src/Utilities/Util.h
rename to src/common/Utilities/Util.h
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
deleted file mode 100644
index 3b6202072..000000000
--- a/src/scripts/CMakeLists.txt
+++ /dev/null
@@ -1,193 +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.
-
-# Enable precompiled headers when using the GCC compiler.
-
-CU_RUN_HOOK(BEFORE_SCRIPTS_LIBRARY)
-
-CU_SET_PATH("AC_SCRIPTS_DIR" "${CMAKE_CURRENT_LIST_DIR}")
-
-if (USE_SCRIPTPCH)
-  set(scripts_STAT_PCH_HDR PrecompiledHeaders/ScriptPCH.h)
-  set(scripts_STAT_PCH_SRC PrecompiledHeaders/ScriptPCH.cpp)
-endif ()
-
-message(STATUS "SCRIPT PREPARATIONS")
-include(Spells/CMakeLists.txt)
-
-include(Commands/CMakeLists.txt)
-
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ScriptLoader.cpp
-  ScriptLoader.h
-  ${BUILDDIR}/GenLoader.cpp
-  ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
-  ../game/AI/ScriptedAI/ScriptedCreature.cpp
-  ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
-)
-
-AC_ADD_SCRIPT_LOADER("Spell" "ScriptLoader.h")
-AC_ADD_SCRIPT_LOADER("SC_Smart" "ScriptLoader.h")
-AC_ADD_SCRIPT_LOADER("Command" "ScriptLoader.h")
-
-CU_SET_PATH("CMAKE_AC_MODULE_DIR" "${CMAKE_CURRENT_LIST_DIR}")
-
-if(SCRIPTS)
-  include(World/CMakeLists.txt)
-  include(OutdoorPvP/CMakeLists.txt)
-  include(EasternKingdoms/CMakeLists.txt)
-  include(Kalimdor/CMakeLists.txt)
-  include(Outland/CMakeLists.txt)
-  include(Northrend/CMakeLists.txt)
-  include(Events/CMakeLists.txt)
-  include(Pet/CMakeLists.txt)
-endif()
-
-if(EXISTS "${AC_SCRIPTS_DIR}/Custom/CMakeLists.txt")
-include(Custom/CMakeLists.txt)
-endif()
-
-CU_GET_GLOBAL("AC_ADD_SCRIPTS_LIST")
-CU_GET_GLOBAL("AC_ADD_SCRIPTS_INCLUDE")
-CU_GET_GLOBAL("AC_SCRIPTS_SOURCES")
-
-set(scripts_STAT_SRCS
-  ${scripts_STAT_SRCS}
-  ${AC_SCRIPTS_SOURCES}
-)
-
-set("AC_SCRIPTS_INCLUDES" "")
-
-FOREACH (include ${AC_ADD_SCRIPTS_INCLUDE})
-    set("AC_SCRIPTS_INCLUDES" "#include \"${include}\"\n${AC_SCRIPTS_INCLUDES}")
-ENDFOREACH()
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GenLoader.cpp.cmake ${BUILDDIR}/GenLoader.cpp)
-
-message(STATUS "SCRIPT PREPARATION COMPLETE")
-message("")
-
-include_directories(
-  ${scripts_INCLUDE_DIRS}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour/Include
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast/Include
-  ${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/src/
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database
-  ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/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}/modules/worldengine/nucleus/src/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_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-  ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
-)
-
-add_library(scripts STATIC
-  ${scripts_STAT_SRCS}
-  ${scripts_STAT_PCH_SRC}
-)
-
-add_dependencies(scripts revision.h)
-
-# Generate precompiled header
-if (USE_SCRIPTPCH)
-  add_cxx_pch(scripts ${scripts_STAT_PCH_HDR} ${scripts_STAT_PCH_SRC})
-endif()
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
new file mode 100644
index 000000000..d6a3e9736
--- /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/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp
similarity index 100%
rename from src/authserver/Authentication/AuthCodes.cpp
rename to src/server/authserver/Authentication/AuthCodes.cpp
diff --git a/src/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h
similarity index 100%
rename from src/authserver/Authentication/AuthCodes.h
rename to src/server/authserver/Authentication/AuthCodes.h
diff --git a/src/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
similarity index 82%
rename from src/authserver/CMakeLists.txt
rename to src/server/authserver/CMakeLists.txt
index 4fa2f788e..65c4ed58e 100644
--- a/src/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -43,15 +43,15 @@ endif()
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${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_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/authserver/Main.cpp b/src/server/authserver/Main.cpp
similarity index 100%
rename from src/authserver/Main.cpp
rename to src/server/authserver/Main.cpp
diff --git a/src/authserver/PrecompiledHeaders/authPCH.cpp b/src/server/authserver/PrecompiledHeaders/authPCH.cpp
similarity index 100%
rename from src/authserver/PrecompiledHeaders/authPCH.cpp
rename to src/server/authserver/PrecompiledHeaders/authPCH.cpp
diff --git a/src/authserver/PrecompiledHeaders/authPCH.h b/src/server/authserver/PrecompiledHeaders/authPCH.h
similarity index 100%
rename from src/authserver/PrecompiledHeaders/authPCH.h
rename to src/server/authserver/PrecompiledHeaders/authPCH.h
diff --git a/src/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp
similarity index 100%
rename from src/authserver/Realms/RealmList.cpp
rename to src/server/authserver/Realms/RealmList.cpp
diff --git a/src/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h
similarity index 100%
rename from src/authserver/Realms/RealmList.h
rename to src/server/authserver/Realms/RealmList.h
diff --git a/src/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
similarity index 100%
rename from src/authserver/Server/AuthSocket.cpp
rename to src/server/authserver/Server/AuthSocket.cpp
diff --git a/src/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h
similarity index 100%
rename from src/authserver/Server/AuthSocket.h
rename to src/server/authserver/Server/AuthSocket.h
diff --git a/src/authserver/Server/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h
similarity index 100%
rename from src/authserver/Server/RealmAcceptor.h
rename to src/server/authserver/Server/RealmAcceptor.h
diff --git a/src/authserver/Server/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp
similarity index 100%
rename from src/authserver/Server/RealmSocket.cpp
rename to src/server/authserver/Server/RealmSocket.cpp
diff --git a/src/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h
similarity index 100%
rename from src/authserver/Server/RealmSocket.h
rename to src/server/authserver/Server/RealmSocket.h
diff --git a/src/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
similarity index 100%
rename from src/authserver/authserver.conf.dist
rename to src/server/authserver/authserver.conf.dist
diff --git a/src/authserver/authserver.ico b/src/server/authserver/authserver.ico
similarity index 100%
rename from src/authserver/authserver.ico
rename to src/server/authserver/authserver.ico
diff --git a/src/authserver/authserver.rc b/src/server/authserver/authserver.rc
similarity index 100%
rename from src/authserver/authserver.rc
rename to src/server/authserver/authserver.rc
diff --git a/src/authserver/resource.h b/src/server/authserver/resource.h
similarity index 100%
rename from src/authserver/resource.h
rename to src/server/authserver/resource.h
diff --git a/src/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/CombatAI.cpp
rename to src/server/game/AI/CoreAI/CombatAI.cpp
diff --git a/src/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h
similarity index 100%
rename from src/game/AI/CoreAI/CombatAI.h
rename to src/server/game/AI/CoreAI/CombatAI.h
diff --git a/src/game/AI/CoreAI/GameObjectAI.cpp b/src/server/game/AI/CoreAI/GameObjectAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/GameObjectAI.cpp
rename to src/server/game/AI/CoreAI/GameObjectAI.cpp
diff --git a/src/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h
similarity index 100%
rename from src/game/AI/CoreAI/GameObjectAI.h
rename to src/server/game/AI/CoreAI/GameObjectAI.h
diff --git a/src/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/GuardAI.cpp
rename to src/server/game/AI/CoreAI/GuardAI.cpp
diff --git a/src/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
similarity index 100%
rename from src/game/AI/CoreAI/GuardAI.h
rename to src/server/game/AI/CoreAI/GuardAI.h
diff --git a/src/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/PassiveAI.cpp
rename to src/server/game/AI/CoreAI/PassiveAI.cpp
diff --git a/src/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h
similarity index 100%
rename from src/game/AI/CoreAI/PassiveAI.h
rename to src/server/game/AI/CoreAI/PassiveAI.h
diff --git a/src/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/PetAI.cpp
rename to src/server/game/AI/CoreAI/PetAI.cpp
diff --git a/src/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
similarity index 100%
rename from src/game/AI/CoreAI/PetAI.h
rename to src/server/game/AI/CoreAI/PetAI.h
diff --git a/src/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/ReactorAI.cpp
rename to src/server/game/AI/CoreAI/ReactorAI.cpp
diff --git a/src/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h
similarity index 100%
rename from src/game/AI/CoreAI/ReactorAI.h
rename to src/server/game/AI/CoreAI/ReactorAI.h
diff --git a/src/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/TotemAI.cpp
rename to src/server/game/AI/CoreAI/TotemAI.cpp
diff --git a/src/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
similarity index 100%
rename from src/game/AI/CoreAI/TotemAI.h
rename to src/server/game/AI/CoreAI/TotemAI.h
diff --git a/src/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp
similarity index 100%
rename from src/game/AI/CoreAI/UnitAI.cpp
rename to src/server/game/AI/CoreAI/UnitAI.cpp
diff --git a/src/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h
similarity index 100%
rename from src/game/AI/CoreAI/UnitAI.h
rename to src/server/game/AI/CoreAI/UnitAI.h
diff --git a/src/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
similarity index 100%
rename from src/game/AI/CreatureAI.cpp
rename to src/server/game/AI/CreatureAI.cpp
diff --git a/src/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
similarity index 100%
rename from src/game/AI/CreatureAI.h
rename to src/server/game/AI/CreatureAI.h
diff --git a/src/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
similarity index 100%
rename from src/game/AI/CreatureAIFactory.h
rename to src/server/game/AI/CreatureAIFactory.h
diff --git a/src/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
similarity index 100%
rename from src/game/AI/CreatureAIImpl.h
rename to src/server/game/AI/CreatureAIImpl.h
diff --git a/src/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
similarity index 100%
rename from src/game/AI/CreatureAIRegistry.cpp
rename to src/server/game/AI/CreatureAIRegistry.cpp
diff --git a/src/game/AI/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h
similarity index 100%
rename from src/game/AI/CreatureAIRegistry.h
rename to src/server/game/AI/CreatureAIRegistry.h
diff --git a/src/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
similarity index 100%
rename from src/game/AI/CreatureAISelector.cpp
rename to src/server/game/AI/CreatureAISelector.cpp
diff --git a/src/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h
similarity index 100%
rename from src/game/AI/CreatureAISelector.h
rename to src/server/game/AI/CreatureAISelector.h
diff --git a/src/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedCreature.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedCreature.h
rename to src/server/game/AI/ScriptedAI/ScriptedCreature.h
diff --git a/src/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedEscortAI.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedEscortAI.h
rename to src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
diff --git a/src/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedFollowerAI.h
rename to src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
diff --git a/src/game/AI/ScriptedAI/ScriptedGossip.cpp b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedGossip.cpp
rename to src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
similarity index 100%
rename from src/game/AI/ScriptedAI/ScriptedGossip.h
rename to src/server/game/AI/ScriptedAI/ScriptedGossip.h
diff --git a/src/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
similarity index 100%
rename from src/game/AI/SmartScripts/SmartAI.cpp
rename to src/server/game/AI/SmartScripts/SmartAI.cpp
diff --git a/src/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h
similarity index 100%
rename from src/game/AI/SmartScripts/SmartAI.h
rename to src/server/game/AI/SmartScripts/SmartAI.h
diff --git a/src/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
similarity index 100%
rename from src/game/AI/SmartScripts/SmartScript.cpp
rename to src/server/game/AI/SmartScripts/SmartScript.cpp
diff --git a/src/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h
similarity index 100%
rename from src/game/AI/SmartScripts/SmartScript.h
rename to src/server/game/AI/SmartScripts/SmartScript.h
diff --git a/src/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
similarity index 100%
rename from src/game/AI/SmartScripts/SmartScriptMgr.cpp
rename to src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
diff --git a/src/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
similarity index 100%
rename from src/game/AI/SmartScripts/SmartScriptMgr.h
rename to src/server/game/AI/SmartScripts/SmartScriptMgr.h
diff --git a/src/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
similarity index 100%
rename from src/game/Accounts/AccountMgr.cpp
rename to src/server/game/Accounts/AccountMgr.cpp
diff --git a/src/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
similarity index 100%
rename from src/game/Accounts/AccountMgr.h
rename to src/server/game/Accounts/AccountMgr.h
diff --git a/src/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
similarity index 100%
rename from src/game/Achievements/AchievementMgr.cpp
rename to src/server/game/Achievements/AchievementMgr.cpp
diff --git a/src/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
similarity index 100%
rename from src/game/Achievements/AchievementMgr.h
rename to src/server/game/Achievements/AchievementMgr.h
diff --git a/modules/acore/game-framework/src/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
similarity index 100%
rename from modules/acore/game-framework/src/Addons/AddonMgr.cpp
rename to src/server/game/Addons/AddonMgr.cpp
diff --git a/modules/acore/game-framework/src/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
similarity index 100%
rename from modules/acore/game-framework/src/Addons/AddonMgr.h
rename to src/server/game/Addons/AddonMgr.h
diff --git a/src/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h
similarity index 100%
rename from src/game/ArenaSpectator/ArenaSpectator.h
rename to src/server/game/ArenaSpectator/ArenaSpectator.h
diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
similarity index 100%
rename from src/game/AuctionHouse/AuctionHouseMgr.cpp
rename to src/server/game/AuctionHouse/AuctionHouseMgr.cpp
diff --git a/src/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
similarity index 100%
rename from src/game/AuctionHouse/AuctionHouseMgr.h
rename to src/server/game/AuctionHouse/AuctionHouseMgr.h
diff --git a/src/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
similarity index 100%
rename from src/game/Battlefield/Battlefield.cpp
rename to src/server/game/Battlefield/Battlefield.cpp
diff --git a/src/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
similarity index 100%
rename from src/game/Battlefield/Battlefield.h
rename to src/server/game/Battlefield/Battlefield.h
diff --git a/src/game/Battlefield/BattlefieldHandler.cpp b/src/server/game/Battlefield/BattlefieldHandler.cpp
similarity index 100%
rename from src/game/Battlefield/BattlefieldHandler.cpp
rename to src/server/game/Battlefield/BattlefieldHandler.cpp
diff --git a/src/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp
similarity index 100%
rename from src/game/Battlefield/BattlefieldMgr.cpp
rename to src/server/game/Battlefield/BattlefieldMgr.cpp
diff --git a/src/game/Battlefield/BattlefieldMgr.h b/src/server/game/Battlefield/BattlefieldMgr.h
similarity index 100%
rename from src/game/Battlefield/BattlefieldMgr.h
rename to src/server/game/Battlefield/BattlefieldMgr.h
diff --git a/src/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
similarity index 100%
rename from src/game/Battlefield/Zones/BattlefieldWG.cpp
rename to src/server/game/Battlefield/Zones/BattlefieldWG.cpp
diff --git a/src/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h
similarity index 100%
rename from src/game/Battlefield/Zones/BattlefieldWG.h
rename to src/server/game/Battlefield/Zones/BattlefieldWG.h
diff --git a/src/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp
similarity index 100%
rename from src/game/Battlegrounds/ArenaTeam.cpp
rename to src/server/game/Battlegrounds/ArenaTeam.cpp
diff --git a/src/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h
similarity index 100%
rename from src/game/Battlegrounds/ArenaTeam.h
rename to src/server/game/Battlegrounds/ArenaTeam.h
diff --git a/src/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
similarity index 100%
rename from src/game/Battlegrounds/ArenaTeamMgr.cpp
rename to src/server/game/Battlegrounds/ArenaTeamMgr.cpp
diff --git a/src/game/Battlegrounds/ArenaTeamMgr.h b/src/server/game/Battlegrounds/ArenaTeamMgr.h
similarity index 100%
rename from src/game/Battlegrounds/ArenaTeamMgr.h
rename to src/server/game/Battlegrounds/ArenaTeamMgr.h
diff --git a/src/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
similarity index 100%
rename from src/game/Battlegrounds/Battleground.cpp
rename to src/server/game/Battlegrounds/Battleground.cpp
diff --git a/src/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
similarity index 100%
rename from src/game/Battlegrounds/Battleground.h
rename to src/server/game/Battlegrounds/Battleground.h
diff --git a/src/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
similarity index 100%
rename from src/game/Battlegrounds/BattlegroundMgr.cpp
rename to src/server/game/Battlegrounds/BattlegroundMgr.cpp
diff --git a/src/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h
similarity index 100%
rename from src/game/Battlegrounds/BattlegroundMgr.h
rename to src/server/game/Battlegrounds/BattlegroundMgr.h
diff --git a/src/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
similarity index 100%
rename from src/game/Battlegrounds/BattlegroundQueue.cpp
rename to src/server/game/Battlegrounds/BattlegroundQueue.cpp
diff --git a/src/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h
similarity index 100%
rename from src/game/Battlegrounds/BattlegroundQueue.h
rename to src/server/game/Battlegrounds/BattlegroundQueue.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundAB.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundAB.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundAB.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundAV.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundAV.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundAV.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundBE.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundBE.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundBE.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundDS.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundDS.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundDS.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundEY.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundEY.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundEY.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundIC.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundIC.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundIC.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundNA.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundNA.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundNA.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundRL.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundRL.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundRL.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundRV.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundRV.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundRV.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundSA.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundSA.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundSA.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundWS.cpp
rename to src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
similarity index 100%
rename from src/game/Battlegrounds/Zones/BattlegroundWS.h
rename to src/server/game/Battlegrounds/Zones/BattlegroundWS.h
diff --git a/src/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
similarity index 82%
rename from src/game/CMakeLists.txt
rename to src/server/game/CMakeLists.txt
index 5638e7f2f..2b4f7c26a 100644
--- a/src/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -111,29 +111,29 @@ set(game_STAT_SRCS
 include_directories(
   ${game_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour/Include
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast/Include
-  ${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/src/
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/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_SOURCE_DIR}/modules/acore/game-framework/src/Addons
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour/Include
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast/Include
+  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/deps/zlib
+  ${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}
@@ -218,10 +218,6 @@ add_library(game STATIC
   ${game_STAT_PCH_SRC}
 )
 
-target_link_libraries(game
-  gamefw
-)
-
 add_dependencies(game revision.h)
 
 # Generate precompiled header
diff --git a/src/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp
similarity index 100%
rename from src/game/Calendar/CalendarMgr.cpp
rename to src/server/game/Calendar/CalendarMgr.cpp
diff --git a/src/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h
similarity index 100%
rename from src/game/Calendar/CalendarMgr.h
rename to src/server/game/Calendar/CalendarMgr.h
diff --git a/src/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
similarity index 100%
rename from src/game/Chat/Channels/Channel.cpp
rename to src/server/game/Chat/Channels/Channel.cpp
diff --git a/src/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
similarity index 100%
rename from src/game/Chat/Channels/Channel.h
rename to src/server/game/Chat/Channels/Channel.h
diff --git a/src/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
similarity index 100%
rename from src/game/Chat/Channels/ChannelMgr.cpp
rename to src/server/game/Chat/Channels/ChannelMgr.cpp
diff --git a/src/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
similarity index 100%
rename from src/game/Chat/Channels/ChannelMgr.h
rename to src/server/game/Chat/Channels/ChannelMgr.h
diff --git a/src/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
similarity index 100%
rename from src/game/Chat/Chat.cpp
rename to src/server/game/Chat/Chat.cpp
diff --git a/src/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
similarity index 100%
rename from src/game/Chat/Chat.h
rename to src/server/game/Chat/Chat.h
diff --git a/src/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp
similarity index 100%
rename from src/game/Chat/ChatLink.cpp
rename to src/server/game/Chat/ChatLink.cpp
diff --git a/src/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h
similarity index 100%
rename from src/game/Chat/ChatLink.h
rename to src/server/game/Chat/ChatLink.h
diff --git a/src/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp
similarity index 100%
rename from src/game/Combat/HostileRefManager.cpp
rename to src/server/game/Combat/HostileRefManager.cpp
diff --git a/src/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h
similarity index 100%
rename from src/game/Combat/HostileRefManager.h
rename to src/server/game/Combat/HostileRefManager.h
diff --git a/src/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
similarity index 100%
rename from src/game/Combat/ThreatManager.cpp
rename to src/server/game/Combat/ThreatManager.cpp
diff --git a/src/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
similarity index 100%
rename from src/game/Combat/ThreatManager.h
rename to src/server/game/Combat/ThreatManager.h
diff --git a/src/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h
similarity index 100%
rename from src/game/Combat/UnitEvents.h
rename to src/server/game/Combat/UnitEvents.h
diff --git a/src/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
similarity index 100%
rename from src/game/Conditions/ConditionMgr.cpp
rename to src/server/game/Conditions/ConditionMgr.cpp
diff --git a/src/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
similarity index 100%
rename from src/game/Conditions/ConditionMgr.h
rename to src/server/game/Conditions/ConditionMgr.h
diff --git a/src/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp
similarity index 100%
rename from src/game/Conditions/DisableMgr.cpp
rename to src/server/game/Conditions/DisableMgr.cpp
diff --git a/src/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h
similarity index 100%
rename from src/game/Conditions/DisableMgr.h
rename to src/server/game/Conditions/DisableMgr.h
diff --git a/src/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
similarity index 100%
rename from src/game/DataStores/DBCEnums.h
rename to src/server/game/DataStores/DBCEnums.h
diff --git a/src/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
similarity index 100%
rename from src/game/DataStores/DBCStores.cpp
rename to src/server/game/DataStores/DBCStores.cpp
diff --git a/src/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
similarity index 100%
rename from src/game/DataStores/DBCStores.h
rename to src/server/game/DataStores/DBCStores.h
diff --git a/src/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
similarity index 100%
rename from src/game/DataStores/DBCStructure.h
rename to src/server/game/DataStores/DBCStructure.h
diff --git a/src/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
similarity index 100%
rename from src/game/DataStores/DBCfmt.h
rename to src/server/game/DataStores/DBCfmt.h
diff --git a/src/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp
similarity index 100%
rename from src/game/DungeonFinding/LFG.cpp
rename to src/server/game/DungeonFinding/LFG.cpp
diff --git a/src/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h
similarity index 100%
rename from src/game/DungeonFinding/LFG.h
rename to src/server/game/DungeonFinding/LFG.h
diff --git a/src/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp
similarity index 100%
rename from src/game/DungeonFinding/LFGGroupData.cpp
rename to src/server/game/DungeonFinding/LFGGroupData.cpp
diff --git a/src/game/DungeonFinding/LFGGroupData.h b/src/server/game/DungeonFinding/LFGGroupData.h
similarity index 100%
rename from src/game/DungeonFinding/LFGGroupData.h
rename to src/server/game/DungeonFinding/LFGGroupData.h
diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
similarity index 100%
rename from src/game/DungeonFinding/LFGMgr.cpp
rename to src/server/game/DungeonFinding/LFGMgr.cpp
diff --git a/src/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
similarity index 100%
rename from src/game/DungeonFinding/LFGMgr.h
rename to src/server/game/DungeonFinding/LFGMgr.h
diff --git a/src/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp
similarity index 100%
rename from src/game/DungeonFinding/LFGPlayerData.cpp
rename to src/server/game/DungeonFinding/LFGPlayerData.cpp
diff --git a/src/game/DungeonFinding/LFGPlayerData.h b/src/server/game/DungeonFinding/LFGPlayerData.h
similarity index 100%
rename from src/game/DungeonFinding/LFGPlayerData.h
rename to src/server/game/DungeonFinding/LFGPlayerData.h
diff --git a/src/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp
similarity index 100%
rename from src/game/DungeonFinding/LFGQueue.cpp
rename to src/server/game/DungeonFinding/LFGQueue.cpp
diff --git a/src/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h
similarity index 100%
rename from src/game/DungeonFinding/LFGQueue.h
rename to src/server/game/DungeonFinding/LFGQueue.h
diff --git a/src/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
similarity index 100%
rename from src/game/DungeonFinding/LFGScripts.cpp
rename to src/server/game/DungeonFinding/LFGScripts.cpp
diff --git a/src/game/DungeonFinding/LFGScripts.h b/src/server/game/DungeonFinding/LFGScripts.h
similarity index 100%
rename from src/game/DungeonFinding/LFGScripts.h
rename to src/server/game/DungeonFinding/LFGScripts.h
diff --git a/src/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
similarity index 100%
rename from src/game/Entities/Corpse/Corpse.cpp
rename to src/server/game/Entities/Corpse/Corpse.cpp
diff --git a/src/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
similarity index 100%
rename from src/game/Entities/Corpse/Corpse.h
rename to src/server/game/Entities/Corpse/Corpse.h
diff --git a/src/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
similarity index 100%
rename from src/game/Entities/Creature/Creature.cpp
rename to src/server/game/Entities/Creature/Creature.cpp
diff --git a/src/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
similarity index 100%
rename from src/game/Entities/Creature/Creature.h
rename to src/server/game/Entities/Creature/Creature.h
diff --git a/src/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
similarity index 100%
rename from src/game/Entities/Creature/CreatureGroups.cpp
rename to src/server/game/Entities/Creature/CreatureGroups.cpp
diff --git a/src/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h
similarity index 100%
rename from src/game/Entities/Creature/CreatureGroups.h
rename to src/server/game/Entities/Creature/CreatureGroups.h
diff --git a/src/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
similarity index 100%
rename from src/game/Entities/Creature/GossipDef.cpp
rename to src/server/game/Entities/Creature/GossipDef.cpp
diff --git a/src/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
similarity index 100%
rename from src/game/Entities/Creature/GossipDef.h
rename to src/server/game/Entities/Creature/GossipDef.h
diff --git a/src/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
similarity index 100%
rename from src/game/Entities/Creature/TemporarySummon.cpp
rename to src/server/game/Entities/Creature/TemporarySummon.cpp
diff --git a/src/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h
similarity index 100%
rename from src/game/Entities/Creature/TemporarySummon.h
rename to src/server/game/Entities/Creature/TemporarySummon.h
diff --git a/src/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
similarity index 100%
rename from src/game/Entities/DynamicObject/DynamicObject.cpp
rename to src/server/game/Entities/DynamicObject/DynamicObject.cpp
diff --git a/src/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h
similarity index 100%
rename from src/game/Entities/DynamicObject/DynamicObject.h
rename to src/server/game/Entities/DynamicObject/DynamicObject.h
diff --git a/src/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
similarity index 100%
rename from src/game/Entities/GameObject/GameObject.cpp
rename to src/server/game/Entities/GameObject/GameObject.cpp
diff --git a/src/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
similarity index 100%
rename from src/game/Entities/GameObject/GameObject.h
rename to src/server/game/Entities/GameObject/GameObject.h
diff --git a/src/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp
similarity index 100%
rename from src/game/Entities/Item/Container/Bag.cpp
rename to src/server/game/Entities/Item/Container/Bag.cpp
diff --git a/src/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h
similarity index 100%
rename from src/game/Entities/Item/Container/Bag.h
rename to src/server/game/Entities/Item/Container/Bag.h
diff --git a/src/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp
similarity index 100%
rename from src/game/Entities/Item/Item.cpp
rename to src/server/game/Entities/Item/Item.cpp
diff --git a/src/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h
similarity index 100%
rename from src/game/Entities/Item/Item.h
rename to src/server/game/Entities/Item/Item.h
diff --git a/src/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
similarity index 100%
rename from src/game/Entities/Item/ItemEnchantmentMgr.cpp
rename to src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
diff --git a/src/game/Entities/Item/ItemEnchantmentMgr.h b/src/server/game/Entities/Item/ItemEnchantmentMgr.h
similarity index 100%
rename from src/game/Entities/Item/ItemEnchantmentMgr.h
rename to src/server/game/Entities/Item/ItemEnchantmentMgr.h
diff --git a/src/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
similarity index 100%
rename from src/game/Entities/Item/ItemPrototype.h
rename to src/server/game/Entities/Item/ItemPrototype.h
diff --git a/src/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
similarity index 100%
rename from src/game/Entities/Object/Object.cpp
rename to src/server/game/Entities/Object/Object.cpp
diff --git a/src/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
similarity index 100%
rename from src/game/Entities/Object/Object.h
rename to src/server/game/Entities/Object/Object.h
diff --git a/src/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
similarity index 100%
rename from src/game/Entities/Object/ObjectDefines.h
rename to src/server/game/Entities/Object/ObjectDefines.h
diff --git a/src/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp
similarity index 100%
rename from src/game/Entities/Object/ObjectPosSelector.cpp
rename to src/server/game/Entities/Object/ObjectPosSelector.cpp
diff --git a/src/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h
similarity index 100%
rename from src/game/Entities/Object/ObjectPosSelector.h
rename to src/server/game/Entities/Object/ObjectPosSelector.h
diff --git a/src/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp
similarity index 100%
rename from src/game/Entities/Object/Updates/UpdateData.cpp
rename to src/server/game/Entities/Object/Updates/UpdateData.cpp
diff --git a/src/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h
similarity index 100%
rename from src/game/Entities/Object/Updates/UpdateData.h
rename to src/server/game/Entities/Object/Updates/UpdateData.h
diff --git a/src/game/Entities/Object/Updates/UpdateFieldFlags.cpp b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp
similarity index 100%
rename from src/game/Entities/Object/Updates/UpdateFieldFlags.cpp
rename to src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp
diff --git a/src/game/Entities/Object/Updates/UpdateFieldFlags.h b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
similarity index 100%
rename from src/game/Entities/Object/Updates/UpdateFieldFlags.h
rename to src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
diff --git a/src/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h
similarity index 100%
rename from src/game/Entities/Object/Updates/UpdateFields.h
rename to src/server/game/Entities/Object/Updates/UpdateFields.h
diff --git a/src/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h
similarity index 100%
rename from src/game/Entities/Object/Updates/UpdateMask.h
rename to src/server/game/Entities/Object/Updates/UpdateMask.h
diff --git a/src/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
similarity index 100%
rename from src/game/Entities/Pet/Pet.cpp
rename to src/server/game/Entities/Pet/Pet.cpp
diff --git a/src/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
similarity index 100%
rename from src/game/Entities/Pet/Pet.h
rename to src/server/game/Entities/Pet/Pet.h
diff --git a/src/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h
similarity index 100%
rename from src/game/Entities/Pet/PetDefines.h
rename to src/server/game/Entities/Pet/PetDefines.h
diff --git a/src/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
similarity index 100%
rename from src/game/Entities/Player/Player.cpp
rename to src/server/game/Entities/Player/Player.cpp
diff --git a/src/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
similarity index 100%
rename from src/game/Entities/Player/Player.h
rename to src/server/game/Entities/Player/Player.h
diff --git a/src/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
similarity index 100%
rename from src/game/Entities/Player/SocialMgr.cpp
rename to src/server/game/Entities/Player/SocialMgr.cpp
diff --git a/src/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
similarity index 100%
rename from src/game/Entities/Player/SocialMgr.h
rename to src/server/game/Entities/Player/SocialMgr.h
diff --git a/src/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp
similarity index 100%
rename from src/game/Entities/Totem/Totem.cpp
rename to src/server/game/Entities/Totem/Totem.cpp
diff --git a/src/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h
similarity index 100%
rename from src/game/Entities/Totem/Totem.h
rename to src/server/game/Entities/Totem/Totem.h
diff --git a/src/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
similarity index 100%
rename from src/game/Entities/Transport/Transport.cpp
rename to src/server/game/Entities/Transport/Transport.cpp
diff --git a/src/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h
similarity index 100%
rename from src/game/Entities/Transport/Transport.h
rename to src/server/game/Entities/Transport/Transport.h
diff --git a/src/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
similarity index 100%
rename from src/game/Entities/Unit/StatSystem.cpp
rename to src/server/game/Entities/Unit/StatSystem.cpp
diff --git a/src/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
similarity index 100%
rename from src/game/Entities/Unit/Unit.cpp
rename to src/server/game/Entities/Unit/Unit.cpp
diff --git a/src/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
similarity index 100%
rename from src/game/Entities/Unit/Unit.h
rename to src/server/game/Entities/Unit/Unit.h
diff --git a/src/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
similarity index 100%
rename from src/game/Entities/Vehicle/Vehicle.cpp
rename to src/server/game/Entities/Vehicle/Vehicle.cpp
diff --git a/src/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h
similarity index 100%
rename from src/game/Entities/Vehicle/Vehicle.h
rename to src/server/game/Entities/Vehicle/Vehicle.h
diff --git a/src/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h
similarity index 100%
rename from src/game/Entities/Vehicle/VehicleDefines.h
rename to src/server/game/Entities/Vehicle/VehicleDefines.h
diff --git a/src/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
similarity index 100%
rename from src/game/Events/GameEventMgr.cpp
rename to src/server/game/Events/GameEventMgr.cpp
diff --git a/src/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
similarity index 100%
rename from src/game/Events/GameEventMgr.h
rename to src/server/game/Events/GameEventMgr.h
diff --git a/src/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
similarity index 100%
rename from src/game/Globals/ObjectAccessor.cpp
rename to src/server/game/Globals/ObjectAccessor.cpp
diff --git a/src/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
similarity index 100%
rename from src/game/Globals/ObjectAccessor.h
rename to src/server/game/Globals/ObjectAccessor.h
diff --git a/src/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
similarity index 100%
rename from src/game/Globals/ObjectMgr.cpp
rename to src/server/game/Globals/ObjectMgr.cpp
diff --git a/src/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
similarity index 100%
rename from src/game/Globals/ObjectMgr.h
rename to src/server/game/Globals/ObjectMgr.h
diff --git a/src/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
similarity index 100%
rename from src/game/Grids/Cells/Cell.h
rename to src/server/game/Grids/Cells/Cell.h
diff --git a/src/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h
similarity index 100%
rename from src/game/Grids/Cells/CellImpl.h
rename to src/server/game/Grids/Cells/CellImpl.h
diff --git a/src/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
similarity index 100%
rename from src/game/Grids/Grid.h
rename to src/server/game/Grids/Grid.h
diff --git a/src/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
similarity index 100%
rename from src/game/Grids/GridDefines.h
rename to src/server/game/Grids/GridDefines.h
diff --git a/src/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h
similarity index 100%
rename from src/game/Grids/GridLoader.h
rename to src/server/game/Grids/GridLoader.h
diff --git a/src/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
similarity index 100%
rename from src/game/Grids/GridRefManager.h
rename to src/server/game/Grids/GridRefManager.h
diff --git a/src/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
similarity index 100%
rename from src/game/Grids/GridReference.h
rename to src/server/game/Grids/GridReference.h
diff --git a/src/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
similarity index 100%
rename from src/game/Grids/NGrid.h
rename to src/server/game/Grids/NGrid.h
diff --git a/src/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
similarity index 100%
rename from src/game/Grids/Notifiers/GridNotifiers.cpp
rename to src/server/game/Grids/Notifiers/GridNotifiers.cpp
diff --git a/src/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
similarity index 100%
rename from src/game/Grids/Notifiers/GridNotifiers.h
rename to src/server/game/Grids/Notifiers/GridNotifiers.h
diff --git a/src/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
similarity index 100%
rename from src/game/Grids/Notifiers/GridNotifiersImpl.h
rename to src/server/game/Grids/Notifiers/GridNotifiersImpl.h
diff --git a/src/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
similarity index 100%
rename from src/game/Grids/ObjectGridLoader.cpp
rename to src/server/game/Grids/ObjectGridLoader.cpp
diff --git a/src/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
similarity index 100%
rename from src/game/Grids/ObjectGridLoader.h
rename to src/server/game/Grids/ObjectGridLoader.h
diff --git a/src/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
similarity index 100%
rename from src/game/Groups/Group.cpp
rename to src/server/game/Groups/Group.cpp
diff --git a/src/game/Groups/Group.h b/src/server/game/Groups/Group.h
similarity index 100%
rename from src/game/Groups/Group.h
rename to src/server/game/Groups/Group.h
diff --git a/src/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp
similarity index 100%
rename from src/game/Groups/GroupMgr.cpp
rename to src/server/game/Groups/GroupMgr.cpp
diff --git a/src/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h
similarity index 100%
rename from src/game/Groups/GroupMgr.h
rename to src/server/game/Groups/GroupMgr.h
diff --git a/src/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h
similarity index 100%
rename from src/game/Groups/GroupRefManager.h
rename to src/server/game/Groups/GroupRefManager.h
diff --git a/src/game/Groups/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp
similarity index 100%
rename from src/game/Groups/GroupReference.cpp
rename to src/server/game/Groups/GroupReference.cpp
diff --git a/src/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h
similarity index 100%
rename from src/game/Groups/GroupReference.h
rename to src/server/game/Groups/GroupReference.h
diff --git a/src/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
similarity index 100%
rename from src/game/Guilds/Guild.cpp
rename to src/server/game/Guilds/Guild.cpp
diff --git a/src/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
similarity index 100%
rename from src/game/Guilds/Guild.h
rename to src/server/game/Guilds/Guild.h
diff --git a/src/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
similarity index 100%
rename from src/game/Guilds/GuildMgr.cpp
rename to src/server/game/Guilds/GuildMgr.cpp
diff --git a/src/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h
similarity index 100%
rename from src/game/Guilds/GuildMgr.h
rename to src/server/game/Guilds/GuildMgr.h
diff --git a/src/game/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp
similarity index 100%
rename from src/game/Handlers/AddonHandler.cpp
rename to src/server/game/Handlers/AddonHandler.cpp
diff --git a/src/game/Handlers/AddonHandler.h b/src/server/game/Handlers/AddonHandler.h
similarity index 100%
rename from src/game/Handlers/AddonHandler.h
rename to src/server/game/Handlers/AddonHandler.h
diff --git a/src/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp
similarity index 100%
rename from src/game/Handlers/ArenaTeamHandler.cpp
rename to src/server/game/Handlers/ArenaTeamHandler.cpp
diff --git a/src/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp
similarity index 100%
rename from src/game/Handlers/AuctionHouseHandler.cpp
rename to src/server/game/Handlers/AuctionHouseHandler.cpp
diff --git a/src/game/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp
similarity index 100%
rename from src/game/Handlers/AuthHandler.cpp
rename to src/server/game/Handlers/AuthHandler.cpp
diff --git a/src/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
similarity index 100%
rename from src/game/Handlers/BattleGroundHandler.cpp
rename to src/server/game/Handlers/BattleGroundHandler.cpp
diff --git a/src/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp
similarity index 100%
rename from src/game/Handlers/CalendarHandler.cpp
rename to src/server/game/Handlers/CalendarHandler.cpp
diff --git a/src/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp
similarity index 100%
rename from src/game/Handlers/ChannelHandler.cpp
rename to src/server/game/Handlers/ChannelHandler.cpp
diff --git a/src/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
similarity index 100%
rename from src/game/Handlers/CharacterHandler.cpp
rename to src/server/game/Handlers/CharacterHandler.cpp
diff --git a/src/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
similarity index 100%
rename from src/game/Handlers/ChatHandler.cpp
rename to src/server/game/Handlers/ChatHandler.cpp
diff --git a/src/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp
similarity index 100%
rename from src/game/Handlers/CombatHandler.cpp
rename to src/server/game/Handlers/CombatHandler.cpp
diff --git a/src/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp
similarity index 100%
rename from src/game/Handlers/DuelHandler.cpp
rename to src/server/game/Handlers/DuelHandler.cpp
diff --git a/src/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
similarity index 100%
rename from src/game/Handlers/GroupHandler.cpp
rename to src/server/game/Handlers/GroupHandler.cpp
diff --git a/src/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp
similarity index 100%
rename from src/game/Handlers/GuildHandler.cpp
rename to src/server/game/Handlers/GuildHandler.cpp
diff --git a/src/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
similarity index 100%
rename from src/game/Handlers/ItemHandler.cpp
rename to src/server/game/Handlers/ItemHandler.cpp
diff --git a/src/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp
similarity index 100%
rename from src/game/Handlers/LFGHandler.cpp
rename to src/server/game/Handlers/LFGHandler.cpp
diff --git a/src/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp
similarity index 100%
rename from src/game/Handlers/LootHandler.cpp
rename to src/server/game/Handlers/LootHandler.cpp
diff --git a/src/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp
similarity index 100%
rename from src/game/Handlers/MailHandler.cpp
rename to src/server/game/Handlers/MailHandler.cpp
diff --git a/src/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
similarity index 100%
rename from src/game/Handlers/MiscHandler.cpp
rename to src/server/game/Handlers/MiscHandler.cpp
diff --git a/src/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
similarity index 100%
rename from src/game/Handlers/MovementHandler.cpp
rename to src/server/game/Handlers/MovementHandler.cpp
diff --git a/src/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp
similarity index 100%
rename from src/game/Handlers/NPCHandler.cpp
rename to src/server/game/Handlers/NPCHandler.cpp
diff --git a/src/game/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h
similarity index 100%
rename from src/game/Handlers/NPCHandler.h
rename to src/server/game/Handlers/NPCHandler.h
diff --git a/src/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
similarity index 100%
rename from src/game/Handlers/PetHandler.cpp
rename to src/server/game/Handlers/PetHandler.cpp
diff --git a/src/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp
similarity index 100%
rename from src/game/Handlers/PetitionsHandler.cpp
rename to src/server/game/Handlers/PetitionsHandler.cpp
diff --git a/src/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp
similarity index 100%
rename from src/game/Handlers/QueryHandler.cpp
rename to src/server/game/Handlers/QueryHandler.cpp
diff --git a/src/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
similarity index 100%
rename from src/game/Handlers/QuestHandler.cpp
rename to src/server/game/Handlers/QuestHandler.cpp
diff --git a/src/game/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp
similarity index 100%
rename from src/game/Handlers/ReferAFriendHandler.cpp
rename to src/server/game/Handlers/ReferAFriendHandler.cpp
diff --git a/src/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp
similarity index 100%
rename from src/game/Handlers/SkillHandler.cpp
rename to src/server/game/Handlers/SkillHandler.cpp
diff --git a/src/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
similarity index 100%
rename from src/game/Handlers/SpellHandler.cpp
rename to src/server/game/Handlers/SpellHandler.cpp
diff --git a/src/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp
similarity index 100%
rename from src/game/Handlers/TaxiHandler.cpp
rename to src/server/game/Handlers/TaxiHandler.cpp
diff --git a/src/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp
similarity index 100%
rename from src/game/Handlers/TicketHandler.cpp
rename to src/server/game/Handlers/TicketHandler.cpp
diff --git a/src/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp
similarity index 100%
rename from src/game/Handlers/TradeHandler.cpp
rename to src/server/game/Handlers/TradeHandler.cpp
diff --git a/src/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp
similarity index 100%
rename from src/game/Handlers/VehicleHandler.cpp
rename to src/server/game/Handlers/VehicleHandler.cpp
diff --git a/src/game/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp
similarity index 100%
rename from src/game/Handlers/VoiceChatHandler.cpp
rename to src/server/game/Handlers/VoiceChatHandler.cpp
diff --git a/src/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
similarity index 100%
rename from src/game/Instances/InstanceSaveMgr.cpp
rename to src/server/game/Instances/InstanceSaveMgr.cpp
diff --git a/src/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
similarity index 100%
rename from src/game/Instances/InstanceSaveMgr.h
rename to src/server/game/Instances/InstanceSaveMgr.h
diff --git a/src/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
similarity index 100%
rename from src/game/Instances/InstanceScript.cpp
rename to src/server/game/Instances/InstanceScript.cpp
diff --git a/src/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h
similarity index 100%
rename from src/game/Instances/InstanceScript.h
rename to src/server/game/Instances/InstanceScript.h
diff --git a/src/game/Loot/LootItemStorage.cpp b/src/server/game/Loot/LootItemStorage.cpp
similarity index 100%
rename from src/game/Loot/LootItemStorage.cpp
rename to src/server/game/Loot/LootItemStorage.cpp
diff --git a/src/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h
similarity index 100%
rename from src/game/Loot/LootItemStorage.h
rename to src/server/game/Loot/LootItemStorage.h
diff --git a/src/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
similarity index 100%
rename from src/game/Loot/LootMgr.cpp
rename to src/server/game/Loot/LootMgr.cpp
diff --git a/src/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
similarity index 100%
rename from src/game/Loot/LootMgr.h
rename to src/server/game/Loot/LootMgr.h
diff --git a/src/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp
similarity index 100%
rename from src/game/Mails/Mail.cpp
rename to src/server/game/Mails/Mail.cpp
diff --git a/src/game/Mails/Mail.h b/src/server/game/Mails/Mail.h
similarity index 100%
rename from src/game/Mails/Mail.h
rename to src/server/game/Mails/Mail.h
diff --git a/src/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
similarity index 100%
rename from src/game/Maps/Map.cpp
rename to src/server/game/Maps/Map.cpp
diff --git a/src/game/Maps/Map.h b/src/server/game/Maps/Map.h
similarity index 100%
rename from src/game/Maps/Map.h
rename to src/server/game/Maps/Map.h
diff --git a/src/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
similarity index 100%
rename from src/game/Maps/MapInstanced.cpp
rename to src/server/game/Maps/MapInstanced.cpp
diff --git a/src/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h
similarity index 100%
rename from src/game/Maps/MapInstanced.h
rename to src/server/game/Maps/MapInstanced.h
diff --git a/src/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
similarity index 100%
rename from src/game/Maps/MapManager.cpp
rename to src/server/game/Maps/MapManager.cpp
diff --git a/src/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
similarity index 100%
rename from src/game/Maps/MapManager.h
rename to src/server/game/Maps/MapManager.h
diff --git a/src/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h
similarity index 100%
rename from src/game/Maps/MapRefManager.h
rename to src/server/game/Maps/MapRefManager.h
diff --git a/src/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h
similarity index 100%
rename from src/game/Maps/MapReference.h
rename to src/server/game/Maps/MapReference.h
diff --git a/src/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
similarity index 100%
rename from src/game/Maps/MapUpdater.cpp
rename to src/server/game/Maps/MapUpdater.cpp
diff --git a/src/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
similarity index 100%
rename from src/game/Maps/MapUpdater.h
rename to src/server/game/Maps/MapUpdater.h
diff --git a/src/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp
similarity index 100%
rename from src/game/Maps/TransportMgr.cpp
rename to src/server/game/Maps/TransportMgr.cpp
diff --git a/src/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h
similarity index 100%
rename from src/game/Maps/TransportMgr.h
rename to src/server/game/Maps/TransportMgr.h
diff --git a/src/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h
similarity index 100%
rename from src/game/Maps/ZoneScript.h
rename to src/server/game/Maps/ZoneScript.h
diff --git a/src/game/Misc/AsyncAuctionListing.cpp b/src/server/game/Misc/AsyncAuctionListing.cpp
similarity index 100%
rename from src/game/Misc/AsyncAuctionListing.cpp
rename to src/server/game/Misc/AsyncAuctionListing.cpp
diff --git a/src/game/Misc/AsyncAuctionListing.h b/src/server/game/Misc/AsyncAuctionListing.h
similarity index 100%
rename from src/game/Misc/AsyncAuctionListing.h
rename to src/server/game/Misc/AsyncAuctionListing.h
diff --git a/src/game/Misc/AvgDiffTracker.cpp b/src/server/game/Misc/AvgDiffTracker.cpp
similarity index 100%
rename from src/game/Misc/AvgDiffTracker.cpp
rename to src/server/game/Misc/AvgDiffTracker.cpp
diff --git a/src/game/Misc/AvgDiffTracker.h b/src/server/game/Misc/AvgDiffTracker.h
similarity index 100%
rename from src/game/Misc/AvgDiffTracker.h
rename to src/server/game/Misc/AvgDiffTracker.h
diff --git a/src/game/Misc/DynamicVisibility.cpp b/src/server/game/Misc/DynamicVisibility.cpp
similarity index 100%
rename from src/game/Misc/DynamicVisibility.cpp
rename to src/server/game/Misc/DynamicVisibility.cpp
diff --git a/src/game/Misc/DynamicVisibility.h b/src/server/game/Misc/DynamicVisibility.h
similarity index 100%
rename from src/game/Misc/DynamicVisibility.h
rename to src/server/game/Misc/DynamicVisibility.h
diff --git a/src/game/Misc/SavingSystem.cpp b/src/server/game/Misc/SavingSystem.cpp
similarity index 100%
rename from src/game/Misc/SavingSystem.cpp
rename to src/server/game/Misc/SavingSystem.cpp
diff --git a/src/game/Misc/SavingSystem.h b/src/server/game/Misc/SavingSystem.h
similarity index 100%
rename from src/game/Misc/SavingSystem.h
rename to src/server/game/Misc/SavingSystem.h
diff --git a/src/game/Misc/WhoListCache.cpp b/src/server/game/Misc/WhoListCache.cpp
similarity index 100%
rename from src/game/Misc/WhoListCache.cpp
rename to src/server/game/Misc/WhoListCache.cpp
diff --git a/src/game/Misc/WhoListCache.h b/src/server/game/Misc/WhoListCache.h
similarity index 100%
rename from src/game/Misc/WhoListCache.h
rename to src/server/game/Misc/WhoListCache.h
diff --git a/src/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h
similarity index 100%
rename from src/game/Miscellaneous/Formulas.h
rename to src/server/game/Miscellaneous/Formulas.h
diff --git a/src/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
similarity index 100%
rename from src/game/Miscellaneous/Language.h
rename to src/server/game/Miscellaneous/Language.h
diff --git a/src/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
similarity index 100%
rename from src/game/Miscellaneous/SharedDefines.h
rename to src/server/game/Miscellaneous/SharedDefines.h
diff --git a/src/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
similarity index 100%
rename from src/game/Movement/FollowerRefManager.h
rename to src/server/game/Movement/FollowerRefManager.h
diff --git a/src/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp
similarity index 100%
rename from src/game/Movement/FollowerReference.cpp
rename to src/server/game/Movement/FollowerReference.cpp
diff --git a/src/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
similarity index 100%
rename from src/game/Movement/FollowerReference.h
rename to src/server/game/Movement/FollowerReference.h
diff --git a/src/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
similarity index 100%
rename from src/game/Movement/MotionMaster.cpp
rename to src/server/game/Movement/MotionMaster.cpp
diff --git a/src/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
similarity index 100%
rename from src/game/Movement/MotionMaster.h
rename to src/server/game/Movement/MotionMaster.h
diff --git a/src/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerator.h
rename to src/server/game/Movement/MovementGenerator.h
diff --git a/src/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h
similarity index 100%
rename from src/game/Movement/MovementGeneratorImpl.h
rename to src/server/game/Movement/MovementGeneratorImpl.h
diff --git a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/EscortMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/EscortMovementGenerator.h b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/EscortMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/FleeingMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/HomeMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/IdleMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/PathGenerator.cpp b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/PathGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/PathGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/PathGenerator.h b/src/server/game/Movement/MovementGenerators/PathGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/PathGenerator.h
rename to src/server/game/Movement/MovementGenerators/PathGenerator.h
diff --git a/src/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/PointMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/PointMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/RandomMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/TargetedMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
similarity index 100%
rename from src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
rename to src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
similarity index 100%
rename from src/game/Movement/MovementGenerators/WaypointMovementGenerator.h
rename to src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
diff --git a/src/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp
similarity index 100%
rename from src/game/Movement/Spline/MoveSpline.cpp
rename to src/server/game/Movement/Spline/MoveSpline.cpp
diff --git a/src/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h
similarity index 100%
rename from src/game/Movement/Spline/MoveSpline.h
rename to src/server/game/Movement/Spline/MoveSpline.h
diff --git a/src/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h
similarity index 100%
rename from src/game/Movement/Spline/MoveSplineFlag.h
rename to src/server/game/Movement/Spline/MoveSplineFlag.h
diff --git a/src/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
similarity index 100%
rename from src/game/Movement/Spline/MoveSplineInit.cpp
rename to src/server/game/Movement/Spline/MoveSplineInit.cpp
diff --git a/src/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h
similarity index 100%
rename from src/game/Movement/Spline/MoveSplineInit.h
rename to src/server/game/Movement/Spline/MoveSplineInit.h
diff --git a/src/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
similarity index 100%
rename from src/game/Movement/Spline/MoveSplineInitArgs.h
rename to src/server/game/Movement/Spline/MoveSplineInitArgs.h
diff --git a/src/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
similarity index 100%
rename from src/game/Movement/Spline/MovementPacketBuilder.cpp
rename to src/server/game/Movement/Spline/MovementPacketBuilder.cpp
diff --git a/src/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h
similarity index 100%
rename from src/game/Movement/Spline/MovementPacketBuilder.h
rename to src/server/game/Movement/Spline/MovementPacketBuilder.h
diff --git a/src/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h
similarity index 100%
rename from src/game/Movement/Spline/MovementTypedefs.h
rename to src/server/game/Movement/Spline/MovementTypedefs.h
diff --git a/src/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp
similarity index 100%
rename from src/game/Movement/Spline/MovementUtil.cpp
rename to src/server/game/Movement/Spline/MovementUtil.cpp
diff --git a/src/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp
similarity index 100%
rename from src/game/Movement/Spline/Spline.cpp
rename to src/server/game/Movement/Spline/Spline.cpp
diff --git a/src/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h
similarity index 100%
rename from src/game/Movement/Spline/Spline.h
rename to src/server/game/Movement/Spline/Spline.h
diff --git a/src/game/Movement/Spline/SplineImpl.h b/src/server/game/Movement/Spline/SplineImpl.h
similarity index 100%
rename from src/game/Movement/Spline/SplineImpl.h
rename to src/server/game/Movement/Spline/SplineImpl.h
diff --git a/src/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
similarity index 100%
rename from src/game/Movement/Waypoints/WaypointManager.cpp
rename to src/server/game/Movement/Waypoints/WaypointManager.cpp
diff --git a/src/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h
similarity index 100%
rename from src/game/Movement/Waypoints/WaypointManager.h
rename to src/server/game/Movement/Waypoints/WaypointManager.h
diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
similarity index 100%
rename from src/game/OutdoorPvP/OutdoorPvP.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvP.cpp
diff --git a/src/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
similarity index 100%
rename from src/game/OutdoorPvP/OutdoorPvP.h
rename to src/server/game/OutdoorPvP/OutdoorPvP.h
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
similarity index 100%
rename from src/game/OutdoorPvP/OutdoorPvPMgr.cpp
rename to src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
similarity index 100%
rename from src/game/OutdoorPvP/OutdoorPvPMgr.h
rename to src/server/game/OutdoorPvP/OutdoorPvPMgr.h
diff --git a/src/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp
similarity index 100%
rename from src/game/Petitions/PetitionMgr.cpp
rename to src/server/game/Petitions/PetitionMgr.cpp
diff --git a/src/game/Petitions/PetitionMgr.h b/src/server/game/Petitions/PetitionMgr.h
similarity index 100%
rename from src/game/Petitions/PetitionMgr.h
rename to src/server/game/Petitions/PetitionMgr.h
diff --git a/src/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
similarity index 100%
rename from src/game/Pools/PoolMgr.cpp
rename to src/server/game/Pools/PoolMgr.cpp
diff --git a/src/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
similarity index 100%
rename from src/game/Pools/PoolMgr.h
rename to src/server/game/Pools/PoolMgr.h
diff --git a/src/game/PrecompiledHeaders/gamePCH.cpp b/src/server/game/PrecompiledHeaders/gamePCH.cpp
similarity index 100%
rename from src/game/PrecompiledHeaders/gamePCH.cpp
rename to src/server/game/PrecompiledHeaders/gamePCH.cpp
diff --git a/src/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h
similarity index 100%
rename from src/game/PrecompiledHeaders/gamePCH.h
rename to src/server/game/PrecompiledHeaders/gamePCH.h
diff --git a/src/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
similarity index 100%
rename from src/game/Quests/QuestDef.cpp
rename to src/server/game/Quests/QuestDef.cpp
diff --git a/src/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
similarity index 100%
rename from src/game/Quests/QuestDef.h
rename to src/server/game/Quests/QuestDef.h
diff --git a/src/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp
similarity index 100%
rename from src/game/Reputation/ReputationMgr.cpp
rename to src/server/game/Reputation/ReputationMgr.cpp
diff --git a/src/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
similarity index 100%
rename from src/game/Reputation/ReputationMgr.h
rename to src/server/game/Reputation/ReputationMgr.h
diff --git a/src/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp
similarity index 100%
rename from src/game/Scripting/MapScripts.cpp
rename to src/server/game/Scripting/MapScripts.cpp
diff --git a/src/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
similarity index 100%
rename from src/game/Scripting/ScriptMgr.cpp
rename to src/server/game/Scripting/ScriptMgr.cpp
diff --git a/src/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
similarity index 100%
rename from src/game/Scripting/ScriptMgr.h
rename to src/server/game/Scripting/ScriptMgr.h
diff --git a/src/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
similarity index 100%
rename from src/game/Scripting/ScriptSystem.cpp
rename to src/server/game/Scripting/ScriptSystem.cpp
diff --git a/src/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
similarity index 100%
rename from src/game/Scripting/ScriptSystem.h
rename to src/server/game/Scripting/ScriptSystem.h
diff --git a/src/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
similarity index 100%
rename from src/game/Server/Protocol/Opcodes.cpp
rename to src/server/game/Server/Protocol/Opcodes.cpp
diff --git a/src/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
similarity index 100%
rename from src/game/Server/Protocol/Opcodes.h
rename to src/server/game/Server/Protocol/Opcodes.h
diff --git a/src/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp
similarity index 100%
rename from src/game/Server/Protocol/PacketLog.cpp
rename to src/server/game/Server/Protocol/PacketLog.cpp
diff --git a/src/game/Server/Protocol/PacketLog.h b/src/server/game/Server/Protocol/PacketLog.h
similarity index 100%
rename from src/game/Server/Protocol/PacketLog.h
rename to src/server/game/Server/Protocol/PacketLog.h
diff --git a/src/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
similarity index 100%
rename from src/game/Server/WorldSession.cpp
rename to src/server/game/Server/WorldSession.cpp
diff --git a/src/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
similarity index 100%
rename from src/game/Server/WorldSession.h
rename to src/server/game/Server/WorldSession.h
diff --git a/src/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
similarity index 100%
rename from src/game/Server/WorldSocket.cpp
rename to src/server/game/Server/WorldSocket.cpp
diff --git a/src/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
similarity index 100%
rename from src/game/Server/WorldSocket.h
rename to src/server/game/Server/WorldSocket.h
diff --git a/src/game/Server/WorldSocketAcceptor.h b/src/server/game/Server/WorldSocketAcceptor.h
similarity index 100%
rename from src/game/Server/WorldSocketAcceptor.h
rename to src/server/game/Server/WorldSocketAcceptor.h
diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
similarity index 100%
rename from src/game/Server/WorldSocketMgr.cpp
rename to src/server/game/Server/WorldSocketMgr.cpp
diff --git a/src/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
similarity index 100%
rename from src/game/Server/WorldSocketMgr.h
rename to src/server/game/Server/WorldSocketMgr.h
diff --git a/src/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
similarity index 100%
rename from src/game/Skills/SkillDiscovery.cpp
rename to src/server/game/Skills/SkillDiscovery.cpp
diff --git a/src/game/Skills/SkillDiscovery.h b/src/server/game/Skills/SkillDiscovery.h
similarity index 100%
rename from src/game/Skills/SkillDiscovery.h
rename to src/server/game/Skills/SkillDiscovery.h
diff --git a/src/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp
similarity index 100%
rename from src/game/Skills/SkillExtraItems.cpp
rename to src/server/game/Skills/SkillExtraItems.cpp
diff --git a/src/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h
similarity index 100%
rename from src/game/Skills/SkillExtraItems.h
rename to src/server/game/Skills/SkillExtraItems.h
diff --git a/src/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
similarity index 100%
rename from src/game/Spells/Auras/SpellAuraDefines.h
rename to src/server/game/Spells/Auras/SpellAuraDefines.h
diff --git a/src/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
similarity index 100%
rename from src/game/Spells/Auras/SpellAuraEffects.cpp
rename to src/server/game/Spells/Auras/SpellAuraEffects.cpp
diff --git a/src/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h
similarity index 100%
rename from src/game/Spells/Auras/SpellAuraEffects.h
rename to src/server/game/Spells/Auras/SpellAuraEffects.h
diff --git a/src/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
similarity index 100%
rename from src/game/Spells/Auras/SpellAuras.cpp
rename to src/server/game/Spells/Auras/SpellAuras.cpp
diff --git a/src/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
similarity index 100%
rename from src/game/Spells/Auras/SpellAuras.h
rename to src/server/game/Spells/Auras/SpellAuras.h
diff --git a/src/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
similarity index 100%
rename from src/game/Spells/Spell.cpp
rename to src/server/game/Spells/Spell.cpp
diff --git a/src/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
similarity index 100%
rename from src/game/Spells/Spell.h
rename to src/server/game/Spells/Spell.h
diff --git a/src/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
similarity index 100%
rename from src/game/Spells/SpellEffects.cpp
rename to src/server/game/Spells/SpellEffects.cpp
diff --git a/src/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
similarity index 100%
rename from src/game/Spells/SpellInfo.cpp
rename to src/server/game/Spells/SpellInfo.cpp
diff --git a/src/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h
similarity index 100%
rename from src/game/Spells/SpellInfo.h
rename to src/server/game/Spells/SpellInfo.h
diff --git a/src/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
similarity index 100%
rename from src/game/Spells/SpellMgr.cpp
rename to src/server/game/Spells/SpellMgr.cpp
diff --git a/src/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
similarity index 100%
rename from src/game/Spells/SpellMgr.h
rename to src/server/game/Spells/SpellMgr.h
diff --git a/src/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
similarity index 100%
rename from src/game/Spells/SpellScript.cpp
rename to src/server/game/Spells/SpellScript.cpp
diff --git a/src/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h
similarity index 100%
rename from src/game/Spells/SpellScript.h
rename to src/server/game/Spells/SpellScript.h
diff --git a/src/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp
similarity index 100%
rename from src/game/Texts/CreatureTextMgr.cpp
rename to src/server/game/Texts/CreatureTextMgr.cpp
diff --git a/src/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h
similarity index 100%
rename from src/game/Texts/CreatureTextMgr.h
rename to src/server/game/Texts/CreatureTextMgr.h
diff --git a/src/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
similarity index 100%
rename from src/game/Tickets/TicketMgr.cpp
rename to src/server/game/Tickets/TicketMgr.cpp
diff --git a/src/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h
similarity index 100%
rename from src/game/Tickets/TicketMgr.h
rename to src/server/game/Tickets/TicketMgr.h
diff --git a/src/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
similarity index 100%
rename from src/game/Tools/CharacterDatabaseCleaner.cpp
rename to src/server/game/Tools/CharacterDatabaseCleaner.cpp
diff --git a/src/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h
similarity index 100%
rename from src/game/Tools/CharacterDatabaseCleaner.h
rename to src/server/game/Tools/CharacterDatabaseCleaner.h
diff --git a/src/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
similarity index 100%
rename from src/game/Tools/PlayerDump.cpp
rename to src/server/game/Tools/PlayerDump.cpp
diff --git a/src/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h
similarity index 100%
rename from src/game/Tools/PlayerDump.h
rename to src/server/game/Tools/PlayerDump.h
diff --git a/src/game/Warden/Modules/WardenModuleMac.h b/src/server/game/Warden/Modules/WardenModuleMac.h
similarity index 100%
rename from src/game/Warden/Modules/WardenModuleMac.h
rename to src/server/game/Warden/Modules/WardenModuleMac.h
diff --git a/src/game/Warden/Modules/WardenModuleWin.h b/src/server/game/Warden/Modules/WardenModuleWin.h
similarity index 100%
rename from src/game/Warden/Modules/WardenModuleWin.h
rename to src/server/game/Warden/Modules/WardenModuleWin.h
diff --git a/src/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp
similarity index 100%
rename from src/game/Warden/Warden.cpp
rename to src/server/game/Warden/Warden.cpp
diff --git a/src/game/Warden/Warden.h b/src/server/game/Warden/Warden.h
similarity index 100%
rename from src/game/Warden/Warden.h
rename to src/server/game/Warden/Warden.h
diff --git a/src/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp
similarity index 100%
rename from src/game/Warden/WardenCheckMgr.cpp
rename to src/server/game/Warden/WardenCheckMgr.cpp
diff --git a/src/game/Warden/WardenCheckMgr.h b/src/server/game/Warden/WardenCheckMgr.h
similarity index 100%
rename from src/game/Warden/WardenCheckMgr.h
rename to src/server/game/Warden/WardenCheckMgr.h
diff --git a/src/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
similarity index 100%
rename from src/game/Warden/WardenMac.cpp
rename to src/server/game/Warden/WardenMac.cpp
diff --git a/src/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h
similarity index 100%
rename from src/game/Warden/WardenMac.h
rename to src/server/game/Warden/WardenMac.h
diff --git a/src/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp
similarity index 100%
rename from src/game/Warden/WardenWin.cpp
rename to src/server/game/Warden/WardenWin.cpp
diff --git a/src/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h
similarity index 100%
rename from src/game/Warden/WardenWin.h
rename to src/server/game/Warden/WardenWin.h
diff --git a/src/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
similarity index 100%
rename from src/game/Weather/Weather.cpp
rename to src/server/game/Weather/Weather.cpp
diff --git a/src/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
similarity index 100%
rename from src/game/Weather/Weather.h
rename to src/server/game/Weather/Weather.h
diff --git a/src/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
similarity index 100%
rename from src/game/Weather/WeatherMgr.cpp
rename to src/server/game/Weather/WeatherMgr.cpp
diff --git a/src/game/Weather/WeatherMgr.h b/src/server/game/Weather/WeatherMgr.h
similarity index 100%
rename from src/game/Weather/WeatherMgr.h
rename to src/server/game/Weather/WeatherMgr.h
diff --git a/src/game/World/World.cpp b/src/server/game/World/World.cpp
similarity index 100%
rename from src/game/World/World.cpp
rename to src/server/game/World/World.cpp
diff --git a/src/game/World/World.h b/src/server/game/World/World.h
similarity index 100%
rename from src/game/World/World.h
rename to src/server/game/World/World.h
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
new file mode 100644
index 000000000..a3373a007
--- /dev/null
+++ b/src/server/scripts/CMakeLists.txt
@@ -0,0 +1,193 @@
+# 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.
+
+# Enable precompiled headers when using the GCC compiler.
+
+CU_RUN_HOOK(BEFORE_SCRIPTS_LIBRARY)
+
+CU_SET_PATH("AC_SCRIPTS_DIR" "${CMAKE_CURRENT_LIST_DIR}")
+
+if (USE_SCRIPTPCH)
+  set(scripts_STAT_PCH_HDR PrecompiledHeaders/ScriptPCH.h)
+  set(scripts_STAT_PCH_SRC PrecompiledHeaders/ScriptPCH.cpp)
+endif ()
+
+message(STATUS "SCRIPT PREPARATIONS")
+include(Spells/CMakeLists.txt)
+
+include(Commands/CMakeLists.txt)
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ScriptLoader.cpp
+  ScriptLoader.h
+  ${BUILDDIR}/GenLoader.cpp
+  ../game/AI/ScriptedAI/ScriptedEscortAI.cpp
+  ../game/AI/ScriptedAI/ScriptedCreature.cpp
+  ../game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+)
+
+AC_ADD_SCRIPT_LOADER("Spell" "ScriptLoader.h")
+AC_ADD_SCRIPT_LOADER("SC_Smart" "ScriptLoader.h")
+AC_ADD_SCRIPT_LOADER("Command" "ScriptLoader.h")
+
+CU_SET_PATH("CMAKE_AC_MODULE_DIR" "${CMAKE_CURRENT_LIST_DIR}")
+
+if(SCRIPTS)
+  include(World/CMakeLists.txt)
+  include(OutdoorPvP/CMakeLists.txt)
+  include(EasternKingdoms/CMakeLists.txt)
+  include(Kalimdor/CMakeLists.txt)
+  include(Outland/CMakeLists.txt)
+  include(Northrend/CMakeLists.txt)
+  include(Events/CMakeLists.txt)
+  include(Pet/CMakeLists.txt)
+endif()
+
+if(EXISTS "${AC_SCRIPTS_DIR}/Custom/CMakeLists.txt")
+include(Custom/CMakeLists.txt)
+endif()
+
+CU_GET_GLOBAL("AC_ADD_SCRIPTS_LIST")
+CU_GET_GLOBAL("AC_ADD_SCRIPTS_INCLUDE")
+CU_GET_GLOBAL("AC_SCRIPTS_SOURCES")
+
+set(scripts_STAT_SRCS
+  ${scripts_STAT_SRCS}
+  ${AC_SCRIPTS_SOURCES}
+)
+
+set("AC_SCRIPTS_INCLUDES" "")
+
+FOREACH (include ${AC_ADD_SCRIPTS_INCLUDE})
+    set("AC_SCRIPTS_INCLUDES" "#include \"${include}\"\n${AC_SCRIPTS_INCLUDES}")
+ENDFOREACH()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GenLoader.cpp.cmake ${BUILDDIR}/GenLoader.cpp)
+
+message(STATUS "SCRIPT PREPARATION COMPLETE")
+message("")
+
+include_directories(
+  ${scripts_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour/Include
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast/Include
+  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/deps/zlib
+  ${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}
+  ${MYSQL_INCLUDE_DIR}
+)
+
+add_library(scripts STATIC
+  ${scripts_STAT_SRCS}
+  ${scripts_STAT_PCH_SRC}
+)
+
+add_dependencies(scripts revision.h)
+
+# Generate precompiled header
+if (USE_SCRIPTPCH)
+  add_cxx_pch(scripts ${scripts_STAT_PCH_HDR} ${scripts_STAT_PCH_SRC})
+endif()
diff --git a/src/scripts/Commands/CMakeLists.txt b/src/server/scripts/Commands/CMakeLists.txt
similarity index 100%
rename from src/scripts/Commands/CMakeLists.txt
rename to src/server/scripts/Commands/CMakeLists.txt
diff --git a/src/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
similarity index 100%
rename from src/scripts/Commands/cs_account.cpp
rename to src/server/scripts/Commands/cs_account.cpp
diff --git a/src/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp
similarity index 100%
rename from src/scripts/Commands/cs_achievement.cpp
rename to src/server/scripts/Commands/cs_achievement.cpp
diff --git a/src/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp
similarity index 100%
rename from src/scripts/Commands/cs_ban.cpp
rename to src/server/scripts/Commands/cs_ban.cpp
diff --git a/src/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp
similarity index 100%
rename from src/scripts/Commands/cs_bf.cpp
rename to src/server/scripts/Commands/cs_bf.cpp
diff --git a/src/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp
similarity index 100%
rename from src/scripts/Commands/cs_cast.cpp
rename to src/server/scripts/Commands/cs_cast.cpp
diff --git a/src/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
similarity index 100%
rename from src/scripts/Commands/cs_character.cpp
rename to src/server/scripts/Commands/cs_character.cpp
diff --git a/src/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
similarity index 100%
rename from src/scripts/Commands/cs_debug.cpp
rename to src/server/scripts/Commands/cs_debug.cpp
diff --git a/src/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp
similarity index 100%
rename from src/scripts/Commands/cs_disable.cpp
rename to src/server/scripts/Commands/cs_disable.cpp
diff --git a/src/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp
similarity index 100%
rename from src/scripts/Commands/cs_event.cpp
rename to src/server/scripts/Commands/cs_event.cpp
diff --git a/src/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
similarity index 100%
rename from src/scripts/Commands/cs_gm.cpp
rename to src/server/scripts/Commands/cs_gm.cpp
diff --git a/src/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
similarity index 100%
rename from src/scripts/Commands/cs_go.cpp
rename to src/server/scripts/Commands/cs_go.cpp
diff --git a/src/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
similarity index 100%
rename from src/scripts/Commands/cs_gobject.cpp
rename to src/server/scripts/Commands/cs_gobject.cpp
diff --git a/src/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp
similarity index 100%
rename from src/scripts/Commands/cs_guild.cpp
rename to src/server/scripts/Commands/cs_guild.cpp
diff --git a/src/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp
similarity index 100%
rename from src/scripts/Commands/cs_honor.cpp
rename to src/server/scripts/Commands/cs_honor.cpp
diff --git a/src/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
similarity index 100%
rename from src/scripts/Commands/cs_instance.cpp
rename to src/server/scripts/Commands/cs_instance.cpp
diff --git a/src/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
similarity index 100%
rename from src/scripts/Commands/cs_learn.cpp
rename to src/server/scripts/Commands/cs_learn.cpp
diff --git a/src/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp
similarity index 100%
rename from src/scripts/Commands/cs_lfg.cpp
rename to src/server/scripts/Commands/cs_lfg.cpp
diff --git a/src/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp
similarity index 100%
rename from src/scripts/Commands/cs_list.cpp
rename to src/server/scripts/Commands/cs_list.cpp
diff --git a/src/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
similarity index 100%
rename from src/scripts/Commands/cs_lookup.cpp
rename to src/server/scripts/Commands/cs_lookup.cpp
diff --git a/src/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp
similarity index 100%
rename from src/scripts/Commands/cs_message.cpp
rename to src/server/scripts/Commands/cs_message.cpp
diff --git a/src/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
similarity index 100%
rename from src/scripts/Commands/cs_misc.cpp
rename to src/server/scripts/Commands/cs_misc.cpp
diff --git a/src/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp
similarity index 100%
rename from src/scripts/Commands/cs_mmaps.cpp
rename to src/server/scripts/Commands/cs_mmaps.cpp
diff --git a/src/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
similarity index 100%
rename from src/scripts/Commands/cs_modify.cpp
rename to src/server/scripts/Commands/cs_modify.cpp
diff --git a/src/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
similarity index 100%
rename from src/scripts/Commands/cs_npc.cpp
rename to src/server/scripts/Commands/cs_npc.cpp
diff --git a/src/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
similarity index 100%
rename from src/scripts/Commands/cs_quest.cpp
rename to src/server/scripts/Commands/cs_quest.cpp
diff --git a/src/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
similarity index 100%
rename from src/scripts/Commands/cs_reload.cpp
rename to src/server/scripts/Commands/cs_reload.cpp
diff --git a/src/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
similarity index 100%
rename from src/scripts/Commands/cs_reset.cpp
rename to src/server/scripts/Commands/cs_reset.cpp
diff --git a/src/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
similarity index 100%
rename from src/scripts/Commands/cs_server.cpp
rename to src/server/scripts/Commands/cs_server.cpp
diff --git a/src/scripts/Commands/cs_spectator.cpp b/src/server/scripts/Commands/cs_spectator.cpp
similarity index 100%
rename from src/scripts/Commands/cs_spectator.cpp
rename to src/server/scripts/Commands/cs_spectator.cpp
diff --git a/src/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
similarity index 100%
rename from src/scripts/Commands/cs_tele.cpp
rename to src/server/scripts/Commands/cs_tele.cpp
diff --git a/src/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp
similarity index 100%
rename from src/scripts/Commands/cs_ticket.cpp
rename to src/server/scripts/Commands/cs_ticket.cpp
diff --git a/src/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp
similarity index 100%
rename from src/scripts/Commands/cs_titles.cpp
rename to src/server/scripts/Commands/cs_titles.cpp
diff --git a/src/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
similarity index 100%
rename from src/scripts/Commands/cs_wp.cpp
rename to src/server/scripts/Commands/cs_wp.cpp
diff --git a/src/scripts/Custom/README.md b/src/server/scripts/Custom/README.md
similarity index 100%
rename from src/scripts/Custom/README.md
rename to src/server/scripts/Custom/README.md
diff --git a/src/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
rename to src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
diff --git a/src/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
rename to src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
diff --git a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
similarity index 100%
rename from src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
rename to src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
diff --git a/src/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt
similarity index 100%
rename from src/scripts/EasternKingdoms/CMakeLists.txt
rename to src/server/scripts/EasternKingdoms/CMakeLists.txt
diff --git a/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
rename to src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
diff --git a/src/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
similarity index 100%
rename from src/scripts/EasternKingdoms/Deadmines/deadmines.h
rename to src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
diff --git a/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
rename to src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
diff --git a/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
rename to src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/karazhan.cpp
rename to src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
similarity index 100%
rename from src/scripts/EasternKingdoms/Karazhan/karazhan.h
rename to src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
rename to src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
rename to src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
diff --git a/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
similarity index 100%
rename from src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
rename to src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
rename to src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
rename to src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
rename to src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
rename to src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
diff --git a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
rename to src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
diff --git a/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
rename to src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
diff --git a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
rename to src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
diff --git a/src/scripts/EasternKingdoms/Scholomance/scholomance.h b/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
similarity index 100%
rename from src/scripts/EasternKingdoms/Scholomance/scholomance.h
rename to src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
rename to src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
diff --git a/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
similarity index 100%
rename from src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
rename to src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
diff --git a/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
rename to src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
diff --git a/src/scripts/EasternKingdoms/Stratholme/stratholme.h b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
similarity index 100%
rename from src/scripts/EasternKingdoms/Stratholme/stratholme.h
rename to src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
diff --git a/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
rename to src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
diff --git a/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
similarity index 100%
rename from src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
rename to src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
diff --git a/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
similarity index 100%
rename from src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
rename to src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
diff --git a/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
rename to src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
diff --git a/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
rename to src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
diff --git a/src/scripts/EasternKingdoms/Uldaman/uldaman.h b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h
similarity index 100%
rename from src/scripts/EasternKingdoms/Uldaman/uldaman.h
rename to src/server/scripts/EasternKingdoms/Uldaman/uldaman.h
diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/zulaman.cpp
rename to src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulAman/zulaman.h
rename to src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
rename to src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
diff --git a/src/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
similarity index 100%
rename from src/scripts/EasternKingdoms/ZulGurub/zulgurub.h
rename to src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
diff --git a/src/scripts/EasternKingdoms/zone_alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_alterac_mountains.cpp
rename to src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp
diff --git a/src/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_arathi_highlands.cpp
rename to src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_blasted_lands.cpp
rename to src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_burning_steppes.cpp b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_burning_steppes.cpp
rename to src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
diff --git a/src/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_duskwood.cpp
rename to src/server/scripts/EasternKingdoms/zone_duskwood.cpp
diff --git a/src/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
rename to src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_eversong_woods.cpp
rename to src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
diff --git a/src/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_ghostlands.cpp
rename to src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_hinterlands.cpp
rename to src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_ironforge.cpp
rename to src/server/scripts/EasternKingdoms/zone_ironforge.cpp
diff --git a/src/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
rename to src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
diff --git a/src/scripts/EasternKingdoms/zone_loch_modan.cpp b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_loch_modan.cpp
rename to src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
diff --git a/src/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_redridge_mountains.cpp
rename to src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
diff --git a/src/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_silverpine_forest.cpp
rename to src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
diff --git a/src/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_stormwind_city.cpp
rename to src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
diff --git a/src/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
rename to src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
diff --git a/src/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
rename to src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
diff --git a/src/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
rename to src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
diff --git a/src/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_undercity.cpp
rename to src/server/scripts/EasternKingdoms/zone_undercity.cpp
diff --git a/src/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_western_plaguelands.cpp
rename to src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_westfall.cpp
rename to src/server/scripts/EasternKingdoms/zone_westfall.cpp
diff --git a/src/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
similarity index 100%
rename from src/scripts/EasternKingdoms/zone_wetlands.cpp
rename to src/server/scripts/EasternKingdoms/zone_wetlands.cpp
diff --git a/src/scripts/Events/CMakeLists.txt b/src/server/scripts/Events/CMakeLists.txt
similarity index 100%
rename from src/scripts/Events/CMakeLists.txt
rename to src/server/scripts/Events/CMakeLists.txt
diff --git a/src/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp
similarity index 100%
rename from src/scripts/Events/brewfest.cpp
rename to src/server/scripts/Events/brewfest.cpp
diff --git a/src/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp
similarity index 100%
rename from src/scripts/Events/childrens_week.cpp
rename to src/server/scripts/Events/childrens_week.cpp
diff --git a/src/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp
similarity index 100%
rename from src/scripts/Events/hallows_end.cpp
rename to src/server/scripts/Events/hallows_end.cpp
diff --git a/src/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp
similarity index 100%
rename from src/scripts/Events/love_in_air.cpp
rename to src/server/scripts/Events/love_in_air.cpp
diff --git a/src/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp
similarity index 100%
rename from src/scripts/Events/midsummer.cpp
rename to src/server/scripts/Events/midsummer.cpp
diff --git a/src/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp
similarity index 100%
rename from src/scripts/Events/pilgrims_bounty.cpp
rename to src/server/scripts/Events/pilgrims_bounty.cpp
diff --git a/src/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp
similarity index 100%
rename from src/scripts/Events/winter_veil.cpp
rename to src/server/scripts/Events/winter_veil.cpp
diff --git a/src/scripts/GenLoader.cpp.cmake b/src/server/scripts/GenLoader.cpp.cmake
similarity index 100%
rename from src/scripts/GenLoader.cpp.cmake
rename to src/server/scripts/GenLoader.cpp.cmake
diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
similarity index 100%
rename from src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
rename to src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
diff --git a/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
similarity index 100%
rename from src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
rename to src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
diff --git a/src/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt
similarity index 100%
rename from src/scripts/Kalimdor/CMakeLists.txt
rename to src/server/scripts/Kalimdor/CMakeLists.txt
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
diff --git a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
diff --git a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
diff --git a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
similarity index 100%
rename from src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
rename to src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
diff --git a/src/scripts/Kalimdor/DireMaul/dire_maul.h b/src/server/scripts/Kalimdor/DireMaul/dire_maul.h
similarity index 100%
rename from src/scripts/Kalimdor/DireMaul/dire_maul.h
rename to src/server/scripts/Kalimdor/DireMaul/dire_maul.h
diff --git a/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
similarity index 100%
rename from src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
rename to src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
diff --git a/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
similarity index 100%
rename from src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
rename to src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
diff --git a/src/scripts/Kalimdor/Maraudon/maraudon.h b/src/server/scripts/Kalimdor/Maraudon/maraudon.h
similarity index 100%
rename from src/scripts/Kalimdor/Maraudon/maraudon.h
rename to src/server/scripts/Kalimdor/Maraudon/maraudon.h
diff --git a/src/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
similarity index 100%
rename from src/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
rename to src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
diff --git a/src/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
similarity index 100%
rename from src/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
rename to src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
diff --git a/src/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
similarity index 100%
rename from src/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
rename to src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
diff --git a/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
rename to src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
diff --git a/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
rename to src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
rename to src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
diff --git a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
similarity index 100%
rename from src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
rename to src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
diff --git a/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
rename to src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
diff --git a/src/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
similarity index 100%
rename from src/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
rename to src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
diff --git a/src/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
similarity index 100%
rename from src/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
rename to src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
diff --git a/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
similarity index 100%
rename from src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
rename to src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
diff --git a/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
similarity index 100%
rename from src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
rename to src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
diff --git a/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
similarity index 100%
rename from src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
rename to src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
diff --git a/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
similarity index 100%
rename from src/scripts/Kalimdor/ZulFarrak/zulfarrak.h
rename to src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
diff --git a/src/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
similarity index 100%
rename from src/scripts/Kalimdor/boss_azuregos.cpp
rename to src/server/scripts/Kalimdor/boss_azuregos.cpp
diff --git a/src/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_ashenvale.cpp
rename to src/server/scripts/Kalimdor/zone_ashenvale.cpp
diff --git a/src/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_azshara.cpp
rename to src/server/scripts/Kalimdor/zone_azshara.cpp
diff --git a/src/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_azuremyst_isle.cpp
rename to src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
diff --git a/src/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_bloodmyst_isle.cpp
rename to src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
diff --git a/src/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_darkshore.cpp
rename to src/server/scripts/Kalimdor/zone_darkshore.cpp
diff --git a/src/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_desolace.cpp
rename to src/server/scripts/Kalimdor/zone_desolace.cpp
diff --git a/src/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_durotar.cpp
rename to src/server/scripts/Kalimdor/zone_durotar.cpp
diff --git a/src/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_dustwallow_marsh.cpp
rename to src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
diff --git a/src/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_felwood.cpp
rename to src/server/scripts/Kalimdor/zone_felwood.cpp
diff --git a/src/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_feralas.cpp
rename to src/server/scripts/Kalimdor/zone_feralas.cpp
diff --git a/src/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_moonglade.cpp
rename to src/server/scripts/Kalimdor/zone_moonglade.cpp
diff --git a/src/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_mulgore.cpp
rename to src/server/scripts/Kalimdor/zone_mulgore.cpp
diff --git a/src/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_orgrimmar.cpp
rename to src/server/scripts/Kalimdor/zone_orgrimmar.cpp
diff --git a/src/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_silithus.cpp
rename to src/server/scripts/Kalimdor/zone_silithus.cpp
diff --git a/src/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_stonetalon_mountains.cpp
rename to src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
diff --git a/src/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_tanaris.cpp
rename to src/server/scripts/Kalimdor/zone_tanaris.cpp
diff --git a/src/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_teldrassil.cpp
rename to src/server/scripts/Kalimdor/zone_teldrassil.cpp
diff --git a/src/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_the_barrens.cpp
rename to src/server/scripts/Kalimdor/zone_the_barrens.cpp
diff --git a/src/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_thousand_needles.cpp
rename to src/server/scripts/Kalimdor/zone_thousand_needles.cpp
diff --git a/src/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_thunder_bluff.cpp
rename to src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
diff --git a/src/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_ungoro_crater.cpp
rename to src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
diff --git a/src/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
similarity index 100%
rename from src/scripts/Kalimdor/zone_winterspring.cpp
rename to src/server/scripts/Kalimdor/zone_winterspring.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
rename to src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
diff --git a/src/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
similarity index 100%
rename from src/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
rename to src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
diff --git a/src/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt
similarity index 100%
rename from src/scripts/Northrend/CMakeLists.txt
rename to src/server/scripts/Northrend/CMakeLists.txt
diff --git a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
diff --git a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
diff --git a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
rename to src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
diff --git a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
similarity index 100%
rename from src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
rename to src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
similarity index 100%
rename from src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
rename to src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
diff --git a/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
similarity index 100%
rename from src/scripts/Northrend/DraktharonKeep/boss_dred.cpp
rename to src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
diff --git a/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
similarity index 100%
rename from src/scripts/Northrend/DraktharonKeep/boss_novos.cpp
rename to src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
diff --git a/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
similarity index 100%
rename from src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
rename to src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
diff --git a/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
similarity index 100%
rename from src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
rename to src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
diff --git a/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
similarity index 100%
rename from src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
rename to src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
diff --git a/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
similarity index 100%
rename from src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
rename to src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
diff --git a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
rename to src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
rename to src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
similarity index 100%
rename from src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
rename to src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
diff --git a/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
similarity index 100%
rename from src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
rename to src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
diff --git a/src/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp
similarity index 100%
rename from src/scripts/Northrend/Gundrak/boss_eck.cpp
rename to src/server/scripts/Northrend/Gundrak/boss_eck.cpp
diff --git a/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
similarity index 100%
rename from src/scripts/Northrend/Gundrak/boss_gal_darah.cpp
rename to src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
diff --git a/src/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
similarity index 100%
rename from src/scripts/Northrend/Gundrak/boss_moorabi.cpp
rename to src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
diff --git a/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
similarity index 100%
rename from src/scripts/Northrend/Gundrak/boss_slad_ran.cpp
rename to src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
diff --git a/src/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h
similarity index 100%
rename from src/scripts/Northrend/Gundrak/gundrak.h
rename to src/server/scripts/Northrend/Gundrak/gundrak.h
diff --git a/src/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
similarity index 100%
rename from src/scripts/Northrend/Gundrak/instance_gundrak.cpp
rename to src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
rename to src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
diff --git a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
diff --git a/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
similarity index 100%
rename from src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
rename to src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_faerlina.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_gluth.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_gothik.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_heigan.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_loatheb.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_maexxna.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_noth.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_razuvious.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
diff --git a/src/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/boss_thaddius.cpp
rename to src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
diff --git a/src/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
rename to src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
diff --git a/src/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h
similarity index 100%
rename from src/scripts/Northrend/Naxxramas/naxxramas.h
rename to src/server/scripts/Northrend/Naxxramas/naxxramas.h
diff --git a/src/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
diff --git a/src/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
similarity index 100%
rename from src/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
diff --git a/src/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
rename to src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
diff --git a/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
diff --git a/src/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
rename to src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
diff --git a/src/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
similarity index 100%
rename from src/scripts/Northrend/Nexus/Nexus/nexus.h
rename to src/server/scripts/Northrend/Nexus/Nexus/nexus.h
diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
diff --git a/src/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
diff --git a/src/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
diff --git a/src/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
similarity index 100%
rename from src/scripts/Northrend/Nexus/Oculus/oculus.cpp
rename to src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
diff --git a/src/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h
similarity index 100%
rename from src/scripts/Northrend/Nexus/Oculus/oculus.h
rename to src/server/scripts/Northrend/Nexus/Oculus/oculus.h
diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
diff --git a/src/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
diff --git a/src/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
rename to src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
rename to src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
diff --git a/src/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
similarity index 100%
rename from src/scripts/Northrend/Ulduar/Ulduar/ulduar.h
rename to src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
diff --git a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
similarity index 100%
rename from src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
rename to src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
similarity index 100%
rename from src/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
rename to src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
similarity index 100%
rename from src/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
rename to src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
similarity index 100%
rename from src/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
rename to src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
diff --git a/src/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
similarity index 100%
rename from src/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
rename to src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
diff --git a/src/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
similarity index 100%
rename from src/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
rename to src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
diff --git a/src/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
similarity index 100%
rename from src/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
rename to src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
diff --git a/src/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
rename to src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
diff --git a/src/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/boss_erekem.cpp
rename to src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
diff --git a/src/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/boss_ichoron.cpp
rename to src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
diff --git a/src/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/boss_lavanthor.cpp
rename to src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
diff --git a/src/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/boss_moragg.cpp
rename to src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
diff --git a/src/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/boss_xevozz.cpp
rename to src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
diff --git a/src/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/boss_zuramat.cpp
rename to src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
diff --git a/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/instance_violet_hold.cpp
rename to src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
diff --git a/src/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
similarity index 100%
rename from src/scripts/Northrend/VioletHold/violet_hold.cpp
rename to src/server/scripts/Northrend/VioletHold/violet_hold.cpp
diff --git a/src/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h
similarity index 100%
rename from src/scripts/Northrend/VioletHold/violet_hold.h
rename to src/server/scripts/Northrend/VioletHold/violet_hold.h
diff --git a/src/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp
similarity index 100%
rename from src/scripts/Northrend/isle_of_conquest.cpp
rename to src/server/scripts/Northrend/isle_of_conquest.cpp
diff --git a/src/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_borean_tundra.cpp
rename to src/server/scripts/Northrend/zone_borean_tundra.cpp
diff --git a/src/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_crystalsong_forest.cpp
rename to src/server/scripts/Northrend/zone_crystalsong_forest.cpp
diff --git a/src/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_dalaran.cpp
rename to src/server/scripts/Northrend/zone_dalaran.cpp
diff --git a/src/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_dragonblight.cpp
rename to src/server/scripts/Northrend/zone_dragonblight.cpp
diff --git a/src/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_grizzly_hills.cpp
rename to src/server/scripts/Northrend/zone_grizzly_hills.cpp
diff --git a/src/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_howling_fjord.cpp
rename to src/server/scripts/Northrend/zone_howling_fjord.cpp
diff --git a/src/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_icecrown.cpp
rename to src/server/scripts/Northrend/zone_icecrown.cpp
diff --git a/src/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_sholazar_basin.cpp
rename to src/server/scripts/Northrend/zone_sholazar_basin.cpp
diff --git a/src/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_storm_peaks.cpp
rename to src/server/scripts/Northrend/zone_storm_peaks.cpp
diff --git a/src/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_wintergrasp.cpp
rename to src/server/scripts/Northrend/zone_wintergrasp.cpp
diff --git a/src/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
similarity index 100%
rename from src/scripts/Northrend/zone_zuldrak.cpp
rename to src/server/scripts/Northrend/zone_zuldrak.cpp
diff --git a/src/scripts/OutdoorPvP/CMakeLists.txt b/src/server/scripts/OutdoorPvP/CMakeLists.txt
similarity index 100%
rename from src/scripts/OutdoorPvP/CMakeLists.txt
rename to src/server/scripts/OutdoorPvP/CMakeLists.txt
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPEP.cpp
rename to src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPEP.h
rename to src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPGH.cpp
rename to src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPGH.h b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.h
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPGH.h
rename to src/server/scripts/OutdoorPvP/OutdoorPvPGH.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPHP.cpp
rename to src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPHP.h
rename to src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPNA.cpp
rename to src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPNA.h
rename to src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPSI.cpp
rename to src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPSI.h
rename to src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPTF.cpp
rename to src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPTF.h
rename to src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPZM.cpp
rename to src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
similarity index 100%
rename from src/scripts/OutdoorPvP/OutdoorPvPZM.h
rename to src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
rename to src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
diff --git a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
rename to src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
diff --git a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
rename to src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
diff --git a/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
similarity index 100%
rename from src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
rename to src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
similarity index 100%
rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
diff --git a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
similarity index 100%
rename from src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
rename to src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
diff --git a/src/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
similarity index 100%
rename from src/scripts/Outland/BlackTemple/black_temple.h
rename to src/server/scripts/Outland/BlackTemple/black_temple.h
diff --git a/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_bloodboil.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
diff --git a/src/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_illidan.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
diff --git a/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
diff --git a/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
diff --git a/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
diff --git a/src/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_supremus.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
diff --git a/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
diff --git a/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
rename to src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
diff --git a/src/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/illidari_council.cpp
rename to src/server/scripts/Outland/BlackTemple/illidari_council.cpp
diff --git a/src/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
similarity index 100%
rename from src/scripts/Outland/BlackTemple/instance_black_temple.cpp
rename to src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
diff --git a/src/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt
similarity index 100%
rename from src/scripts/Outland/CMakeLists.txt
rename to src/server/scripts/Outland/CMakeLists.txt
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
rename to src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
diff --git a/src/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
diff --git a/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
rename to src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
diff --git a/src/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
similarity index 100%
rename from src/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
rename to src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
diff --git a/src/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
similarity index 100%
rename from src/scripts/Outland/GruulsLair/boss_gruul.cpp
rename to src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
diff --git a/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
similarity index 100%
rename from src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
rename to src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
diff --git a/src/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
similarity index 100%
rename from src/scripts/Outland/GruulsLair/gruuls_lair.h
rename to src/server/scripts/Outland/GruulsLair/gruuls_lair.h
diff --git a/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
similarity index 100%
rename from src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
rename to src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
rename to src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
diff --git a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
rename to src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
rename to src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
diff --git a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
similarity index 100%
rename from src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
rename to src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
diff --git a/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
diff --git a/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
rename to src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
diff --git a/src/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Eye/the_eye.h
rename to src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
diff --git a/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
diff --git a/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
rename to src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
diff --git a/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
similarity index 100%
rename from src/scripts/Outland/TempestKeep/Mechanar/mechanar.h
rename to src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
rename to src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
diff --git a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
similarity index 100%
rename from src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
rename to src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
diff --git a/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
rename to src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
diff --git a/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
rename to src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
rename to src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
rename to src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
rename to src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
rename to src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
diff --git a/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
rename to src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
diff --git a/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
similarity index 100%
rename from src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
rename to src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
diff --git a/src/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
similarity index 100%
rename from src/scripts/Outland/TempestKeep/botanica/the_botanica.h
rename to src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
diff --git a/src/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
similarity index 100%
rename from src/scripts/Outland/boss_doomlord_kazzak.cpp
rename to src/server/scripts/Outland/boss_doomlord_kazzak.cpp
diff --git a/src/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
similarity index 100%
rename from src/scripts/Outland/boss_doomwalker.cpp
rename to src/server/scripts/Outland/boss_doomwalker.cpp
diff --git a/src/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
similarity index 100%
rename from src/scripts/Outland/zone_blades_edge_mountains.cpp
rename to src/server/scripts/Outland/zone_blades_edge_mountains.cpp
diff --git a/src/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
similarity index 100%
rename from src/scripts/Outland/zone_hellfire_peninsula.cpp
rename to src/server/scripts/Outland/zone_hellfire_peninsula.cpp
diff --git a/src/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
similarity index 100%
rename from src/scripts/Outland/zone_nagrand.cpp
rename to src/server/scripts/Outland/zone_nagrand.cpp
diff --git a/src/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
similarity index 100%
rename from src/scripts/Outland/zone_netherstorm.cpp
rename to src/server/scripts/Outland/zone_netherstorm.cpp
diff --git a/src/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
similarity index 100%
rename from src/scripts/Outland/zone_shadowmoon_valley.cpp
rename to src/server/scripts/Outland/zone_shadowmoon_valley.cpp
diff --git a/src/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp
similarity index 100%
rename from src/scripts/Outland/zone_shattrath_city.cpp
rename to src/server/scripts/Outland/zone_shattrath_city.cpp
diff --git a/src/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
similarity index 100%
rename from src/scripts/Outland/zone_terokkar_forest.cpp
rename to src/server/scripts/Outland/zone_terokkar_forest.cpp
diff --git a/src/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp
similarity index 100%
rename from src/scripts/Outland/zone_zangarmarsh.cpp
rename to src/server/scripts/Outland/zone_zangarmarsh.cpp
diff --git a/src/scripts/Pet/CMakeLists.txt b/src/server/scripts/Pet/CMakeLists.txt
similarity index 100%
rename from src/scripts/Pet/CMakeLists.txt
rename to src/server/scripts/Pet/CMakeLists.txt
diff --git a/src/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
similarity index 100%
rename from src/scripts/Pet/pet_dk.cpp
rename to src/server/scripts/Pet/pet_dk.cpp
diff --git a/src/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
similarity index 100%
rename from src/scripts/Pet/pet_generic.cpp
rename to src/server/scripts/Pet/pet_generic.cpp
diff --git a/src/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
similarity index 100%
rename from src/scripts/Pet/pet_hunter.cpp
rename to src/server/scripts/Pet/pet_hunter.cpp
diff --git a/src/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
similarity index 100%
rename from src/scripts/Pet/pet_mage.cpp
rename to src/server/scripts/Pet/pet_mage.cpp
diff --git a/src/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp
similarity index 100%
rename from src/scripts/Pet/pet_priest.cpp
rename to src/server/scripts/Pet/pet_priest.cpp
diff --git a/src/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp
similarity index 100%
rename from src/scripts/Pet/pet_shaman.cpp
rename to src/server/scripts/Pet/pet_shaman.cpp
diff --git a/src/scripts/PrecompiledHeaders/ScriptPCH.cpp b/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
similarity index 100%
rename from src/scripts/PrecompiledHeaders/ScriptPCH.cpp
rename to src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
diff --git a/src/scripts/PrecompiledHeaders/ScriptPCH.h b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h
similarity index 100%
rename from src/scripts/PrecompiledHeaders/ScriptPCH.h
rename to src/server/scripts/PrecompiledHeaders/ScriptPCH.h
diff --git a/src/scripts/ScriptLoader.cpp b/src/server/scripts/ScriptLoader.cpp
similarity index 100%
rename from src/scripts/ScriptLoader.cpp
rename to src/server/scripts/ScriptLoader.cpp
diff --git a/src/scripts/ScriptLoader.h b/src/server/scripts/ScriptLoader.h
similarity index 100%
rename from src/scripts/ScriptLoader.h
rename to src/server/scripts/ScriptLoader.h
diff --git a/src/scripts/Spells/CMakeLists.txt b/src/server/scripts/Spells/CMakeLists.txt
similarity index 100%
rename from src/scripts/Spells/CMakeLists.txt
rename to src/server/scripts/Spells/CMakeLists.txt
diff --git a/src/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
similarity index 100%
rename from src/scripts/Spells/spell_dk.cpp
rename to src/server/scripts/Spells/spell_dk.cpp
diff --git a/src/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
similarity index 100%
rename from src/scripts/Spells/spell_druid.cpp
rename to src/server/scripts/Spells/spell_druid.cpp
diff --git a/src/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
similarity index 100%
rename from src/scripts/Spells/spell_generic.cpp
rename to src/server/scripts/Spells/spell_generic.cpp
diff --git a/src/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
similarity index 100%
rename from src/scripts/Spells/spell_hunter.cpp
rename to src/server/scripts/Spells/spell_hunter.cpp
diff --git a/src/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
similarity index 100%
rename from src/scripts/Spells/spell_item.cpp
rename to src/server/scripts/Spells/spell_item.cpp
diff --git a/src/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
similarity index 100%
rename from src/scripts/Spells/spell_mage.cpp
rename to src/server/scripts/Spells/spell_mage.cpp
diff --git a/src/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
similarity index 100%
rename from src/scripts/Spells/spell_paladin.cpp
rename to src/server/scripts/Spells/spell_paladin.cpp
diff --git a/src/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
similarity index 100%
rename from src/scripts/Spells/spell_priest.cpp
rename to src/server/scripts/Spells/spell_priest.cpp
diff --git a/src/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
similarity index 100%
rename from src/scripts/Spells/spell_quest.cpp
rename to src/server/scripts/Spells/spell_quest.cpp
diff --git a/src/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
similarity index 100%
rename from src/scripts/Spells/spell_rogue.cpp
rename to src/server/scripts/Spells/spell_rogue.cpp
diff --git a/src/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
similarity index 100%
rename from src/scripts/Spells/spell_shaman.cpp
rename to src/server/scripts/Spells/spell_shaman.cpp
diff --git a/src/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
similarity index 100%
rename from src/scripts/Spells/spell_warlock.cpp
rename to src/server/scripts/Spells/spell_warlock.cpp
diff --git a/src/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
similarity index 100%
rename from src/scripts/Spells/spell_warrior.cpp
rename to src/server/scripts/Spells/spell_warrior.cpp
diff --git a/src/scripts/World/CMakeLists.txt b/src/server/scripts/World/CMakeLists.txt
similarity index 100%
rename from src/scripts/World/CMakeLists.txt
rename to src/server/scripts/World/CMakeLists.txt
diff --git a/src/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
similarity index 100%
rename from src/scripts/World/achievement_scripts.cpp
rename to src/server/scripts/World/achievement_scripts.cpp
diff --git a/src/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
similarity index 100%
rename from src/scripts/World/areatrigger_scripts.cpp
rename to src/server/scripts/World/areatrigger_scripts.cpp
diff --git a/src/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp
similarity index 100%
rename from src/scripts/World/boss_emerald_dragons.cpp
rename to src/server/scripts/World/boss_emerald_dragons.cpp
diff --git a/src/scripts/World/character_creation.cpp b/src/server/scripts/World/character_creation.cpp
similarity index 100%
rename from src/scripts/World/character_creation.cpp
rename to src/server/scripts/World/character_creation.cpp
diff --git a/src/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp
similarity index 100%
rename from src/scripts/World/chat_log.cpp
rename to src/server/scripts/World/chat_log.cpp
diff --git a/src/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
similarity index 100%
rename from src/scripts/World/go_scripts.cpp
rename to src/server/scripts/World/go_scripts.cpp
diff --git a/src/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
similarity index 100%
rename from src/scripts/World/guards.cpp
rename to src/server/scripts/World/guards.cpp
diff --git a/src/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
similarity index 100%
rename from src/scripts/World/item_scripts.cpp
rename to src/server/scripts/World/item_scripts.cpp
diff --git a/src/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
similarity index 100%
rename from src/scripts/World/mob_generic_creature.cpp
rename to src/server/scripts/World/mob_generic_creature.cpp
diff --git a/src/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp
similarity index 100%
rename from src/scripts/World/npc_innkeeper.cpp
rename to src/server/scripts/World/npc_innkeeper.cpp
diff --git a/src/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
similarity index 100%
rename from src/scripts/World/npc_professions.cpp
rename to src/server/scripts/World/npc_professions.cpp
diff --git a/src/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
similarity index 100%
rename from src/scripts/World/npc_taxi.cpp
rename to src/server/scripts/World/npc_taxi.cpp
diff --git a/src/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
similarity index 100%
rename from src/scripts/World/npcs_special.cpp
rename to src/server/scripts/World/npcs_special.cpp
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
new file mode 100644
index 000000000..fdc17078b
--- /dev/null
+++ b/src/server/worldserver/CMakeLists.txt
@@ -0,0 +1,216 @@
+# 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.
+
+file(GLOB_RECURSE sources_CommandLine CommandLine/*.cpp CommandLine/*.h)
+file(GLOB_RECURSE sources_RemoteAccess RemoteAccess/*.cpp RemoteAccess/*.h)
+file(GLOB_RECURSE sources_TCSoap TCSoap/*.cpp TCSoap/*.h)
+file(GLOB_RECURSE sources_WorldThread WorldThread/*.cpp WorldThread/*.h)
+file(GLOB sources_localdir *.cpp *.h)
+
+if (USE_COREPCH)
+  set(worldserver_PCH_HDR PrecompiledHeaders/worldPCH.h)
+  set(worldserver_PCH_SRC PrecompiledHeaders/worldPCH.cpp)
+endif()
+
+set(worldserver_SRCS
+  ${worldserver_SRCS}
+  ${sources_CommandLine}
+  ${sources_RemoteAccess}
+  ${sources_TCSoap}
+  ${sources_WorldThread}
+  ${sources_localdir}
+)
+
+if( WIN32 )
+  set(worldserver_SRCS
+    ${worldserver_SRCS}
+    ${sources_windows_Debugging}
+  )
+  if ( MSVC )
+    set(worldserver_SRCS
+      ${worldserver_SRCS}
+      worldserver.rc
+    )
+  endif()
+endif()
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour/Include
+  ${CMAKE_SOURCE_DIR}/deps/gsoap
+  ${CMAKE_SOURCE_DIR}/deps/sockets/include
+  ${CMAKE_SOURCE_DIR}/deps/SFMT
+  ${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/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
+  ${CMAKE_CURRENT_SOURCE_DIR}/TCSoap
+  ${CMAKE_CURRENT_SOURCE_DIR}/WorldThread
+  ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
+)
+
+add_executable(worldserver
+  ${worldserver_SRCS}
+  ${worldserver_PCH_SRC}
+)
+
+if( NOT WIN32 )
+  set_target_properties(worldserver PROPERTIES
+    COMPILE_DEFINITIONS _TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf"
+  )
+endif()
+
+add_dependencies(worldserver revision.h)
+
+if( UNIX AND NOT NOJEM )
+  set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
+endif()
+
+set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
+
+target_link_libraries(worldserver
+  game
+  shared
+  scripts
+  collision
+  g3dlib
+  gsoap
+  Detour
+  ${GPERFTOOLS_LIBRARIES}
+  ${JEMALLOC_LIBRARY}
+  ${READLINE_LIBRARY}
+  ${TERMCAP_LIBRARY}
+  ${ACE_LIBRARY}
+  ${MYSQL_LIBRARY}
+  ${OPENSSL_LIBRARIES}
+  ${ZLIB_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT}
+)
+
+if( WIN32 )
+  if ( MSVC )
+    add_custom_command(TARGET worldserver
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/
+    )
+  elseif ( MINGW )
+    add_custom_command(TARGET worldserver
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/
+    )
+  endif()
+endif()
+
+if( UNIX )
+  install(TARGETS worldserver DESTINATION bin)
+elseif( WIN32 )
+  install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
+endif()
+
+install(FILES worldserver.conf.dist DESTINATION ${CONF_DIR})
+
+# Generate precompiled header
+if( USE_COREPCH )
+  add_cxx_pch(worldserver ${worldserver_PCH_HDR} ${worldserver_PCH_SRC})
+endif()
+
+CU_RUN_HOOK("AFTER_WORLDSERVER_CMAKE")
diff --git a/src/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
similarity index 100%
rename from src/worldserver/CommandLine/CliRunnable.cpp
rename to src/server/worldserver/CommandLine/CliRunnable.cpp
diff --git a/src/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h
similarity index 100%
rename from src/worldserver/CommandLine/CliRunnable.h
rename to src/server/worldserver/CommandLine/CliRunnable.h
diff --git a/src/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
similarity index 100%
rename from src/worldserver/Main.cpp
rename to src/server/worldserver/Main.cpp
diff --git a/src/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
similarity index 100%
rename from src/worldserver/Master.cpp
rename to src/server/worldserver/Master.cpp
diff --git a/src/worldserver/Master.h b/src/server/worldserver/Master.h
similarity index 100%
rename from src/worldserver/Master.h
rename to src/server/worldserver/Master.h
diff --git a/src/worldserver/PrecompiledHeaders/worldPCH.cpp b/src/server/worldserver/PrecompiledHeaders/worldPCH.cpp
similarity index 100%
rename from src/worldserver/PrecompiledHeaders/worldPCH.cpp
rename to src/server/worldserver/PrecompiledHeaders/worldPCH.cpp
diff --git a/src/worldserver/PrecompiledHeaders/worldPCH.h b/src/server/worldserver/PrecompiledHeaders/worldPCH.h
similarity index 100%
rename from src/worldserver/PrecompiledHeaders/worldPCH.h
rename to src/server/worldserver/PrecompiledHeaders/worldPCH.h
diff --git a/src/worldserver/RemoteAccess/RARunnable.cpp b/src/server/worldserver/RemoteAccess/RARunnable.cpp
similarity index 100%
rename from src/worldserver/RemoteAccess/RARunnable.cpp
rename to src/server/worldserver/RemoteAccess/RARunnable.cpp
diff --git a/src/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h
similarity index 100%
rename from src/worldserver/RemoteAccess/RARunnable.h
rename to src/server/worldserver/RemoteAccess/RARunnable.h
diff --git a/src/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp
similarity index 100%
rename from src/worldserver/RemoteAccess/RASocket.cpp
rename to src/server/worldserver/RemoteAccess/RASocket.cpp
diff --git a/src/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h
similarity index 100%
rename from src/worldserver/RemoteAccess/RASocket.h
rename to src/server/worldserver/RemoteAccess/RASocket.h
diff --git a/src/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp
similarity index 100%
rename from src/worldserver/TCSoap/TCSoap.cpp
rename to src/server/worldserver/TCSoap/TCSoap.cpp
diff --git a/src/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h
similarity index 100%
rename from src/worldserver/TCSoap/TCSoap.h
rename to src/server/worldserver/TCSoap/TCSoap.h
diff --git a/src/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
similarity index 100%
rename from src/worldserver/WorldThread/WorldRunnable.cpp
rename to src/server/worldserver/WorldThread/WorldRunnable.cpp
diff --git a/src/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h
similarity index 100%
rename from src/worldserver/WorldThread/WorldRunnable.h
rename to src/server/worldserver/WorldThread/WorldRunnable.h
diff --git a/src/worldserver/resource.h b/src/server/worldserver/resource.h
similarity index 100%
rename from src/worldserver/resource.h
rename to src/server/worldserver/resource.h
diff --git a/src/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
similarity index 100%
rename from src/worldserver/worldserver.conf.dist
rename to src/server/worldserver/worldserver.conf.dist
diff --git a/src/worldserver/worldserver.ico b/src/server/worldserver/worldserver.ico
similarity index 100%
rename from src/worldserver/worldserver.ico
rename to src/server/worldserver/worldserver.ico
diff --git a/src/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc
similarity index 100%
rename from src/worldserver/worldserver.rc
rename to src/server/worldserver/worldserver.rc
diff --git a/modules/acore/extractors/CMakeLists.txt b/src/tools/CMakeLists.txt
similarity index 100%
rename from modules/acore/extractors/CMakeLists.txt
rename to src/tools/CMakeLists.txt
diff --git a/modules/acore/extractors/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
similarity index 76%
rename from modules/acore/extractors/map_extractor/CMakeLists.txt
rename to src/tools/map_extractor/CMakeLists.txt
index 020f8a02e..7d6ec21a5 100644
--- a/modules/acore/extractors/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -12,10 +12,10 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
+    ${CMAKE_SOURCE_DIR}/src/common/Utilities
+    ${CMAKE_SOURCE_DIR}/src/common
+    ${CMAKE_SOURCE_DIR}/deps/libmpq
+    ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
 )
@@ -23,7 +23,7 @@ set(include_Dirs
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
   )
 endif()
 
diff --git a/modules/acore/extractors/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
similarity index 100%
rename from modules/acore/extractors/map_extractor/System.cpp
rename to src/tools/map_extractor/System.cpp
diff --git a/modules/acore/extractors/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp
similarity index 100%
rename from modules/acore/extractors/map_extractor/adt.cpp
rename to src/tools/map_extractor/adt.cpp
diff --git a/modules/acore/extractors/map_extractor/adt.h b/src/tools/map_extractor/adt.h
similarity index 100%
rename from modules/acore/extractors/map_extractor/adt.h
rename to src/tools/map_extractor/adt.h
diff --git a/modules/acore/extractors/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp
similarity index 100%
rename from modules/acore/extractors/map_extractor/dbcfile.cpp
rename to src/tools/map_extractor/dbcfile.cpp
diff --git a/modules/acore/extractors/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h
similarity index 100%
rename from modules/acore/extractors/map_extractor/dbcfile.h
rename to src/tools/map_extractor/dbcfile.h
diff --git a/modules/acore/extractors/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
similarity index 100%
rename from modules/acore/extractors/map_extractor/loadlib.cpp
rename to src/tools/map_extractor/loadlib.cpp
diff --git a/modules/acore/extractors/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
similarity index 100%
rename from modules/acore/extractors/map_extractor/loadlib/loadlib.h
rename to src/tools/map_extractor/loadlib/loadlib.h
diff --git a/modules/acore/extractors/map_extractor/mpq_libmpq.cpp b/src/tools/map_extractor/mpq_libmpq.cpp
similarity index 100%
rename from modules/acore/extractors/map_extractor/mpq_libmpq.cpp
rename to src/tools/map_extractor/mpq_libmpq.cpp
diff --git a/modules/acore/extractors/map_extractor/mpq_libmpq04.h b/src/tools/map_extractor/mpq_libmpq04.h
similarity index 100%
rename from modules/acore/extractors/map_extractor/mpq_libmpq04.h
rename to src/tools/map_extractor/mpq_libmpq04.h
diff --git a/modules/acore/extractors/map_extractor/wdt.cpp b/src/tools/map_extractor/wdt.cpp
similarity index 100%
rename from modules/acore/extractors/map_extractor/wdt.cpp
rename to src/tools/map_extractor/wdt.cpp
diff --git a/modules/acore/extractors/map_extractor/wdt.h b/src/tools/map_extractor/wdt.h
similarity index 100%
rename from modules/acore/extractors/map_extractor/wdt.h
rename to src/tools/map_extractor/wdt.h
diff --git a/modules/acore/extractors/mesh_extractor/ADT.cpp b/src/tools/mesh_extractor/ADT.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ADT.cpp
rename to src/tools/mesh_extractor/ADT.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ADT.h b/src/tools/mesh_extractor/ADT.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ADT.h
rename to src/tools/mesh_extractor/ADT.h
diff --git a/modules/acore/extractors/mesh_extractor/CMakeLists.txt b/src/tools/mesh_extractor/CMakeLists.txt
similarity index 73%
rename from modules/acore/extractors/mesh_extractor/CMakeLists.txt
rename to src/tools/mesh_extractor/CMakeLists.txt
index 445532ba9..7c330adce 100644
--- a/modules/acore/extractors/mesh_extractor/CMakeLists.txt
+++ b/src/tools/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/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
+  ${CMAKE_SOURCE_DIR}/src/common
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/deps/libmpq
+  ${CMAKE_SOURCE_DIR}/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/worldengine/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
     )
 endif()
 
diff --git a/modules/acore/extractors/mesh_extractor/Cache.h b/src/tools/mesh_extractor/Cache.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Cache.h
rename to src/tools/mesh_extractor/Cache.h
diff --git a/modules/acore/extractors/mesh_extractor/Chunk.cpp b/src/tools/mesh_extractor/Chunk.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Chunk.cpp
rename to src/tools/mesh_extractor/Chunk.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Chunk.h b/src/tools/mesh_extractor/Chunk.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Chunk.h
rename to src/tools/mesh_extractor/Chunk.h
diff --git a/modules/acore/extractors/mesh_extractor/ChunkedData.cpp b/src/tools/mesh_extractor/ChunkedData.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ChunkedData.cpp
rename to src/tools/mesh_extractor/ChunkedData.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ChunkedData.h b/src/tools/mesh_extractor/ChunkedData.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ChunkedData.h
rename to src/tools/mesh_extractor/ChunkedData.h
diff --git a/modules/acore/extractors/mesh_extractor/Constants.h b/src/tools/mesh_extractor/Constants.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Constants.h
rename to src/tools/mesh_extractor/Constants.h
diff --git a/modules/acore/extractors/mesh_extractor/ContinentBuilder.cpp b/src/tools/mesh_extractor/ContinentBuilder.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ContinentBuilder.cpp
rename to src/tools/mesh_extractor/ContinentBuilder.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ContinentBuilder.h b/src/tools/mesh_extractor/ContinentBuilder.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ContinentBuilder.h
rename to src/tools/mesh_extractor/ContinentBuilder.h
diff --git a/modules/acore/extractors/mesh_extractor/DBC.cpp b/src/tools/mesh_extractor/DBC.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/DBC.cpp
rename to src/tools/mesh_extractor/DBC.cpp
diff --git a/modules/acore/extractors/mesh_extractor/DBC.h b/src/tools/mesh_extractor/DBC.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/DBC.h
rename to src/tools/mesh_extractor/DBC.h
diff --git a/modules/acore/extractors/mesh_extractor/DoodadHandler.cpp b/src/tools/mesh_extractor/DoodadHandler.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/DoodadHandler.cpp
rename to src/tools/mesh_extractor/DoodadHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/DoodadHandler.h b/src/tools/mesh_extractor/DoodadHandler.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/DoodadHandler.h
rename to src/tools/mesh_extractor/DoodadHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/Geometry.cpp b/src/tools/mesh_extractor/Geometry.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Geometry.cpp
rename to src/tools/mesh_extractor/Geometry.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Geometry.h b/src/tools/mesh_extractor/Geometry.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Geometry.h
rename to src/tools/mesh_extractor/Geometry.h
diff --git a/modules/acore/extractors/mesh_extractor/LiquidHandler.cpp b/src/tools/mesh_extractor/LiquidHandler.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/LiquidHandler.cpp
rename to src/tools/mesh_extractor/LiquidHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/LiquidHandler.h b/src/tools/mesh_extractor/LiquidHandler.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/LiquidHandler.h
rename to src/tools/mesh_extractor/LiquidHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/MPQ.cpp b/src/tools/mesh_extractor/MPQ.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/MPQ.cpp
rename to src/tools/mesh_extractor/MPQ.cpp
diff --git a/modules/acore/extractors/mesh_extractor/MPQ.h b/src/tools/mesh_extractor/MPQ.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/MPQ.h
rename to src/tools/mesh_extractor/MPQ.h
diff --git a/modules/acore/extractors/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQManager.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/MPQManager.cpp
rename to src/tools/mesh_extractor/MPQManager.cpp
diff --git a/modules/acore/extractors/mesh_extractor/MPQManager.h b/src/tools/mesh_extractor/MPQManager.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/MPQManager.h
rename to src/tools/mesh_extractor/MPQManager.h
diff --git a/modules/acore/extractors/mesh_extractor/MapChunk.cpp b/src/tools/mesh_extractor/MapChunk.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/MapChunk.cpp
rename to src/tools/mesh_extractor/MapChunk.cpp
diff --git a/modules/acore/extractors/mesh_extractor/MapChunk.h b/src/tools/mesh_extractor/MapChunk.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/MapChunk.h
rename to src/tools/mesh_extractor/MapChunk.h
diff --git a/modules/acore/extractors/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/MeshExtractor.cpp
rename to src/tools/mesh_extractor/MeshExtractor.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Model.cpp b/src/tools/mesh_extractor/Model.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Model.cpp
rename to src/tools/mesh_extractor/Model.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Model.h b/src/tools/mesh_extractor/Model.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Model.h
rename to src/tools/mesh_extractor/Model.h
diff --git a/modules/acore/extractors/mesh_extractor/ObjectDataHandler.cpp b/src/tools/mesh_extractor/ObjectDataHandler.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ObjectDataHandler.cpp
rename to src/tools/mesh_extractor/ObjectDataHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ObjectDataHandler.h b/src/tools/mesh_extractor/ObjectDataHandler.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/ObjectDataHandler.h
rename to src/tools/mesh_extractor/ObjectDataHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/TileBuilder.cpp b/src/tools/mesh_extractor/TileBuilder.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/TileBuilder.cpp
rename to src/tools/mesh_extractor/TileBuilder.cpp
diff --git a/modules/acore/extractors/mesh_extractor/TileBuilder.h b/src/tools/mesh_extractor/TileBuilder.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/TileBuilder.h
rename to src/tools/mesh_extractor/TileBuilder.h
diff --git a/modules/acore/extractors/mesh_extractor/Utils.cpp b/src/tools/mesh_extractor/Utils.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Utils.cpp
rename to src/tools/mesh_extractor/Utils.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Utils.h b/src/tools/mesh_extractor/Utils.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/Utils.h
rename to src/tools/mesh_extractor/Utils.h
diff --git a/modules/acore/extractors/mesh_extractor/WDT.cpp b/src/tools/mesh_extractor/WDT.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WDT.cpp
rename to src/tools/mesh_extractor/WDT.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WDT.h b/src/tools/mesh_extractor/WDT.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WDT.h
rename to src/tools/mesh_extractor/WDT.h
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelGroup.cpp b/src/tools/mesh_extractor/WorldModelGroup.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WorldModelGroup.cpp
rename to src/tools/mesh_extractor/WorldModelGroup.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelGroup.h b/src/tools/mesh_extractor/WorldModelGroup.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WorldModelGroup.h
rename to src/tools/mesh_extractor/WorldModelGroup.h
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WorldModelHandler.cpp
rename to src/tools/mesh_extractor/WorldModelHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelHandler.h b/src/tools/mesh_extractor/WorldModelHandler.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WorldModelHandler.h
rename to src/tools/mesh_extractor/WorldModelHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelRoot.cpp b/src/tools/mesh_extractor/WorldModelRoot.cpp
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WorldModelRoot.cpp
rename to src/tools/mesh_extractor/WorldModelRoot.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelRoot.h b/src/tools/mesh_extractor/WorldModelRoot.h
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/WorldModelRoot.h
rename to src/tools/mesh_extractor/WorldModelRoot.h
diff --git a/modules/acore/extractors/mesh_extractor/readme b/src/tools/mesh_extractor/readme
similarity index 100%
rename from modules/acore/extractors/mesh_extractor/readme
rename to src/tools/mesh_extractor/readme
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
new file mode 100644
index 000000000..6c3a932b9
--- /dev/null
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -0,0 +1,140 @@
+# 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.
+
+file(GLOB_RECURSE mmap_gen_sources *.cpp *.h)
+
+set(mmap_gen_Includes
+  ${CMAKE_BINARY_DIR}
+  ${ACE_INCLUDE_DIR}
+  ${MYSQL_INCLUDE_DIR}
+  ${OPENSSL_INCLUDE_DIR}
+  ${CMAKE_SOURCE_DIR}/deps/libmpq
+  ${CMAKE_SOURCE_DIR}/deps/zlib
+  ${CMAKE_SOURCE_DIR}/deps/bzip2
+  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour
+  ${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 )
+  set(mmap_gen_Includes
+    ${mmap_gen_Includes}
+    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
+    )
+endif()
+
+include_directories(${mmap_gen_Includes})
+
+add_executable(mmaps_generator ${mmap_gen_sources})
+
+target_link_libraries(mmaps_generator
+  shared
+  collision
+  g3dlib
+  Recast
+  Detour
+  ${ACE_LIBRARY}
+  ${MYSQL_LIBRARY}
+  ${OPENSSL_LIBRARIES}
+  ${BZIP2_LIBRARIES}
+  ${ZLIB_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT}
+)
+
+if( UNIX )
+  install(TARGETS mmaps_generator DESTINATION bin)
+elseif( WIN32 )
+  install(TARGETS mmaps_generator DESTINATION "${CMAKE_INSTALL_PREFIX}")
+endif()
diff --git a/modules/acore/extractors/mmaps_generator/Info/readme.txt b/src/tools/mmaps_generator/Info/readme.txt
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/Info/readme.txt
rename to src/tools/mmaps_generator/Info/readme.txt
diff --git a/modules/acore/extractors/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/IntermediateValues.cpp
rename to src/tools/mmaps_generator/IntermediateValues.cpp
diff --git a/modules/acore/extractors/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/IntermediateValues.h
rename to src/tools/mmaps_generator/IntermediateValues.h
diff --git a/modules/acore/extractors/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/MapBuilder.cpp
rename to src/tools/mmaps_generator/MapBuilder.cpp
diff --git a/modules/acore/extractors/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/MapBuilder.h
rename to src/tools/mmaps_generator/MapBuilder.h
diff --git a/modules/acore/extractors/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/PathCommon.h
rename to src/tools/mmaps_generator/PathCommon.h
diff --git a/modules/acore/extractors/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/PathGenerator.cpp
rename to src/tools/mmaps_generator/PathGenerator.cpp
diff --git a/modules/acore/extractors/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/TerrainBuilder.cpp
rename to src/tools/mmaps_generator/TerrainBuilder.cpp
diff --git a/modules/acore/extractors/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
similarity index 99%
rename from modules/acore/extractors/mmaps_generator/TerrainBuilder.h
rename to src/tools/mmaps_generator/TerrainBuilder.h
index 3e536fd14..52773320f 100644
--- a/modules/acore/extractors/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/modules/acore/extractors/mmaps_generator/VMapExtensions.cpp b/src/tools/mmaps_generator/VMapExtensions.cpp
similarity index 100%
rename from modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
rename to src/tools/mmaps_generator/VMapExtensions.cpp
diff --git a/modules/acore/extractors/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
similarity index 71%
rename from modules/acore/extractors/vmap4_assembler/CMakeLists.txt
rename to src/tools/vmap4_assembler/CMakeLists.txt
index 177550f9a..f15181217 100644
--- a/modules/acore/extractors/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -10,12 +10,12 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 include_directories(
-  ${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/src/
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models
+  ${CMAKE_SOURCE_DIR}/deps/g3dlite/include
+  ${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}
 )
diff --git a/modules/acore/extractors/vmap4_assembler/VMapAssembler.cpp b/src/tools/vmap4_assembler/VMapAssembler.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_assembler/VMapAssembler.cpp
rename to src/tools/vmap4_assembler/VMapAssembler.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
similarity index 88%
rename from modules/acore/extractors/vmap4_extractor/CMakeLists.txt
rename to src/tools/vmap4_extractor/CMakeLists.txt
index 4cc103ecf..f84093b39 100644
--- a/modules/acore/extractors/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -12,13 +12,13 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq
+    ${CMAKE_SOURCE_DIR}/deps/libmpq
 )
 
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win
+    ${CMAKE_SOURCE_DIR}/deps/libmpq/win
   )
 endif()
 
diff --git a/modules/acore/extractors/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/adtfile.cpp
rename to src/tools/vmap4_extractor/adtfile.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/adtfile.h
rename to src/tools/vmap4_extractor/adtfile.h
diff --git a/modules/acore/extractors/vmap4_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/dbcfile.cpp
rename to src/tools/vmap4_extractor/dbcfile.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/dbcfile.h
rename to src/tools/vmap4_extractor/dbcfile.h
diff --git a/modules/acore/extractors/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/gameobject_extract.cpp
rename to src/tools/vmap4_extractor/gameobject_extract.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/loadlib/loadlib.h b/src/tools/vmap4_extractor/loadlib/loadlib.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/loadlib/loadlib.h
rename to src/tools/vmap4_extractor/loadlib/loadlib.h
diff --git a/modules/acore/extractors/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/model.cpp
rename to src/tools/vmap4_extractor/model.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/model.h
rename to src/tools/vmap4_extractor/model.h
diff --git a/modules/acore/extractors/vmap4_extractor/modelheaders.h b/src/tools/vmap4_extractor/modelheaders.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/modelheaders.h
rename to src/tools/vmap4_extractor/modelheaders.h
diff --git a/modules/acore/extractors/vmap4_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/mpq_libmpq.cpp
rename to src/tools/vmap4_extractor/mpq_libmpq.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/mpq_libmpq04.h
rename to src/tools/vmap4_extractor/mpq_libmpq04.h
diff --git a/modules/acore/extractors/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/vec3d.h
rename to src/tools/vmap4_extractor/vec3d.h
diff --git a/modules/acore/extractors/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/vmapexport.cpp
rename to src/tools/vmap4_extractor/vmapexport.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/vmapexport.h b/src/tools/vmap4_extractor/vmapexport.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/vmapexport.h
rename to src/tools/vmap4_extractor/vmapexport.h
diff --git a/modules/acore/extractors/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/wdtfile.cpp
rename to src/tools/vmap4_extractor/wdtfile.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/wdtfile.h
rename to src/tools/vmap4_extractor/wdtfile.h
diff --git a/modules/acore/extractors/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/wmo.cpp
rename to src/tools/vmap4_extractor/wmo.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
similarity index 100%
rename from modules/acore/extractors/vmap4_extractor/wmo.h
rename to src/tools/vmap4_extractor/wmo.h
diff --git a/src/worldserver/CMakeLists.txt b/src/worldserver/CMakeLists.txt
deleted file mode 100644
index 2c4b52f37..000000000
--- a/src/worldserver/CMakeLists.txt
+++ /dev/null
@@ -1,216 +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.
-
-file(GLOB_RECURSE sources_CommandLine CommandLine/*.cpp CommandLine/*.h)
-file(GLOB_RECURSE sources_RemoteAccess RemoteAccess/*.cpp RemoteAccess/*.h)
-file(GLOB_RECURSE sources_TCSoap TCSoap/*.cpp TCSoap/*.h)
-file(GLOB_RECURSE sources_WorldThread WorldThread/*.cpp WorldThread/*.h)
-file(GLOB sources_localdir *.cpp *.h)
-
-if (USE_COREPCH)
-  set(worldserver_PCH_HDR PrecompiledHeaders/worldPCH.h)
-  set(worldserver_PCH_SRC PrecompiledHeaders/worldPCH.cpp)
-endif()
-
-set(worldserver_SRCS
-  ${worldserver_SRCS}
-  ${sources_CommandLine}
-  ${sources_RemoteAccess}
-  ${sources_TCSoap}
-  ${sources_WorldThread}
-  ${sources_localdir}
-)
-
-if( WIN32 )
-  set(worldserver_SRCS
-    ${worldserver_SRCS}
-    ${sources_windows_Debugging}
-  )
-  if ( MSVC )
-    set(worldserver_SRCS
-      ${worldserver_SRCS}
-      worldserver.rc
-    )
-  endif()
-endif()
-
-include_directories(
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour/Include
-  ${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/src/
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management
-  ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/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}/modules/acore/game-framework/src/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_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/CommandLine
-  ${CMAKE_CURRENT_SOURCE_DIR}/RemoteAccess
-  ${CMAKE_CURRENT_SOURCE_DIR}/TCSoap
-  ${CMAKE_CURRENT_SOURCE_DIR}/WorldThread
-  ${ACE_INCLUDE_DIR}
-  ${MYSQL_INCLUDE_DIR}
-  ${OPENSSL_INCLUDE_DIR}
-)
-
-add_executable(worldserver
-  ${worldserver_SRCS}
-  ${worldserver_PCH_SRC}
-)
-
-if( NOT WIN32 )
-  set_target_properties(worldserver PROPERTIES
-    COMPILE_DEFINITIONS _TRINITY_CORE_CONFIG="${CONF_DIR}/worldserver.conf"
-  )
-endif()
-
-add_dependencies(worldserver revision.h)
-
-if( UNIX AND NOT NOJEM )
-  set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}")
-endif()
-
-set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
-
-target_link_libraries(worldserver
-  game
-  shared
-  scripts
-  collision
-  g3dlib
-  gsoap
-  Detour
-  ${GPERFTOOLS_LIBRARIES}
-  ${JEMALLOC_LIBRARY}
-  ${READLINE_LIBRARY}
-  ${TERMCAP_LIBRARY}
-  ${ACE_LIBRARY}
-  ${MYSQL_LIBRARY}
-  ${OPENSSL_LIBRARIES}
-  ${ZLIB_LIBRARIES}
-  ${CMAKE_THREAD_LIBS_INIT}
-)
-
-if( WIN32 )
-  if ( MSVC )
-    add_custom_command(TARGET worldserver
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/
-    )
-  elseif ( MINGW )
-    add_custom_command(TARGET worldserver
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/
-    )
-  endif()
-endif()
-
-if( UNIX )
-  install(TARGETS worldserver DESTINATION bin)
-elseif( WIN32 )
-  install(TARGETS worldserver DESTINATION "${CMAKE_INSTALL_PREFIX}")
-endif()
-
-install(FILES worldserver.conf.dist DESTINATION ${CONF_DIR})
-
-# Generate precompiled header
-if( USE_COREPCH )
-  add_cxx_pch(worldserver ${worldserver_PCH_HDR} ${worldserver_PCH_SRC})
-endif()
-
-CU_RUN_HOOK("AFTER_WORLDSERVER_CMAKE")
diff --git a/var/build/.gitkeep b/var/build/.gitkeep
new file mode 100644
index 000000000..e69de29bb