3563 files changed, 831 insertions, 2847 deletions

diff --git a/.gitignore b/.gitignore
index 57b2b70b0a..cc03f14526 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 9e8d620b41..32edeb3458 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
index 512173a8be..8a3eb6e185 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
index 8dd3c9821c..d90b4b451d 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
index ba57f2bccf..ba57f2bccf 100644
--- a/bin/compiler/.gitignore
+++ b/apps/compiler/.gitignore
diff --git a/bin/compiler/1-clean.sh b/apps/compiler/1-clean.sh
index 558c093e3f..558c093e3f 100755..100644
--- a/bin/compiler/1-clean.sh
+++ b/apps/compiler/1-clean.sh
diff --git a/bin/compiler/2-configure.sh b/apps/compiler/2-configure.sh
index 0d59b1caac..0d59b1caac 100755..100644
--- a/bin/compiler/2-configure.sh
+++ b/apps/compiler/2-configure.sh
diff --git a/bin/compiler/3-build.sh b/apps/compiler/3-build.sh
index 6956f82fd3..6956f82fd3 100755..100644
--- a/bin/compiler/3-build.sh
+++ b/apps/compiler/3-build.sh
diff --git a/bin/compiler/README.md b/apps/compiler/README.md
index a4759ee232..a4759ee232 100644
--- a/bin/compiler/README.md
+++ b/apps/compiler/README.md
diff --git a/bin/compiler/compiler.sh b/apps/compiler/compiler.sh
index cb89bfb705..cb89bfb705 100755..100644
--- a/bin/compiler/compiler.sh
+++ b/apps/compiler/compiler.sh
diff --git a/bin/compiler/includes/defines.sh b/apps/compiler/includes/defines.sh
index 57c809c470..57c809c470 100644
--- a/bin/compiler/includes/defines.sh
+++ b/apps/compiler/includes/defines.sh
diff --git a/bin/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh
index 4dfaa46038..4dfaa46038 100644
--- a/bin/compiler/includes/functions.sh
+++ b/apps/compiler/includes/functions.sh
diff --git a/bin/compiler/includes/includes.sh b/apps/compiler/includes/includes.sh
index ffde93a73e..c425160dc0 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
index 0c63e20d7b..0c63e20d7b 100644
--- a/bin/db_assembler/.gitignore
+++ b/apps/db_assembler/.gitignore
diff --git a/bin/db_assembler/README.md b/apps/db_assembler/README.md
index 2d8f4a0eab..2d8f4a0eab 100644
--- a/bin/db_assembler/README.md
+++ b/apps/db_assembler/README.md
diff --git a/bin/db_assembler/db_assembler.sh b/apps/db_assembler/db_assembler.sh
index 4b4c23e5b9..4b4c23e5b9 100755..100644
--- a/bin/db_assembler/db_assembler.sh
+++ b/apps/db_assembler/db_assembler.sh
diff --git a/bin/db_assembler/includes/functions.sh b/apps/db_assembler/includes/functions.sh
index 946365372d..946365372d 100644
--- a/bin/db_assembler/includes/functions.sh
+++ b/apps/db_assembler/includes/functions.sh
diff --git a/bin/db_assembler/includes/includes.sh b/apps/db_assembler/includes/includes.sh
index b4ac555151..50bb575355 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
index cdd7c19c8d..cdd7c19c8d 100644
--- a/bin/db_exporter/.gitignore
+++ b/apps/db_exporter/.gitignore
diff --git a/bin/db_exporter/README.md b/apps/db_exporter/README.md
index 98703a88df..98703a88df 100644
--- a/bin/db_exporter/README.md
+++ b/apps/db_exporter/README.md
diff --git a/bin/db_exporter/db_export.sh b/apps/db_exporter/db_export.sh
index dc321f90ae..c7dff778dc 100755..100644
--- 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
index ebbff1bbca..ebbff1bbca 100755..100644
--- a/bin/db_pendings/import.sh
+++ b/apps/db_pendings/import.sh
diff --git a/bin/installer/includes/functions.sh b/apps/installer/includes/functions.sh
index 3aa0b6baf2..3aa0b6baf2 100644
--- a/bin/installer/includes/functions.sh
+++ b/apps/installer/includes/functions.sh
diff --git a/bin/installer/includes/includes.sh b/apps/installer/includes/includes.sh
index fdede154f1..16ba795792 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
index eb67cfb367..eb67cfb367 100644
--- a/bin/installer/includes/os_configs/debian.sh
+++ b/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
index 5ea43f641d..5ea43f641d 100644
--- a/bin/installer/includes/os_configs/osx.sh
+++ b/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
index 6ed4117ed6..6ed4117ed6 100644
--- a/bin/installer/includes/os_configs/ubuntu.sh
+++ b/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
index 9a5e13f6da..9a5e13f6da 100644
--- a/bin/installer/includes/os_configs/windows.sh
+++ b/apps/installer/includes/os_configs/windows.sh
diff --git a/bin/installer/main.sh b/apps/installer/main.sh
index a71bca1996..7123117a40 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
index 774a7c01ce..774a7c01ce 100644
--- a/modules/acore/startup-scripts/conf.sh.dist
+++ b/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
index 575981cf2a..575981cf2a 100644
--- a/modules/acore/startup-scripts/examples/restarter-auth.sh
+++ b/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
index 5307eb4a76..5307eb4a76 100644
--- a/modules/acore/startup-scripts/examples/restarter-world.sh
+++ b/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
index 0aedb9bca7..0aedb9bca7 100644
--- a/modules/acore/startup-scripts/examples/starter-auth.sh
+++ b/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
index 4b866dee1d..4b866dee1d 100644
--- a/modules/acore/startup-scripts/examples/starter-world.sh
+++ b/apps/startup-scripts/examples/starter-world.sh
diff --git a/modules/acore/startup-scripts/run-engine b/apps/startup-scripts/run-engine
index 86391f02a7..86391f02a7 100644
--- a/modules/acore/startup-scripts/run-engine
+++ b/apps/startup-scripts/run-engine
diff --git a/modules/acore/startup-scripts/starter b/apps/startup-scripts/starter
index dcb5a5c97f..dcb5a5c97f 100755..100644
--- a/modules/acore/startup-scripts/starter
+++ b/apps/startup-scripts/starter
diff --git a/bin/acore b/bin/acore
new file mode 100755
index 0000000000..a9c10efb22
--- /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 0000000000..aa356deede
--- /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 0000000000..7cc11c8ef8
--- /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 0000000000..9a1f154586
--- /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 0000000000..569d161c63
--- /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 0000000000..c61d00458e
--- /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 5aeff93dfc..96bde98363 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
index c2e6c9cf29..c2e6c9cf29 100644
--- a/modules/worldengine/deps/.gitignore
+++ b/deps/.gitignore
diff --git a/modules/worldengine/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 30ce4fe1fc..30ce4fe1fc 100644
--- a/modules/worldengine/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
diff --git a/modules/worldengine/deps/PackageList.txt b/deps/PackageList.txt
index 30fcb8dbab..30fcb8dbab 100644
--- a/modules/worldengine/deps/PackageList.txt
+++ b/deps/PackageList.txt
diff --git a/modules/worldengine/deps/SFMT/SFMT.h b/deps/SFMT/SFMT.h
index 4004ae1db6..4004ae1db6 100644
--- a/modules/worldengine/deps/SFMT/SFMT.h
+++ b/deps/SFMT/SFMT.h
diff --git a/modules/worldengine/deps/SFMT/randomc.h b/deps/SFMT/randomc.h
index eed2c81a20..eed2c81a20 100644
--- a/modules/worldengine/deps/SFMT/randomc.h
+++ b/deps/SFMT/randomc.h
diff --git a/modules/worldengine/deps/acelite/AUTHORS b/deps/acelite/AUTHORS
index 98fed3d664..98fed3d664 100644
--- a/modules/worldengine/deps/acelite/AUTHORS
+++ b/deps/acelite/AUTHORS
diff --git a/modules/worldengine/deps/acelite/CMakeLists.txt b/deps/acelite/CMakeLists.txt
index 096539f189..096539f189 100644
--- a/modules/worldengine/deps/acelite/CMakeLists.txt
+++ b/deps/acelite/CMakeLists.txt
diff --git a/modules/worldengine/deps/acelite/COPYING b/deps/acelite/COPYING
index 5f66fb4b61..5f66fb4b61 100644
--- a/modules/worldengine/deps/acelite/COPYING
+++ b/deps/acelite/COPYING
diff --git a/modules/worldengine/deps/acelite/NEWS b/deps/acelite/NEWS
index 60f41f0198..60f41f0198 100644
--- a/modules/worldengine/deps/acelite/NEWS
+++ b/deps/acelite/NEWS
diff --git a/modules/worldengine/deps/acelite/README b/deps/acelite/README
index ba3a21e151..ba3a21e151 100644
--- a/modules/worldengine/deps/acelite/README
+++ b/deps/acelite/README
diff --git a/modules/worldengine/deps/acelite/THANKS b/deps/acelite/THANKS
index bbbb98c234..bbbb98c234 100644
--- a/modules/worldengine/deps/acelite/THANKS
+++ b/deps/acelite/THANKS
diff --git a/modules/worldengine/deps/acelite/VERSION b/deps/acelite/VERSION
index db1805dc4a..db1805dc4a 100644
--- a/modules/worldengine/deps/acelite/VERSION
+++ b/deps/acelite/VERSION
diff --git a/modules/worldengine/deps/acelite/ace/ACE.cpp b/deps/acelite/ace/ACE.cpp
index 0e35b2ceb8..0e35b2ceb8 100644
--- a/modules/worldengine/deps/acelite/ace/ACE.cpp
+++ b/deps/acelite/ace/ACE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ACE.h b/deps/acelite/ace/ACE.h
index 370bd36bb5..370bd36bb5 100644
--- a/modules/worldengine/deps/acelite/ace/ACE.h
+++ b/deps/acelite/ace/ACE.h
diff --git a/modules/worldengine/deps/acelite/ace/ACE.inl b/deps/acelite/ace/ACE.inl
index 95f45ee99d..95f45ee99d 100644
--- a/modules/worldengine/deps/acelite/ace/ACE.inl
+++ b/deps/acelite/ace/ACE.inl
diff --git a/modules/worldengine/deps/acelite/ace/ACE.pc.in b/deps/acelite/ace/ACE.pc.in
index 90b2a9eebd..90b2a9eebd 100644
--- a/modules/worldengine/deps/acelite/ace/ACE.pc.in
+++ b/deps/acelite/ace/ACE.pc.in
diff --git a/modules/worldengine/deps/acelite/ace/ACE_crc32.cpp b/deps/acelite/ace/ACE_crc32.cpp
index f9eb064f51..f9eb064f51 100644
--- a/modules/worldengine/deps/acelite/ace/ACE_crc32.cpp
+++ b/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
index c1455d7917..c1455d7917 100644
--- a/modules/worldengine/deps/acelite/ace/ACE_crc_ccitt.cpp
+++ b/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
index 74c62ec34d..74c62ec34d 100644
--- a/modules/worldengine/deps/acelite/ace/ACE_export.h
+++ b/deps/acelite/ace/ACE_export.h
diff --git a/modules/worldengine/deps/acelite/ace/ARGV.cpp b/deps/acelite/ace/ARGV.cpp
index 8ad1fc001c..8ad1fc001c 100644
--- a/modules/worldengine/deps/acelite/ace/ARGV.cpp
+++ b/deps/acelite/ace/ARGV.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ARGV.h b/deps/acelite/ace/ARGV.h
index 1c291bd6ed..1c291bd6ed 100644
--- a/modules/worldengine/deps/acelite/ace/ARGV.h
+++ b/deps/acelite/ace/ARGV.h
diff --git a/modules/worldengine/deps/acelite/ace/ARGV.inl b/deps/acelite/ace/ARGV.inl
index fdc5b13d7c..fdc5b13d7c 100644
--- a/modules/worldengine/deps/acelite/ace/ARGV.inl
+++ b/deps/acelite/ace/ARGV.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.cpp b/deps/acelite/ace/ATM_Acceptor.cpp
index db7d676585..db7d676585 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.cpp
+++ b/deps/acelite/ace/ATM_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.h b/deps/acelite/ace/ATM_Acceptor.h
index 736c980d6f..736c980d6f 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.h
+++ b/deps/acelite/ace/ATM_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.inl b/deps/acelite/ace/ATM_Acceptor.inl
index 8e4aef7fa0..8e4aef7fa0 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Acceptor.inl
+++ b/deps/acelite/ace/ATM_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Addr.cpp b/deps/acelite/ace/ATM_Addr.cpp
index afe10cc8f9..afe10cc8f9 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Addr.cpp
+++ b/deps/acelite/ace/ATM_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Addr.h b/deps/acelite/ace/ATM_Addr.h
index 8f8aac81d6..8f8aac81d6 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Addr.h
+++ b/deps/acelite/ace/ATM_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Addr.inl b/deps/acelite/ace/ATM_Addr.inl
index d1f7e2c4d1..d1f7e2c4d1 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Addr.inl
+++ b/deps/acelite/ace/ATM_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Connector.cpp b/deps/acelite/ace/ATM_Connector.cpp
index b05860557d..b05860557d 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Connector.cpp
+++ b/deps/acelite/ace/ATM_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Connector.h b/deps/acelite/ace/ATM_Connector.h
index 2bca5b61d6..2bca5b61d6 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Connector.h
+++ b/deps/acelite/ace/ATM_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Connector.inl b/deps/acelite/ace/ATM_Connector.inl
index e35f408546..e35f408546 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Connector.inl
+++ b/deps/acelite/ace/ATM_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Params.cpp b/deps/acelite/ace/ATM_Params.cpp
index ac8a996e58..ac8a996e58 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Params.cpp
+++ b/deps/acelite/ace/ATM_Params.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Params.h b/deps/acelite/ace/ATM_Params.h
index 34db502486..34db502486 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Params.h
+++ b/deps/acelite/ace/ATM_Params.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Params.inl b/deps/acelite/ace/ATM_Params.inl
index 59ec331b53..59ec331b53 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Params.inl
+++ b/deps/acelite/ace/ATM_Params.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_QoS.cpp b/deps/acelite/ace/ATM_QoS.cpp
index a6b097326a..a6b097326a 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_QoS.cpp
+++ b/deps/acelite/ace/ATM_QoS.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_QoS.h b/deps/acelite/ace/ATM_QoS.h
index 02aa7d7c91..02aa7d7c91 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_QoS.h
+++ b/deps/acelite/ace/ATM_QoS.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_QoS.inl b/deps/acelite/ace/ATM_QoS.inl
index 479079e993..479079e993 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_QoS.inl
+++ b/deps/acelite/ace/ATM_QoS.inl
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Stream.cpp b/deps/acelite/ace/ATM_Stream.cpp
index f87ac4def1..f87ac4def1 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Stream.cpp
+++ b/deps/acelite/ace/ATM_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Stream.h b/deps/acelite/ace/ATM_Stream.h
index 10bd3e7002..10bd3e7002 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Stream.h
+++ b/deps/acelite/ace/ATM_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/ATM_Stream.inl b/deps/acelite/ace/ATM_Stream.inl
index eda7ca9bc8..eda7ca9bc8 100644
--- a/modules/worldengine/deps/acelite/ace/ATM_Stream.inl
+++ b/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
index 3207733b24..3207733b24 100644
--- a/modules/worldengine/deps/acelite/ace/Abstract_Timer_Queue.cpp
+++ b/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
index ddb8abf7f1..ddb8abf7f1 100644
--- a/modules/worldengine/deps/acelite/ace/Abstract_Timer_Queue.h
+++ b/deps/acelite/ace/Abstract_Timer_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Acceptor.cpp b/deps/acelite/ace/Acceptor.cpp
index a2df5e8360..a2df5e8360 100644
--- a/modules/worldengine/deps/acelite/ace/Acceptor.cpp
+++ b/deps/acelite/ace/Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Acceptor.h b/deps/acelite/ace/Acceptor.h
index 5923718fbc..5923718fbc 100644
--- a/modules/worldengine/deps/acelite/ace/Acceptor.h
+++ b/deps/acelite/ace/Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/Activation_Queue.cpp b/deps/acelite/ace/Activation_Queue.cpp
index 5921c26c47..5921c26c47 100644
--- a/modules/worldengine/deps/acelite/ace/Activation_Queue.cpp
+++ b/deps/acelite/ace/Activation_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Activation_Queue.h b/deps/acelite/ace/Activation_Queue.h
index a386ca7672..a386ca7672 100644
--- a/modules/worldengine/deps/acelite/ace/Activation_Queue.h
+++ b/deps/acelite/ace/Activation_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Activation_Queue.inl b/deps/acelite/ace/Activation_Queue.inl
index 4c0ffc049d..4c0ffc049d 100644
--- a/modules/worldengine/deps/acelite/ace/Activation_Queue.inl
+++ b/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
index 574bcb8575..574bcb8575 100644
--- a/modules/worldengine/deps/acelite/ace/Active_Map_Manager.cpp
+++ b/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
index 7bade46aa5..7bade46aa5 100644
--- a/modules/worldengine/deps/acelite/ace/Active_Map_Manager.h
+++ b/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
index df90ada6a0..df90ada6a0 100644
--- a/modules/worldengine/deps/acelite/ace/Active_Map_Manager.inl
+++ b/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
index 732cc29511..732cc29511 100644
--- a/modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.cpp
+++ b/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
index 80eaada26a..80eaada26a 100644
--- a/modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.h
+++ b/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
index 647b55ebd5..647b55ebd5 100644
--- a/modules/worldengine/deps/acelite/ace/Active_Map_Manager_T.inl
+++ b/deps/acelite/ace/Active_Map_Manager_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Addr.cpp b/deps/acelite/ace/Addr.cpp
index dbf1a5c3bd..dbf1a5c3bd 100644
--- a/modules/worldengine/deps/acelite/ace/Addr.cpp
+++ b/deps/acelite/ace/Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Addr.h b/deps/acelite/ace/Addr.h
index 6175fbb27b..6175fbb27b 100644
--- a/modules/worldengine/deps/acelite/ace/Addr.h
+++ b/deps/acelite/ace/Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/Addr.inl b/deps/acelite/ace/Addr.inl
index 0ff355eaeb..0ff355eaeb 100644
--- a/modules/worldengine/deps/acelite/ace/Addr.inl
+++ b/deps/acelite/ace/Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Arg_Shifter.cpp b/deps/acelite/ace/Arg_Shifter.cpp
index 6267860356..6267860356 100644
--- a/modules/worldengine/deps/acelite/ace/Arg_Shifter.cpp
+++ b/deps/acelite/ace/Arg_Shifter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Arg_Shifter.h b/deps/acelite/ace/Arg_Shifter.h
index 123a70560c..123a70560c 100644
--- a/modules/worldengine/deps/acelite/ace/Arg_Shifter.h
+++ b/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
index 4c8e4fbb93..4c8e4fbb93 100644
--- a/modules/worldengine/deps/acelite/ace/Argv_Type_Converter.cpp
+++ b/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
index 9734a1de03..9734a1de03 100644
--- a/modules/worldengine/deps/acelite/ace/Argv_Type_Converter.h
+++ b/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
index 8c7bc89ca8..8c7bc89ca8 100644
--- a/modules/worldengine/deps/acelite/ace/Argv_Type_Converter.inl
+++ b/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
index 830634f7bf..830634f7bf 100644
--- a/modules/worldengine/deps/acelite/ace/Array_Base.cpp
+++ b/deps/acelite/ace/Array_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Array_Base.h b/deps/acelite/ace/Array_Base.h
index 4fafa4bb83..4fafa4bb83 100644
--- a/modules/worldengine/deps/acelite/ace/Array_Base.h
+++ b/deps/acelite/ace/Array_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Array_Base.inl b/deps/acelite/ace/Array_Base.inl
index ccd367f2d9..ccd367f2d9 100644
--- a/modules/worldengine/deps/acelite/ace/Array_Base.inl
+++ b/deps/acelite/ace/Array_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/Array_Map.cpp b/deps/acelite/ace/Array_Map.cpp
index 219144e829..219144e829 100644
--- a/modules/worldengine/deps/acelite/ace/Array_Map.cpp
+++ b/deps/acelite/ace/Array_Map.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Array_Map.h b/deps/acelite/ace/Array_Map.h
index 03830b52ce..03830b52ce 100644
--- a/modules/worldengine/deps/acelite/ace/Array_Map.h
+++ b/deps/acelite/ace/Array_Map.h
diff --git a/modules/worldengine/deps/acelite/ace/Array_Map.inl b/deps/acelite/ace/Array_Map.inl
index c331fae801..c331fae801 100644
--- a/modules/worldengine/deps/acelite/ace/Array_Map.inl
+++ b/deps/acelite/ace/Array_Map.inl
diff --git a/modules/worldengine/deps/acelite/ace/Assert.cpp b/deps/acelite/ace/Assert.cpp
index 8578844904..8578844904 100644
--- a/modules/worldengine/deps/acelite/ace/Assert.cpp
+++ b/deps/acelite/ace/Assert.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Assert.h b/deps/acelite/ace/Assert.h
index 7732323f08..7732323f08 100644
--- a/modules/worldengine/deps/acelite/ace/Assert.h
+++ b/deps/acelite/ace/Assert.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Acceptor.cpp b/deps/acelite/ace/Asynch_Acceptor.cpp
index c518c3a62f..c518c3a62f 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_Acceptor.cpp
+++ b/deps/acelite/ace/Asynch_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Acceptor.h b/deps/acelite/ace/Asynch_Acceptor.h
index 520c7bf3f8..520c7bf3f8 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_Acceptor.h
+++ b/deps/acelite/ace/Asynch_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Connector.cpp b/deps/acelite/ace/Asynch_Connector.cpp
index 5391ca5ad5..5391ca5ad5 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_Connector.cpp
+++ b/deps/acelite/ace/Asynch_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_Connector.h b/deps/acelite/ace/Asynch_Connector.h
index 8706fd2221..8706fd2221 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_Connector.h
+++ b/deps/acelite/ace/Asynch_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_IO.cpp b/deps/acelite/ace/Asynch_IO.cpp
index f50cdc33d3..f50cdc33d3 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_IO.cpp
+++ b/deps/acelite/ace/Asynch_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Asynch_IO.h b/deps/acelite/ace/Asynch_IO.h
index 6cc143d240..6cc143d240 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_IO.h
+++ b/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
index 1f25a1ee7b..1f25a1ee7b 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.cpp
+++ b/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
index a4ec996df1..a4ec996df1 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.h
+++ b/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
index e6fce33b38..e6fce33b38 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_IO_Impl.inl
+++ b/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
index 0b6a14b60e..0b6a14b60e 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_Pseudo_Task.cpp
+++ b/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
index 4337361fe4..4337361fe4 100644
--- a/modules/worldengine/deps/acelite/ace/Asynch_Pseudo_Task.h
+++ b/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
index 5b8cc7a0d5..5b8cc7a0d5 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op.cpp
+++ b/deps/acelite/ace/Atomic_Op.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op.h b/deps/acelite/ace/Atomic_Op.h
index 8ae1b2e5ed..8ae1b2e5ed 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op.h
+++ b/deps/acelite/ace/Atomic_Op.h
diff --git a/modules/worldengine/deps/acelite/ace/Atomic_Op.inl b/deps/acelite/ace/Atomic_Op.inl
index 2f9ec57bac..2f9ec57bac 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op.inl
+++ b/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
index 3e7e7cada0..3e7e7cada0 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.cpp
+++ b/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
index 6a25fe176b..6a25fe176b 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.h
+++ b/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
index 90f7c4839c..90f7c4839c 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_GCC_T.inl
+++ b/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
index 9e59864ae8..9e59864ae8 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_Sparc.c
+++ b/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
index 3c4d883c2a..3c4d883c2a 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_Sparc.h
+++ b/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
index 82311d3e26..82311d3e26 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_T.cpp
+++ b/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
index 86fb0ef098..86fb0ef098 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_T.h
+++ b/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
index 1b1eb988f9..1b1eb988f9 100644
--- a/modules/worldengine/deps/acelite/ace/Atomic_Op_T.inl
+++ b/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
index 516755c681..516755c681 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Event.cpp
+++ b/deps/acelite/ace/Auto_Event.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Event.h b/deps/acelite/ace/Auto_Event.h
index ec62441d27..ec62441d27 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Event.h
+++ b/deps/acelite/ace/Auto_Event.h
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Event.inl b/deps/acelite/ace/Auto_Event.inl
index e1facac51a..e1facac51a 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Event.inl
+++ b/deps/acelite/ace/Auto_Event.inl
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Functor.cpp b/deps/acelite/ace/Auto_Functor.cpp
index 7310d78d34..7310d78d34 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Functor.cpp
+++ b/deps/acelite/ace/Auto_Functor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Functor.h b/deps/acelite/ace/Auto_Functor.h
index 7e75ae7b6a..7e75ae7b6a 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Functor.h
+++ b/deps/acelite/ace/Auto_Functor.h
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Functor.inl b/deps/acelite/ace/Auto_Functor.inl
index be0c38361a..be0c38361a 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Functor.inl
+++ b/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
index 56514ef449..56514ef449 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_IncDec_T.cpp
+++ b/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
index 3e1eefa64c..3e1eefa64c 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_IncDec_T.h
+++ b/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
index cb21448886..cb21448886 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_IncDec_T.inl
+++ b/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
index 9a23ab0383..9a23ab0383 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Ptr.cpp
+++ b/deps/acelite/ace/Auto_Ptr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Ptr.h b/deps/acelite/ace/Auto_Ptr.h
index e06eb21b4a..e06eb21b4a 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Ptr.h
+++ b/deps/acelite/ace/Auto_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Auto_Ptr.inl b/deps/acelite/ace/Auto_Ptr.inl
index a172ea9dc0..a172ea9dc0 100644
--- a/modules/worldengine/deps/acelite/ace/Auto_Ptr.inl
+++ b/deps/acelite/ace/Auto_Ptr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Barrier.cpp b/deps/acelite/ace/Barrier.cpp
index e6f33efee9..e6f33efee9 100644
--- a/modules/worldengine/deps/acelite/ace/Barrier.cpp
+++ b/deps/acelite/ace/Barrier.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Barrier.h b/deps/acelite/ace/Barrier.h
index b9a06ea682..b9a06ea682 100644
--- a/modules/worldengine/deps/acelite/ace/Barrier.h
+++ b/deps/acelite/ace/Barrier.h
diff --git a/modules/worldengine/deps/acelite/ace/Barrier.inl b/deps/acelite/ace/Barrier.inl
index f742deeb6e..f742deeb6e 100644
--- a/modules/worldengine/deps/acelite/ace/Barrier.inl
+++ b/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
index f965bac12a..f965bac12a 100644
--- a/modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.cpp
+++ b/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
index d45ce65748..d45ce65748 100644
--- a/modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.h
+++ b/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
index febce6f49c..febce6f49c 100644
--- a/modules/worldengine/deps/acelite/ace/Base_Thread_Adapter.inl
+++ b/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
index ef094f02e7..ef094f02e7 100644
--- a/modules/worldengine/deps/acelite/ace/Based_Pointer_Repository.cpp
+++ b/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
index 00b6d2c4f6..00b6d2c4f6 100644
--- a/modules/worldengine/deps/acelite/ace/Based_Pointer_Repository.h
+++ b/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
index b36939aec9..b36939aec9 100644
--- a/modules/worldengine/deps/acelite/ace/Based_Pointer_T.cpp
+++ b/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
index e0211603c0..e0211603c0 100644
--- a/modules/worldengine/deps/acelite/ace/Based_Pointer_T.h
+++ b/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
index 04ab75831b..04ab75831b 100644
--- a/modules/worldengine/deps/acelite/ace/Based_Pointer_T.inl
+++ b/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
index 98e3193f3d..98e3193f3d 100644
--- a/modules/worldengine/deps/acelite/ace/Basic_Stats.cpp
+++ b/deps/acelite/ace/Basic_Stats.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Stats.h b/deps/acelite/ace/Basic_Stats.h
index 4cc4bd2d63..4cc4bd2d63 100644
--- a/modules/worldengine/deps/acelite/ace/Basic_Stats.h
+++ b/deps/acelite/ace/Basic_Stats.h
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Stats.inl b/deps/acelite/ace/Basic_Stats.inl
index 185478ab7f..185478ab7f 100644
--- a/modules/worldengine/deps/acelite/ace/Basic_Stats.inl
+++ b/deps/acelite/ace/Basic_Stats.inl
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Types.cpp b/deps/acelite/ace/Basic_Types.cpp
index 56867684e7..56867684e7 100644
--- a/modules/worldengine/deps/acelite/ace/Basic_Types.cpp
+++ b/deps/acelite/ace/Basic_Types.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Basic_Types.h b/deps/acelite/ace/Basic_Types.h
index b9feefb5ea..b9feefb5ea 100644
--- a/modules/worldengine/deps/acelite/ace/Basic_Types.h
+++ b/deps/acelite/ace/Basic_Types.h
diff --git a/modules/worldengine/deps/acelite/ace/Bound_Ptr.h b/deps/acelite/ace/Bound_Ptr.h
index 5c317db6f1..5c317db6f1 100644
--- a/modules/worldengine/deps/acelite/ace/Bound_Ptr.h
+++ b/deps/acelite/ace/Bound_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Bound_Ptr.inl b/deps/acelite/ace/Bound_Ptr.inl
index fb31747a4f..fb31747a4f 100644
--- a/modules/worldengine/deps/acelite/ace/Bound_Ptr.inl
+++ b/deps/acelite/ace/Bound_Ptr.inl
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Base.cpp b/deps/acelite/ace/CDR_Base.cpp
index b2ee413e98..b2ee413e98 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Base.cpp
+++ b/deps/acelite/ace/CDR_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Base.h b/deps/acelite/ace/CDR_Base.h
index 22dd8adf97..22dd8adf97 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Base.h
+++ b/deps/acelite/ace/CDR_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Base.inl b/deps/acelite/ace/CDR_Base.inl
index 2a93c82b63..2a93c82b63 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Base.inl
+++ b/deps/acelite/ace/CDR_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Size.cpp b/deps/acelite/ace/CDR_Size.cpp
index 4263532eb5..4263532eb5 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Size.cpp
+++ b/deps/acelite/ace/CDR_Size.cpp
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Size.h b/deps/acelite/ace/CDR_Size.h
index ad229bca38..ad229bca38 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Size.h
+++ b/deps/acelite/ace/CDR_Size.h
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Size.inl b/deps/acelite/ace/CDR_Size.inl
index 9b83b6f72e..9b83b6f72e 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Size.inl
+++ b/deps/acelite/ace/CDR_Size.inl
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Stream.cpp b/deps/acelite/ace/CDR_Stream.cpp
index bf99178977..bf99178977 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Stream.cpp
+++ b/deps/acelite/ace/CDR_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Stream.h b/deps/acelite/ace/CDR_Stream.h
index 8197b0f4be..8197b0f4be 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Stream.h
+++ b/deps/acelite/ace/CDR_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/CDR_Stream.inl b/deps/acelite/ace/CDR_Stream.inl
index 0103d27922..0103d27922 100644
--- a/modules/worldengine/deps/acelite/ace/CDR_Stream.inl
+++ b/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
index 8711f1e57c..8711f1e57c 100644
--- a/modules/worldengine/deps/acelite/ace/CE_Screen_Output.cpp
+++ b/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
index 65c697daa4..65c697daa4 100644
--- a/modules/worldengine/deps/acelite/ace/CE_Screen_Output.h
+++ b/deps/acelite/ace/CE_Screen_Output.h
diff --git a/modules/worldengine/deps/acelite/ace/CMakeLists.txt b/deps/acelite/ace/CMakeLists.txt
index b90158b157..deb86f7f3a 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
index 9cd55e26d1..9cd55e26d1 100644
--- a/modules/worldengine/deps/acelite/ace/CORBA_macros.h
+++ b/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
index c6a6d9d399..c6a6d9d399 100644
--- a/modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.cpp
+++ b/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
index 3e1d90a08e..3e1d90a08e 100644
--- a/modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.h
+++ b/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
index dc2a42ef0f..dc2a42ef0f 100644
--- a/modules/worldengine/deps/acelite/ace/Cache_Map_Manager_T.inl
+++ b/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
index 7af6626069..7af6626069 100644
--- a/modules/worldengine/deps/acelite/ace/Cached_Connect_Strategy_T.cpp
+++ b/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
index 396152ea79..396152ea79 100644
--- a/modules/worldengine/deps/acelite/ace/Cached_Connect_Strategy_T.h
+++ b/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
index 9db1902e73..9db1902e73 100644
--- a/modules/worldengine/deps/acelite/ace/Caching_Strategies_T.cpp
+++ b/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
index 864b7c21d4..864b7c21d4 100644
--- a/modules/worldengine/deps/acelite/ace/Caching_Strategies_T.h
+++ b/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
index dd9c985132..dd9c985132 100644
--- a/modules/worldengine/deps/acelite/ace/Caching_Strategies_T.inl
+++ b/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
index aa344562d8..aa344562d8 100644
--- a/modules/worldengine/deps/acelite/ace/Caching_Utility_T.cpp
+++ b/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
index bdeb165fb6..bdeb165fb6 100644
--- a/modules/worldengine/deps/acelite/ace/Caching_Utility_T.h
+++ b/deps/acelite/ace/Caching_Utility_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Capabilities.cpp b/deps/acelite/ace/Capabilities.cpp
index b6b9bd0f6d..b6b9bd0f6d 100644
--- a/modules/worldengine/deps/acelite/ace/Capabilities.cpp
+++ b/deps/acelite/ace/Capabilities.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Capabilities.h b/deps/acelite/ace/Capabilities.h
index 16776ed442..16776ed442 100644
--- a/modules/worldengine/deps/acelite/ace/Capabilities.h
+++ b/deps/acelite/ace/Capabilities.h
diff --git a/modules/worldengine/deps/acelite/ace/Capabilities.inl b/deps/acelite/ace/Capabilities.inl
index 0579ae6cd9..0579ae6cd9 100644
--- a/modules/worldengine/deps/acelite/ace/Capabilities.inl
+++ b/deps/acelite/ace/Capabilities.inl
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup.cpp b/deps/acelite/ace/Cleanup.cpp
index d83022c858..d83022c858 100644
--- a/modules/worldengine/deps/acelite/ace/Cleanup.cpp
+++ b/deps/acelite/ace/Cleanup.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup.h b/deps/acelite/ace/Cleanup.h
index 33d944630d..33d944630d 100644
--- a/modules/worldengine/deps/acelite/ace/Cleanup.h
+++ b/deps/acelite/ace/Cleanup.h
diff --git a/modules/worldengine/deps/acelite/ace/Cleanup.inl b/deps/acelite/ace/Cleanup.inl
index fdae3412f6..fdae3412f6 100644
--- a/modules/worldengine/deps/acelite/ace/Cleanup.inl
+++ b/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
index 53cf0b876a..53cf0b876a 100644
--- a/modules/worldengine/deps/acelite/ace/Cleanup_Strategies_T.cpp
+++ b/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
index 96900418a0..96900418a0 100644
--- a/modules/worldengine/deps/acelite/ace/Cleanup_Strategies_T.h
+++ b/deps/acelite/ace/Cleanup_Strategies_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Codecs.cpp b/deps/acelite/ace/Codecs.cpp
index eafc05973c..eafc05973c 100644
--- a/modules/worldengine/deps/acelite/ace/Codecs.cpp
+++ b/deps/acelite/ace/Codecs.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Codecs.h b/deps/acelite/ace/Codecs.h
index 1f0ee3a9a8..1f0ee3a9a8 100644
--- a/modules/worldengine/deps/acelite/ace/Codecs.h
+++ b/deps/acelite/ace/Codecs.h
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_IBM1047.cpp b/deps/acelite/ace/Codeset_IBM1047.cpp
index ba8d1eb9cd..ba8d1eb9cd 100644
--- a/modules/worldengine/deps/acelite/ace/Codeset_IBM1047.cpp
+++ b/deps/acelite/ace/Codeset_IBM1047.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_IBM1047.h b/deps/acelite/ace/Codeset_IBM1047.h
index d04b5997b3..d04b5997b3 100644
--- a/modules/worldengine/deps/acelite/ace/Codeset_IBM1047.h
+++ b/deps/acelite/ace/Codeset_IBM1047.h
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Registry.cpp b/deps/acelite/ace/Codeset_Registry.cpp
index 3a0610741f..3a0610741f 100644
--- a/modules/worldengine/deps/acelite/ace/Codeset_Registry.cpp
+++ b/deps/acelite/ace/Codeset_Registry.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Registry.h b/deps/acelite/ace/Codeset_Registry.h
index 86599663ff..86599663ff 100644
--- a/modules/worldengine/deps/acelite/ace/Codeset_Registry.h
+++ b/deps/acelite/ace/Codeset_Registry.h
diff --git a/modules/worldengine/deps/acelite/ace/Codeset_Registry.inl b/deps/acelite/ace/Codeset_Registry.inl
index f459d4d83a..f459d4d83a 100644
--- a/modules/worldengine/deps/acelite/ace/Codeset_Registry.inl
+++ b/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
index 53b719d87c..53b719d87c 100644
--- a/modules/worldengine/deps/acelite/ace/Codeset_Registry_db.cpp
+++ b/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
index f57935f8c3..f57935f8c3 100644
--- a/modules/worldengine/deps/acelite/ace/Codeset_Symbols.h
+++ b/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
index e9bd69aecd..e9bd69aecd 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/ACE_Compression.mpc
+++ b/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
index 2b07d8e279..2b07d8e279 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/ACE_Compression_export.h
+++ b/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
index 191bc839a4..191bc839a4 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/Compressor.cpp
+++ b/deps/acelite/ace/Compression/Compressor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Compression/Compressor.h b/deps/acelite/ace/Compression/Compressor.h
index 315104bbde..315104bbde 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/Compressor.h
+++ b/deps/acelite/ace/Compression/Compressor.h
diff --git a/modules/worldengine/deps/acelite/ace/Compression/Compressor.inl b/deps/acelite/ace/Compression/Compressor.inl
index 5f9a10af74..5f9a10af74 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/Compressor.inl
+++ b/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
index 40c3bc0d91..40c3bc0d91 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/rle/ACE_RLECompression.mpc
+++ b/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
index 7850212d69..7850212d69 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/rle/ACE_RLECompression_export.h
+++ b/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
index f027b5667c..f027b5667c 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/rle/RLECompressor.cpp
+++ b/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
index 8164015539..8164015539 100644
--- a/modules/worldengine/deps/acelite/ace/Compression/rle/RLECompressor.h
+++ b/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
index 044dfacc50..044dfacc50 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Attributes.cpp
+++ b/deps/acelite/ace/Condition_Attributes.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Attributes.h b/deps/acelite/ace/Condition_Attributes.h
index 13c1b8abf7..13c1b8abf7 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Attributes.h
+++ b/deps/acelite/ace/Condition_Attributes.h
diff --git a/modules/worldengine/deps/acelite/ace/Condition_Attributes.inl b/deps/acelite/ace/Condition_Attributes.inl
index 7fecc4aafd..7fecc4aafd 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Attributes.inl
+++ b/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
index 2f68f8c8b3..2f68f8c8b3 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/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
index a7ce9944cc..a7ce9944cc 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Recursive_Thread_Mutex.h
+++ b/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
index 2657822edd..2657822edd 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_T.cpp
+++ b/deps/acelite/ace/Condition_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Condition_T.h b/deps/acelite/ace/Condition_T.h
index a42b02ade5..a42b02ade5 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_T.h
+++ b/deps/acelite/ace/Condition_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Condition_T.inl b/deps/acelite/ace/Condition_T.inl
index dc42662298..dc42662298 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_T.inl
+++ b/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
index d012e1a7d1..d012e1a7d1 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.cpp
+++ b/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
index 6ba91871e1..6ba91871e1 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.h
+++ b/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
index 5db2808d1a..5db2808d1a 100644
--- a/modules/worldengine/deps/acelite/ace/Condition_Thread_Mutex.inl
+++ b/deps/acelite/ace/Condition_Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Configuration.cpp b/deps/acelite/ace/Configuration.cpp
index 5050f8a81b..5050f8a81b 100644
--- a/modules/worldengine/deps/acelite/ace/Configuration.cpp
+++ b/deps/acelite/ace/Configuration.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Configuration.h b/deps/acelite/ace/Configuration.h
index fc96cacc51..fc96cacc51 100644
--- a/modules/worldengine/deps/acelite/ace/Configuration.h
+++ b/deps/acelite/ace/Configuration.h
diff --git a/modules/worldengine/deps/acelite/ace/Configuration.inl b/deps/acelite/ace/Configuration.inl
index ebd6d6f9e5..ebd6d6f9e5 100644
--- a/modules/worldengine/deps/acelite/ace/Configuration.inl
+++ b/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
index 74ff1a32b5..74ff1a32b5 100644
--- a/modules/worldengine/deps/acelite/ace/Configuration_Import_Export.cpp
+++ b/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
index f40019ecca..f40019ecca 100644
--- a/modules/worldengine/deps/acelite/ace/Configuration_Import_Export.h
+++ b/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
index b5619a6749..b5619a6749 100644
--- a/modules/worldengine/deps/acelite/ace/Connection_Recycling_Strategy.cpp
+++ b/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
index 368d4b2a3b..368d4b2a3b 100644
--- a/modules/worldengine/deps/acelite/ace/Connection_Recycling_Strategy.h
+++ b/deps/acelite/ace/Connection_Recycling_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/Connector.cpp b/deps/acelite/ace/Connector.cpp
index 43da033214..43da033214 100644
--- a/modules/worldengine/deps/acelite/ace/Connector.cpp
+++ b/deps/acelite/ace/Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Connector.h b/deps/acelite/ace/Connector.h
index a70f03a242..a70f03a242 100644
--- a/modules/worldengine/deps/acelite/ace/Connector.h
+++ b/deps/acelite/ace/Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/Containers.cpp b/deps/acelite/ace/Containers.cpp
index 40c5629620..40c5629620 100644
--- a/modules/worldengine/deps/acelite/ace/Containers.cpp
+++ b/deps/acelite/ace/Containers.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Containers.h b/deps/acelite/ace/Containers.h
index 6288431ae1..6288431ae1 100644
--- a/modules/worldengine/deps/acelite/ace/Containers.h
+++ b/deps/acelite/ace/Containers.h
diff --git a/modules/worldengine/deps/acelite/ace/Containers.inl b/deps/acelite/ace/Containers.inl
index cd7507d403..cd7507d403 100644
--- a/modules/worldengine/deps/acelite/ace/Containers.inl
+++ b/deps/acelite/ace/Containers.inl
diff --git a/modules/worldengine/deps/acelite/ace/Containers_T.cpp b/deps/acelite/ace/Containers_T.cpp
index 4a835ebeae..4a835ebeae 100644
--- a/modules/worldengine/deps/acelite/ace/Containers_T.cpp
+++ b/deps/acelite/ace/Containers_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Containers_T.h b/deps/acelite/ace/Containers_T.h
index bc93b9c1a0..bc93b9c1a0 100644
--- a/modules/worldengine/deps/acelite/ace/Containers_T.h
+++ b/deps/acelite/ace/Containers_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Containers_T.inl b/deps/acelite/ace/Containers_T.inl
index adc0f42cd2..adc0f42cd2 100644
--- a/modules/worldengine/deps/acelite/ace/Containers_T.inl
+++ b/deps/acelite/ace/Containers_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Copy_Disabled.cpp b/deps/acelite/ace/Copy_Disabled.cpp
index 59c6ba7af9..59c6ba7af9 100644
--- a/modules/worldengine/deps/acelite/ace/Copy_Disabled.cpp
+++ b/deps/acelite/ace/Copy_Disabled.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Copy_Disabled.h b/deps/acelite/ace/Copy_Disabled.h
index 374227e8a3..374227e8a3 100644
--- a/modules/worldengine/deps/acelite/ace/Copy_Disabled.h
+++ b/deps/acelite/ace/Copy_Disabled.h
diff --git a/modules/worldengine/deps/acelite/ace/Countdown_Time.h b/deps/acelite/ace/Countdown_Time.h
index 7c9a9e3d2b..7c9a9e3d2b 100644
--- a/modules/worldengine/deps/acelite/ace/Countdown_Time.h
+++ b/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
index 8a38c4de11..8a38c4de11 100644
--- a/modules/worldengine/deps/acelite/ace/Countdown_Time_T.cpp
+++ b/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
index 78d46c6d3f..78d46c6d3f 100644
--- a/modules/worldengine/deps/acelite/ace/Countdown_Time_T.h
+++ b/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
index 319729d9c3..319729d9c3 100644
--- a/modules/worldengine/deps/acelite/ace/Countdown_Time_T.inl
+++ b/deps/acelite/ace/Countdown_Time_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV.cpp b/deps/acelite/ace/DEV.cpp
index 762e9472de..762e9472de 100644
--- a/modules/worldengine/deps/acelite/ace/DEV.cpp
+++ b/deps/acelite/ace/DEV.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV.h b/deps/acelite/ace/DEV.h
index c74c23429c..c74c23429c 100644
--- a/modules/worldengine/deps/acelite/ace/DEV.h
+++ b/deps/acelite/ace/DEV.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV.inl b/deps/acelite/ace/DEV.inl
index ee0bb78389..ee0bb78389 100644
--- a/modules/worldengine/deps/acelite/ace/DEV.inl
+++ b/deps/acelite/ace/DEV.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Addr.cpp b/deps/acelite/ace/DEV_Addr.cpp
index 6ff76ca946..6ff76ca946 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_Addr.cpp
+++ b/deps/acelite/ace/DEV_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Addr.h b/deps/acelite/ace/DEV_Addr.h
index 3bbbad057c..3bbbad057c 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_Addr.h
+++ b/deps/acelite/ace/DEV_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Addr.inl b/deps/acelite/ace/DEV_Addr.inl
index 3025745f2c..3025745f2c 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_Addr.inl
+++ b/deps/acelite/ace/DEV_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Connector.cpp b/deps/acelite/ace/DEV_Connector.cpp
index c07e8b2661..c07e8b2661 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_Connector.cpp
+++ b/deps/acelite/ace/DEV_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Connector.h b/deps/acelite/ace/DEV_Connector.h
index 1dbdf08414..1dbdf08414 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_Connector.h
+++ b/deps/acelite/ace/DEV_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV_Connector.inl b/deps/acelite/ace/DEV_Connector.inl
index b92b4d2a5a..b92b4d2a5a 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_Connector.inl
+++ b/deps/acelite/ace/DEV_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/DEV_IO.cpp b/deps/acelite/ace/DEV_IO.cpp
index bc619e27f3..bc619e27f3 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_IO.cpp
+++ b/deps/acelite/ace/DEV_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DEV_IO.h b/deps/acelite/ace/DEV_IO.h
index 9a97c011f5..9a97c011f5 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_IO.h
+++ b/deps/acelite/ace/DEV_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/DEV_IO.inl b/deps/acelite/ace/DEV_IO.inl
index 45e4a09707..45e4a09707 100644
--- a/modules/worldengine/deps/acelite/ace/DEV_IO.inl
+++ b/deps/acelite/ace/DEV_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/DLL.cpp b/deps/acelite/ace/DLL.cpp
index 24987005c6..24987005c6 100644
--- a/modules/worldengine/deps/acelite/ace/DLL.cpp
+++ b/deps/acelite/ace/DLL.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DLL.h b/deps/acelite/ace/DLL.h
index 57d0f92541..57d0f92541 100644
--- a/modules/worldengine/deps/acelite/ace/DLL.h
+++ b/deps/acelite/ace/DLL.h
diff --git a/modules/worldengine/deps/acelite/ace/DLL_Manager.cpp b/deps/acelite/ace/DLL_Manager.cpp
index 09f3e2f40b..09f3e2f40b 100644
--- a/modules/worldengine/deps/acelite/ace/DLL_Manager.cpp
+++ b/deps/acelite/ace/DLL_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/DLL_Manager.h b/deps/acelite/ace/DLL_Manager.h
index f803bc0e16..f803bc0e16 100644
--- a/modules/worldengine/deps/acelite/ace/DLL_Manager.h
+++ b/deps/acelite/ace/DLL_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Date_Time.cpp b/deps/acelite/ace/Date_Time.cpp
index 8d84df812e..8d84df812e 100644
--- a/modules/worldengine/deps/acelite/ace/Date_Time.cpp
+++ b/deps/acelite/ace/Date_Time.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Date_Time.h b/deps/acelite/ace/Date_Time.h
index aba5d04487..aba5d04487 100644
--- a/modules/worldengine/deps/acelite/ace/Date_Time.h
+++ b/deps/acelite/ace/Date_Time.h
diff --git a/modules/worldengine/deps/acelite/ace/Date_Time.inl b/deps/acelite/ace/Date_Time.inl
index 196f572bef..196f572bef 100644
--- a/modules/worldengine/deps/acelite/ace/Date_Time.inl
+++ b/deps/acelite/ace/Date_Time.inl
diff --git a/modules/worldengine/deps/acelite/ace/Default_Constants.h b/deps/acelite/ace/Default_Constants.h
index 8a6c069177..8a6c069177 100644
--- a/modules/worldengine/deps/acelite/ace/Default_Constants.h
+++ b/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
index 87d78be719..87d78be719 100644
--- a/modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.cpp
+++ b/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
index 31f942e3e8..31f942e3e8 100644
--- a/modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.h
+++ b/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
index aedd570571..aedd570571 100644
--- a/modules/worldengine/deps/acelite/ace/Dev_Poll_Reactor.inl
+++ b/deps/acelite/ace/Dev_Poll_Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dirent.cpp b/deps/acelite/ace/Dirent.cpp
index 5f8bd074d5..5f8bd074d5 100644
--- a/modules/worldengine/deps/acelite/ace/Dirent.cpp
+++ b/deps/acelite/ace/Dirent.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dirent.h b/deps/acelite/ace/Dirent.h
index a1acbedd49..a1acbedd49 100644
--- a/modules/worldengine/deps/acelite/ace/Dirent.h
+++ b/deps/acelite/ace/Dirent.h
diff --git a/modules/worldengine/deps/acelite/ace/Dirent.inl b/deps/acelite/ace/Dirent.inl
index 3e420f1cc7..3e420f1cc7 100644
--- a/modules/worldengine/deps/acelite/ace/Dirent.inl
+++ b/deps/acelite/ace/Dirent.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dirent_Selector.cpp b/deps/acelite/ace/Dirent_Selector.cpp
index 3e71059977..3e71059977 100644
--- a/modules/worldengine/deps/acelite/ace/Dirent_Selector.cpp
+++ b/deps/acelite/ace/Dirent_Selector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dirent_Selector.h b/deps/acelite/ace/Dirent_Selector.h
index 0de9dc085a..0de9dc085a 100644
--- a/modules/worldengine/deps/acelite/ace/Dirent_Selector.h
+++ b/deps/acelite/ace/Dirent_Selector.h
diff --git a/modules/worldengine/deps/acelite/ace/Dirent_Selector.inl b/deps/acelite/ace/Dirent_Selector.inl
index 27651569b7..27651569b7 100644
--- a/modules/worldengine/deps/acelite/ace/Dirent_Selector.inl
+++ b/deps/acelite/ace/Dirent_Selector.inl
diff --git a/modules/worldengine/deps/acelite/ace/Dump.cpp b/deps/acelite/ace/Dump.cpp
index 1dbb021753..1dbb021753 100644
--- a/modules/worldengine/deps/acelite/ace/Dump.cpp
+++ b/deps/acelite/ace/Dump.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dump.h b/deps/acelite/ace/Dump.h
index 5c32e05257..5c32e05257 100644
--- a/modules/worldengine/deps/acelite/ace/Dump.h
+++ b/deps/acelite/ace/Dump.h
diff --git a/modules/worldengine/deps/acelite/ace/Dump_T.cpp b/deps/acelite/ace/Dump_T.cpp
index fc0833a9e3..fc0833a9e3 100644
--- a/modules/worldengine/deps/acelite/ace/Dump_T.cpp
+++ b/deps/acelite/ace/Dump_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dump_T.h b/deps/acelite/ace/Dump_T.h
index b8859d1136..b8859d1136 100644
--- a/modules/worldengine/deps/acelite/ace/Dump_T.h
+++ b/deps/acelite/ace/Dump_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic.cpp b/deps/acelite/ace/Dynamic.cpp
index f4e9708b99..f4e9708b99 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic.cpp
+++ b/deps/acelite/ace/Dynamic.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic.h b/deps/acelite/ace/Dynamic.h
index 83bc055f34..83bc055f34 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic.h
+++ b/deps/acelite/ace/Dynamic.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic.inl b/deps/acelite/ace/Dynamic.inl
index 795f33d2ec..795f33d2ec 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic.inl
+++ b/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
index 35802fdbff..35802fdbff 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.cpp
+++ b/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
index 94b67d9477..94b67d9477 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.h
+++ b/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
index 675e0f1e49..675e0f1e49 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Message_Strategy.inl
+++ b/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
index 8bf6871d1d..8bf6871d1d 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Service.cpp
+++ b/deps/acelite/ace/Dynamic_Service.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service.h b/deps/acelite/ace/Dynamic_Service.h
index 95456db349..95456db349 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Service.h
+++ b/deps/acelite/ace/Dynamic_Service.h
diff --git a/modules/worldengine/deps/acelite/ace/Dynamic_Service.inl b/deps/acelite/ace/Dynamic_Service.inl
index 5ae958d8ff..5ae958d8ff 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Service.inl
+++ b/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
index d38f1a5cd9..d38f1a5cd9 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Base.cpp
+++ b/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
index fe34b50af1..fe34b50af1 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Base.h
+++ b/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
index 0a7e9e03d7..0a7e9e03d7 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Dependency.cpp
+++ b/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
index bb5294f408..bb5294f408 100644
--- a/modules/worldengine/deps/acelite/ace/Dynamic_Service_Dependency.h
+++ b/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
index 89e0907076..89e0907076 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ACE_ETCL.pc.in
+++ b/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
index 80ece055d2..80ece055d2 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
+++ b/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
index 7cbc0c4782..7cbc0c4782 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.ll
+++ b/deps/acelite/ace/ETCL/ETCL.ll
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.mpc b/deps/acelite/ace/ETCL/ETCL.mpc
index 20d387cbd7..20d387cbd7 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.mpc
+++ b/deps/acelite/ace/ETCL/ETCL.mpc
diff --git a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.yy b/deps/acelite/ace/ETCL/ETCL.yy
index 507b8b9740..507b8b9740 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL.yy
+++ b/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
index 9d38af32bb..9d38af32bb 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.cpp
+++ b/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
index bb1e9eec9c..bb1e9eec9c 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.h
+++ b/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
index 2ee32f420c..2ee32f420c 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint.inl
+++ b/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
index 50d666025d..50d666025d 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
+++ b/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
index ea790676c9..ea790676c9 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
+++ b/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
index cc37c48b89..cc37c48b89 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Interpreter.cpp
+++ b/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
index 06fe138dd0..06fe138dd0 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_Interpreter.h
+++ b/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
index 4b78f5b06d..4b78f5b06d 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_l.cpp
+++ b/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
index 9fe453f62f..9fe453f62f 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_y.cpp
+++ b/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
index ee66290c48..ee66290c48 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ETCL_y.h
+++ b/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
index 3470a5b2b6..3470a5b2b6 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/ace_etcl_export.h
+++ b/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
index e0e62b8f77..e0e62b8f77 100644
--- a/modules/worldengine/deps/acelite/ace/ETCL/etcl_parser_export.h
+++ b/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
index 29a3a1d18f..29a3a1d18f 100644
--- a/modules/worldengine/deps/acelite/ace/Encoding_Converter.cpp
+++ b/deps/acelite/ace/Encoding_Converter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Encoding_Converter.h b/deps/acelite/ace/Encoding_Converter.h
index c430e8f93a..c430e8f93a 100644
--- a/modules/worldengine/deps/acelite/ace/Encoding_Converter.h
+++ b/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
index 85f139fc11..85f139fc11 100644
--- a/modules/worldengine/deps/acelite/ace/Encoding_Converter_Factory.cpp
+++ b/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
index 1a871a4cc5..1a871a4cc5 100644
--- a/modules/worldengine/deps/acelite/ace/Encoding_Converter_Factory.h
+++ b/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
index a63e768440..a63e768440 100644
--- a/modules/worldengine/deps/acelite/ace/Env_Value_T.cpp
+++ b/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
index 4e268d3f93..4e268d3f93 100644
--- a/modules/worldengine/deps/acelite/ace/Env_Value_T.h
+++ b/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
index 1fc1b863f0..1fc1b863f0 100644
--- a/modules/worldengine/deps/acelite/ace/Env_Value_T.inl
+++ b/deps/acelite/ace/Env_Value_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event.cpp b/deps/acelite/ace/Event.cpp
index 72a15d3ba8..72a15d3ba8 100644
--- a/modules/worldengine/deps/acelite/ace/Event.cpp
+++ b/deps/acelite/ace/Event.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event.h b/deps/acelite/ace/Event.h
index d7fdcd4af3..d7fdcd4af3 100644
--- a/modules/worldengine/deps/acelite/ace/Event.h
+++ b/deps/acelite/ace/Event.h
diff --git a/modules/worldengine/deps/acelite/ace/Event.inl b/deps/acelite/ace/Event.inl
index e1facac51a..e1facac51a 100644
--- a/modules/worldengine/deps/acelite/ace/Event.inl
+++ b/deps/acelite/ace/Event.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event_Base.cpp b/deps/acelite/ace/Event_Base.cpp
index ac191b0840..ac191b0840 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Base.cpp
+++ b/deps/acelite/ace/Event_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event_Base.h b/deps/acelite/ace/Event_Base.h
index a158c5e67f..a158c5e67f 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Base.h
+++ b/deps/acelite/ace/Event_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Event_Base.inl b/deps/acelite/ace/Event_Base.inl
index fa8cf909e2..fa8cf909e2 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Base.inl
+++ b/deps/acelite/ace/Event_Base.inl
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler.cpp b/deps/acelite/ace/Event_Handler.cpp
index 82e6879bed..82e6879bed 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler.cpp
+++ b/deps/acelite/ace/Event_Handler.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler.h b/deps/acelite/ace/Event_Handler.h
index 3b4f9bb94f..3b4f9bb94f 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler.h
+++ b/deps/acelite/ace/Event_Handler.h
diff --git a/modules/worldengine/deps/acelite/ace/Event_Handler.inl b/deps/acelite/ace/Event_Handler.inl
index 4ad5d2d26b..4ad5d2d26b 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler.inl
+++ b/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
index c2edf3d2df..c2edf3d2df 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
+++ b/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
index 200e2e4724..200e2e4724 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
+++ b/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
index 8c0b41bb0c..8c0b41bb0c 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
+++ b/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
index 51efca8913..51efca8913 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler_T.cpp
+++ b/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
index 5f596e7272..5f596e7272 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler_T.h
+++ b/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
index 64df02a1d0..64df02a1d0 100644
--- a/modules/worldengine/deps/acelite/ace/Event_Handler_T.inl
+++ b/deps/acelite/ace/Event_Handler_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/FIFO.cpp b/deps/acelite/ace/FIFO.cpp
index 95bfd6ef99..95bfd6ef99 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO.cpp
+++ b/deps/acelite/ace/FIFO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO.h b/deps/acelite/ace/FIFO.h
index 2c66ab10f0..2c66ab10f0 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO.h
+++ b/deps/acelite/ace/FIFO.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO.inl b/deps/acelite/ace/FIFO.inl
index 9fe5c733e3..9fe5c733e3 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO.inl
+++ b/deps/acelite/ace/FIFO.inl
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv.cpp b/deps/acelite/ace/FIFO_Recv.cpp
index 37c9f31a4f..37c9f31a4f 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Recv.cpp
+++ b/deps/acelite/ace/FIFO_Recv.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv.h b/deps/acelite/ace/FIFO_Recv.h
index bf3c9a8d2e..bf3c9a8d2e 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Recv.h
+++ b/deps/acelite/ace/FIFO_Recv.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Recv.inl b/deps/acelite/ace/FIFO_Recv.inl
index aa95234c57..aa95234c57 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Recv.inl
+++ b/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
index bb14e733c8..bb14e733c8 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.cpp
+++ b/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
index 566f26fdfa..566f26fdfa 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.h
+++ b/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
index 917aee9df3..917aee9df3 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Recv_Msg.inl
+++ b/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
index 32a502ae36..32a502ae36 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Send.cpp
+++ b/deps/acelite/ace/FIFO_Send.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send.h b/deps/acelite/ace/FIFO_Send.h
index 37580662b0..37580662b0 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Send.h
+++ b/deps/acelite/ace/FIFO_Send.h
diff --git a/modules/worldengine/deps/acelite/ace/FIFO_Send.inl b/deps/acelite/ace/FIFO_Send.inl
index ee0d8d0b53..ee0d8d0b53 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Send.inl
+++ b/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
index cd9294d3bd..cd9294d3bd 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.cpp
+++ b/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
index 226f53da06..226f53da06 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.h
+++ b/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
index 74aaa19719..74aaa19719 100644
--- a/modules/worldengine/deps/acelite/ace/FIFO_Send_Msg.inl
+++ b/deps/acelite/ace/FIFO_Send_Msg.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE.cpp b/deps/acelite/ace/FILE.cpp
index 7704285384..7704285384 100644
--- a/modules/worldengine/deps/acelite/ace/FILE.cpp
+++ b/deps/acelite/ace/FILE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE.h b/deps/acelite/ace/FILE.h
index e128eda3a0..e128eda3a0 100644
--- a/modules/worldengine/deps/acelite/ace/FILE.h
+++ b/deps/acelite/ace/FILE.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE.inl b/deps/acelite/ace/FILE.inl
index 69c3e0cd23..69c3e0cd23 100644
--- a/modules/worldengine/deps/acelite/ace/FILE.inl
+++ b/deps/acelite/ace/FILE.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Addr.cpp b/deps/acelite/ace/FILE_Addr.cpp
index 9d043f5fcf..9d043f5fcf 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_Addr.cpp
+++ b/deps/acelite/ace/FILE_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Addr.h b/deps/acelite/ace/FILE_Addr.h
index 52466e7807..52466e7807 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_Addr.h
+++ b/deps/acelite/ace/FILE_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Addr.inl b/deps/acelite/ace/FILE_Addr.inl
index c873ba8b08..c873ba8b08 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_Addr.inl
+++ b/deps/acelite/ace/FILE_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Connector.cpp b/deps/acelite/ace/FILE_Connector.cpp
index 1dfc9adf4e..1dfc9adf4e 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_Connector.cpp
+++ b/deps/acelite/ace/FILE_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Connector.h b/deps/acelite/ace/FILE_Connector.h
index abec0acc07..abec0acc07 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_Connector.h
+++ b/deps/acelite/ace/FILE_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE_Connector.inl b/deps/acelite/ace/FILE_Connector.inl
index a12a6573bc..a12a6573bc 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_Connector.inl
+++ b/deps/acelite/ace/FILE_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/FILE_IO.cpp b/deps/acelite/ace/FILE_IO.cpp
index f79b6827a6..f79b6827a6 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_IO.cpp
+++ b/deps/acelite/ace/FILE_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FILE_IO.h b/deps/acelite/ace/FILE_IO.h
index 96cfb9863b..96cfb9863b 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_IO.h
+++ b/deps/acelite/ace/FILE_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/FILE_IO.inl b/deps/acelite/ace/FILE_IO.inl
index 57c300490e..57c300490e 100644
--- a/modules/worldengine/deps/acelite/ace/FILE_IO.inl
+++ b/deps/acelite/ace/FILE_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/File_Lock.cpp b/deps/acelite/ace/File_Lock.cpp
index 5255ca460d..5255ca460d 100644
--- a/modules/worldengine/deps/acelite/ace/File_Lock.cpp
+++ b/deps/acelite/ace/File_Lock.cpp
diff --git a/modules/worldengine/deps/acelite/ace/File_Lock.h b/deps/acelite/ace/File_Lock.h
index 060aeebe0b..060aeebe0b 100644
--- a/modules/worldengine/deps/acelite/ace/File_Lock.h
+++ b/deps/acelite/ace/File_Lock.h
diff --git a/modules/worldengine/deps/acelite/ace/File_Lock.inl b/deps/acelite/ace/File_Lock.inl
index fb9ae6e0c1..fb9ae6e0c1 100644
--- a/modules/worldengine/deps/acelite/ace/File_Lock.inl
+++ b/deps/acelite/ace/File_Lock.inl
diff --git a/modules/worldengine/deps/acelite/ace/Filecache.cpp b/deps/acelite/ace/Filecache.cpp
index d6da738642..d6da738642 100644
--- a/modules/worldengine/deps/acelite/ace/Filecache.cpp
+++ b/deps/acelite/ace/Filecache.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Filecache.h b/deps/acelite/ace/Filecache.h
index 995ae49cf7..995ae49cf7 100644
--- a/modules/worldengine/deps/acelite/ace/Filecache.h
+++ b/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
index c284481585..c284481585 100644
--- a/modules/worldengine/deps/acelite/ace/FlReactor/ACE_FlReactor.pc.in
+++ b/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
index cb704d279a..cb704d279a 100644
--- a/modules/worldengine/deps/acelite/ace/FlReactor/ACE_FlReactor_export.h
+++ b/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
index edbac9be35..edbac9be35 100644
--- a/modules/worldengine/deps/acelite/ace/FlReactor/FlReactor.cpp
+++ b/deps/acelite/ace/FlReactor/FlReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FlReactor/FlReactor.h b/deps/acelite/ace/FlReactor/FlReactor.h
index 794a06133e..794a06133e 100644
--- a/modules/worldengine/deps/acelite/ace/FlReactor/FlReactor.h
+++ b/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
index c9fc2b039a..c9fc2b039a 100644
--- a/modules/worldengine/deps/acelite/ace/FlReactor/ace_flreactor.mpc
+++ b/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
index db8a6d9e6d..db8a6d9e6d 100644
--- a/modules/worldengine/deps/acelite/ace/Flag_Manip.cpp
+++ b/deps/acelite/ace/Flag_Manip.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Flag_Manip.h b/deps/acelite/ace/Flag_Manip.h
index f9324dd346..f9324dd346 100644
--- a/modules/worldengine/deps/acelite/ace/Flag_Manip.h
+++ b/deps/acelite/ace/Flag_Manip.h
diff --git a/modules/worldengine/deps/acelite/ace/Flag_Manip.inl b/deps/acelite/ace/Flag_Manip.inl
index f6def7748f..f6def7748f 100644
--- a/modules/worldengine/deps/acelite/ace/Flag_Manip.inl
+++ b/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
index 83d9e5fb96..83d9e5fb96 100644
--- a/modules/worldengine/deps/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
+++ b/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
index 4618bece03..4618bece03 100644
--- a/modules/worldengine/deps/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
+++ b/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
index 9560a5ae2c..9560a5ae2c 100644
--- a/modules/worldengine/deps/acelite/ace/FoxReactor/FoxReactor.cpp
+++ b/deps/acelite/ace/FoxReactor/FoxReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/FoxReactor/FoxReactor.h b/deps/acelite/ace/FoxReactor/FoxReactor.h
index c8794469e7..c8794469e7 100644
--- a/modules/worldengine/deps/acelite/ace/FoxReactor/FoxReactor.h
+++ b/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
index 16ba4d5196..16ba4d5196 100644
--- a/modules/worldengine/deps/acelite/ace/FoxReactor/ace_foxreactor.mpc
+++ b/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
index 25e3f388ec..25e3f388ec 100644
--- a/modules/worldengine/deps/acelite/ace/Framework_Component.cpp
+++ b/deps/acelite/ace/Framework_Component.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Framework_Component.h b/deps/acelite/ace/Framework_Component.h
index 9cf7c4d57a..9cf7c4d57a 100644
--- a/modules/worldengine/deps/acelite/ace/Framework_Component.h
+++ b/deps/acelite/ace/Framework_Component.h
diff --git a/modules/worldengine/deps/acelite/ace/Framework_Component.inl b/deps/acelite/ace/Framework_Component.inl
index e5d25bb2fe..e5d25bb2fe 100644
--- a/modules/worldengine/deps/acelite/ace/Framework_Component.inl
+++ b/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
index 4c42671d79..4c42671d79 100644
--- a/modules/worldengine/deps/acelite/ace/Framework_Component_T.cpp
+++ b/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
index 43ee133ce2..43ee133ce2 100644
--- a/modules/worldengine/deps/acelite/ace/Framework_Component_T.h
+++ b/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
index c7f670243d..c7f670243d 100644
--- a/modules/worldengine/deps/acelite/ace/Free_List.cpp
+++ b/deps/acelite/ace/Free_List.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Free_List.h b/deps/acelite/ace/Free_List.h
index 03e1129b00..03e1129b00 100644
--- a/modules/worldengine/deps/acelite/ace/Free_List.h
+++ b/deps/acelite/ace/Free_List.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor.cpp b/deps/acelite/ace/Functor.cpp
index c598c0f0f2..c598c0f0f2 100644
--- a/modules/worldengine/deps/acelite/ace/Functor.cpp
+++ b/deps/acelite/ace/Functor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Functor.h b/deps/acelite/ace/Functor.h
index 4b0b52e327..4b0b52e327 100644
--- a/modules/worldengine/deps/acelite/ace/Functor.h
+++ b/deps/acelite/ace/Functor.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor.inl b/deps/acelite/ace/Functor.inl
index 4abf11742d..4abf11742d 100644
--- a/modules/worldengine/deps/acelite/ace/Functor.inl
+++ b/deps/acelite/ace/Functor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Functor_String.cpp b/deps/acelite/ace/Functor_String.cpp
index e12934fca9..e12934fca9 100644
--- a/modules/worldengine/deps/acelite/ace/Functor_String.cpp
+++ b/deps/acelite/ace/Functor_String.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Functor_String.h b/deps/acelite/ace/Functor_String.h
index 6c29cba4e8..6c29cba4e8 100644
--- a/modules/worldengine/deps/acelite/ace/Functor_String.h
+++ b/deps/acelite/ace/Functor_String.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor_String.inl b/deps/acelite/ace/Functor_String.inl
index d6f427f4a7..d6f427f4a7 100644
--- a/modules/worldengine/deps/acelite/ace/Functor_String.inl
+++ b/deps/acelite/ace/Functor_String.inl
diff --git a/modules/worldengine/deps/acelite/ace/Functor_T.cpp b/deps/acelite/ace/Functor_T.cpp
index 59d0dae30a..59d0dae30a 100644
--- a/modules/worldengine/deps/acelite/ace/Functor_T.cpp
+++ b/deps/acelite/ace/Functor_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Functor_T.h b/deps/acelite/ace/Functor_T.h
index 8ac4cc2ce4..8ac4cc2ce4 100644
--- a/modules/worldengine/deps/acelite/ace/Functor_T.h
+++ b/deps/acelite/ace/Functor_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Functor_T.inl b/deps/acelite/ace/Functor_T.inl
index 415a0090b4..415a0090b4 100644
--- a/modules/worldengine/deps/acelite/ace/Functor_T.inl
+++ b/deps/acelite/ace/Functor_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Future.cpp b/deps/acelite/ace/Future.cpp
index f610267db3..f610267db3 100644
--- a/modules/worldengine/deps/acelite/ace/Future.cpp
+++ b/deps/acelite/ace/Future.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Future.h b/deps/acelite/ace/Future.h
index c83fae41a4..c83fae41a4 100644
--- a/modules/worldengine/deps/acelite/ace/Future.h
+++ b/deps/acelite/ace/Future.h
diff --git a/modules/worldengine/deps/acelite/ace/Future_Set.cpp b/deps/acelite/ace/Future_Set.cpp
index c10fdf30bc..c10fdf30bc 100644
--- a/modules/worldengine/deps/acelite/ace/Future_Set.cpp
+++ b/deps/acelite/ace/Future_Set.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Future_Set.h b/deps/acelite/ace/Future_Set.h
index 9374164965..9374164965 100644
--- a/modules/worldengine/deps/acelite/ace/Future_Set.h
+++ b/deps/acelite/ace/Future_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Get_Opt.cpp b/deps/acelite/ace/Get_Opt.cpp
index e7be7813df..e7be7813df 100644
--- a/modules/worldengine/deps/acelite/ace/Get_Opt.cpp
+++ b/deps/acelite/ace/Get_Opt.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Get_Opt.h b/deps/acelite/ace/Get_Opt.h
index b8c3eedb18..b8c3eedb18 100644
--- a/modules/worldengine/deps/acelite/ace/Get_Opt.h
+++ b/deps/acelite/ace/Get_Opt.h
diff --git a/modules/worldengine/deps/acelite/ace/Get_Opt.inl b/deps/acelite/ace/Get_Opt.inl
index 32de1d85c1..32de1d85c1 100644
--- a/modules/worldengine/deps/acelite/ace/Get_Opt.inl
+++ b/deps/acelite/ace/Get_Opt.inl
diff --git a/modules/worldengine/deps/acelite/ace/Global_Macros.h b/deps/acelite/ace/Global_Macros.h
index 2bb86ab177..2bb86ab177 100644
--- a/modules/worldengine/deps/acelite/ace/Global_Macros.h
+++ b/deps/acelite/ace/Global_Macros.h
diff --git a/modules/worldengine/deps/acelite/ace/Guard_T.cpp b/deps/acelite/ace/Guard_T.cpp
index dd4f9a2b96..dd4f9a2b96 100644
--- a/modules/worldengine/deps/acelite/ace/Guard_T.cpp
+++ b/deps/acelite/ace/Guard_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Guard_T.h b/deps/acelite/ace/Guard_T.h
index f357599f2c..f357599f2c 100644
--- a/modules/worldengine/deps/acelite/ace/Guard_T.h
+++ b/deps/acelite/ace/Guard_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Guard_T.inl b/deps/acelite/ace/Guard_T.inl
index 02d6989cdc..02d6989cdc 100644
--- a/modules/worldengine/deps/acelite/ace/Guard_T.inl
+++ b/deps/acelite/ace/Guard_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Gobbler.h b/deps/acelite/ace/Handle_Gobbler.h
index 2d52e1f879..2d52e1f879 100644
--- a/modules/worldengine/deps/acelite/ace/Handle_Gobbler.h
+++ b/deps/acelite/ace/Handle_Gobbler.h
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Gobbler.inl b/deps/acelite/ace/Handle_Gobbler.inl
index 8bacb005de..8bacb005de 100644
--- a/modules/worldengine/deps/acelite/ace/Handle_Gobbler.inl
+++ b/deps/acelite/ace/Handle_Gobbler.inl
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Ops.cpp b/deps/acelite/ace/Handle_Ops.cpp
index 6d83f91b86..6d83f91b86 100644
--- a/modules/worldengine/deps/acelite/ace/Handle_Ops.cpp
+++ b/deps/acelite/ace/Handle_Ops.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Ops.h b/deps/acelite/ace/Handle_Ops.h
index bc95fd30c3..bc95fd30c3 100644
--- a/modules/worldengine/deps/acelite/ace/Handle_Ops.h
+++ b/deps/acelite/ace/Handle_Ops.h
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Set.cpp b/deps/acelite/ace/Handle_Set.cpp
index c720e99e5a..c720e99e5a 100644
--- a/modules/worldengine/deps/acelite/ace/Handle_Set.cpp
+++ b/deps/acelite/ace/Handle_Set.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Set.h b/deps/acelite/ace/Handle_Set.h
index bfb8713c10..bfb8713c10 100644
--- a/modules/worldengine/deps/acelite/ace/Handle_Set.h
+++ b/deps/acelite/ace/Handle_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Handle_Set.inl b/deps/acelite/ace/Handle_Set.inl
index c234bd79aa..c234bd79aa 100644
--- a/modules/worldengine/deps/acelite/ace/Handle_Set.inl
+++ b/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
index e6f06570f8..e6f06570f8 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/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
index 80cbee984c..80cbee984c 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.h
+++ b/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
index 1d9de7a0d9..1d9de7a0d9 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Cache_Map_Manager_T.inl
+++ b/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
index d7d61b9276..d7d61b9276 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager.h
+++ b/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
index 7ad4310a1a..7ad4310a1a 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.cpp
+++ b/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
index eb3e2cbb46..eb3e2cbb46 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.h
+++ b/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
index c112e3d543..c112e3d543 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Map_Manager_T.inl
+++ b/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
index 0f0a256f11..0f0a256f11 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.cpp
+++ b/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
index 21eaec5f6b..21eaec5f6b 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.h
+++ b/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
index 23214a7c29..23214a7c29 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Map_With_Allocator_T.inl
+++ b/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
index 21af83b76f..21af83b76f 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.cpp
+++ b/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
index fefa3fb5ee..fefa3fb5ee 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.h
+++ b/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
index 0fc32da55b..0fc32da55b 100644
--- a/modules/worldengine/deps/acelite/ace/Hash_Multi_Map_Manager_T.inl
+++ b/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
index 547a3065f6..547a3065f6 100644
--- a/modules/worldengine/deps/acelite/ace/Hashable.cpp
+++ b/deps/acelite/ace/Hashable.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Hashable.h b/deps/acelite/ace/Hashable.h
index 6e9e332ad4..6e9e332ad4 100644
--- a/modules/worldengine/deps/acelite/ace/Hashable.h
+++ b/deps/acelite/ace/Hashable.h
diff --git a/modules/worldengine/deps/acelite/ace/Hashable.inl b/deps/acelite/ace/Hashable.inl
index ac9af977a3..ac9af977a3 100644
--- a/modules/worldengine/deps/acelite/ace/Hashable.inl
+++ b/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
index 13449b5981..13449b5981 100644
--- a/modules/worldengine/deps/acelite/ace/High_Res_Timer.cpp
+++ b/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
index 85d59a3c0e..85d59a3c0e 100644
--- a/modules/worldengine/deps/acelite/ace/High_Res_Timer.h
+++ b/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
index fd0a1e8b08..fd0a1e8b08 100644
--- a/modules/worldengine/deps/acelite/ace/High_Res_Timer.inl
+++ b/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
index c55493ada5..c55493ada5 100644
--- a/modules/worldengine/deps/acelite/ace/ICMP_Socket.cpp
+++ b/deps/acelite/ace/ICMP_Socket.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ICMP_Socket.h b/deps/acelite/ace/ICMP_Socket.h
index 70161ca63d..70161ca63d 100644
--- a/modules/worldengine/deps/acelite/ace/ICMP_Socket.h
+++ b/deps/acelite/ace/ICMP_Socket.h
diff --git a/modules/worldengine/deps/acelite/ace/INET_Addr.cpp b/deps/acelite/ace/INET_Addr.cpp
index 9e8dfb22f3..9e8dfb22f3 100644
--- a/modules/worldengine/deps/acelite/ace/INET_Addr.cpp
+++ b/deps/acelite/ace/INET_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/INET_Addr.h b/deps/acelite/ace/INET_Addr.h
index c1a4055375..c1a4055375 100644
--- a/modules/worldengine/deps/acelite/ace/INET_Addr.h
+++ b/deps/acelite/ace/INET_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/INET_Addr.inl b/deps/acelite/ace/INET_Addr.inl
index 3e7b18f3e4..3e7b18f3e4 100644
--- a/modules/worldengine/deps/acelite/ace/INET_Addr.inl
+++ b/deps/acelite/ace/INET_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/IOStream.cpp b/deps/acelite/ace/IOStream.cpp
index a4158b0014..a4158b0014 100644
--- a/modules/worldengine/deps/acelite/ace/IOStream.cpp
+++ b/deps/acelite/ace/IOStream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IOStream.h b/deps/acelite/ace/IOStream.h
index cd22e65e98..cd22e65e98 100644
--- a/modules/worldengine/deps/acelite/ace/IOStream.h
+++ b/deps/acelite/ace/IOStream.h
diff --git a/modules/worldengine/deps/acelite/ace/IOStream_T.cpp b/deps/acelite/ace/IOStream_T.cpp
index 21b8e66263..21b8e66263 100644
--- a/modules/worldengine/deps/acelite/ace/IOStream_T.cpp
+++ b/deps/acelite/ace/IOStream_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IOStream_T.h b/deps/acelite/ace/IOStream_T.h
index d67e4ee41e..d67e4ee41e 100644
--- a/modules/worldengine/deps/acelite/ace/IOStream_T.h
+++ b/deps/acelite/ace/IOStream_T.h
diff --git a/modules/worldengine/deps/acelite/ace/IOStream_T.inl b/deps/acelite/ace/IOStream_T.inl
index 1797de613d..1797de613d 100644
--- a/modules/worldengine/deps/acelite/ace/IOStream_T.inl
+++ b/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
index 3501a376cf..3501a376cf 100644
--- a/modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.cpp
+++ b/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
index e4f2a2a5f1..e4f2a2a5f1 100644
--- a/modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.h
+++ b/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
index 17f1dbcfb6..17f1dbcfb6 100644
--- a/modules/worldengine/deps/acelite/ace/IO_Cntl_Msg.inl
+++ b/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
index f31d0699d0..f31d0699d0 100644
--- a/modules/worldengine/deps/acelite/ace/IO_SAP.cpp
+++ b/deps/acelite/ace/IO_SAP.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IO_SAP.h b/deps/acelite/ace/IO_SAP.h
index f1183e638d..f1183e638d 100644
--- a/modules/worldengine/deps/acelite/ace/IO_SAP.h
+++ b/deps/acelite/ace/IO_SAP.h
diff --git a/modules/worldengine/deps/acelite/ace/IO_SAP.inl b/deps/acelite/ace/IO_SAP.inl
index d3472bb974..d3472bb974 100644
--- a/modules/worldengine/deps/acelite/ace/IO_SAP.inl
+++ b/deps/acelite/ace/IO_SAP.inl
diff --git a/modules/worldengine/deps/acelite/ace/IPC_SAP.cpp b/deps/acelite/ace/IPC_SAP.cpp
index 35287f2a06..35287f2a06 100644
--- a/modules/worldengine/deps/acelite/ace/IPC_SAP.cpp
+++ b/deps/acelite/ace/IPC_SAP.cpp
diff --git a/modules/worldengine/deps/acelite/ace/IPC_SAP.h b/deps/acelite/ace/IPC_SAP.h
index 43dc993024..43dc993024 100644
--- a/modules/worldengine/deps/acelite/ace/IPC_SAP.h
+++ b/deps/acelite/ace/IPC_SAP.h
diff --git a/modules/worldengine/deps/acelite/ace/IPC_SAP.inl b/deps/acelite/ace/IPC_SAP.inl
index 8419609148..8419609148 100644
--- a/modules/worldengine/deps/acelite/ace/IPC_SAP.inl
+++ b/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
index 5b8d3e93f4..5b8d3e93f4 100644
--- a/modules/worldengine/deps/acelite/ace/If_Then_Else.h
+++ b/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
index 9e07a8ab4c..9e07a8ab4c 100644
--- a/modules/worldengine/deps/acelite/ace/Init_ACE.cpp
+++ b/deps/acelite/ace/Init_ACE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Init_ACE.h b/deps/acelite/ace/Init_ACE.h
index dbf06ead97..dbf06ead97 100644
--- a/modules/worldengine/deps/acelite/ace/Init_ACE.h
+++ b/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
index 4297cc719a..4297cc719a 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.cpp
+++ b/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
index 61c52dd871..61c52dd871 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.h
+++ b/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
index 7d353e316c..7d353e316c 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_Auto_Ptr.inl
+++ b/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
index 0623adbe49..0623adbe49 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_List.cpp
+++ b/deps/acelite/ace/Intrusive_List.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List.h b/deps/acelite/ace/Intrusive_List.h
index 0bc823960c..0bc823960c 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_List.h
+++ b/deps/acelite/ace/Intrusive_List.h
diff --git a/modules/worldengine/deps/acelite/ace/Intrusive_List.inl b/deps/acelite/ace/Intrusive_List.inl
index 17d7a15653..17d7a15653 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_List.inl
+++ b/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
index 830ea4b1ce..830ea4b1ce 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_List_Node.cpp
+++ b/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
index 732a517924..732a517924 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_List_Node.h
+++ b/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
index 220453adc4..220453adc4 100644
--- a/modules/worldengine/deps/acelite/ace/Intrusive_List_Node.inl
+++ b/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
index 65a5512ba8..65a5512ba8 100644
--- a/modules/worldengine/deps/acelite/ace/LOCK_SOCK_Acceptor.cpp
+++ b/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
index 619e92f8a7..619e92f8a7 100644
--- a/modules/worldengine/deps/acelite/ace/LOCK_SOCK_Acceptor.h
+++ b/deps/acelite/ace/LOCK_SOCK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK.cpp b/deps/acelite/ace/LSOCK.cpp
index 60cc7711eb..60cc7711eb 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK.cpp
+++ b/deps/acelite/ace/LSOCK.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK.h b/deps/acelite/ace/LSOCK.h
index cb9603afd8..cb9603afd8 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK.h
+++ b/deps/acelite/ace/LSOCK.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK.inl b/deps/acelite/ace/LSOCK.inl
index 9815783f32..9815783f32 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK.inl
+++ b/deps/acelite/ace/LSOCK.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.cpp b/deps/acelite/ace/LSOCK_Acceptor.cpp
index 54c4e27bc0..54c4e27bc0 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.cpp
+++ b/deps/acelite/ace/LSOCK_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.h b/deps/acelite/ace/LSOCK_Acceptor.h
index d15db52884..d15db52884 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Acceptor.h
+++ b/deps/acelite/ace/LSOCK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.cpp b/deps/acelite/ace/LSOCK_CODgram.cpp
index d7bb336d04..d7bb336d04 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.cpp
+++ b/deps/acelite/ace/LSOCK_CODgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.h b/deps/acelite/ace/LSOCK_CODgram.h
index 2077b8fed9..2077b8fed9 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.h
+++ b/deps/acelite/ace/LSOCK_CODgram.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.inl b/deps/acelite/ace/LSOCK_CODgram.inl
index 1ebcf344bb..1ebcf344bb 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_CODgram.inl
+++ b/deps/acelite/ace/LSOCK_CODgram.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.cpp b/deps/acelite/ace/LSOCK_Connector.cpp
index 9167773e23..9167773e23 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.cpp
+++ b/deps/acelite/ace/LSOCK_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.h b/deps/acelite/ace/LSOCK_Connector.h
index 48af5e1a16..48af5e1a16 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.h
+++ b/deps/acelite/ace/LSOCK_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.inl b/deps/acelite/ace/LSOCK_Connector.inl
index fa519c2155..fa519c2155 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Connector.inl
+++ b/deps/acelite/ace/LSOCK_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.cpp b/deps/acelite/ace/LSOCK_Dgram.cpp
index 107c962db6..107c962db6 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.cpp
+++ b/deps/acelite/ace/LSOCK_Dgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.h b/deps/acelite/ace/LSOCK_Dgram.h
index d0843cd923..d0843cd923 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.h
+++ b/deps/acelite/ace/LSOCK_Dgram.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.inl b/deps/acelite/ace/LSOCK_Dgram.inl
index 6028a3586c..6028a3586c 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Dgram.inl
+++ b/deps/acelite/ace/LSOCK_Dgram.inl
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.cpp b/deps/acelite/ace/LSOCK_Stream.cpp
index 7dbbfb8d3b..7dbbfb8d3b 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.cpp
+++ b/deps/acelite/ace/LSOCK_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.h b/deps/acelite/ace/LSOCK_Stream.h
index 54f87e1fd1..54f87e1fd1 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.h
+++ b/deps/acelite/ace/LSOCK_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.inl b/deps/acelite/ace/LSOCK_Stream.inl
index 16b9489153..16b9489153 100644
--- a/modules/worldengine/deps/acelite/ace/LSOCK_Stream.inl
+++ b/deps/acelite/ace/LSOCK_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/Lib_Find.cpp b/deps/acelite/ace/Lib_Find.cpp
index 8c4cdaad8e..8c4cdaad8e 100644
--- a/modules/worldengine/deps/acelite/ace/Lib_Find.cpp
+++ b/deps/acelite/ace/Lib_Find.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Lib_Find.h b/deps/acelite/ace/Lib_Find.h
index 696dce03da..696dce03da 100644
--- a/modules/worldengine/deps/acelite/ace/Lib_Find.h
+++ b/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
index 6d56e2500b..6d56e2500b 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Memory_Pool.cpp
+++ b/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
index a346af36db..a346af36db 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Memory_Pool.h
+++ b/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
index 4ced48dae5..4ced48dae5 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Name_Space.cpp
+++ b/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
index b750c16dd5..b750c16dd5 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Name_Space.h
+++ b/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
index 4ab4fc01b3..4ab4fc01b3 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Name_Space_T.cpp
+++ b/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
index 13d533771b..13d533771b 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Name_Space_T.h
+++ b/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
index 7a1ebe981f..7a1ebe981f 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Tokens.cpp
+++ b/deps/acelite/ace/Local_Tokens.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Local_Tokens.h b/deps/acelite/ace/Local_Tokens.h
index 40403938a0..40403938a0 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Tokens.h
+++ b/deps/acelite/ace/Local_Tokens.h
diff --git a/modules/worldengine/deps/acelite/ace/Local_Tokens.inl b/deps/acelite/ace/Local_Tokens.inl
index 23dc5d8679..23dc5d8679 100644
--- a/modules/worldengine/deps/acelite/ace/Local_Tokens.inl
+++ b/deps/acelite/ace/Local_Tokens.inl
diff --git a/modules/worldengine/deps/acelite/ace/Lock.cpp b/deps/acelite/ace/Lock.cpp
index ada3e97f3e..ada3e97f3e 100644
--- a/modules/worldengine/deps/acelite/ace/Lock.cpp
+++ b/deps/acelite/ace/Lock.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Lock.h b/deps/acelite/ace/Lock.h
index bfb10b9c25..bfb10b9c25 100644
--- a/modules/worldengine/deps/acelite/ace/Lock.h
+++ b/deps/acelite/ace/Lock.h
diff --git a/modules/worldengine/deps/acelite/ace/Lock.inl b/deps/acelite/ace/Lock.inl
index 43b4bac089..43b4bac089 100644
--- a/modules/worldengine/deps/acelite/ace/Lock.inl
+++ b/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
index 0068e8ae0d..0068e8ae0d 100644
--- a/modules/worldengine/deps/acelite/ace/Lock_Adapter_T.cpp
+++ b/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
index 0dc88e813a..0dc88e813a 100644
--- a/modules/worldengine/deps/acelite/ace/Lock_Adapter_T.h
+++ b/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
index 5de19ea5b2..5de19ea5b2 100644
--- a/modules/worldengine/deps/acelite/ace/Lock_Adapter_T.inl
+++ b/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
index b92e4cd977..b92e4cd977 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Category.cpp
+++ b/deps/acelite/ace/Log_Category.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Category.h b/deps/acelite/ace/Log_Category.h
index 5723d9429d..5723d9429d 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Category.h
+++ b/deps/acelite/ace/Log_Category.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Category.inl b/deps/acelite/ace/Log_Category.inl
index 8fac70ac0d..8fac70ac0d 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Category.inl
+++ b/deps/acelite/ace/Log_Category.inl
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg.cpp b/deps/acelite/ace/Log_Msg.cpp
index df31f6e286..df31f6e286 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg.cpp
+++ b/deps/acelite/ace/Log_Msg.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg.h b/deps/acelite/ace/Log_Msg.h
index 4281ece641..4281ece641 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg.h
+++ b/deps/acelite/ace/Log_Msg.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Msg.inl b/deps/acelite/ace/Log_Msg.inl
index 1062c15c6b..1062c15c6b 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg.inl
+++ b/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
index 95fd1a6a7d..95fd1a6a7d 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_Backend.cpp
+++ b/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
index 91a01b8123..91a01b8123 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_Backend.h
+++ b/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
index 5586c7470f..5586c7470f 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_Callback.cpp
+++ b/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
index 1f07976eef..1f07976eef 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_Callback.h
+++ b/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
index 713facea85..713facea85 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_IPC.cpp
+++ b/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
index 8761df6ace..8761df6ace 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_IPC.h
+++ b/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
index f9d0d141de..f9d0d141de 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_NT_Event_Log.cpp
+++ b/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
index d234923a54..d234923a54 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_NT_Event_Log.h
+++ b/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
index ab5d271605..ab5d271605 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_UNIX_Syslog.cpp
+++ b/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
index c870d07e81..c870d07e81 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Msg_UNIX_Syslog.h
+++ b/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
index 7e8ed8feaa..7e8ed8feaa 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Priority.h
+++ b/deps/acelite/ace/Log_Priority.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Record.cpp b/deps/acelite/ace/Log_Record.cpp
index 1c6a67294d..1c6a67294d 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Record.cpp
+++ b/deps/acelite/ace/Log_Record.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Log_Record.h b/deps/acelite/ace/Log_Record.h
index cae7527776..cae7527776 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Record.h
+++ b/deps/acelite/ace/Log_Record.h
diff --git a/modules/worldengine/deps/acelite/ace/Log_Record.inl b/deps/acelite/ace/Log_Record.inl
index ca9ea53876..ca9ea53876 100644
--- a/modules/worldengine/deps/acelite/ace/Log_Record.inl
+++ b/deps/acelite/ace/Log_Record.inl
diff --git a/modules/worldengine/deps/acelite/ace/Logging_Strategy.cpp b/deps/acelite/ace/Logging_Strategy.cpp
index 62891db3ab..62891db3ab 100644
--- a/modules/worldengine/deps/acelite/ace/Logging_Strategy.cpp
+++ b/deps/acelite/ace/Logging_Strategy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Logging_Strategy.h b/deps/acelite/ace/Logging_Strategy.h
index 5ef1b7b3d0..5ef1b7b3d0 100644
--- a/modules/worldengine/deps/acelite/ace/Logging_Strategy.h
+++ b/deps/acelite/ace/Logging_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.cpp b/deps/acelite/ace/MEM_Acceptor.cpp
index 75768ec283..75768ec283 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.cpp
+++ b/deps/acelite/ace/MEM_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.h b/deps/acelite/ace/MEM_Acceptor.h
index cb1e34157a..cb1e34157a 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.h
+++ b/deps/acelite/ace/MEM_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.inl b/deps/acelite/ace/MEM_Acceptor.inl
index 77e7b9b37d..77e7b9b37d 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Acceptor.inl
+++ b/deps/acelite/ace/MEM_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Addr.cpp b/deps/acelite/ace/MEM_Addr.cpp
index 1d06fd02bf..1d06fd02bf 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Addr.cpp
+++ b/deps/acelite/ace/MEM_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Addr.h b/deps/acelite/ace/MEM_Addr.h
index 2944fa9fc7..2944fa9fc7 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Addr.h
+++ b/deps/acelite/ace/MEM_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Addr.inl b/deps/acelite/ace/MEM_Addr.inl
index f51d16154a..f51d16154a 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Addr.inl
+++ b/deps/acelite/ace/MEM_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Connector.cpp b/deps/acelite/ace/MEM_Connector.cpp
index af50199f66..af50199f66 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Connector.cpp
+++ b/deps/acelite/ace/MEM_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Connector.h b/deps/acelite/ace/MEM_Connector.h
index 808e8fcec9..808e8fcec9 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Connector.h
+++ b/deps/acelite/ace/MEM_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Connector.inl b/deps/acelite/ace/MEM_Connector.inl
index ca7a601f11..ca7a601f11 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Connector.inl
+++ b/deps/acelite/ace/MEM_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_IO.cpp b/deps/acelite/ace/MEM_IO.cpp
index a417b0c8c0..a417b0c8c0 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_IO.cpp
+++ b/deps/acelite/ace/MEM_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_IO.h b/deps/acelite/ace/MEM_IO.h
index 7dc928d832..7dc928d832 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_IO.h
+++ b/deps/acelite/ace/MEM_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_IO.inl b/deps/acelite/ace/MEM_IO.inl
index 0599660bc7..0599660bc7 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_IO.inl
+++ b/deps/acelite/ace/MEM_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_SAP.cpp b/deps/acelite/ace/MEM_SAP.cpp
index 81300c9b81..81300c9b81 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_SAP.cpp
+++ b/deps/acelite/ace/MEM_SAP.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_SAP.h b/deps/acelite/ace/MEM_SAP.h
index ea5f1cd210..ea5f1cd210 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_SAP.h
+++ b/deps/acelite/ace/MEM_SAP.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_SAP.inl b/deps/acelite/ace/MEM_SAP.inl
index 87c6f9133f..87c6f9133f 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_SAP.inl
+++ b/deps/acelite/ace/MEM_SAP.inl
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Stream.cpp b/deps/acelite/ace/MEM_Stream.cpp
index 74690a6dd2..74690a6dd2 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Stream.cpp
+++ b/deps/acelite/ace/MEM_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Stream.h b/deps/acelite/ace/MEM_Stream.h
index 8afbe13b29..8afbe13b29 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Stream.h
+++ b/deps/acelite/ace/MEM_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/MEM_Stream.inl b/deps/acelite/ace/MEM_Stream.inl
index d268c45a74..d268c45a74 100644
--- a/modules/worldengine/deps/acelite/ace/MEM_Stream.inl
+++ b/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
index c0a02bac81..c0a02bac81 100644
--- a/modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.cpp
+++ b/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
index cb76f5d571..cb76f5d571 100644
--- a/modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.h
+++ b/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
index bc494c4312..bc494c4312 100644
--- a/modules/worldengine/deps/acelite/ace/MMAP_Memory_Pool.inl
+++ b/deps/acelite/ace/MMAP_Memory_Pool.inl
diff --git a/modules/worldengine/deps/acelite/ace/Malloc.cpp b/deps/acelite/ace/Malloc.cpp
index 0984ac100a..0984ac100a 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc.cpp
+++ b/deps/acelite/ace/Malloc.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Malloc.h b/deps/acelite/ace/Malloc.h
index 3afe9b9578..3afe9b9578 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc.h
+++ b/deps/acelite/ace/Malloc.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc.inl b/deps/acelite/ace/Malloc.inl
index 2eb2a3a232..2eb2a3a232 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc.inl
+++ b/deps/acelite/ace/Malloc.inl
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.cpp b/deps/acelite/ace/Malloc_Allocator.cpp
index ffb736eb78..ffb736eb78 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.cpp
+++ b/deps/acelite/ace/Malloc_Allocator.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.h b/deps/acelite/ace/Malloc_Allocator.h
index 81710aad54..81710aad54 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.h
+++ b/deps/acelite/ace/Malloc_Allocator.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.inl b/deps/acelite/ace/Malloc_Allocator.inl
index bb1fcffc0c..bb1fcffc0c 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc_Allocator.inl
+++ b/deps/acelite/ace/Malloc_Allocator.inl
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_Base.h b/deps/acelite/ace/Malloc_Base.h
index b5be17807f..b5be17807f 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc_Base.h
+++ b/deps/acelite/ace/Malloc_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_T.cpp b/deps/acelite/ace/Malloc_T.cpp
index ebedc2b9e8..ebedc2b9e8 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc_T.cpp
+++ b/deps/acelite/ace/Malloc_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_T.h b/deps/acelite/ace/Malloc_T.h
index 9b84b3742d..9b84b3742d 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc_T.h
+++ b/deps/acelite/ace/Malloc_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Malloc_T.inl b/deps/acelite/ace/Malloc_T.inl
index 55ee851d7e..55ee851d7e 100644
--- a/modules/worldengine/deps/acelite/ace/Malloc_T.inl
+++ b/deps/acelite/ace/Malloc_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Managed_Object.cpp b/deps/acelite/ace/Managed_Object.cpp
index 9aecf6bea2..9aecf6bea2 100644
--- a/modules/worldengine/deps/acelite/ace/Managed_Object.cpp
+++ b/deps/acelite/ace/Managed_Object.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Managed_Object.h b/deps/acelite/ace/Managed_Object.h
index 48292bb550..48292bb550 100644
--- a/modules/worldengine/deps/acelite/ace/Managed_Object.h
+++ b/deps/acelite/ace/Managed_Object.h
diff --git a/modules/worldengine/deps/acelite/ace/Managed_Object.inl b/deps/acelite/ace/Managed_Object.inl
index 4747e8faa2..4747e8faa2 100644
--- a/modules/worldengine/deps/acelite/ace/Managed_Object.inl
+++ b/deps/acelite/ace/Managed_Object.inl
diff --git a/modules/worldengine/deps/acelite/ace/Manual_Event.cpp b/deps/acelite/ace/Manual_Event.cpp
index 4263a0b272..4263a0b272 100644
--- a/modules/worldengine/deps/acelite/ace/Manual_Event.cpp
+++ b/deps/acelite/ace/Manual_Event.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Manual_Event.h b/deps/acelite/ace/Manual_Event.h
index 40b4da5add..40b4da5add 100644
--- a/modules/worldengine/deps/acelite/ace/Manual_Event.h
+++ b/deps/acelite/ace/Manual_Event.h
diff --git a/modules/worldengine/deps/acelite/ace/Manual_Event.inl b/deps/acelite/ace/Manual_Event.inl
index e1facac51a..e1facac51a 100644
--- a/modules/worldengine/deps/acelite/ace/Manual_Event.inl
+++ b/deps/acelite/ace/Manual_Event.inl
diff --git a/modules/worldengine/deps/acelite/ace/Map_Manager.cpp b/deps/acelite/ace/Map_Manager.cpp
index 50549a3eee..50549a3eee 100644
--- a/modules/worldengine/deps/acelite/ace/Map_Manager.cpp
+++ b/deps/acelite/ace/Map_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Map_Manager.h b/deps/acelite/ace/Map_Manager.h
index 0517449639..0517449639 100644
--- a/modules/worldengine/deps/acelite/ace/Map_Manager.h
+++ b/deps/acelite/ace/Map_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Map_Manager.inl b/deps/acelite/ace/Map_Manager.inl
index 3c132b4f9b..3c132b4f9b 100644
--- a/modules/worldengine/deps/acelite/ace/Map_Manager.inl
+++ b/deps/acelite/ace/Map_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Map_T.cpp b/deps/acelite/ace/Map_T.cpp
index f67f07ef8f..f67f07ef8f 100644
--- a/modules/worldengine/deps/acelite/ace/Map_T.cpp
+++ b/deps/acelite/ace/Map_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Map_T.h b/deps/acelite/ace/Map_T.h
index 71af05dd9c..71af05dd9c 100644
--- a/modules/worldengine/deps/acelite/ace/Map_T.h
+++ b/deps/acelite/ace/Map_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Map_T.inl b/deps/acelite/ace/Map_T.inl
index 1e4ae9b817..1e4ae9b817 100644
--- a/modules/worldengine/deps/acelite/ace/Map_T.inl
+++ b/deps/acelite/ace/Map_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Mem_Map.cpp b/deps/acelite/ace/Mem_Map.cpp
index 7e697f64ef..7e697f64ef 100644
--- a/modules/worldengine/deps/acelite/ace/Mem_Map.cpp
+++ b/deps/acelite/ace/Mem_Map.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Mem_Map.h b/deps/acelite/ace/Mem_Map.h
index e8a8c4356a..e8a8c4356a 100644
--- a/modules/worldengine/deps/acelite/ace/Mem_Map.h
+++ b/deps/acelite/ace/Mem_Map.h
diff --git a/modules/worldengine/deps/acelite/ace/Mem_Map.inl b/deps/acelite/ace/Mem_Map.inl
index 0d9994ce81..0d9994ce81 100644
--- a/modules/worldengine/deps/acelite/ace/Mem_Map.inl
+++ b/deps/acelite/ace/Mem_Map.inl
diff --git a/modules/worldengine/deps/acelite/ace/Memory_Pool.h b/deps/acelite/ace/Memory_Pool.h
index ff0ee16c10..ff0ee16c10 100644
--- a/modules/worldengine/deps/acelite/ace/Memory_Pool.h
+++ b/deps/acelite/ace/Memory_Pool.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block.cpp b/deps/acelite/ace/Message_Block.cpp
index 835f0b1b20..835f0b1b20 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Block.cpp
+++ b/deps/acelite/ace/Message_Block.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block.h b/deps/acelite/ace/Message_Block.h
index 1a742d088e..1a742d088e 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Block.h
+++ b/deps/acelite/ace/Message_Block.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Block.inl b/deps/acelite/ace/Message_Block.inl
index 1bc636fbd7..1bc636fbd7 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Block.inl
+++ b/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
index e4161efed1..e4161efed1 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Block_T.cpp
+++ b/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
index 4261f32acf..4261f32acf 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Block_T.h
+++ b/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
index cdc1b73872..cdc1b73872 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Block_T.inl
+++ b/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
index dc35953255..dc35953255 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue.cpp
+++ b/deps/acelite/ace/Message_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue.h b/deps/acelite/ace/Message_Queue.h
index c43c97605f..c43c97605f 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue.h
+++ b/deps/acelite/ace/Message_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Message_Queue.inl b/deps/acelite/ace/Message_Queue.inl
index 31f420e4c2..31f420e4c2 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue.inl
+++ b/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
index 8107c6c7c5..8107c6c7c5 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_NT.cpp
+++ b/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
index d6f0a7d06c..d6f0a7d06c 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_NT.h
+++ b/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
index 7c1b285150..7c1b285150 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_NT.inl
+++ b/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
index 06c1819ec6..06c1819ec6 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_T.cpp
+++ b/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
index 03fa79764a..03fa79764a 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_T.h
+++ b/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
index 96747822d8..96747822d8 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_Vx.cpp
+++ b/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
index ed57a23cd3..ed57a23cd3 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_Vx.h
+++ b/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
index fe79a760ac..fe79a760ac 100644
--- a/modules/worldengine/deps/acelite/ace/Message_Queue_Vx.inl
+++ b/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
index f48d395cba..f48d395cba 100644
--- a/modules/worldengine/deps/acelite/ace/Method_Request.cpp
+++ b/deps/acelite/ace/Method_Request.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Method_Request.h b/deps/acelite/ace/Method_Request.h
index 440e3499b3..440e3499b3 100644
--- a/modules/worldengine/deps/acelite/ace/Method_Request.h
+++ b/deps/acelite/ace/Method_Request.h
diff --git a/modules/worldengine/deps/acelite/ace/Metrics_Cache.h b/deps/acelite/ace/Metrics_Cache.h
index 5bf44c47d3..5bf44c47d3 100644
--- a/modules/worldengine/deps/acelite/ace/Metrics_Cache.h
+++ b/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
index b17c85c131..b17c85c131 100644
--- a/modules/worldengine/deps/acelite/ace/Metrics_Cache_T.cpp
+++ b/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
index 037ae3bee8..037ae3bee8 100644
--- a/modules/worldengine/deps/acelite/ace/Metrics_Cache_T.h
+++ b/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
index 5b2e1a7715..5b2e1a7715 100644
--- a/modules/worldengine/deps/acelite/ace/Metrics_Cache_T.inl
+++ b/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
index be7dc1815a..be7dc1815a 100644
--- a/modules/worldengine/deps/acelite/ace/Min_Max.h
+++ b/deps/acelite/ace/Min_Max.h
diff --git a/modules/worldengine/deps/acelite/ace/Module.cpp b/deps/acelite/ace/Module.cpp
index acc1231709..acc1231709 100644
--- a/modules/worldengine/deps/acelite/ace/Module.cpp
+++ b/deps/acelite/ace/Module.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Module.h b/deps/acelite/ace/Module.h
index f5b1ce47d0..f5b1ce47d0 100644
--- a/modules/worldengine/deps/acelite/ace/Module.h
+++ b/deps/acelite/ace/Module.h
diff --git a/modules/worldengine/deps/acelite/ace/Module.inl b/deps/acelite/ace/Module.inl
index 43f9dba762..43f9dba762 100644
--- a/modules/worldengine/deps/acelite/ace/Module.inl
+++ b/deps/acelite/ace/Module.inl
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Admin.cpp b/deps/acelite/ace/Monitor_Admin.cpp
index 78e82e75df..78e82e75df 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Admin.cpp
+++ b/deps/acelite/ace/Monitor_Admin.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Admin.h b/deps/acelite/ace/Monitor_Admin.h
index c506c049ef..c506c049ef 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Admin.h
+++ b/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
index b4a363f1d3..b4a363f1d3 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Admin_Manager.cpp
+++ b/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
index 5b4f04c230..5b4f04c230 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Admin_Manager.h
+++ b/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
index 8538e168a5..8538e168a5 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Base.cpp
+++ b/deps/acelite/ace/Monitor_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Base.h b/deps/acelite/ace/Monitor_Base.h
index 769418e25d..769418e25d 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Base.h
+++ b/deps/acelite/ace/Monitor_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Base.inl b/deps/acelite/ace/Monitor_Base.inl
index 53248c3db8..53248c3db8 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Base.inl
+++ b/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
index e65e4f2ec9..e65e4f2ec9 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
+++ b/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
index 7a488d5370..7a488d5370 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.h
+++ b/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
index 1e8a99d287..1e8a99d287 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
+++ b/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
index a5677030e1..a5677030e1 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
+++ b/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
index 0cca617c78..0cca617c78 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
+++ b/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
index eabb99399c..eabb99399c 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
+++ b/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
index 7e1e408a5f..7e1e408a5f 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
+++ b/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
index 7cf0def29d..7cf0def29d 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
+++ b/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
index af3e6214dd..af3e6214dd 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
+++ b/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
index 7ae6dda69d..7ae6dda69d 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
+++ b/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
index f6b4f68595..f6b4f68595 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
+++ b/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
index d63bf35f81..d63bf35f81 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.h
+++ b/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
index 5e4297d76c..5e4297d76c 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
+++ b/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
index 6278ad50ff..6278ad50ff 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Constraint_Visitor.h
+++ b/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
index 1348f6a21c..1348f6a21c 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
+++ b/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
index 61a650c4c5..61a650c4c5 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
+++ b/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
index a92f82b881..a92f82b881 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
+++ b/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
index 0320bfa3f8..0320bfa3f8 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
+++ b/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
index 73b29f73ab..73b29f73ab 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
+++ b/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
index c8eb730767..c8eb730767 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
+++ b/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
index 0c063092a3..0c063092a3 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.h
+++ b/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
index d1d22614b0..d1d22614b0 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.mpc
+++ b/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
index a6c8eb8495..a6c8eb8495 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control.vsd
+++ b/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
index 095ee92685..095ee92685 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control_export.h
+++ b/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
index 46130542fe..46130542fe 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Control_utils.h
+++ b/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
index 77cc456797..77cc456797 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Group.cpp
+++ b/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
index 2ce370c860..2ce370c860 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Group.h
+++ b/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
index 6de953b161..6de953b161 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Query.cpp
+++ b/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
index 5c24c7f4ab..5c24c7f4ab 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Monitor_Query.h
+++ b/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
index ad554ca17c..ad554ca17c 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
+++ b/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
index 82fd317078..82fd317078 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
+++ b/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
index 90e3d46ee4..90e3d46ee4 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
+++ b/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
index 2c44c0e7f4..2c44c0e7f4 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
+++ b/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
index f0029acd6a..f0029acd6a 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
+++ b/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
index bb0e7d0763..bb0e7d0763 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
+++ b/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
index de5cfd3781..de5cfd3781 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
+++ b/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
index 1ad0a2d9a6..1ad0a2d9a6 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
+++ b/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
index d57dc88ad3..d57dc88ad3 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
+++ b/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
index 83f02f71e0..83f02f71e0 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
+++ b/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
index d44f7e58a2..d44f7e58a2 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Monitor.cpp
+++ b/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
index d23c8c0088..d23c8c0088 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Monitor.h
+++ b/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
index 7d3b68d5c0..7d3b68d5c0 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
+++ b/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
index e3bc3e42e0..e3bc3e42e0 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
+++ b/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
index 63416dde18..63416dde18 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control_Action.cpp
+++ b/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
index f25e57bf37..f25e57bf37 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control_Action.h
+++ b/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
index 786ca4c8a9..786ca4c8a9 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control_Types.cpp
+++ b/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
index 8d22fc3257..8d22fc3257 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Control_Types.h
+++ b/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
index 0fd350db73..0fd350db73 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Point_Registry.cpp
+++ b/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
index 42245249d6..42245249d6 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Point_Registry.h
+++ b/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
index 545a09690a..545a09690a 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Size.cpp
+++ b/deps/acelite/ace/Monitor_Size.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Monitor_Size.h b/deps/acelite/ace/Monitor_Size.h
index aba4595566..aba4595566 100644
--- a/modules/worldengine/deps/acelite/ace/Monitor_Size.h
+++ b/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
index 7b66b7bb0e..7b66b7bb0e 100644
--- a/modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.cpp
+++ b/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
index 77e822e6a3..77e822e6a3 100644
--- a/modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.h
+++ b/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
index bef06a049d..bef06a049d 100644
--- a/modules/worldengine/deps/acelite/ace/Monotonic_Time_Policy.inl
+++ b/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
index 7852dceade..7852dceade 100644
--- a/modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.cpp
+++ b/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
index 981cdf5be6..981cdf5be6 100644
--- a/modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.h
+++ b/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
index ee73e61181..ee73e61181 100644
--- a/modules/worldengine/deps/acelite/ace/Msg_WFMO_Reactor.inl
+++ b/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
index 1acc40c105..1acc40c105 100644
--- a/modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.cpp
+++ b/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
index 12c7117e4f..12c7117e4f 100644
--- a/modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.h
+++ b/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
index 0dbad83758..0dbad83758 100644
--- a/modules/worldengine/deps/acelite/ace/Multihomed_INET_Addr.inl
+++ b/deps/acelite/ace/Multihomed_INET_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Mutex.cpp b/deps/acelite/ace/Mutex.cpp
index f07a9ff43f..f07a9ff43f 100644
--- a/modules/worldengine/deps/acelite/ace/Mutex.cpp
+++ b/deps/acelite/ace/Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Mutex.h b/deps/acelite/ace/Mutex.h
index fd4edb6fa9..fd4edb6fa9 100644
--- a/modules/worldengine/deps/acelite/ace/Mutex.h
+++ b/deps/acelite/ace/Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Mutex.inl b/deps/acelite/ace/Mutex.inl
index 632172dd00..632172dd00 100644
--- a/modules/worldengine/deps/acelite/ace/Mutex.inl
+++ b/deps/acelite/ace/Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/NT_Service.cpp b/deps/acelite/ace/NT_Service.cpp
index 2c3e4813e4..2c3e4813e4 100644
--- a/modules/worldengine/deps/acelite/ace/NT_Service.cpp
+++ b/deps/acelite/ace/NT_Service.cpp
diff --git a/modules/worldengine/deps/acelite/ace/NT_Service.h b/deps/acelite/ace/NT_Service.h
index 1fa4bc8bc5..1fa4bc8bc5 100644
--- a/modules/worldengine/deps/acelite/ace/NT_Service.h
+++ b/deps/acelite/ace/NT_Service.h
diff --git a/modules/worldengine/deps/acelite/ace/NT_Service.inl b/deps/acelite/ace/NT_Service.inl
index 9808ce8f7b..9808ce8f7b 100644
--- a/modules/worldengine/deps/acelite/ace/NT_Service.inl
+++ b/deps/acelite/ace/NT_Service.inl
diff --git a/modules/worldengine/deps/acelite/ace/Name_Proxy.cpp b/deps/acelite/ace/Name_Proxy.cpp
index 5357a349ed..5357a349ed 100644
--- a/modules/worldengine/deps/acelite/ace/Name_Proxy.cpp
+++ b/deps/acelite/ace/Name_Proxy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Name_Proxy.h b/deps/acelite/ace/Name_Proxy.h
index 05254a0a36..05254a0a36 100644
--- a/modules/worldengine/deps/acelite/ace/Name_Proxy.h
+++ b/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
index 72cc2a2a39..72cc2a2a39 100644
--- a/modules/worldengine/deps/acelite/ace/Name_Request_Reply.cpp
+++ b/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
index 5c91d2389d..5c91d2389d 100644
--- a/modules/worldengine/deps/acelite/ace/Name_Request_Reply.h
+++ b/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
index 2f61a10dbd..2f61a10dbd 100644
--- a/modules/worldengine/deps/acelite/ace/Name_Space.cpp
+++ b/deps/acelite/ace/Name_Space.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Name_Space.h b/deps/acelite/ace/Name_Space.h
index f6de4d7886..f6de4d7886 100644
--- a/modules/worldengine/deps/acelite/ace/Name_Space.h
+++ b/deps/acelite/ace/Name_Space.h
diff --git a/modules/worldengine/deps/acelite/ace/Naming_Context.cpp b/deps/acelite/ace/Naming_Context.cpp
index de5f13e623..de5f13e623 100644
--- a/modules/worldengine/deps/acelite/ace/Naming_Context.cpp
+++ b/deps/acelite/ace/Naming_Context.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Naming_Context.h b/deps/acelite/ace/Naming_Context.h
index 8b4444b085..8b4444b085 100644
--- a/modules/worldengine/deps/acelite/ace/Naming_Context.h
+++ b/deps/acelite/ace/Naming_Context.h
diff --git a/modules/worldengine/deps/acelite/ace/Naming_Context.inl b/deps/acelite/ace/Naming_Context.inl
index 77d451e820..77d451e820 100644
--- a/modules/worldengine/deps/acelite/ace/Naming_Context.inl
+++ b/deps/acelite/ace/Naming_Context.inl
diff --git a/modules/worldengine/deps/acelite/ace/Netlink_Addr.cpp b/deps/acelite/ace/Netlink_Addr.cpp
index 1a7424546b..1a7424546b 100644
--- a/modules/worldengine/deps/acelite/ace/Netlink_Addr.cpp
+++ b/deps/acelite/ace/Netlink_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Netlink_Addr.h b/deps/acelite/ace/Netlink_Addr.h
index b9a1e0cc35..b9a1e0cc35 100644
--- a/modules/worldengine/deps/acelite/ace/Netlink_Addr.h
+++ b/deps/acelite/ace/Netlink_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/Netlink_Addr.inl b/deps/acelite/ace/Netlink_Addr.inl
index 912f21cd83..912f21cd83 100644
--- a/modules/worldengine/deps/acelite/ace/Netlink_Addr.inl
+++ b/deps/acelite/ace/Netlink_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Node.cpp b/deps/acelite/ace/Node.cpp
index 7b6c0998d5..7b6c0998d5 100644
--- a/modules/worldengine/deps/acelite/ace/Node.cpp
+++ b/deps/acelite/ace/Node.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Node.h b/deps/acelite/ace/Node.h
index ee541d0300..ee541d0300 100644
--- a/modules/worldengine/deps/acelite/ace/Node.h
+++ b/deps/acelite/ace/Node.h
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Queue.cpp b/deps/acelite/ace/Notification_Queue.cpp
index 28e4ed76d0..28e4ed76d0 100644
--- a/modules/worldengine/deps/acelite/ace/Notification_Queue.cpp
+++ b/deps/acelite/ace/Notification_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Queue.h b/deps/acelite/ace/Notification_Queue.h
index 190c89718d..190c89718d 100644
--- a/modules/worldengine/deps/acelite/ace/Notification_Queue.h
+++ b/deps/acelite/ace/Notification_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Queue.inl b/deps/acelite/ace/Notification_Queue.inl
index 5d615dffb3..5d615dffb3 100644
--- a/modules/worldengine/deps/acelite/ace/Notification_Queue.inl
+++ b/deps/acelite/ace/Notification_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Strategy.cpp b/deps/acelite/ace/Notification_Strategy.cpp
index 854e9d962f..854e9d962f 100644
--- a/modules/worldengine/deps/acelite/ace/Notification_Strategy.cpp
+++ b/deps/acelite/ace/Notification_Strategy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Strategy.h b/deps/acelite/ace/Notification_Strategy.h
index f47824b76e..f47824b76e 100644
--- a/modules/worldengine/deps/acelite/ace/Notification_Strategy.h
+++ b/deps/acelite/ace/Notification_Strategy.h
diff --git a/modules/worldengine/deps/acelite/ace/Notification_Strategy.inl b/deps/acelite/ace/Notification_Strategy.inl
index f1c1598d0b..f1c1598d0b 100644
--- a/modules/worldengine/deps/acelite/ace/Notification_Strategy.inl
+++ b/deps/acelite/ace/Notification_Strategy.inl
diff --git a/modules/worldengine/deps/acelite/ace/Null_Barrier.h b/deps/acelite/ace/Null_Barrier.h
index 4db9dbdfb5..4db9dbdfb5 100644
--- a/modules/worldengine/deps/acelite/ace/Null_Barrier.h
+++ b/deps/acelite/ace/Null_Barrier.h
diff --git a/modules/worldengine/deps/acelite/ace/Null_Condition.h b/deps/acelite/ace/Null_Condition.h
index 5044f668d4..5044f668d4 100644
--- a/modules/worldengine/deps/acelite/ace/Null_Condition.h
+++ b/deps/acelite/ace/Null_Condition.h
diff --git a/modules/worldengine/deps/acelite/ace/Null_Mutex.h b/deps/acelite/ace/Null_Mutex.h
index 21501e18cc..21501e18cc 100644
--- a/modules/worldengine/deps/acelite/ace/Null_Mutex.h
+++ b/deps/acelite/ace/Null_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Null_Semaphore.h b/deps/acelite/ace/Null_Semaphore.h
index bdab2a6457..bdab2a6457 100644
--- a/modules/worldengine/deps/acelite/ace/Null_Semaphore.h
+++ b/deps/acelite/ace/Null_Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Numeric_Limits.h b/deps/acelite/ace/Numeric_Limits.h
index 187123f6a1..187123f6a1 100644
--- a/modules/worldengine/deps/acelite/ace/Numeric_Limits.h
+++ b/deps/acelite/ace/Numeric_Limits.h
diff --git a/modules/worldengine/deps/acelite/ace/OS.h b/deps/acelite/ace/OS.h
index 53ce524ec0..53ce524ec0 100644
--- a/modules/worldengine/deps/acelite/ace/OS.h
+++ b/deps/acelite/ace/OS.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_Errno.cpp b/deps/acelite/ace/OS_Errno.cpp
index 065eb39e13..065eb39e13 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Errno.cpp
+++ b/deps/acelite/ace/OS_Errno.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_Errno.h b/deps/acelite/ace/OS_Errno.h
index 081990f754..081990f754 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Errno.h
+++ b/deps/acelite/ace/OS_Errno.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_Errno.inl b/deps/acelite/ace/OS_Errno.inl
index 9fd2af39b9..9fd2af39b9 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Errno.inl
+++ b/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
index e5eea9fdd0..e5eea9fdd0 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.cpp
+++ b/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
index 6ef922b1ac..6ef922b1ac 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.h
+++ b/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
index 222609f53d..222609f53d 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Log_Msg_Attributes.inl
+++ b/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
index 3d3a55955a..3d3a55955a 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Memory.h
+++ b/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
index 2eeb79a580..2eeb79a580 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_Thread.cpp
+++ b/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
index ce79d69198..ce79d69198 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_Thread.h
+++ b/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
index ff4a08251d..ff4a08251d 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_Thread.inl
+++ b/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
index 8094cf042f..8094cf042f 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.cpp
+++ b/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
index cff4c17e8b..cff4c17e8b 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.h
+++ b/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
index 495c913e07..495c913e07 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_arpa_inet.inl
+++ b/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
index c97a1f026b..c97a1f026b 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_ctype.cpp
+++ b/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
index 50d78cd3bb..50d78cd3bb 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_ctype.h
+++ b/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
index 73d9529be4..73d9529be4 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_ctype.inl
+++ b/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
index 5d891ee205..5d891ee205 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_dirent.cpp
+++ b/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
index 7542a77a3d..7542a77a3d 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_dirent.h
+++ b/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
index 6e31c21a13..6e31c21a13 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_dirent.inl
+++ b/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
index e3d1c96ade..e3d1c96ade 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.cpp
+++ b/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
index af53ef09a5..af53ef09a5 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.h
+++ b/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
index 2147def7fe..2147def7fe 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_dlfcn.inl
+++ b/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
index f84975d40a..f84975d40a 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_errno.cpp
+++ b/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
index 75701f9840..75701f9840 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_errno.h
+++ b/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
index cad5d49789..cad5d49789 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_errno.inl
+++ b/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
index 5478687655..5478687655 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_fcntl.cpp
+++ b/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
index e129263fe4..e129263fe4 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_fcntl.h
+++ b/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
index afb95c6842..afb95c6842 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_fcntl.inl
+++ b/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
index 647f3143e8..647f3143e8 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_macros.h
+++ b/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
index ffacea8767..ffacea8767 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_math.cpp
+++ b/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
index 58841d6b2d..58841d6b2d 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_math.h
+++ b/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
index 3c9753a297..3c9753a297 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_math.inl
+++ b/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
index 3d5432023c..3d5432023c 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_netdb.cpp
+++ b/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
index 6e86aecdc9..6e86aecdc9 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_netdb.h
+++ b/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
index a8426aee9c..a8426aee9c 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_netdb.inl
+++ b/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
index 8265665e9e..8265665e9e 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_poll.cpp
+++ b/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
index 7fb61c54d5..7fb61c54d5 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_poll.h
+++ b/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
index 511c71948c..511c71948c 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_poll.inl
+++ b/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
index 6212d2c255..6212d2c255 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_pwd.cpp
+++ b/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
index 4e4bea6d69..4e4bea6d69 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_pwd.h
+++ b/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
index 3d680bba97..3d680bba97 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_pwd.inl
+++ b/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
index c6302c74ca..c6302c74ca 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_regex.cpp
+++ b/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
index 5a2c503cea..5a2c503cea 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_regex.h
+++ b/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
index e135051c76..e135051c76 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_regex.inl
+++ b/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
index 49177a6d40..49177a6d40 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_signal.cpp
+++ b/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
index e9db0df8e9..e9db0df8e9 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_signal.h
+++ b/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
index 2872f27439..2872f27439 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_signal.inl
+++ b/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
index 146b67ca09..146b67ca09 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stdio.cpp
+++ b/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
index 9d76ccab44..9d76ccab44 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stdio.h
+++ b/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
index e9a2170c5e..e9a2170c5e 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stdio.inl
+++ b/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
index 3526b9f74d..3526b9f74d 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stdlib.cpp
+++ b/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
index c7b89a06fc..c7b89a06fc 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stdlib.h
+++ b/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
index 5417a04170..5417a04170 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stdlib.inl
+++ b/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
index 4e4c37bb69..4e4c37bb69 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_string.cpp
+++ b/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
index 2f76759af9..2f76759af9 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_string.h
+++ b/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
index 23119a68aa..23119a68aa 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_string.inl
+++ b/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
index d09d152fd2..d09d152fd2 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_strings.cpp
+++ b/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
index 371f0e295d..371f0e295d 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_strings.h
+++ b/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
index 780eff09da..780eff09da 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_strings.inl
+++ b/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
index 64b527fcc6..64b527fcc6 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stropts.cpp
+++ b/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
index 2936fdad1f..2936fdad1f 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stropts.h
+++ b/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
index 21c5d096f6..21c5d096f6 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_stropts.inl
+++ b/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
index c42b4a880a..c42b4a880a 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.cpp
+++ b/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
index 36b609fba7..36b609fba7 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.h
+++ b/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
index 538e60fd92..538e60fd92 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_mman.inl
+++ b/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
index fc30680891..fc30680891 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.cpp
+++ b/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
index 9016758a23..9016758a23 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.h
+++ b/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
index 92b7a646e1..92b7a646e1 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_msg.inl
+++ b/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
index f6798a0350..f6798a0350 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.cpp
+++ b/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
index 2faa718903..2faa718903 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.h
+++ b/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
index e49119d3e3..e49119d3e3 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_resource.inl
+++ b/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
index 0fb85c079c..0fb85c079c 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_select.cpp
+++ b/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
index d46e949ce1..d46e949ce1 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_select.h
+++ b/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
index 396ffe729c..396ffe729c 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_select.inl
+++ b/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
index 03928ea21c..03928ea21c 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.cpp
+++ b/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
index 5b7f5da816..5b7f5da816 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.h
+++ b/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
index 3be63e7d9b..3be63e7d9b 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_sendfile.inl
+++ b/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
index eebf798e45..eebf798e45 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.cpp
+++ b/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
index 6e4ba212a0..6e4ba212a0 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.h
+++ b/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
index 02c3b9221f..02c3b9221f 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_shm.inl
+++ b/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
index dd92b3a17a..dd92b3a17a 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.cpp
+++ b/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
index fa5dd2d3e8..fa5dd2d3e8 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.h
+++ b/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
index 8b49393c04..8b49393c04 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_socket.inl
+++ b/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
index fd6accb3ff..fd6accb3ff 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.cpp
+++ b/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
index ed9ce01ba8..ed9ce01ba8 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.h
+++ b/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
index f46a182368..f46a182368 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_stat.inl
+++ b/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
index f2f8a37ec2..f2f8a37ec2 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_time.cpp
+++ b/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
index 3426efa6d2..3426efa6d2 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_time.h
+++ b/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
index ac9dfb5f10..ac9dfb5f10 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_time.inl
+++ b/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
index 9ba9d6c5b7..9ba9d6c5b7 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.cpp
+++ b/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
index 2a521def8c..2a521def8c 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.h
+++ b/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
index d31e7034e0..d31e7034e0 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_uio.inl
+++ b/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
index 2ce19b133f..2ce19b133f 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_utsname.cpp
+++ b/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
index c0db1b2d0b..c0db1b2d0b 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_utsname.h
+++ b/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
index 16f8cc26ea..16f8cc26ea 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.cpp
+++ b/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
index cb4380bf39..cb4380bf39 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.h
+++ b/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
index ddb4adfa12..ddb4adfa12 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_sys_wait.inl
+++ b/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
index 738964f13e..738964f13e 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_time.cpp
+++ b/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
index 11d226ea28..11d226ea28 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_time.h
+++ b/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
index ab3fd7ec7b..ab3fd7ec7b 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_time.inl
+++ b/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
index 8f8d6c7981..8f8d6c7981 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_unistd.cpp
+++ b/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
index 20a81571e1..20a81571e1 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_unistd.h
+++ b/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
index 6bcc6f7254..6bcc6f7254 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_unistd.inl
+++ b/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
index aa914be249..aa914be249 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_wchar.cpp
+++ b/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
index ee5b6494c6..ee5b6494c6 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_wchar.h
+++ b/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
index 0b11e61e30..0b11e61e30 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_wchar.inl
+++ b/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
index 8c74fdea26..8c74fdea26 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_wctype.cpp
+++ b/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
index f20f204348..f20f204348 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_wctype.h
+++ b/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
index 9bb54585d7..9bb54585d7 100644
--- a/modules/worldengine/deps/acelite/ace/OS_NS_wctype.inl
+++ b/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
index 47bce4a886..47bce4a886 100644
--- a/modules/worldengine/deps/acelite/ace/OS_QoS.cpp
+++ b/deps/acelite/ace/OS_QoS.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_QoS.h b/deps/acelite/ace/OS_QoS.h
index 3173eadba0..3173eadba0 100644
--- a/modules/worldengine/deps/acelite/ace/OS_QoS.h
+++ b/deps/acelite/ace/OS_QoS.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_TLI.cpp b/deps/acelite/ace/OS_TLI.cpp
index 1ae8e540e1..1ae8e540e1 100644
--- a/modules/worldengine/deps/acelite/ace/OS_TLI.cpp
+++ b/deps/acelite/ace/OS_TLI.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_TLI.h b/deps/acelite/ace/OS_TLI.h
index 0d40dcddd7..0d40dcddd7 100644
--- a/modules/worldengine/deps/acelite/ace/OS_TLI.h
+++ b/deps/acelite/ace/OS_TLI.h
diff --git a/modules/worldengine/deps/acelite/ace/OS_TLI.inl b/deps/acelite/ace/OS_TLI.inl
index 7104344cac..7104344cac 100644
--- a/modules/worldengine/deps/acelite/ace/OS_TLI.inl
+++ b/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
index 073782ea18..073782ea18 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Thread_Adapter.cpp
+++ b/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
index 38cfa6e6bd..38cfa6e6bd 100644
--- a/modules/worldengine/deps/acelite/ace/OS_Thread_Adapter.h
+++ b/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
index 74b917da9f..74b917da9f 100644
--- a/modules/worldengine/deps/acelite/ace/OS_main.cpp
+++ b/deps/acelite/ace/OS_main.cpp
diff --git a/modules/worldengine/deps/acelite/ace/OS_main.h b/deps/acelite/ace/OS_main.h
index 3b4769cc3f..3b4769cc3f 100644
--- a/modules/worldengine/deps/acelite/ace/OS_main.h
+++ b/deps/acelite/ace/OS_main.h
diff --git a/modules/worldengine/deps/acelite/ace/Obchunk.cpp b/deps/acelite/ace/Obchunk.cpp
index af9f021171..af9f021171 100644
--- a/modules/worldengine/deps/acelite/ace/Obchunk.cpp
+++ b/deps/acelite/ace/Obchunk.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Obchunk.h b/deps/acelite/ace/Obchunk.h
index 3a2fddc260..3a2fddc260 100644
--- a/modules/worldengine/deps/acelite/ace/Obchunk.h
+++ b/deps/acelite/ace/Obchunk.h
diff --git a/modules/worldengine/deps/acelite/ace/Obchunk.inl b/deps/acelite/ace/Obchunk.inl
index b27a8abef0..b27a8abef0 100644
--- a/modules/worldengine/deps/acelite/ace/Obchunk.inl
+++ b/deps/acelite/ace/Obchunk.inl
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager.cpp b/deps/acelite/ace/Object_Manager.cpp
index 193720c3b1..193720c3b1 100644
--- a/modules/worldengine/deps/acelite/ace/Object_Manager.cpp
+++ b/deps/acelite/ace/Object_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager.h b/deps/acelite/ace/Object_Manager.h
index 0e71ec8be2..0e71ec8be2 100644
--- a/modules/worldengine/deps/acelite/ace/Object_Manager.h
+++ b/deps/acelite/ace/Object_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Object_Manager.inl b/deps/acelite/ace/Object_Manager.inl
index a65098a6fa..a65098a6fa 100644
--- a/modules/worldengine/deps/acelite/ace/Object_Manager.inl
+++ b/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
index 1ef953dfd4..1ef953dfd4 100644
--- a/modules/worldengine/deps/acelite/ace/Object_Manager_Base.cpp
+++ b/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
index 3872600077..3872600077 100644
--- a/modules/worldengine/deps/acelite/ace/Object_Manager_Base.h
+++ b/deps/acelite/ace/Object_Manager_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/Obstack.cpp b/deps/acelite/ace/Obstack.cpp
index 110a5cc8d8..110a5cc8d8 100644
--- a/modules/worldengine/deps/acelite/ace/Obstack.cpp
+++ b/deps/acelite/ace/Obstack.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Obstack.h b/deps/acelite/ace/Obstack.h
index 4d0faad902..4d0faad902 100644
--- a/modules/worldengine/deps/acelite/ace/Obstack.h
+++ b/deps/acelite/ace/Obstack.h
diff --git a/modules/worldengine/deps/acelite/ace/Obstack_T.cpp b/deps/acelite/ace/Obstack_T.cpp
index cf02d47e2c..cf02d47e2c 100644
--- a/modules/worldengine/deps/acelite/ace/Obstack_T.cpp
+++ b/deps/acelite/ace/Obstack_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Obstack_T.h b/deps/acelite/ace/Obstack_T.h
index ef3a5a10ae..ef3a5a10ae 100644
--- a/modules/worldengine/deps/acelite/ace/Obstack_T.h
+++ b/deps/acelite/ace/Obstack_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Obstack_T.inl b/deps/acelite/ace/Obstack_T.inl
index fb9d09d431..fb9d09d431 100644
--- a/modules/worldengine/deps/acelite/ace/Obstack_T.inl
+++ b/deps/acelite/ace/Obstack_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/PI_Malloc.cpp b/deps/acelite/ace/PI_Malloc.cpp
index b1e94335e9..b1e94335e9 100644
--- a/modules/worldengine/deps/acelite/ace/PI_Malloc.cpp
+++ b/deps/acelite/ace/PI_Malloc.cpp
diff --git a/modules/worldengine/deps/acelite/ace/PI_Malloc.h b/deps/acelite/ace/PI_Malloc.h
index a76d95f367..a76d95f367 100644
--- a/modules/worldengine/deps/acelite/ace/PI_Malloc.h
+++ b/deps/acelite/ace/PI_Malloc.h
diff --git a/modules/worldengine/deps/acelite/ace/PI_Malloc.inl b/deps/acelite/ace/PI_Malloc.inl
index 98cdca3ae0..98cdca3ae0 100644
--- a/modules/worldengine/deps/acelite/ace/PI_Malloc.inl
+++ b/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
index 2b29515b93..2b29515b93 100644
--- a/modules/worldengine/deps/acelite/ace/POSIX_Asynch_IO.cpp
+++ b/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
index ad920bc0e5..ad920bc0e5 100644
--- a/modules/worldengine/deps/acelite/ace/POSIX_Asynch_IO.h
+++ b/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
index 9be836cc81..9be836cc81 100644
--- a/modules/worldengine/deps/acelite/ace/POSIX_CB_Proactor.cpp
+++ b/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
index e38360f5f9..e38360f5f9 100644
--- a/modules/worldengine/deps/acelite/ace/POSIX_CB_Proactor.h
+++ b/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
index 4d5105ae03..4d5105ae03 100644
--- a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.cpp
+++ b/deps/acelite/ace/POSIX_Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.h b/deps/acelite/ace/POSIX_Proactor.h
index 46ebef1fab..46ebef1fab 100644
--- a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.h
+++ b/deps/acelite/ace/POSIX_Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.inl b/deps/acelite/ace/POSIX_Proactor.inl
index c6edd4a5ca..c6edd4a5ca 100644
--- a/modules/worldengine/deps/acelite/ace/POSIX_Proactor.inl
+++ b/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
index ba803872c3..ba803872c3 100644
--- a/modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.cpp
+++ b/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
index 842537bdb4..842537bdb4 100644
--- a/modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.h
+++ b/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
index 30003e0b1e..30003e0b1e 100644
--- a/modules/worldengine/deps/acelite/ace/Pagefile_Memory_Pool.inl
+++ b/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
index 0bf170b381..0bf170b381 100644
--- a/modules/worldengine/deps/acelite/ace/Pair_T.cpp
+++ b/deps/acelite/ace/Pair_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Pair_T.h b/deps/acelite/ace/Pair_T.h
index 329778178c..329778178c 100644
--- a/modules/worldengine/deps/acelite/ace/Pair_T.h
+++ b/deps/acelite/ace/Pair_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Pair_T.inl b/deps/acelite/ace/Pair_T.inl
index a8f620350f..a8f620350f 100644
--- a/modules/worldengine/deps/acelite/ace/Pair_T.inl
+++ b/deps/acelite/ace/Pair_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Parse_Node.cpp b/deps/acelite/ace/Parse_Node.cpp
index 3b5a6e1156..3b5a6e1156 100644
--- a/modules/worldengine/deps/acelite/ace/Parse_Node.cpp
+++ b/deps/acelite/ace/Parse_Node.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Parse_Node.h b/deps/acelite/ace/Parse_Node.h
index 8afa6f025c..8afa6f025c 100644
--- a/modules/worldengine/deps/acelite/ace/Parse_Node.h
+++ b/deps/acelite/ace/Parse_Node.h
diff --git a/modules/worldengine/deps/acelite/ace/Ping_Socket.cpp b/deps/acelite/ace/Ping_Socket.cpp
index cdafe36377..cdafe36377 100644
--- a/modules/worldengine/deps/acelite/ace/Ping_Socket.cpp
+++ b/deps/acelite/ace/Ping_Socket.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Ping_Socket.h b/deps/acelite/ace/Ping_Socket.h
index 4497b9e8e3..4497b9e8e3 100644
--- a/modules/worldengine/deps/acelite/ace/Ping_Socket.h
+++ b/deps/acelite/ace/Ping_Socket.h
diff --git a/modules/worldengine/deps/acelite/ace/Ping_Socket.inl b/deps/acelite/ace/Ping_Socket.inl
index b6fcf0be11..b6fcf0be11 100644
--- a/modules/worldengine/deps/acelite/ace/Ping_Socket.inl
+++ b/deps/acelite/ace/Ping_Socket.inl
diff --git a/modules/worldengine/deps/acelite/ace/Pipe.cpp b/deps/acelite/ace/Pipe.cpp
index c13e4aee96..c13e4aee96 100644
--- a/modules/worldengine/deps/acelite/ace/Pipe.cpp
+++ b/deps/acelite/ace/Pipe.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Pipe.h b/deps/acelite/ace/Pipe.h
index 8406e7aee9..8406e7aee9 100644
--- a/modules/worldengine/deps/acelite/ace/Pipe.h
+++ b/deps/acelite/ace/Pipe.h
diff --git a/modules/worldengine/deps/acelite/ace/Pipe.inl b/deps/acelite/ace/Pipe.inl
index 85900d2d6e..85900d2d6e 100644
--- a/modules/worldengine/deps/acelite/ace/Pipe.inl
+++ b/deps/acelite/ace/Pipe.inl
diff --git a/modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
index bd7cb3d4ef..bd7cb3d4ef 100644
--- a/modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
+++ b/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
diff --git a/modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h b/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
index 6ff97bfcf1..6ff97bfcf1 100644
--- a/modules/worldengine/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
+++ b/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
diff --git a/modules/worldengine/deps/acelite/ace/Priority_Reactor.cpp b/deps/acelite/ace/Priority_Reactor.cpp
index ae4aa93b33..ae4aa93b33 100644
--- a/modules/worldengine/deps/acelite/ace/Priority_Reactor.cpp
+++ b/deps/acelite/ace/Priority_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Priority_Reactor.h b/deps/acelite/ace/Priority_Reactor.h
index 177a8cf7a7..177a8cf7a7 100644
--- a/modules/worldengine/deps/acelite/ace/Priority_Reactor.h
+++ b/deps/acelite/ace/Priority_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Proactor.cpp b/deps/acelite/ace/Proactor.cpp
index cd8e9133c8..cd8e9133c8 100644
--- a/modules/worldengine/deps/acelite/ace/Proactor.cpp
+++ b/deps/acelite/ace/Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Proactor.h b/deps/acelite/ace/Proactor.h
index ec5cad2711..ec5cad2711 100644
--- a/modules/worldengine/deps/acelite/ace/Proactor.h
+++ b/deps/acelite/ace/Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Proactor.inl b/deps/acelite/ace/Proactor.inl
index c5027092b0..c5027092b0 100644
--- a/modules/worldengine/deps/acelite/ace/Proactor.inl
+++ b/deps/acelite/ace/Proactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Proactor_Impl.cpp b/deps/acelite/ace/Proactor_Impl.cpp
index 9cf5f4795d..9cf5f4795d 100644
--- a/modules/worldengine/deps/acelite/ace/Proactor_Impl.cpp
+++ b/deps/acelite/ace/Proactor_Impl.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Proactor_Impl.h b/deps/acelite/ace/Proactor_Impl.h
index 9b27fcbde7..9b27fcbde7 100644
--- a/modules/worldengine/deps/acelite/ace/Proactor_Impl.h
+++ b/deps/acelite/ace/Proactor_Impl.h
diff --git a/modules/worldengine/deps/acelite/ace/Process.cpp b/deps/acelite/ace/Process.cpp
index 761064b174..761064b174 100644
--- a/modules/worldengine/deps/acelite/ace/Process.cpp
+++ b/deps/acelite/ace/Process.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process.h b/deps/acelite/ace/Process.h
index cb91bac90d..cb91bac90d 100644
--- a/modules/worldengine/deps/acelite/ace/Process.h
+++ b/deps/acelite/ace/Process.h
diff --git a/modules/worldengine/deps/acelite/ace/Process.inl b/deps/acelite/ace/Process.inl
index 1bccc24677..1bccc24677 100644
--- a/modules/worldengine/deps/acelite/ace/Process.inl
+++ b/deps/acelite/ace/Process.inl
diff --git a/modules/worldengine/deps/acelite/ace/Process_Manager.cpp b/deps/acelite/ace/Process_Manager.cpp
index 3ee9f00c1a..3ee9f00c1a 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Manager.cpp
+++ b/deps/acelite/ace/Process_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process_Manager.h b/deps/acelite/ace/Process_Manager.h
index bd320c87f7..bd320c87f7 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Manager.h
+++ b/deps/acelite/ace/Process_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Process_Manager.inl b/deps/acelite/ace/Process_Manager.inl
index 33d2c034be..33d2c034be 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Manager.inl
+++ b/deps/acelite/ace/Process_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Process_Mutex.cpp b/deps/acelite/ace/Process_Mutex.cpp
index c10321af3b..c10321af3b 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Mutex.cpp
+++ b/deps/acelite/ace/Process_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process_Mutex.h b/deps/acelite/ace/Process_Mutex.h
index c1561e40d5..c1561e40d5 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Mutex.h
+++ b/deps/acelite/ace/Process_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Process_Mutex.inl b/deps/acelite/ace/Process_Mutex.inl
index 57dc044d93..57dc044d93 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Mutex.inl
+++ b/deps/acelite/ace/Process_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Process_Semaphore.cpp b/deps/acelite/ace/Process_Semaphore.cpp
index d92fed1437..d92fed1437 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Semaphore.cpp
+++ b/deps/acelite/ace/Process_Semaphore.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Process_Semaphore.h b/deps/acelite/ace/Process_Semaphore.h
index c16c8bdd33..c16c8bdd33 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Semaphore.h
+++ b/deps/acelite/ace/Process_Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Process_Semaphore.inl b/deps/acelite/ace/Process_Semaphore.inl
index d19eb2286b..d19eb2286b 100644
--- a/modules/worldengine/deps/acelite/ace/Process_Semaphore.inl
+++ b/deps/acelite/ace/Process_Semaphore.inl
diff --git a/modules/worldengine/deps/acelite/ace/Profile_Timer.cpp b/deps/acelite/ace/Profile_Timer.cpp
index f23a62f498..f23a62f498 100644
--- a/modules/worldengine/deps/acelite/ace/Profile_Timer.cpp
+++ b/deps/acelite/ace/Profile_Timer.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Profile_Timer.h b/deps/acelite/ace/Profile_Timer.h
index 17829f04b5..17829f04b5 100644
--- a/modules/worldengine/deps/acelite/ace/Profile_Timer.h
+++ b/deps/acelite/ace/Profile_Timer.h
diff --git a/modules/worldengine/deps/acelite/ace/Profile_Timer.inl b/deps/acelite/ace/Profile_Timer.inl
index 3b52d41954..3b52d41954 100644
--- a/modules/worldengine/deps/acelite/ace/Profile_Timer.inl
+++ b/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
index ba6fda765b..ba6fda765b 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/ACE_QoS.pc.in
+++ b/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
index b721d177ac..b721d177ac 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/ACE_QoS_Export.h
+++ b/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
index abecb9473b..abecb9473b 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Decorator.cpp
+++ b/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
index af0d98447d..af0d98447d 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Decorator.h
+++ b/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
index c7bbbb0918..c7bbbb0918 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Manager.cpp
+++ b/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
index c57eeb6405..c57eeb6405 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Manager.h
+++ b/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
index c01a53688c..c01a53688c 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session.h
+++ b/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
index 1c815b6af2..1c815b6af2 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Factory.cpp
+++ b/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
index 518a6d13dc..518a6d13dc 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Factory.h
+++ b/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
index b983dd6c71..b983dd6c71 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.cpp
+++ b/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
index 158945bc3b..158945bc3b 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.h
+++ b/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
index 37000bdde3..37000bdde3 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/QoS_Session_Impl.inl
+++ b/deps/acelite/ace/QoS/QoS_Session_Impl.inl
diff --git a/modules/worldengine/deps/acelite/ace/QoS/README b/deps/acelite/ace/QoS/README
index 923e16223a..923e16223a 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/README
+++ b/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
index 787ca5555d..787ca5555d 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/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
index 974f588ef3..974f588ef3 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ b/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
index e3cad2380f..e3cad2380f 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
+++ b/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
index d7f07122f2..d7f07122f2 100644
--- a/modules/worldengine/deps/acelite/ace/QoS/qos.mpc
+++ b/deps/acelite/ace/QoS/qos.mpc
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/.gitignore b/deps/acelite/ace/QtReactor/.gitignore
index 3e07896a1c..3e07896a1c 100644
--- a/modules/worldengine/deps/acelite/ace/QtReactor/.gitignore
+++ b/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
index 4e7aa83e6b..4e7aa83e6b 100644
--- a/modules/worldengine/deps/acelite/ace/QtReactor/ACE_QtReactor.pc.in
+++ b/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
index 9daa25e510..9daa25e510 100644
--- a/modules/worldengine/deps/acelite/ace/QtReactor/ACE_QtReactor_export.h
+++ b/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
index ce60296059..ce60296059 100644
--- a/modules/worldengine/deps/acelite/ace/QtReactor/QtReactor.cpp
+++ b/deps/acelite/ace/QtReactor/QtReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/QtReactor/QtReactor.h b/deps/acelite/ace/QtReactor/QtReactor.h
index 4a1279694d..4a1279694d 100644
--- a/modules/worldengine/deps/acelite/ace/QtReactor/QtReactor.h
+++ b/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
index 107c1ef2d3..107c1ef2d3 100644
--- a/modules/worldengine/deps/acelite/ace/QtReactor/ace_qt4reactor.mpc
+++ b/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
index 8ca11831be..8ca11831be 100644
--- a/modules/worldengine/deps/acelite/ace/RB_Tree.cpp
+++ b/deps/acelite/ace/RB_Tree.cpp
diff --git a/modules/worldengine/deps/acelite/ace/RB_Tree.h b/deps/acelite/ace/RB_Tree.h
index 2f35d6b53c..2f35d6b53c 100644
--- a/modules/worldengine/deps/acelite/ace/RB_Tree.h
+++ b/deps/acelite/ace/RB_Tree.h
diff --git a/modules/worldengine/deps/acelite/ace/RB_Tree.inl b/deps/acelite/ace/RB_Tree.inl
index dcebea5e71..dcebea5e71 100644
--- a/modules/worldengine/deps/acelite/ace/RB_Tree.inl
+++ b/deps/acelite/ace/RB_Tree.inl
diff --git a/modules/worldengine/deps/acelite/ace/README b/deps/acelite/ace/README
index 39e05ddb0c..39e05ddb0c 100644
--- a/modules/worldengine/deps/acelite/ace/README
+++ b/deps/acelite/ace/README
diff --git a/modules/worldengine/deps/acelite/ace/RW_Mutex.cpp b/deps/acelite/ace/RW_Mutex.cpp
index 15775f0423..15775f0423 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Mutex.cpp
+++ b/deps/acelite/ace/RW_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/RW_Mutex.h b/deps/acelite/ace/RW_Mutex.h
index 8a223c6395..8a223c6395 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Mutex.h
+++ b/deps/acelite/ace/RW_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/RW_Mutex.inl b/deps/acelite/ace/RW_Mutex.inl
index 3939b8c23f..3939b8c23f 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Mutex.inl
+++ b/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
index eda9c8a819..eda9c8a819 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Process_Mutex.cpp
+++ b/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
index 5ad1122da5..5ad1122da5 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Process_Mutex.h
+++ b/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
index 61326713ab..61326713ab 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Process_Mutex.inl
+++ b/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
index 1d94430ed8..1d94430ed8 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.cpp
+++ b/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
index 1f096bec1b..1f096bec1b 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.h
+++ b/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
index a69c8b597c..a69c8b597c 100644
--- a/modules/worldengine/deps/acelite/ace/RW_Thread_Mutex.inl
+++ b/deps/acelite/ace/RW_Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Reactor.cpp b/deps/acelite/ace/Reactor.cpp
index b23e3effe2..b23e3effe2 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor.cpp
+++ b/deps/acelite/ace/Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reactor.h b/deps/acelite/ace/Reactor.h
index fa2759f2ab..fa2759f2ab 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor.h
+++ b/deps/acelite/ace/Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/Reactor.inl b/deps/acelite/ace/Reactor.inl
index 5d2bc60cff..5d2bc60cff 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor.inl
+++ b/deps/acelite/ace/Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Impl.cpp b/deps/acelite/ace/Reactor_Impl.cpp
index f8389bd87e..f8389bd87e 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Impl.cpp
+++ b/deps/acelite/ace/Reactor_Impl.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Reactor_Impl.h b/deps/acelite/ace/Reactor_Impl.h
index 44d5d55afd..44d5d55afd 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Impl.h
+++ b/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
index 534236bebb..534236bebb 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.cpp
+++ b/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
index 93f58051d2..93f58051d2 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.h
+++ b/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
index 92a472cee9..92a472cee9 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Notification_Strategy.inl
+++ b/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
index 7eb0969773..7eb0969773 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Timer_Interface.cpp
+++ b/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
index eaaa31a34f..eaaa31a34f 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Timer_Interface.h
+++ b/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
index c446e4e288..c446e4e288 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Token_T.cpp
+++ b/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
index 521fdc8452..521fdc8452 100644
--- a/modules/worldengine/deps/acelite/ace/Reactor_Token_T.h
+++ b/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
index 14ac5ded6b..14ac5ded6b 100644
--- a/modules/worldengine/deps/acelite/ace/Read_Buffer.cpp
+++ b/deps/acelite/ace/Read_Buffer.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Read_Buffer.h b/deps/acelite/ace/Read_Buffer.h
index 9ef8677938..9ef8677938 100644
--- a/modules/worldengine/deps/acelite/ace/Read_Buffer.h
+++ b/deps/acelite/ace/Read_Buffer.h
diff --git a/modules/worldengine/deps/acelite/ace/Read_Buffer.inl b/deps/acelite/ace/Read_Buffer.inl
index cadd007746..cadd007746 100644
--- a/modules/worldengine/deps/acelite/ace/Read_Buffer.inl
+++ b/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
index 517f8d6f8a..517f8d6f8a 100644
--- a/modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.cpp
+++ b/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
index 9c2d062172..9c2d062172 100644
--- a/modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.h
+++ b/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
index 739e775693..739e775693 100644
--- a/modules/worldengine/deps/acelite/ace/Recursive_Thread_Mutex.inl
+++ b/deps/acelite/ace/Recursive_Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Recyclable.cpp b/deps/acelite/ace/Recyclable.cpp
index d42aea8a4f..d42aea8a4f 100644
--- a/modules/worldengine/deps/acelite/ace/Recyclable.cpp
+++ b/deps/acelite/ace/Recyclable.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Recyclable.h b/deps/acelite/ace/Recyclable.h
index 47d06052f9..47d06052f9 100644
--- a/modules/worldengine/deps/acelite/ace/Recyclable.h
+++ b/deps/acelite/ace/Recyclable.h
diff --git a/modules/worldengine/deps/acelite/ace/Recyclable.inl b/deps/acelite/ace/Recyclable.inl
index 7a7e3fda26..7a7e3fda26 100644
--- a/modules/worldengine/deps/acelite/ace/Recyclable.inl
+++ b/deps/acelite/ace/Recyclable.inl
diff --git a/modules/worldengine/deps/acelite/ace/Refcountable_T.cpp b/deps/acelite/ace/Refcountable_T.cpp
index 5ffada80af..5ffada80af 100644
--- a/modules/worldengine/deps/acelite/ace/Refcountable_T.cpp
+++ b/deps/acelite/ace/Refcountable_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Refcountable_T.h b/deps/acelite/ace/Refcountable_T.h
index b4916bf986..b4916bf986 100644
--- a/modules/worldengine/deps/acelite/ace/Refcountable_T.h
+++ b/deps/acelite/ace/Refcountable_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Refcountable_T.inl b/deps/acelite/ace/Refcountable_T.inl
index 7a901476d9..7a901476d9 100644
--- a/modules/worldengine/deps/acelite/ace/Refcountable_T.inl
+++ b/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
index 455ee868c5..455ee868c5 100644
--- a/modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.cpp
+++ b/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
index b5670cc05a..b5670cc05a 100644
--- a/modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.h
+++ b/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
index f495076b15..f495076b15 100644
--- a/modules/worldengine/deps/acelite/ace/Refcounted_Auto_Ptr.inl
+++ b/deps/acelite/ace/Refcounted_Auto_Ptr.inl
diff --git a/modules/worldengine/deps/acelite/ace/Registry.cpp b/deps/acelite/ace/Registry.cpp
index 017ae1a5de..017ae1a5de 100644
--- a/modules/worldengine/deps/acelite/ace/Registry.cpp
+++ b/deps/acelite/ace/Registry.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Registry.h b/deps/acelite/ace/Registry.h
index afdf775b6e..afdf775b6e 100644
--- a/modules/worldengine/deps/acelite/ace/Registry.h
+++ b/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
index c803b5a2ed..c803b5a2ed 100644
--- a/modules/worldengine/deps/acelite/ace/Registry_Name_Space.cpp
+++ b/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
index 5c830112d4..5c830112d4 100644
--- a/modules/worldengine/deps/acelite/ace/Registry_Name_Space.h
+++ b/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
index 00378e78f3..00378e78f3 100644
--- a/modules/worldengine/deps/acelite/ace/Remote_Name_Space.cpp
+++ b/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
index d1dbe8a788..d1dbe8a788 100644
--- a/modules/worldengine/deps/acelite/ace/Remote_Name_Space.h
+++ b/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
index 2e1d246174..2e1d246174 100644
--- a/modules/worldengine/deps/acelite/ace/Remote_Tokens.cpp
+++ b/deps/acelite/ace/Remote_Tokens.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Remote_Tokens.h b/deps/acelite/ace/Remote_Tokens.h
index edf389b2e7..edf389b2e7 100644
--- a/modules/worldengine/deps/acelite/ace/Remote_Tokens.h
+++ b/deps/acelite/ace/Remote_Tokens.h
diff --git a/modules/worldengine/deps/acelite/ace/Remote_Tokens.inl b/deps/acelite/ace/Remote_Tokens.inl
index 84f8e3691f..84f8e3691f 100644
--- a/modules/worldengine/deps/acelite/ace/Remote_Tokens.inl
+++ b/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
index e55e1f4726..e55e1f4726 100644
--- a/modules/worldengine/deps/acelite/ace/Reverse_Lock_T.cpp
+++ b/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
index 1457c27ec5..1457c27ec5 100644
--- a/modules/worldengine/deps/acelite/ace/Reverse_Lock_T.h
+++ b/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
index 21d4d9705b..21d4d9705b 100644
--- a/modules/worldengine/deps/acelite/ace/Reverse_Lock_T.inl
+++ b/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
index 389169d7a3..389169d7a3 100644
--- a/modules/worldengine/deps/acelite/ace/Rtems_init.c
+++ b/deps/acelite/ace/Rtems_init.c
diff --git a/modules/worldengine/deps/acelite/ace/SOCK.cpp b/deps/acelite/ace/SOCK.cpp
index 3cbfd4b124..3cbfd4b124 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK.cpp
+++ b/deps/acelite/ace/SOCK.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK.h b/deps/acelite/ace/SOCK.h
index 4392d1c20a..4392d1c20a 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK.h
+++ b/deps/acelite/ace/SOCK.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK.inl b/deps/acelite/ace/SOCK.inl
index 74875bd41c..74875bd41c 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK.inl
+++ b/deps/acelite/ace/SOCK.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.cpp b/deps/acelite/ace/SOCK_Acceptor.cpp
index 819b61b732..819b61b732 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.cpp
+++ b/deps/acelite/ace/SOCK_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.h b/deps/acelite/ace/SOCK_Acceptor.h
index cda6d40b03..cda6d40b03 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.h
+++ b/deps/acelite/ace/SOCK_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.inl b/deps/acelite/ace/SOCK_Acceptor.inl
index bf6822a3e0..bf6822a3e0 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Acceptor.inl
+++ b/deps/acelite/ace/SOCK_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.cpp b/deps/acelite/ace/SOCK_CODgram.cpp
index bf74e145cd..bf74e145cd 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.cpp
+++ b/deps/acelite/ace/SOCK_CODgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.h b/deps/acelite/ace/SOCK_CODgram.h
index b22eb6075d..b22eb6075d 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.h
+++ b/deps/acelite/ace/SOCK_CODgram.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.inl b/deps/acelite/ace/SOCK_CODgram.inl
index 28f4faf936..28f4faf936 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_CODgram.inl
+++ b/deps/acelite/ace/SOCK_CODgram.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Connector.cpp b/deps/acelite/ace/SOCK_Connector.cpp
index 4601462926..4601462926 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Connector.cpp
+++ b/deps/acelite/ace/SOCK_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Connector.h b/deps/acelite/ace/SOCK_Connector.h
index a8f7d36038..a8f7d36038 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Connector.h
+++ b/deps/acelite/ace/SOCK_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Connector.inl b/deps/acelite/ace/SOCK_Connector.inl
index ff1c703118..ff1c703118 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Connector.inl
+++ b/deps/acelite/ace/SOCK_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.cpp b/deps/acelite/ace/SOCK_Dgram.cpp
index 75b0786672..75b0786672 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.cpp
+++ b/deps/acelite/ace/SOCK_Dgram.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.h b/deps/acelite/ace/SOCK_Dgram.h
index 1b8f9f8be4..1b8f9f8be4 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.h
+++ b/deps/acelite/ace/SOCK_Dgram.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.inl b/deps/acelite/ace/SOCK_Dgram.inl
index b2a116c31b..b2a116c31b 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram.inl
+++ b/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
index 1ec606ca70..1ec606ca70 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.cpp
+++ b/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
index 710565ed40..710565ed40 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.h
+++ b/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
index 429afa82e6..429afa82e6 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Bcast.inl
+++ b/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
index dd427e282c..dd427e282c 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.cpp
+++ b/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
index 02a4b85f36..02a4b85f36 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.h
+++ b/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
index d792001268..d792001268 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Dgram_Mcast.inl
+++ b/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
index 9048c8d3f5..9048c8d3f5 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_IO.cpp
+++ b/deps/acelite/ace/SOCK_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_IO.h b/deps/acelite/ace/SOCK_IO.h
index 670375aa0a..670375aa0a 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_IO.h
+++ b/deps/acelite/ace/SOCK_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_IO.inl b/deps/acelite/ace/SOCK_IO.inl
index eec644cd71..eec644cd71 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_IO.inl
+++ b/deps/acelite/ace/SOCK_IO.inl
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.cpp b/deps/acelite/ace/SOCK_Netlink.cpp
index e26745b8db..e26745b8db 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.cpp
+++ b/deps/acelite/ace/SOCK_Netlink.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.h b/deps/acelite/ace/SOCK_Netlink.h
index 993a5d4f5d..993a5d4f5d 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.h
+++ b/deps/acelite/ace/SOCK_Netlink.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.inl b/deps/acelite/ace/SOCK_Netlink.inl
index 58ad283aab..58ad283aab 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Netlink.inl
+++ b/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
index a4f5062e2b..a4f5062e2b 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
+++ b/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
index e5c7fc5450..e5c7fc5450 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.h
+++ b/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
index 82577e2665..82577e2665 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Acceptor.inl
+++ b/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
index b5b14363bf..b5b14363bf 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.cpp
+++ b/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
index 604feec918..604feec918 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.h
+++ b/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
index 98e59c6f42..98e59c6f42 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Association.inl
+++ b/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
index b941c2f6d3..b941c2f6d3 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.cpp
+++ b/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
index f82550956b..f82550956b 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.h
+++ b/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
index 1b04fe2740..1b04fe2740 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_SEQPACK_Connector.inl
+++ b/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
index e8abb169b7..e8abb169b7 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Stream.cpp
+++ b/deps/acelite/ace/SOCK_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Stream.h b/deps/acelite/ace/SOCK_Stream.h
index 2f011b0b62..2f011b0b62 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Stream.h
+++ b/deps/acelite/ace/SOCK_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/SOCK_Stream.inl b/deps/acelite/ace/SOCK_Stream.inl
index fe25fdde36..fe25fdde36 100644
--- a/modules/worldengine/deps/acelite/ace/SOCK_Stream.inl
+++ b/deps/acelite/ace/SOCK_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE.cpp b/deps/acelite/ace/SPIPE.cpp
index 35f4b478e1..35f4b478e1 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE.cpp
+++ b/deps/acelite/ace/SPIPE.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE.h b/deps/acelite/ace/SPIPE.h
index 0ae586ec31..0ae586ec31 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE.h
+++ b/deps/acelite/ace/SPIPE.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE.inl b/deps/acelite/ace/SPIPE.inl
index 5303fbdeaf..5303fbdeaf 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE.inl
+++ b/deps/acelite/ace/SPIPE.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.cpp b/deps/acelite/ace/SPIPE_Acceptor.cpp
index 518ce13231..518ce13231 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.cpp
+++ b/deps/acelite/ace/SPIPE_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.h b/deps/acelite/ace/SPIPE_Acceptor.h
index 60d14a30ef..60d14a30ef 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Acceptor.h
+++ b/deps/acelite/ace/SPIPE_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.cpp b/deps/acelite/ace/SPIPE_Addr.cpp
index ef34d66dc2..ef34d66dc2 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.cpp
+++ b/deps/acelite/ace/SPIPE_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.h b/deps/acelite/ace/SPIPE_Addr.h
index d9e0304337..d9e0304337 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.h
+++ b/deps/acelite/ace/SPIPE_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.inl b/deps/acelite/ace/SPIPE_Addr.inl
index b92aed8091..b92aed8091 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Addr.inl
+++ b/deps/acelite/ace/SPIPE_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.cpp b/deps/acelite/ace/SPIPE_Connector.cpp
index 718236563a..718236563a 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.cpp
+++ b/deps/acelite/ace/SPIPE_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.h b/deps/acelite/ace/SPIPE_Connector.h
index 2e6ccc2011..2e6ccc2011 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.h
+++ b/deps/acelite/ace/SPIPE_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.inl b/deps/acelite/ace/SPIPE_Connector.inl
index e31bf17a2e..e31bf17a2e 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Connector.inl
+++ b/deps/acelite/ace/SPIPE_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.cpp b/deps/acelite/ace/SPIPE_Stream.cpp
index aec34efe21..aec34efe21 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.cpp
+++ b/deps/acelite/ace/SPIPE_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.h b/deps/acelite/ace/SPIPE_Stream.h
index 71ffd4cc5e..71ffd4cc5e 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.h
+++ b/deps/acelite/ace/SPIPE_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.inl b/deps/acelite/ace/SPIPE_Stream.inl
index 08b9071b2f..08b9071b2f 100644
--- a/modules/worldengine/deps/acelite/ace/SPIPE_Stream.inl
+++ b/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
index 51c04a18ff..51c04a18ff 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/ACE_SSL.pc.in
+++ b/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
index bd58fe2a66..bd58fe2a66 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_BIO.cpp
+++ b/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
index 70b1a0fcc0..70b1a0fcc0 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_BIO.h
+++ b/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
index a63a353ace..a63a353ace 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/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
index de2a9dc169..de2a9dc169 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.h
+++ b/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
index 969a37cd37..969a37cd37 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Asynch_Stream.inl
+++ b/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
index 56de6f04b9..56de6f04b9 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Context.cpp
+++ b/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
index 9dc1958ff5..9dc1958ff5 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Context.h
+++ b/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
index d7ccb88d7e..d7ccb88d7e 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Context.inl
+++ b/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
index 0c98d7d280..0c98d7d280 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Export.h
+++ b/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
index b4baac0bc7..b4baac0bc7 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Initializer.cpp
+++ b/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
index d73c8f88ae..d73c8f88ae 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_Initializer.h
+++ b/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
index b82ec7d556..b82ec7d556 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.cpp
+++ b/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
index 16e84af890..16e84af890 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.h
+++ b/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
index 6a12914d84..6a12914d84 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK.inl
+++ b/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
index d790662af2..d790662af2 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
+++ b/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
index add881ed3a..add881ed3a 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.h
+++ b/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
index c02845b22d..c02845b22d 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
+++ b/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
index 45df4ef040..45df4ef040 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.cpp
+++ b/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
index 4c862c9fba..4c862c9fba 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.h
+++ b/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
index 0dd4bb62e3..0dd4bb62e3 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Connector.inl
+++ b/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
index 7ad901d121..7ad901d121 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/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
index c9a54fe98a..c9a54fe98a 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.h
+++ b/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
index 10ab1c2ffa..10ab1c2ffa 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/SSL_SOCK_Stream.inl
+++ b/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
index 707e4e5047..707e4e5047 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/ssl.mpc
+++ b/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
index c89b8c0d5a..c89b8c0d5a 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/ssl_for_tao.mpc
+++ b/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
index 2dfea912bd..2dfea912bd 100644
--- a/modules/worldengine/deps/acelite/ace/SSL/sslconf.h
+++ b/deps/acelite/ace/SSL/sslconf.h
diff --git a/modules/worldengine/deps/acelite/ace/SString.cpp b/deps/acelite/ace/SString.cpp
index 53a204ef08..53a204ef08 100644
--- a/modules/worldengine/deps/acelite/ace/SString.cpp
+++ b/deps/acelite/ace/SString.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SString.h b/deps/acelite/ace/SString.h
index 2eb3e8b8b5..2eb3e8b8b5 100644
--- a/modules/worldengine/deps/acelite/ace/SString.h
+++ b/deps/acelite/ace/SString.h
diff --git a/modules/worldengine/deps/acelite/ace/SString.inl b/deps/acelite/ace/SString.inl
index be539758e7..be539758e7 100644
--- a/modules/worldengine/deps/acelite/ace/SString.inl
+++ b/deps/acelite/ace/SString.inl
diff --git a/modules/worldengine/deps/acelite/ace/SStringfwd.h b/deps/acelite/ace/SStringfwd.h
index b06a43badd..b06a43badd 100644
--- a/modules/worldengine/deps/acelite/ace/SStringfwd.h
+++ b/deps/acelite/ace/SStringfwd.h
diff --git a/modules/worldengine/deps/acelite/ace/SUN_Proactor.cpp b/deps/acelite/ace/SUN_Proactor.cpp
index d9b3ba7b0a..d9b3ba7b0a 100644
--- a/modules/worldengine/deps/acelite/ace/SUN_Proactor.cpp
+++ b/deps/acelite/ace/SUN_Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SUN_Proactor.h b/deps/acelite/ace/SUN_Proactor.h
index 2d68fccf3a..2d68fccf3a 100644
--- a/modules/worldengine/deps/acelite/ace/SUN_Proactor.h
+++ b/deps/acelite/ace/SUN_Proactor.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message.cpp b/deps/acelite/ace/SV_Message.cpp
index 2cb104c6ba..2cb104c6ba 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Message.cpp
+++ b/deps/acelite/ace/SV_Message.cpp
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message.h b/deps/acelite/ace/SV_Message.h
index 3ad09a1cc6..3ad09a1cc6 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Message.h
+++ b/deps/acelite/ace/SV_Message.h
diff --git a/modules/worldengine/deps/acelite/ace/SV_Message.inl b/deps/acelite/ace/SV_Message.inl
index ef4265ba68..ef4265ba68 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Message.inl
+++ b/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
index 2dd9d349eb..2dd9d349eb 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Message_Queue.cpp
+++ b/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
index c2db732054..c2db732054 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Message_Queue.h
+++ b/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
index f1355d51c6..f1355d51c6 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Message_Queue.inl
+++ b/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
index d3e9c7d394..d3e9c7d394 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.cpp
+++ b/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
index 65d1ed5f8e..65d1ed5f8e 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.h
+++ b/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
index 184bd2d64d..184bd2d64d 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Complex.inl
+++ b/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
index 73bbdefe3d..73bbdefe3d 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.cpp
+++ b/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
index 0a475c7e20..0a475c7e20 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.h
+++ b/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
index fc91a85c74..fc91a85c74 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Semaphore_Simple.inl
+++ b/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
index 366267aef4..366267aef4 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Shared_Memory.cpp
+++ b/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
index 4e57b26b23..4e57b26b23 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Shared_Memory.h
+++ b/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
index 19235c3ffe..19235c3ffe 100644
--- a/modules/worldengine/deps/acelite/ace/SV_Shared_Memory.inl
+++ b/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
index 4846477962..4846477962 100644
--- a/modules/worldengine/deps/acelite/ace/Sample_History.cpp
+++ b/deps/acelite/ace/Sample_History.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sample_History.h b/deps/acelite/ace/Sample_History.h
index 9a6bcb1936..9a6bcb1936 100644
--- a/modules/worldengine/deps/acelite/ace/Sample_History.h
+++ b/deps/acelite/ace/Sample_History.h
diff --git a/modules/worldengine/deps/acelite/ace/Sample_History.inl b/deps/acelite/ace/Sample_History.inl
index 305c861ff0..305c861ff0 100644
--- a/modules/worldengine/deps/acelite/ace/Sample_History.inl
+++ b/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
index 358857ba71..358857ba71 100644
--- a/modules/worldengine/deps/acelite/ace/Sbrk_Memory_Pool.cpp
+++ b/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
index 0a9826b0b9..0a9826b0b9 100644
--- a/modules/worldengine/deps/acelite/ace/Sbrk_Memory_Pool.h
+++ b/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
index f9eb92d7cc..f9eb92d7cc 100644
--- a/modules/worldengine/deps/acelite/ace/Sched_Params.cpp
+++ b/deps/acelite/ace/Sched_Params.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sched_Params.h b/deps/acelite/ace/Sched_Params.h
index c355fefc88..c355fefc88 100644
--- a/modules/worldengine/deps/acelite/ace/Sched_Params.h
+++ b/deps/acelite/ace/Sched_Params.h
diff --git a/modules/worldengine/deps/acelite/ace/Sched_Params.inl b/deps/acelite/ace/Sched_Params.inl
index 5392611ac0..5392611ac0 100644
--- a/modules/worldengine/deps/acelite/ace/Sched_Params.inl
+++ b/deps/acelite/ace/Sched_Params.inl
diff --git a/modules/worldengine/deps/acelite/ace/Select_Reactor.h b/deps/acelite/ace/Select_Reactor.h
index b47569b96b..b47569b96b 100644
--- a/modules/worldengine/deps/acelite/ace/Select_Reactor.h
+++ b/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
index 022ff1d7b7..022ff1d7b7 100644
--- a/modules/worldengine/deps/acelite/ace/Select_Reactor_Base.cpp
+++ b/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
index 364f4d0f5a..364f4d0f5a 100644
--- a/modules/worldengine/deps/acelite/ace/Select_Reactor_Base.h
+++ b/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
index 3993e9ff75..3993e9ff75 100644
--- a/modules/worldengine/deps/acelite/ace/Select_Reactor_Base.inl
+++ b/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
index 1c70e7a4d9..1c70e7a4d9 100644
--- a/modules/worldengine/deps/acelite/ace/Select_Reactor_T.cpp
+++ b/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
index c27f62211d..c27f62211d 100644
--- a/modules/worldengine/deps/acelite/ace/Select_Reactor_T.h
+++ b/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
index be6192c55d..be6192c55d 100644
--- a/modules/worldengine/deps/acelite/ace/Select_Reactor_T.inl
+++ b/deps/acelite/ace/Select_Reactor_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Semaphore.cpp b/deps/acelite/ace/Semaphore.cpp
index 062c0cd157..062c0cd157 100644
--- a/modules/worldengine/deps/acelite/ace/Semaphore.cpp
+++ b/deps/acelite/ace/Semaphore.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Semaphore.h b/deps/acelite/ace/Semaphore.h
index 6320b0eb57..6320b0eb57 100644
--- a/modules/worldengine/deps/acelite/ace/Semaphore.h
+++ b/deps/acelite/ace/Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Semaphore.inl b/deps/acelite/ace/Semaphore.inl
index 8de0beef33..8de0beef33 100644
--- a/modules/worldengine/deps/acelite/ace/Semaphore.inl
+++ b/deps/acelite/ace/Semaphore.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Config.cpp b/deps/acelite/ace/Service_Config.cpp
index 516bcf0824..516bcf0824 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Config.cpp
+++ b/deps/acelite/ace/Service_Config.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Config.h b/deps/acelite/ace/Service_Config.h
index e821eed615..e821eed615 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Config.h
+++ b/deps/acelite/ace/Service_Config.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Config.inl b/deps/acelite/ace/Service_Config.inl
index 5cffe43449..5cffe43449 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Config.inl
+++ b/deps/acelite/ace/Service_Config.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Gestalt.cpp b/deps/acelite/ace/Service_Gestalt.cpp
index 9198750964..9198750964 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Gestalt.cpp
+++ b/deps/acelite/ace/Service_Gestalt.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Gestalt.h b/deps/acelite/ace/Service_Gestalt.h
index 7df9a5e4d9..7df9a5e4d9 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Gestalt.h
+++ b/deps/acelite/ace/Service_Gestalt.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Gestalt.inl b/deps/acelite/ace/Service_Gestalt.inl
index ec46b27060..ec46b27060 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Gestalt.inl
+++ b/deps/acelite/ace/Service_Gestalt.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Manager.cpp b/deps/acelite/ace/Service_Manager.cpp
index e53edba3a9..e53edba3a9 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Manager.cpp
+++ b/deps/acelite/ace/Service_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Manager.h b/deps/acelite/ace/Service_Manager.h
index 6573c8588e..6573c8588e 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Manager.h
+++ b/deps/acelite/ace/Service_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Object.cpp b/deps/acelite/ace/Service_Object.cpp
index fc01e29b79..fc01e29b79 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Object.cpp
+++ b/deps/acelite/ace/Service_Object.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Object.h b/deps/acelite/ace/Service_Object.h
index ac66d3c45c..ac66d3c45c 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Object.h
+++ b/deps/acelite/ace/Service_Object.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Object.inl b/deps/acelite/ace/Service_Object.inl
index e5c5099f06..e5c5099f06 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Object.inl
+++ b/deps/acelite/ace/Service_Object.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Repository.cpp b/deps/acelite/ace/Service_Repository.cpp
index 4850cc6313..4850cc6313 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Repository.cpp
+++ b/deps/acelite/ace/Service_Repository.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Repository.h b/deps/acelite/ace/Service_Repository.h
index 4352c540ac..4352c540ac 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Repository.h
+++ b/deps/acelite/ace/Service_Repository.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Repository.inl b/deps/acelite/ace/Service_Repository.inl
index dbe09731f9..dbe09731f9 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Repository.inl
+++ b/deps/acelite/ace/Service_Repository.inl
diff --git a/modules/worldengine/deps/acelite/ace/Service_Types.cpp b/deps/acelite/ace/Service_Types.cpp
index 94986aaa9b..94986aaa9b 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Types.cpp
+++ b/deps/acelite/ace/Service_Types.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Service_Types.h b/deps/acelite/ace/Service_Types.h
index 83dba34e1b..83dba34e1b 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Types.h
+++ b/deps/acelite/ace/Service_Types.h
diff --git a/modules/worldengine/deps/acelite/ace/Service_Types.inl b/deps/acelite/ace/Service_Types.inl
index cb13c1c4ec..cb13c1c4ec 100644
--- a/modules/worldengine/deps/acelite/ace/Service_Types.inl
+++ b/deps/acelite/ace/Service_Types.inl
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory.cpp b/deps/acelite/ace/Shared_Memory.cpp
index 7b2cba500c..7b2cba500c 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory.cpp
+++ b/deps/acelite/ace/Shared_Memory.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Memory.h b/deps/acelite/ace/Shared_Memory.h
index be6970e31f..be6970e31f 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory.h
+++ b/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
index 6aa03ee2c9..6aa03ee2c9 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_MM.cpp
+++ b/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
index 26503997de..26503997de 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_MM.h
+++ b/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
index 75762c1994..75762c1994 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_MM.inl
+++ b/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
index a77275feda..a77275feda 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_Pool.cpp
+++ b/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
index 23b5e90f3d..23b5e90f3d 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_Pool.h
+++ b/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
index 0b2b5d0892..0b2b5d0892 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_SV.cpp
+++ b/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
index 9dca887174..9dca887174 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_SV.h
+++ b/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
index ae7fbc6e26..ae7fbc6e26 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Memory_SV.inl
+++ b/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
index 117b32d47f..117b32d47f 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Object.cpp
+++ b/deps/acelite/ace/Shared_Object.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Object.h b/deps/acelite/ace/Shared_Object.h
index 4749f28da6..4749f28da6 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Object.h
+++ b/deps/acelite/ace/Shared_Object.h
diff --git a/modules/worldengine/deps/acelite/ace/Shared_Object.inl b/deps/acelite/ace/Shared_Object.inl
index 358a3fb7a4..358a3fb7a4 100644
--- a/modules/worldengine/deps/acelite/ace/Shared_Object.inl
+++ b/deps/acelite/ace/Shared_Object.inl
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Adapter.cpp b/deps/acelite/ace/Sig_Adapter.cpp
index bc6b39ed19..bc6b39ed19 100644
--- a/modules/worldengine/deps/acelite/ace/Sig_Adapter.cpp
+++ b/deps/acelite/ace/Sig_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Adapter.h b/deps/acelite/ace/Sig_Adapter.h
index 23be40055d..23be40055d 100644
--- a/modules/worldengine/deps/acelite/ace/Sig_Adapter.h
+++ b/deps/acelite/ace/Sig_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Handler.cpp b/deps/acelite/ace/Sig_Handler.cpp
index 54c76e03b4..54c76e03b4 100644
--- a/modules/worldengine/deps/acelite/ace/Sig_Handler.cpp
+++ b/deps/acelite/ace/Sig_Handler.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Handler.h b/deps/acelite/ace/Sig_Handler.h
index cf64673907..cf64673907 100644
--- a/modules/worldengine/deps/acelite/ace/Sig_Handler.h
+++ b/deps/acelite/ace/Sig_Handler.h
diff --git a/modules/worldengine/deps/acelite/ace/Sig_Handler.inl b/deps/acelite/ace/Sig_Handler.inl
index a2ad69de73..a2ad69de73 100644
--- a/modules/worldengine/deps/acelite/ace/Sig_Handler.inl
+++ b/deps/acelite/ace/Sig_Handler.inl
diff --git a/modules/worldengine/deps/acelite/ace/Signal.cpp b/deps/acelite/ace/Signal.cpp
index b8434592db..b8434592db 100644
--- a/modules/worldengine/deps/acelite/ace/Signal.cpp
+++ b/deps/acelite/ace/Signal.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Signal.h b/deps/acelite/ace/Signal.h
index 924369d475..924369d475 100644
--- a/modules/worldengine/deps/acelite/ace/Signal.h
+++ b/deps/acelite/ace/Signal.h
diff --git a/modules/worldengine/deps/acelite/ace/Signal.inl b/deps/acelite/ace/Signal.inl
index ff2f52403e..ff2f52403e 100644
--- a/modules/worldengine/deps/acelite/ace/Signal.inl
+++ b/deps/acelite/ace/Signal.inl
diff --git a/modules/worldengine/deps/acelite/ace/Singleton.cpp b/deps/acelite/ace/Singleton.cpp
index 89dc15432f..89dc15432f 100644
--- a/modules/worldengine/deps/acelite/ace/Singleton.cpp
+++ b/deps/acelite/ace/Singleton.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Singleton.h b/deps/acelite/ace/Singleton.h
index aac7f787e9..aac7f787e9 100644
--- a/modules/worldengine/deps/acelite/ace/Singleton.h
+++ b/deps/acelite/ace/Singleton.h
diff --git a/modules/worldengine/deps/acelite/ace/Singleton.inl b/deps/acelite/ace/Singleton.inl
index 912271ba20..912271ba20 100644
--- a/modules/worldengine/deps/acelite/ace/Singleton.inl
+++ b/deps/acelite/ace/Singleton.inl
diff --git a/modules/worldengine/deps/acelite/ace/Sock_Connect.cpp b/deps/acelite/ace/Sock_Connect.cpp
index 2b10ecd242..2b10ecd242 100644
--- a/modules/worldengine/deps/acelite/ace/Sock_Connect.cpp
+++ b/deps/acelite/ace/Sock_Connect.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Sock_Connect.h b/deps/acelite/ace/Sock_Connect.h
index 5401114747..5401114747 100644
--- a/modules/worldengine/deps/acelite/ace/Sock_Connect.h
+++ b/deps/acelite/ace/Sock_Connect.h
diff --git a/modules/worldengine/deps/acelite/ace/Stack_Trace.cpp b/deps/acelite/ace/Stack_Trace.cpp
index 9836a0e1f8..9836a0e1f8 100644
--- a/modules/worldengine/deps/acelite/ace/Stack_Trace.cpp
+++ b/deps/acelite/ace/Stack_Trace.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stack_Trace.h b/deps/acelite/ace/Stack_Trace.h
index f3f91e09e8..f3f91e09e8 100644
--- a/modules/worldengine/deps/acelite/ace/Stack_Trace.h
+++ b/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
index 50db451711..50db451711 100644
--- a/modules/worldengine/deps/acelite/ace/Static_Object_Lock.h
+++ b/deps/acelite/ace/Static_Object_Lock.h
diff --git a/modules/worldengine/deps/acelite/ace/Stats.cpp b/deps/acelite/ace/Stats.cpp
index 82bddb5cd4..82bddb5cd4 100644
--- a/modules/worldengine/deps/acelite/ace/Stats.cpp
+++ b/deps/acelite/ace/Stats.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stats.h b/deps/acelite/ace/Stats.h
index 34962e48d4..34962e48d4 100644
--- a/modules/worldengine/deps/acelite/ace/Stats.h
+++ b/deps/acelite/ace/Stats.h
diff --git a/modules/worldengine/deps/acelite/ace/Stats.inl b/deps/acelite/ace/Stats.inl
index 2e54c1228e..2e54c1228e 100644
--- a/modules/worldengine/deps/acelite/ace/Stats.inl
+++ b/deps/acelite/ace/Stats.inl
diff --git a/modules/worldengine/deps/acelite/ace/Strategies_T.cpp b/deps/acelite/ace/Strategies_T.cpp
index f42a74a3b2..f42a74a3b2 100644
--- a/modules/worldengine/deps/acelite/ace/Strategies_T.cpp
+++ b/deps/acelite/ace/Strategies_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Strategies_T.h b/deps/acelite/ace/Strategies_T.h
index 7b405e2b45..7b405e2b45 100644
--- a/modules/worldengine/deps/acelite/ace/Strategies_T.h
+++ b/deps/acelite/ace/Strategies_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Strategies_T.inl b/deps/acelite/ace/Strategies_T.inl
index ef16da2844..ef16da2844 100644
--- a/modules/worldengine/deps/acelite/ace/Strategies_T.inl
+++ b/deps/acelite/ace/Strategies_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Stream.cpp b/deps/acelite/ace/Stream.cpp
index a9d7ee6ad5..a9d7ee6ad5 100644
--- a/modules/worldengine/deps/acelite/ace/Stream.cpp
+++ b/deps/acelite/ace/Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stream.h b/deps/acelite/ace/Stream.h
index de0aed8af3..de0aed8af3 100644
--- a/modules/worldengine/deps/acelite/ace/Stream.h
+++ b/deps/acelite/ace/Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/Stream.inl b/deps/acelite/ace/Stream.inl
index ac9754924c..ac9754924c 100644
--- a/modules/worldengine/deps/acelite/ace/Stream.inl
+++ b/deps/acelite/ace/Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/Stream_Modules.cpp b/deps/acelite/ace/Stream_Modules.cpp
index 0dec9baa94..0dec9baa94 100644
--- a/modules/worldengine/deps/acelite/ace/Stream_Modules.cpp
+++ b/deps/acelite/ace/Stream_Modules.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Stream_Modules.h b/deps/acelite/ace/Stream_Modules.h
index 86432727aa..86432727aa 100644
--- a/modules/worldengine/deps/acelite/ace/Stream_Modules.h
+++ b/deps/acelite/ace/Stream_Modules.h
diff --git a/modules/worldengine/deps/acelite/ace/String_Base.cpp b/deps/acelite/ace/String_Base.cpp
index 758009b26e..758009b26e 100644
--- a/modules/worldengine/deps/acelite/ace/String_Base.cpp
+++ b/deps/acelite/ace/String_Base.cpp
diff --git a/modules/worldengine/deps/acelite/ace/String_Base.h b/deps/acelite/ace/String_Base.h
index 0c8af1147e..0c8af1147e 100644
--- a/modules/worldengine/deps/acelite/ace/String_Base.h
+++ b/deps/acelite/ace/String_Base.h
diff --git a/modules/worldengine/deps/acelite/ace/String_Base.inl b/deps/acelite/ace/String_Base.inl
index 9e397d2d18..9e397d2d18 100644
--- a/modules/worldengine/deps/acelite/ace/String_Base.inl
+++ b/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
index 12169d66a3..12169d66a3 100644
--- a/modules/worldengine/deps/acelite/ace/String_Base_Const.cpp
+++ b/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
index 3fce9f4084..3fce9f4084 100644
--- a/modules/worldengine/deps/acelite/ace/String_Base_Const.h
+++ b/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
index 7c47a5e5a7..7c47a5e5a7 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf.h
+++ b/deps/acelite/ace/Svc_Conf.h
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Conf.y b/deps/acelite/ace/Svc_Conf.y
index 039cbab5e3..039cbab5e3 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf.y
+++ b/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
index 434527ae46..434527ae46 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf_Lexer.cpp
+++ b/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
index ad2528ba44..ad2528ba44 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf_Lexer.h
+++ b/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
index f3039167da..f3039167da 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf_Param.h
+++ b/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
index 78df46db92..78df46db92 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf_Token_Table.h
+++ b/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
index a3e6a129d6..a3e6a129d6 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf_Tokens.h
+++ b/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
index 04c4f4e1ea..04c4f4e1ea 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Conf_y.cpp
+++ b/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
index 1774e0188d..1774e0188d 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Handler.cpp
+++ b/deps/acelite/ace/Svc_Handler.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Svc_Handler.h b/deps/acelite/ace/Svc_Handler.h
index ab893b7edb..ab893b7edb 100644
--- a/modules/worldengine/deps/acelite/ace/Svc_Handler.h
+++ b/deps/acelite/ace/Svc_Handler.h
diff --git a/modules/worldengine/deps/acelite/ace/Synch.h b/deps/acelite/ace/Synch.h
index 6a6bf79425..6a6bf79425 100644
--- a/modules/worldengine/deps/acelite/ace/Synch.h
+++ b/deps/acelite/ace/Synch.h
diff --git a/modules/worldengine/deps/acelite/ace/Synch_Options.cpp b/deps/acelite/ace/Synch_Options.cpp
index 3e17a65ba8..3e17a65ba8 100644
--- a/modules/worldengine/deps/acelite/ace/Synch_Options.cpp
+++ b/deps/acelite/ace/Synch_Options.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Synch_Options.h b/deps/acelite/ace/Synch_Options.h
index c3651202f1..c3651202f1 100644
--- a/modules/worldengine/deps/acelite/ace/Synch_Options.h
+++ b/deps/acelite/ace/Synch_Options.h
diff --git a/modules/worldengine/deps/acelite/ace/Synch_Traits.h b/deps/acelite/ace/Synch_Traits.h
index e73399faa7..e73399faa7 100644
--- a/modules/worldengine/deps/acelite/ace/Synch_Traits.h
+++ b/deps/acelite/ace/Synch_Traits.h
diff --git a/modules/worldengine/deps/acelite/ace/System_Time.cpp b/deps/acelite/ace/System_Time.cpp
index e7c3471049..e7c3471049 100644
--- a/modules/worldengine/deps/acelite/ace/System_Time.cpp
+++ b/deps/acelite/ace/System_Time.cpp
diff --git a/modules/worldengine/deps/acelite/ace/System_Time.h b/deps/acelite/ace/System_Time.h
index dca30ec97e..dca30ec97e 100644
--- a/modules/worldengine/deps/acelite/ace/System_Time.h
+++ b/deps/acelite/ace/System_Time.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI.cpp b/deps/acelite/ace/TLI.cpp
index 310f85ce8b..310f85ce8b 100644
--- a/modules/worldengine/deps/acelite/ace/TLI.cpp
+++ b/deps/acelite/ace/TLI.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI.h b/deps/acelite/ace/TLI.h
index 6a44034799..6a44034799 100644
--- a/modules/worldengine/deps/acelite/ace/TLI.h
+++ b/deps/acelite/ace/TLI.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI.inl b/deps/acelite/ace/TLI.inl
index 2e339c6ead..2e339c6ead 100644
--- a/modules/worldengine/deps/acelite/ace/TLI.inl
+++ b/deps/acelite/ace/TLI.inl
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Acceptor.cpp b/deps/acelite/ace/TLI_Acceptor.cpp
index 4b833578fd..4b833578fd 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Acceptor.cpp
+++ b/deps/acelite/ace/TLI_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Acceptor.h b/deps/acelite/ace/TLI_Acceptor.h
index 47e1225302..47e1225302 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Acceptor.h
+++ b/deps/acelite/ace/TLI_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Connector.cpp b/deps/acelite/ace/TLI_Connector.cpp
index 42682e4dc2..42682e4dc2 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Connector.cpp
+++ b/deps/acelite/ace/TLI_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Connector.h b/deps/acelite/ace/TLI_Connector.h
index b90fb2a0aa..b90fb2a0aa 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Connector.h
+++ b/deps/acelite/ace/TLI_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Connector.inl b/deps/acelite/ace/TLI_Connector.inl
index eac9d9a584..eac9d9a584 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Connector.inl
+++ b/deps/acelite/ace/TLI_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Stream.cpp b/deps/acelite/ace/TLI_Stream.cpp
index 3f20739a47..3f20739a47 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Stream.cpp
+++ b/deps/acelite/ace/TLI_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Stream.h b/deps/acelite/ace/TLI_Stream.h
index acbc4c3d76..acbc4c3d76 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Stream.h
+++ b/deps/acelite/ace/TLI_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/TLI_Stream.inl b/deps/acelite/ace/TLI_Stream.inl
index 8f5608f0a1..8f5608f0a1 100644
--- a/modules/worldengine/deps/acelite/ace/TLI_Stream.inl
+++ b/deps/acelite/ace/TLI_Stream.inl
diff --git a/modules/worldengine/deps/acelite/ace/TP_Reactor.cpp b/deps/acelite/ace/TP_Reactor.cpp
index 62d8bd3780..62d8bd3780 100644
--- a/modules/worldengine/deps/acelite/ace/TP_Reactor.cpp
+++ b/deps/acelite/ace/TP_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TP_Reactor.h b/deps/acelite/ace/TP_Reactor.h
index 15384c0eb6..15384c0eb6 100644
--- a/modules/worldengine/deps/acelite/ace/TP_Reactor.h
+++ b/deps/acelite/ace/TP_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/TP_Reactor.inl b/deps/acelite/ace/TP_Reactor.inl
index f793fd23c6..f793fd23c6 100644
--- a/modules/worldengine/deps/acelite/ace/TP_Reactor.inl
+++ b/deps/acelite/ace/TP_Reactor.inl
diff --git a/modules/worldengine/deps/acelite/ace/TSS_Adapter.cpp b/deps/acelite/ace/TSS_Adapter.cpp
index 0383a7ea81..0383a7ea81 100644
--- a/modules/worldengine/deps/acelite/ace/TSS_Adapter.cpp
+++ b/deps/acelite/ace/TSS_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TSS_Adapter.h b/deps/acelite/ace/TSS_Adapter.h
index 664e59f6d5..664e59f6d5 100644
--- a/modules/worldengine/deps/acelite/ace/TSS_Adapter.h
+++ b/deps/acelite/ace/TSS_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/TSS_T.cpp b/deps/acelite/ace/TSS_T.cpp
index ae55188ab3..ae55188ab3 100644
--- a/modules/worldengine/deps/acelite/ace/TSS_T.cpp
+++ b/deps/acelite/ace/TSS_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TSS_T.h b/deps/acelite/ace/TSS_T.h
index 412cfaee30..412cfaee30 100644
--- a/modules/worldengine/deps/acelite/ace/TSS_T.h
+++ b/deps/acelite/ace/TSS_T.h
diff --git a/modules/worldengine/deps/acelite/ace/TSS_T.inl b/deps/acelite/ace/TSS_T.inl
index 7e68976c88..7e68976c88 100644
--- a/modules/worldengine/deps/acelite/ace/TSS_T.inl
+++ b/deps/acelite/ace/TSS_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/TTY_IO.cpp b/deps/acelite/ace/TTY_IO.cpp
index c9e14e966e..c9e14e966e 100644
--- a/modules/worldengine/deps/acelite/ace/TTY_IO.cpp
+++ b/deps/acelite/ace/TTY_IO.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TTY_IO.h b/deps/acelite/ace/TTY_IO.h
index fcc6ac54b1..fcc6ac54b1 100644
--- a/modules/worldengine/deps/acelite/ace/TTY_IO.h
+++ b/deps/acelite/ace/TTY_IO.h
diff --git a/modules/worldengine/deps/acelite/ace/Task.cpp b/deps/acelite/ace/Task.cpp
index 210fe72b19..210fe72b19 100644
--- a/modules/worldengine/deps/acelite/ace/Task.cpp
+++ b/deps/acelite/ace/Task.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Task.h b/deps/acelite/ace/Task.h
index c6ff290034..c6ff290034 100644
--- a/modules/worldengine/deps/acelite/ace/Task.h
+++ b/deps/acelite/ace/Task.h
diff --git a/modules/worldengine/deps/acelite/ace/Task.inl b/deps/acelite/ace/Task.inl
index 2d585d13b2..2d585d13b2 100644
--- a/modules/worldengine/deps/acelite/ace/Task.inl
+++ b/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
index 2553743911..2553743911 100644
--- a/modules/worldengine/deps/acelite/ace/Task_Ex_T.cpp
+++ b/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
index 1f883dce7a..1f883dce7a 100644
--- a/modules/worldengine/deps/acelite/ace/Task_Ex_T.h
+++ b/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
index a513230564..a513230564 100644
--- a/modules/worldengine/deps/acelite/ace/Task_Ex_T.inl
+++ b/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
index 4d8d5b0114..4d8d5b0114 100644
--- a/modules/worldengine/deps/acelite/ace/Task_T.cpp
+++ b/deps/acelite/ace/Task_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Task_T.h b/deps/acelite/ace/Task_T.h
index 8c5800802a..8c5800802a 100644
--- a/modules/worldengine/deps/acelite/ace/Task_T.h
+++ b/deps/acelite/ace/Task_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Task_T.inl b/deps/acelite/ace/Task_T.inl
index ee73c57d07..ee73c57d07 100644
--- a/modules/worldengine/deps/acelite/ace/Task_T.inl
+++ b/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
index 4ba0dd61d3..4ba0dd61d3 100644
--- a/modules/worldengine/deps/acelite/ace/Test_and_Set.cpp
+++ b/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
index 6ec541a697..6ec541a697 100644
--- a/modules/worldengine/deps/acelite/ace/Test_and_Set.h
+++ b/deps/acelite/ace/Test_and_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread.cpp b/deps/acelite/ace/Thread.cpp
index c8ff2e3bfa..c8ff2e3bfa 100644
--- a/modules/worldengine/deps/acelite/ace/Thread.cpp
+++ b/deps/acelite/ace/Thread.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread.h b/deps/acelite/ace/Thread.h
index b7fc1fb4cb..b7fc1fb4cb 100644
--- a/modules/worldengine/deps/acelite/ace/Thread.h
+++ b/deps/acelite/ace/Thread.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread.inl b/deps/acelite/ace/Thread.inl
index 33f7fcf0b7..33f7fcf0b7 100644
--- a/modules/worldengine/deps/acelite/ace/Thread.inl
+++ b/deps/acelite/ace/Thread.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Adapter.cpp b/deps/acelite/ace/Thread_Adapter.cpp
index ca9749eabf..ca9749eabf 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Adapter.cpp
+++ b/deps/acelite/ace/Thread_Adapter.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Adapter.h b/deps/acelite/ace/Thread_Adapter.h
index a01bd0c452..a01bd0c452 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Adapter.h
+++ b/deps/acelite/ace/Thread_Adapter.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Adapter.inl b/deps/acelite/ace/Thread_Adapter.inl
index 06751eecd9..06751eecd9 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Adapter.inl
+++ b/deps/acelite/ace/Thread_Adapter.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Control.cpp b/deps/acelite/ace/Thread_Control.cpp
index c00234e5f0..c00234e5f0 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Control.cpp
+++ b/deps/acelite/ace/Thread_Control.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Control.h b/deps/acelite/ace/Thread_Control.h
index a392d83a5a..a392d83a5a 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Control.h
+++ b/deps/acelite/ace/Thread_Control.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Control.inl b/deps/acelite/ace/Thread_Control.inl
index 20d03fe78e..20d03fe78e 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Control.inl
+++ b/deps/acelite/ace/Thread_Control.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Exit.cpp b/deps/acelite/ace/Thread_Exit.cpp
index fea5f5c1f7..fea5f5c1f7 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Exit.cpp
+++ b/deps/acelite/ace/Thread_Exit.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Exit.h b/deps/acelite/ace/Thread_Exit.h
index 51425d0010..51425d0010 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Exit.h
+++ b/deps/acelite/ace/Thread_Exit.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Hook.cpp b/deps/acelite/ace/Thread_Hook.cpp
index f1b07e3925..f1b07e3925 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Hook.cpp
+++ b/deps/acelite/ace/Thread_Hook.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Hook.h b/deps/acelite/ace/Thread_Hook.h
index dcb6d396ea..dcb6d396ea 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Hook.h
+++ b/deps/acelite/ace/Thread_Hook.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Manager.cpp b/deps/acelite/ace/Thread_Manager.cpp
index 657ac9f350..657ac9f350 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Manager.cpp
+++ b/deps/acelite/ace/Thread_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Manager.h b/deps/acelite/ace/Thread_Manager.h
index f83a1d6c46..f83a1d6c46 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Manager.h
+++ b/deps/acelite/ace/Thread_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Manager.inl b/deps/acelite/ace/Thread_Manager.inl
index e3ddda3a89..e3ddda3a89 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Manager.inl
+++ b/deps/acelite/ace/Thread_Manager.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Mutex.cpp b/deps/acelite/ace/Thread_Mutex.cpp
index 6b8851865c..6b8851865c 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Mutex.cpp
+++ b/deps/acelite/ace/Thread_Mutex.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Mutex.h b/deps/acelite/ace/Thread_Mutex.h
index ff20fb9382..ff20fb9382 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Mutex.h
+++ b/deps/acelite/ace/Thread_Mutex.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Mutex.inl b/deps/acelite/ace/Thread_Mutex.inl
index e3d2719327..e3d2719327 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Mutex.inl
+++ b/deps/acelite/ace/Thread_Mutex.inl
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.cpp b/deps/acelite/ace/Thread_Semaphore.cpp
index 3959975069..3959975069 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.cpp
+++ b/deps/acelite/ace/Thread_Semaphore.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.h b/deps/acelite/ace/Thread_Semaphore.h
index 634eccc1c9..634eccc1c9 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.h
+++ b/deps/acelite/ace/Thread_Semaphore.h
diff --git a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.inl b/deps/acelite/ace/Thread_Semaphore.inl
index 9a2a0affed..9a2a0affed 100644
--- a/modules/worldengine/deps/acelite/ace/Thread_Semaphore.inl
+++ b/deps/acelite/ace/Thread_Semaphore.inl
diff --git a/modules/worldengine/deps/acelite/ace/Throughput_Stats.cpp b/deps/acelite/ace/Throughput_Stats.cpp
index 6ecc4c8aad..6ecc4c8aad 100644
--- a/modules/worldengine/deps/acelite/ace/Throughput_Stats.cpp
+++ b/deps/acelite/ace/Throughput_Stats.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Throughput_Stats.h b/deps/acelite/ace/Throughput_Stats.h
index f3d1744c56..f3d1744c56 100644
--- a/modules/worldengine/deps/acelite/ace/Throughput_Stats.h
+++ b/deps/acelite/ace/Throughput_Stats.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy.cpp b/deps/acelite/ace/Time_Policy.cpp
index 4d2e6880b9..4d2e6880b9 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Policy.cpp
+++ b/deps/acelite/ace/Time_Policy.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy.h b/deps/acelite/ace/Time_Policy.h
index 01bef13641..01bef13641 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Policy.h
+++ b/deps/acelite/ace/Time_Policy.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Policy.inl b/deps/acelite/ace/Time_Policy.inl
index 59650b8e15..59650b8e15 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Policy.inl
+++ b/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
index 4ca20433e7..4ca20433e7 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Policy_T.cpp
+++ b/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
index 85d0dde6ae..85d0dde6ae 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Policy_T.h
+++ b/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
index 25a5ea0792..25a5ea0792 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Policy_T.inl
+++ b/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
index 2ceada87fd..2ceada87fd 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Value.cpp
+++ b/deps/acelite/ace/Time_Value.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value.h b/deps/acelite/ace/Time_Value.h
index c17023f76a..c17023f76a 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Value.h
+++ b/deps/acelite/ace/Time_Value.h
diff --git a/modules/worldengine/deps/acelite/ace/Time_Value.inl b/deps/acelite/ace/Time_Value.inl
index a4b095033e..a4b095033e 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Value.inl
+++ b/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
index 79689d904c..79689d904c 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Value_T.cpp
+++ b/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
index 4348dccf10..4348dccf10 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Value_T.h
+++ b/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
index 934bebf228..934bebf228 100644
--- a/modules/worldengine/deps/acelite/ace/Time_Value_T.inl
+++ b/deps/acelite/ace/Time_Value_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe.cpp b/deps/acelite/ace/Timeprobe.cpp
index d1895827f2..d1895827f2 100644
--- a/modules/worldengine/deps/acelite/ace/Timeprobe.cpp
+++ b/deps/acelite/ace/Timeprobe.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe.h b/deps/acelite/ace/Timeprobe.h
index 872e274ee3..872e274ee3 100644
--- a/modules/worldengine/deps/acelite/ace/Timeprobe.h
+++ b/deps/acelite/ace/Timeprobe.h
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe.inl b/deps/acelite/ace/Timeprobe.inl
index 216f437246..216f437246 100644
--- a/modules/worldengine/deps/acelite/ace/Timeprobe.inl
+++ b/deps/acelite/ace/Timeprobe.inl
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe_T.cpp b/deps/acelite/ace/Timeprobe_T.cpp
index a88eb00bba..a88eb00bba 100644
--- a/modules/worldengine/deps/acelite/ace/Timeprobe_T.cpp
+++ b/deps/acelite/ace/Timeprobe_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Timeprobe_T.h b/deps/acelite/ace/Timeprobe_T.h
index 0512060af6..0512060af6 100644
--- a/modules/worldengine/deps/acelite/ace/Timeprobe_T.h
+++ b/deps/acelite/ace/Timeprobe_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Hash.h b/deps/acelite/ace/Timer_Hash.h
index 500bb28bd8..500bb28bd8 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Hash.h
+++ b/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
index c3c2e05036..c3c2e05036 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Hash_T.cpp
+++ b/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
index 2e7975c313..2e7975c313 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Hash_T.h
+++ b/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
index 116336b5b4..116336b5b4 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Heap.h
+++ b/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
index 0cc17bea2e..0cc17bea2e 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Heap_T.cpp
+++ b/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
index a6f056c7b7..a6f056c7b7 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Heap_T.h
+++ b/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
index d274f11a37..d274f11a37 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_List.h
+++ b/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
index aa6c795c14..aa6c795c14 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_List_T.cpp
+++ b/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
index dd719b4021..dd719b4021 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_List_T.h
+++ b/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
index c694912474..c694912474 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue.h
+++ b/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
index b2ccf1a216..b2ccf1a216 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.cpp
+++ b/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
index a92a260cd2..a92a260cd2 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.h
+++ b/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
index ad5129f73f..ad5129f73f 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_Adapters.inl
+++ b/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
index 29a8547ae9..29a8547ae9 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.cpp
+++ b/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
index 84f8cbc85c..84f8cbc85c 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.h
+++ b/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
index 556987e08a..556987e08a 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_Iterator.inl
+++ b/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
index 20d5dfbc49..20d5dfbc49 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_T.cpp
+++ b/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
index e97002a1cb..e97002a1cb 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_T.h
+++ b/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
index 64f2bf14c5..64f2bf14c5 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queue_T.inl
+++ b/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
index 26aee6eb67..26aee6eb67 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Queuefwd.h
+++ b/deps/acelite/ace/Timer_Queuefwd.h
diff --git a/modules/worldengine/deps/acelite/ace/Timer_Wheel.h b/deps/acelite/ace/Timer_Wheel.h
index b21eb9c511..b21eb9c511 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Wheel.h
+++ b/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
index e9d4f294e9..e9d4f294e9 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Wheel_T.cpp
+++ b/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
index 22c204ca1e..22c204ca1e 100644
--- a/modules/worldengine/deps/acelite/ace/Timer_Wheel_T.h
+++ b/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
index e53797e600..e53797e600 100644
--- a/modules/worldengine/deps/acelite/ace/TkReactor/ACE_TkReactor.pc.in
+++ b/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
index 905eacb464..905eacb464 100644
--- a/modules/worldengine/deps/acelite/ace/TkReactor/ACE_TkReactor_export.h
+++ b/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
index 13c5904ccd..13c5904ccd 100644
--- a/modules/worldengine/deps/acelite/ace/TkReactor/TkReactor.cpp
+++ b/deps/acelite/ace/TkReactor/TkReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/TkReactor/TkReactor.h b/deps/acelite/ace/TkReactor/TkReactor.h
index adedbb0982..adedbb0982 100644
--- a/modules/worldengine/deps/acelite/ace/TkReactor/TkReactor.h
+++ b/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
index 6389e320dd..6389e320dd 100644
--- a/modules/worldengine/deps/acelite/ace/TkReactor/ace_tkreactor.mpc
+++ b/deps/acelite/ace/TkReactor/ace_tkreactor.mpc
diff --git a/modules/worldengine/deps/acelite/ace/Token.cpp b/deps/acelite/ace/Token.cpp
index 1cb261bfc2..1cb261bfc2 100644
--- a/modules/worldengine/deps/acelite/ace/Token.cpp
+++ b/deps/acelite/ace/Token.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token.h b/deps/acelite/ace/Token.h
index 8173645043..8173645043 100644
--- a/modules/worldengine/deps/acelite/ace/Token.h
+++ b/deps/acelite/ace/Token.h
diff --git a/modules/worldengine/deps/acelite/ace/Token.inl b/deps/acelite/ace/Token.inl
index 5d42c427bd..5d42c427bd 100644
--- a/modules/worldengine/deps/acelite/ace/Token.inl
+++ b/deps/acelite/ace/Token.inl
diff --git a/modules/worldengine/deps/acelite/ace/Token_Collection.cpp b/deps/acelite/ace/Token_Collection.cpp
index c15d7cf9c5..c15d7cf9c5 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Collection.cpp
+++ b/deps/acelite/ace/Token_Collection.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token_Collection.h b/deps/acelite/ace/Token_Collection.h
index c5be0aa132..c5be0aa132 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Collection.h
+++ b/deps/acelite/ace/Token_Collection.h
diff --git a/modules/worldengine/deps/acelite/ace/Token_Collection.inl b/deps/acelite/ace/Token_Collection.inl
index 1104b1f603..1104b1f603 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Collection.inl
+++ b/deps/acelite/ace/Token_Collection.inl
diff --git a/modules/worldengine/deps/acelite/ace/Token_Invariants.cpp b/deps/acelite/ace/Token_Invariants.cpp
index 4d664c02b2..4d664c02b2 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Invariants.cpp
+++ b/deps/acelite/ace/Token_Invariants.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token_Invariants.h b/deps/acelite/ace/Token_Invariants.h
index 6fc5a0028c..6fc5a0028c 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Invariants.h
+++ b/deps/acelite/ace/Token_Invariants.h
diff --git a/modules/worldengine/deps/acelite/ace/Token_Manager.cpp b/deps/acelite/ace/Token_Manager.cpp
index 0c983f9ff9..0c983f9ff9 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Manager.cpp
+++ b/deps/acelite/ace/Token_Manager.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Token_Manager.h b/deps/acelite/ace/Token_Manager.h
index 3f0427799c..3f0427799c 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Manager.h
+++ b/deps/acelite/ace/Token_Manager.h
diff --git a/modules/worldengine/deps/acelite/ace/Token_Manager.inl b/deps/acelite/ace/Token_Manager.inl
index 0bbbfc67d6..0bbbfc67d6 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Manager.inl
+++ b/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
index 3df3541ef9..3df3541ef9 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Request_Reply.cpp
+++ b/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
index edb7c5d9a4..edb7c5d9a4 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Request_Reply.h
+++ b/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
index df58781c5f..df58781c5f 100644
--- a/modules/worldengine/deps/acelite/ace/Token_Request_Reply.inl
+++ b/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
index 7c2924e037..7c2924e037 100644
--- a/modules/worldengine/deps/acelite/ace/Tokenizer_T.cpp
+++ b/deps/acelite/ace/Tokenizer_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Tokenizer_T.h b/deps/acelite/ace/Tokenizer_T.h
index d3bba94919..d3bba94919 100644
--- a/modules/worldengine/deps/acelite/ace/Tokenizer_T.h
+++ b/deps/acelite/ace/Tokenizer_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Trace.cpp b/deps/acelite/ace/Trace.cpp
index 246de3b052..246de3b052 100644
--- a/modules/worldengine/deps/acelite/ace/Trace.cpp
+++ b/deps/acelite/ace/Trace.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Trace.h b/deps/acelite/ace/Trace.h
index f70f35bbf5..f70f35bbf5 100644
--- a/modules/worldengine/deps/acelite/ace/Trace.h
+++ b/deps/acelite/ace/Trace.h
diff --git a/modules/worldengine/deps/acelite/ace/Truncate.h b/deps/acelite/ace/Truncate.h
index 528f4a3a6f..528f4a3a6f 100644
--- a/modules/worldengine/deps/acelite/ace/Truncate.h
+++ b/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
index 842d70ac2a..842d70ac2a 100644
--- a/modules/worldengine/deps/acelite/ace/Typed_SV_Message.cpp
+++ b/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
index 50ef362fb3..50ef362fb3 100644
--- a/modules/worldengine/deps/acelite/ace/Typed_SV_Message.h
+++ b/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
index 2e3c12939c..2e3c12939c 100644
--- a/modules/worldengine/deps/acelite/ace/Typed_SV_Message.inl
+++ b/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
index 3fe864f14d..3fe864f14d 100644
--- a/modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.cpp
+++ b/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
index b10baf4cb6..b10baf4cb6 100644
--- a/modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.h
+++ b/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
index 915bd37171..915bd37171 100644
--- a/modules/worldengine/deps/acelite/ace/Typed_SV_Message_Queue.inl
+++ b/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
index 970e4f2743..970e4f2743 100644
--- a/modules/worldengine/deps/acelite/ace/UNIX_Addr.cpp
+++ b/deps/acelite/ace/UNIX_Addr.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UNIX_Addr.h b/deps/acelite/ace/UNIX_Addr.h
index 02749abf04..02749abf04 100644
--- a/modules/worldengine/deps/acelite/ace/UNIX_Addr.h
+++ b/deps/acelite/ace/UNIX_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/UNIX_Addr.inl b/deps/acelite/ace/UNIX_Addr.inl
index f19ef68a52..f19ef68a52 100644
--- a/modules/worldengine/deps/acelite/ace/UNIX_Addr.inl
+++ b/deps/acelite/ace/UNIX_Addr.inl
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.cpp b/deps/acelite/ace/UPIPE_Acceptor.cpp
index 708c5037fe..708c5037fe 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.cpp
+++ b/deps/acelite/ace/UPIPE_Acceptor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.h b/deps/acelite/ace/UPIPE_Acceptor.h
index 432fac53f2..432fac53f2 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.h
+++ b/deps/acelite/ace/UPIPE_Acceptor.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.inl b/deps/acelite/ace/UPIPE_Acceptor.inl
index 37af88b4ad..37af88b4ad 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Acceptor.inl
+++ b/deps/acelite/ace/UPIPE_Acceptor.inl
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Addr.h b/deps/acelite/ace/UPIPE_Addr.h
index eb331b0b11..eb331b0b11 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Addr.h
+++ b/deps/acelite/ace/UPIPE_Addr.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.cpp b/deps/acelite/ace/UPIPE_Connector.cpp
index 144c1502a3..144c1502a3 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.cpp
+++ b/deps/acelite/ace/UPIPE_Connector.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.h b/deps/acelite/ace/UPIPE_Connector.h
index fff02dc594..fff02dc594 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.h
+++ b/deps/acelite/ace/UPIPE_Connector.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.inl b/deps/acelite/ace/UPIPE_Connector.inl
index cbb55a4864..cbb55a4864 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Connector.inl
+++ b/deps/acelite/ace/UPIPE_Connector.inl
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.cpp b/deps/acelite/ace/UPIPE_Stream.cpp
index 46d470ce79..46d470ce79 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.cpp
+++ b/deps/acelite/ace/UPIPE_Stream.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.h b/deps/acelite/ace/UPIPE_Stream.h
index 491c8799c8..491c8799c8 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.h
+++ b/deps/acelite/ace/UPIPE_Stream.h
diff --git a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.inl b/deps/acelite/ace/UPIPE_Stream.inl
index acc4a4ed78..acc4a4ed78 100644
--- a/modules/worldengine/deps/acelite/ace/UPIPE_Stream.inl
+++ b/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
index 941ab11b24..941ab11b24 100644
--- a/modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.cpp
+++ b/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
index 0097b7bb8d..0097b7bb8d 100644
--- a/modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.h
+++ b/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
index d241c5ec8d..d241c5ec8d 100644
--- a/modules/worldengine/deps/acelite/ace/UTF16_Encoding_Converter.inl
+++ b/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
index 22bd9fac00..22bd9fac00 100644
--- a/modules/worldengine/deps/acelite/ace/UTF32_Encoding_Converter.cpp
+++ b/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
index ab7b9d14e9..ab7b9d14e9 100644
--- a/modules/worldengine/deps/acelite/ace/UTF32_Encoding_Converter.h
+++ b/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
index a618ba4031..a618ba4031 100644
--- a/modules/worldengine/deps/acelite/ace/UTF8_Encoding_Converter.cpp
+++ b/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
index 3cca2f41d1..3cca2f41d1 100644
--- a/modules/worldengine/deps/acelite/ace/UTF8_Encoding_Converter.h
+++ b/deps/acelite/ace/UTF8_Encoding_Converter.h
diff --git a/modules/worldengine/deps/acelite/ace/UUID.cpp b/deps/acelite/ace/UUID.cpp
index b8206531e0..b8206531e0 100644
--- a/modules/worldengine/deps/acelite/ace/UUID.cpp
+++ b/deps/acelite/ace/UUID.cpp
diff --git a/modules/worldengine/deps/acelite/ace/UUID.h b/deps/acelite/ace/UUID.h
index 6b26fb33fe..6b26fb33fe 100644
--- a/modules/worldengine/deps/acelite/ace/UUID.h
+++ b/deps/acelite/ace/UUID.h
diff --git a/modules/worldengine/deps/acelite/ace/UUID.inl b/deps/acelite/ace/UUID.inl
index a497da6466..a497da6466 100644
--- a/modules/worldengine/deps/acelite/ace/UUID.inl
+++ b/deps/acelite/ace/UUID.inl
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.cpp b/deps/acelite/ace/Unbounded_Queue.cpp
index 28f122d0c6..28f122d0c6 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.cpp
+++ b/deps/acelite/ace/Unbounded_Queue.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.h b/deps/acelite/ace/Unbounded_Queue.h
index 8c2172ec82..8c2172ec82 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.h
+++ b/deps/acelite/ace/Unbounded_Queue.h
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.inl b/deps/acelite/ace/Unbounded_Queue.inl
index b3e76ad999..b3e76ad999 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Queue.inl
+++ b/deps/acelite/ace/Unbounded_Queue.inl
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set.cpp b/deps/acelite/ace/Unbounded_Set.cpp
index 4450f21f05..4450f21f05 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Set.cpp
+++ b/deps/acelite/ace/Unbounded_Set.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set.h b/deps/acelite/ace/Unbounded_Set.h
index 90ae7653dd..90ae7653dd 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Set.h
+++ b/deps/acelite/ace/Unbounded_Set.h
diff --git a/modules/worldengine/deps/acelite/ace/Unbounded_Set.inl b/deps/acelite/ace/Unbounded_Set.inl
index d1372f2431..d1372f2431 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Set.inl
+++ b/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
index 7692a4039c..7692a4039c 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.cpp
+++ b/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
index bde3915ace..bde3915ace 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.h
+++ b/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
index bbb8772d6f..bbb8772d6f 100644
--- a/modules/worldengine/deps/acelite/ace/Unbounded_Set_Ex.inl
+++ b/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
index 8d22e5e2bb..8d22e5e2bb 100644
--- a/modules/worldengine/deps/acelite/ace/Value_Ptr.h
+++ b/deps/acelite/ace/Value_Ptr.h
diff --git a/modules/worldengine/deps/acelite/ace/Vector_T.cpp b/deps/acelite/ace/Vector_T.cpp
index 4e7aea27a9..4e7aea27a9 100644
--- a/modules/worldengine/deps/acelite/ace/Vector_T.cpp
+++ b/deps/acelite/ace/Vector_T.cpp
diff --git a/modules/worldengine/deps/acelite/ace/Vector_T.h b/deps/acelite/ace/Vector_T.h
index 7591783489..7591783489 100644
--- a/modules/worldengine/deps/acelite/ace/Vector_T.h
+++ b/deps/acelite/ace/Vector_T.h
diff --git a/modules/worldengine/deps/acelite/ace/Vector_T.inl b/deps/acelite/ace/Vector_T.inl
index 8138243853..8138243853 100644
--- a/modules/worldengine/deps/acelite/ace/Vector_T.inl
+++ b/deps/acelite/ace/Vector_T.inl
diff --git a/modules/worldengine/deps/acelite/ace/Version.h b/deps/acelite/ace/Version.h
index b09b4b1fe0..b09b4b1fe0 100644
--- a/modules/worldengine/deps/acelite/ace/Version.h
+++ b/deps/acelite/ace/Version.h
diff --git a/modules/worldengine/deps/acelite/ace/Versioned_Namespace.h b/deps/acelite/ace/Versioned_Namespace.h
index 9e3274ed9f..9e3274ed9f 100644
--- a/modules/worldengine/deps/acelite/ace/Versioned_Namespace.h
+++ b/deps/acelite/ace/Versioned_Namespace.h
diff --git a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.cpp b/deps/acelite/ace/WFMO_Reactor.cpp
index f2c103d1c0..f2c103d1c0 100644
--- a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.cpp
+++ b/deps/acelite/ace/WFMO_Reactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.h b/deps/acelite/ace/WFMO_Reactor.h
index 32197eb991..32197eb991 100644
--- a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.h
+++ b/deps/acelite/ace/WFMO_Reactor.h
diff --git a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.inl b/deps/acelite/ace/WFMO_Reactor.inl
index 19c7da594d..19c7da594d 100644
--- a/modules/worldengine/deps/acelite/ace/WFMO_Reactor.inl
+++ b/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
index d914ccfc46..d914ccfc46 100644
--- a/modules/worldengine/deps/acelite/ace/WIN32_Asynch_IO.cpp
+++ b/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
index 41ceffac05..41ceffac05 100644
--- a/modules/worldengine/deps/acelite/ace/WIN32_Asynch_IO.h
+++ b/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
index 25bf4f31b3..25bf4f31b3 100644
--- a/modules/worldengine/deps/acelite/ace/WIN32_Proactor.cpp
+++ b/deps/acelite/ace/WIN32_Proactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/WIN32_Proactor.h b/deps/acelite/ace/WIN32_Proactor.h
index 1625fa8ce1..1625fa8ce1 100644
--- a/modules/worldengine/deps/acelite/ace/WIN32_Proactor.h
+++ b/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
index a3b0824733..a3b0824733 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Svc_Conf.cpp
+++ b/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
index a45fa662aa..a45fa662aa 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Svc_Conf.h
+++ b/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
index 9b267ae548..9b267ae548 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
+++ b/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
index 6e79186544..6e79186544 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML.mpc
+++ b/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
index 970e0a6d3e..970e0a6d3e 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
+++ b/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
index c96910a60a..c96910a60a 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
+++ b/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
index 2016982b73..2016982b73 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
+++ b/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
index 20cce1f97b..20cce1f97b 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
+++ b/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
index b431c99f68..b431c99f68 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
+++ b/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
index 9027786a83..9027786a83 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Types.hpp
+++ b/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
index b39e46a39e..b39e46a39e 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Types.ipp
+++ b/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
index 781432b8fd..781432b8fd 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
+++ b/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
index 98078da929..98078da929 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
+++ b/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
index 2803a5a85b..2803a5a85b 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
+++ b/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
index 234baa1448..234baa1448 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Error_Handler.cpp
+++ b/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
index 2f094bbb9f..2f094bbb9f 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Error_Handler.h
+++ b/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
index 6fa5b8d789..6fa5b8d789 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Helper.h
+++ b/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
index bd74e5a923..bd74e5a923 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Helper.tpp
+++ b/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
index b9fa61ad41..b9fa61ad41 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
+++ b/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
index 4fd578776b..4fd578776b 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.h
+++ b/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
index 3b5a68b5d0..3b5a68b5d0 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
+++ b/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
index 3385a4b384..3385a4b384 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Typedefs.cpp
+++ b/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
index 7892f5bc44..7892f5bc44 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Typedefs.h
+++ b/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
index 60e2adec91..60e2adec91 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XML_Utils_Export.h
+++ b/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
index 601e0f9f33..601e0f9f33 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Elements.hpp
+++ b/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
index 90c4e37c59..90c4e37c59 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
+++ b/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
index 6f402b021c..6f402b021c 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
+++ b/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
index 0f7fb87edb..0f7fb87edb 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Parser.hpp
+++ b/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
index b77f077d28..b77f077d28 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
+++ b/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
index 4d6d8b05b9..4d6d8b05b9 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
+++ b/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
index 13c64d9b61..13c64d9b61 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/Writer.hpp
+++ b/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
index ce4b51284b..ce4b51284b 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/XML.hpp
+++ b/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
index 4197851023..4197851023 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
+++ b/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
index d4fe450e22..d4fe450e22 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XercesString.cpp
+++ b/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
index 661f4bd056..661f4bd056 100644
--- a/modules/worldengine/deps/acelite/ace/XML_Utils/XercesString.h
+++ b/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
index 44da82975a..44da82975a 100644
--- a/modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.cpp
+++ b/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
index 56ce534467..56ce534467 100644
--- a/modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.h
+++ b/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
index c8dddef667..c8dddef667 100644
--- a/modules/worldengine/deps/acelite/ace/XTI_ATM_Mcast.inl
+++ b/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
index 118c61c563..118c61c563 100644
--- a/modules/worldengine/deps/acelite/ace/XtReactor/ACE_XtReactor.pc.in
+++ b/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
index 1153d814af..1153d814af 100644
--- a/modules/worldengine/deps/acelite/ace/XtReactor/ACE_XtReactor_export.h
+++ b/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
index bf23d31e67..bf23d31e67 100644
--- a/modules/worldengine/deps/acelite/ace/XtReactor/XtReactor.cpp
+++ b/deps/acelite/ace/XtReactor/XtReactor.cpp
diff --git a/modules/worldengine/deps/acelite/ace/XtReactor/XtReactor.h b/deps/acelite/ace/XtReactor/XtReactor.h
index 8b172fb24c..8b172fb24c 100644
--- a/modules/worldengine/deps/acelite/ace/XtReactor/XtReactor.h
+++ b/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
index 86466d4a4d..86466d4a4d 100644
--- a/modules/worldengine/deps/acelite/ace/XtReactor/ace_xtreactor.mpc
+++ b/deps/acelite/ace/XtReactor/ace_xtreactor.mpc
diff --git a/modules/worldengine/deps/acelite/ace/ace.mpc b/deps/acelite/ace/ace.mpc
index a3fd629892..a3fd629892 100644
--- a/modules/worldengine/deps/acelite/ace/ace.mpc
+++ b/deps/acelite/ace/ace.mpc
diff --git a/modules/worldengine/deps/acelite/ace/ace.mwc b/deps/acelite/ace/ace.mwc
index 2304d23e35..2304d23e35 100644
--- a/modules/worldengine/deps/acelite/ace/ace.mwc
+++ b/deps/acelite/ace/ace.mwc
diff --git a/modules/worldengine/deps/acelite/ace/ace.rc b/deps/acelite/ace/ace.rc
index 5479249190..5479249190 100644
--- a/modules/worldengine/deps/acelite/ace/ace.rc
+++ b/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
index 648049892b..648049892b 100644
--- a/modules/worldengine/deps/acelite/ace/ace_for_tao.mpc
+++ b/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
index 6ac08e5dc6..6ac08e5dc6 100644
--- a/modules/worldengine/deps/acelite/ace/ace_message_table.bin
+++ b/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
index f969c78859..f969c78859 100644
--- a/modules/worldengine/deps/acelite/ace/ace_wchar.cpp
+++ b/deps/acelite/ace/ace_wchar.cpp
diff --git a/modules/worldengine/deps/acelite/ace/ace_wchar.h b/deps/acelite/ace/ace_wchar.h
index ff884231b1..ff884231b1 100644
--- a/modules/worldengine/deps/acelite/ace/ace_wchar.h
+++ b/deps/acelite/ace/ace_wchar.h
diff --git a/modules/worldengine/deps/acelite/ace/ace_wchar.inl b/deps/acelite/ace/ace_wchar.inl
index 744b44f5e7..744b44f5e7 100644
--- a/modules/worldengine/deps/acelite/ace/ace_wchar.inl
+++ b/deps/acelite/ace/ace_wchar.inl
diff --git a/modules/worldengine/deps/acelite/ace/checked_iterator.h b/deps/acelite/ace/checked_iterator.h
index 473ca5c9db..473ca5c9db 100644
--- a/modules/worldengine/deps/acelite/ace/checked_iterator.h
+++ b/deps/acelite/ace/checked_iterator.h
diff --git a/modules/worldengine/deps/acelite/ace/codecs.mpb b/deps/acelite/ace/codecs.mpb
index c38fcd9cd6..c38fcd9cd6 100644
--- a/modules/worldengine/deps/acelite/ace/codecs.mpb
+++ b/deps/acelite/ace/codecs.mpb
diff --git a/modules/worldengine/deps/acelite/ace/config-WinCE.h b/deps/acelite/ace/config-WinCE.h
index e9414226f7..e9414226f7 100644
--- a/modules/worldengine/deps/acelite/ace/config-WinCE.h
+++ b/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
index cfa2786f7e..cfa2786f7e 100644
--- a/modules/worldengine/deps/acelite/ace/config-aix-5.x.h
+++ b/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
index 3864490ce4..3864490ce4 100644
--- a/modules/worldengine/deps/acelite/ace/config-aix-7.h
+++ b/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
index b6e8a03290..b6e8a03290 100644
--- a/modules/worldengine/deps/acelite/ace/config-all.h
+++ b/deps/acelite/ace/config-all.h
diff --git a/modules/worldengine/deps/acelite/ace/config-android.h b/deps/acelite/ace/config-android.h
index 6808ed6695..6808ed6695 100644
--- a/modules/worldengine/deps/acelite/ace/config-android.h
+++ b/deps/acelite/ace/config-android.h
diff --git a/modules/worldengine/deps/acelite/ace/config-cygwin32.h b/deps/acelite/ace/config-cygwin32.h
index 892707740f..892707740f 100644
--- a/modules/worldengine/deps/acelite/ace/config-cygwin32.h
+++ b/deps/acelite/ace/config-cygwin32.h
diff --git a/modules/worldengine/deps/acelite/ace/config-freebsd.h b/deps/acelite/ace/config-freebsd.h
index 34fb9c2f7e..34fb9c2f7e 100644
--- a/modules/worldengine/deps/acelite/ace/config-freebsd.h
+++ b/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
index e024997f42..e024997f42 100644
--- a/modules/worldengine/deps/acelite/ace/config-g++-common.h
+++ b/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
index 995bfd9878..995bfd9878 100644
--- a/modules/worldengine/deps/acelite/ace/config-hpux-11.00.h
+++ b/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
index 4bf0817216..4bf0817216 100644
--- a/modules/worldengine/deps/acelite/ace/config-icc-common.h
+++ b/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
index 98679878ca..98679878ca 100644
--- a/modules/worldengine/deps/acelite/ace/config-integritySCA.h
+++ b/deps/acelite/ace/config-integritySCA.h
diff --git a/modules/worldengine/deps/acelite/ace/config-kfreebsd.h b/deps/acelite/ace/config-kfreebsd.h
index 79a2886a0a..79a2886a0a 100644
--- a/modules/worldengine/deps/acelite/ace/config-kfreebsd.h
+++ b/deps/acelite/ace/config-kfreebsd.h
diff --git a/modules/worldengine/deps/acelite/ace/config-linux.h b/deps/acelite/ace/config-linux.h
index b3b2f0c05f..b3b2f0c05f 100644
--- a/modules/worldengine/deps/acelite/ace/config-linux.h
+++ b/deps/acelite/ace/config-linux.h
diff --git a/modules/worldengine/deps/acelite/ace/config-lite.h b/deps/acelite/ace/config-lite.h
index 3c64478d35..3c64478d35 100644
--- a/modules/worldengine/deps/acelite/ace/config-lite.h
+++ b/deps/acelite/ace/config-lite.h
diff --git a/modules/worldengine/deps/acelite/ace/config-lynxos.h b/deps/acelite/ace/config-lynxos.h
index d4e02902dc..d4e02902dc 100644
--- a/modules/worldengine/deps/acelite/ace/config-lynxos.h
+++ b/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
index 0d2cc900b8..0d2cc900b8 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-iOS-hardware.h
+++ b/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
index 483dad5530..483dad5530 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-iOS-simulator.h
+++ b/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
index 1b9b90d134..1b9b90d134 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-leopard.h
+++ b/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
index 13d450f0aa..13d450f0aa 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-lion.h
+++ b/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
index 630a9722c5..630a9722c5 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-mavericks.h
+++ b/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
index 3445f3f1ba..3445f3f1ba 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-mountainlion.h
+++ b/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
index 63237459a2..63237459a2 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-panther.h
+++ b/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
index cd7798279b..cd7798279b 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-snowleopard.h
+++ b/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
index 1e39c82839..1e39c82839 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-tiger.h
+++ b/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
index bb2a48530b..bb2a48530b 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx-yosemite.h
+++ b/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
index 729c7ffe19..729c7ffe19 100644
--- a/modules/worldengine/deps/acelite/ace/config-macosx.h
+++ b/deps/acelite/ace/config-macosx.h
diff --git a/modules/worldengine/deps/acelite/ace/config-macros.h b/deps/acelite/ace/config-macros.h
index d86733c501..d86733c501 100644
--- a/modules/worldengine/deps/acelite/ace/config-macros.h
+++ b/deps/acelite/ace/config-macros.h
diff --git a/modules/worldengine/deps/acelite/ace/config-netbsd.h b/deps/acelite/ace/config-netbsd.h
index 406df338cb..406df338cb 100644
--- a/modules/worldengine/deps/acelite/ace/config-netbsd.h
+++ b/deps/acelite/ace/config-netbsd.h
diff --git a/modules/worldengine/deps/acelite/ace/config-openbsd.h b/deps/acelite/ace/config-openbsd.h
index e928905ad6..e928905ad6 100644
--- a/modules/worldengine/deps/acelite/ace/config-openbsd.h
+++ b/deps/acelite/ace/config-openbsd.h
diff --git a/modules/worldengine/deps/acelite/ace/config-openvms.h b/deps/acelite/ace/config-openvms.h
index 28d8c01c6f..28d8c01c6f 100644
--- a/modules/worldengine/deps/acelite/ace/config-openvms.h
+++ b/deps/acelite/ace/config-openvms.h
diff --git a/modules/worldengine/deps/acelite/ace/config-pharlap.h b/deps/acelite/ace/config-pharlap.h
index dbc933bc57..dbc933bc57 100644
--- a/modules/worldengine/deps/acelite/ace/config-pharlap.h
+++ b/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
index 23e33eccc2..23e33eccc2 100644
--- a/modules/worldengine/deps/acelite/ace/config-posix-nonetworking.h
+++ b/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
index 781b7a8daa..781b7a8daa 100644
--- a/modules/worldengine/deps/acelite/ace/config-posix.h
+++ b/deps/acelite/ace/config-posix.h
diff --git a/modules/worldengine/deps/acelite/ace/config-qnx.h b/deps/acelite/ace/config-qnx.h
index bedcdd26e0..bedcdd26e0 100644
--- a/modules/worldengine/deps/acelite/ace/config-qnx.h
+++ b/deps/acelite/ace/config-qnx.h
diff --git a/modules/worldengine/deps/acelite/ace/config-rtems.h b/deps/acelite/ace/config-rtems.h
index 5943d8237b..5943d8237b 100644
--- a/modules/worldengine/deps/acelite/ace/config-rtems.h
+++ b/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
index 86677fb64f..86677fb64f 100644
--- a/modules/worldengine/deps/acelite/ace/config-suncc-common.h
+++ b/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
index febdc0e628..febdc0e628 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.10.h
+++ b/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
index 07f8b679f3..07f8b679f3 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.11.h
+++ b/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
index c17ae74eea..c17ae74eea 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.4-g++.h
+++ b/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
index 231876110a..231876110a 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.4-sunc++-4.x.h
+++ b/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
index d6313d754b..d6313d754b 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.5.h
+++ b/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
index a6e2f0c36a..a6e2f0c36a 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.6.h
+++ b/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
index d21859e5d1..d21859e5d1 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.7.h
+++ b/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
index b78ee27a18..b78ee27a18 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.8.h
+++ b/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
index 08fe85252e..08fe85252e 100644
--- a/modules/worldengine/deps/acelite/ace/config-sunos5.9.h
+++ b/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
index 9d0ea65e25..9d0ea65e25 100644
--- a/modules/worldengine/deps/acelite/ace/config-vxworks.h
+++ b/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
index d55dfc193e..d55dfc193e 100644
--- a/modules/worldengine/deps/acelite/ace/config-vxworks6.4.h
+++ b/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
index 6af5b39545..6af5b39545 100644
--- a/modules/worldengine/deps/acelite/ace/config-vxworks6.5.h
+++ b/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
index c2373e20c3..c2373e20c3 100644
--- a/modules/worldengine/deps/acelite/ace/config-vxworks6.6.h
+++ b/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
index dd2778795f..dd2778795f 100644
--- a/modules/worldengine/deps/acelite/ace/config-vxworks6.7.h
+++ b/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
index 56d805d086..56d805d086 100644
--- a/modules/worldengine/deps/acelite/ace/config-vxworks6.8.h
+++ b/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
index d792e51798..d792e51798 100644
--- a/modules/worldengine/deps/acelite/ace/config-vxworks6.9.h
+++ b/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
index 316dcb2633..316dcb2633 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-borland.h
+++ b/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
index f1480b2a5f..f1480b2a5f 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-cegcc.h
+++ b/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
index 0e3a0b96cb..0e3a0b96cb 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-common.h
+++ b/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
index 832ecf0f91..832ecf0f91 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-dmc.h
+++ b/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
index 2f603d55ef..2f603d55ef 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-interix.h
+++ b/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
index 36b61cf48c..36b61cf48c 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-mingw.h
+++ b/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
index 939b2663d3..939b2663d3 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-mingw64.h
+++ b/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
index 62dcdae8dd..62dcdae8dd 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc-10.h
+++ b/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
index 8078ffa604..8078ffa604 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc-11.h
+++ b/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
index 0b59cd4468..0b59cd4468 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc-12.h
+++ b/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
index 7aeaf75d5b..7aeaf75d5b 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc-14.h
+++ b/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
index 7aac881e6e..7aac881e6e 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc-7.h
+++ b/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
index c2dfcfddd3..c2dfcfddd3 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc-8.h
+++ b/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
index 19865aa34b..19865aa34b 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc-9.h
+++ b/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
index dfa1f85da0..dfa1f85da0 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32-msvc.h
+++ b/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
index 3217c2b789..3217c2b789 100644
--- a/modules/worldengine/deps/acelite/ace/config-win32.h
+++ b/deps/acelite/ace/config-win32.h
diff --git a/modules/worldengine/deps/acelite/ace/config-windows.h b/deps/acelite/ace/config-windows.h
index b36f01d246..b36f01d246 100644
--- a/modules/worldengine/deps/acelite/ace/config-windows.h
+++ b/deps/acelite/ace/config-windows.h
diff --git a/modules/worldengine/deps/acelite/ace/filecache.mpb b/deps/acelite/ace/filecache.mpb
index 267d612e68..267d612e68 100644
--- a/modules/worldengine/deps/acelite/ace/filecache.mpb
+++ b/deps/acelite/ace/filecache.mpb
diff --git a/modules/worldengine/deps/acelite/ace/iosfwd.h b/deps/acelite/ace/iosfwd.h
index fb38cf0831..fb38cf0831 100644
--- a/modules/worldengine/deps/acelite/ace/iosfwd.h
+++ b/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
index db079938b7..db079938b7 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/arpa/os_inet.h
+++ b/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
index cdcbacabd0..cdcbacabd0 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/net/os_if.h
+++ b/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
index 31d6d650b6..31d6d650b6 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/netinet/os_in.h
+++ b/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
index 6c672144d1..6c672144d1 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/netinet/os_tcp.h
+++ b/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
index 0d2ffe0802..0d2ffe0802 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_aio.h
+++ b/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
index f69a172d5b..f69a172d5b 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_assert.h
+++ b/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
index 4e0af7af1d..4e0af7af1d 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_byteswap.h
+++ b/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
index 2cd6cf761c..2cd6cf761c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_complex.h
+++ b/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
index 1766fcb27f..1766fcb27f 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_cpio.h
+++ b/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
index c82a1a3e4b..c82a1a3e4b 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_ctype.h
+++ b/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
index b5ce357e86..b5ce357e86 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_dirent.h
+++ b/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
index 5bba90e820..5bba90e820 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_dlfcn.h
+++ b/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
index 729844d922..729844d922 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_errno.h
+++ b/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
index 97cb355f7c..97cb355f7c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_fcntl.h
+++ b/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
index e22f8e4982..e22f8e4982 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_fenv.h
+++ b/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
index f6539c59b5..f6539c59b5 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_float.h
+++ b/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
index 0a6f7ae171..0a6f7ae171 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_fmtmsg.h
+++ b/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
index 932e826bdb..932e826bdb 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_fnmatch.h
+++ b/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
index c7d63a25e2..c7d63a25e2 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_ftw.h
+++ b/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
index e1dd8078ef..e1dd8078ef 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_glob.h
+++ b/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
index 07d9ee1b67..07d9ee1b67 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_grp.h
+++ b/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
index 39f237e799..39f237e799 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_iconv.h
+++ b/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
index eacca0e06d..eacca0e06d 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_ifaddrs.h
+++ b/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
index 9f31f1c09c..9f31f1c09c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_intrin.h
+++ b/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
index eca7c256ed..eca7c256ed 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_inttypes.h
+++ b/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
index 0ca2b70620..0ca2b70620 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_iso646.h
+++ b/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
index 957b608bd8..957b608bd8 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_kstat.h
+++ b/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
index 8af5173699..8af5173699 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_langinfo.h
+++ b/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
index 97d5a8e03e..97d5a8e03e 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_libgen.h
+++ b/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
index acb52890ee..acb52890ee 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_limits.h
+++ b/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
index 308527e89c..308527e89c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_local.h
+++ b/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
index 7695cf8eb9..7695cf8eb9 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_math.h
+++ b/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
index fc99b49103..fc99b49103 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_monetary.h
+++ b/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
index a834f7f4c3..a834f7f4c3 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_mqueue.h
+++ b/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
index e8a28ae91c..e8a28ae91c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_ndbm.h
+++ b/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
index 716bf57251..716bf57251 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_netdb.h
+++ b/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
index 6044371385..6044371385 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_nl_types.h
+++ b/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
index 96c77a99f6..96c77a99f6 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_pdh.h
+++ b/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
index 3ea606fa9d..3ea606fa9d 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_pdhmsg.h
+++ b/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
index b1aad483e5..b1aad483e5 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_poll.h
+++ b/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
index b88b800cff..b88b800cff 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_pthread.h
+++ b/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
index 7b98964fec..7b98964fec 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_pwd.h
+++ b/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
index 61f5492452..61f5492452 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_regex.h
+++ b/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
index c69b75315a..c69b75315a 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_sched.h
+++ b/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
index 673b4d2fb5..673b4d2fb5 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_search.h
+++ b/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
index ef9cf00a0f..ef9cf00a0f 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_semaphore.h
+++ b/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
index 7639aeb2c4..7639aeb2c4 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_setjmp.h
+++ b/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
index f9d3d1f38c..f9d3d1f38c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_signal.h
+++ b/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
index af68968375..af68968375 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_spawn.h
+++ b/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
index c93ffb0353..c93ffb0353 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_stdarg.h
+++ b/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
index b4c1c141cf..b4c1c141cf 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_stdbool.h
+++ b/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
index 625a8a44f6..625a8a44f6 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_stddef.h
+++ b/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
index 1c9bc20b7c..1c9bc20b7c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_stdint.h
+++ b/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
index c5a9bac418..c5a9bac418 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_stdio.h
+++ b/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
index d08af453c0..d08af453c0 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_stdlib.h
+++ b/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
index 3b6d34356c..3b6d34356c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_string.h
+++ b/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
index 3120adab20..3120adab20 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_strings.h
+++ b/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
index 3312bbc773..3312bbc773 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_stropts.h
+++ b/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
index 98e4ad9351..98e4ad9351 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_syslog.h
+++ b/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
index f24b9de38c..f24b9de38c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_tar.h
+++ b/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
index 59392d9021..59392d9021 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_termios.h
+++ b/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
index 512ce9fa16..512ce9fa16 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_tgmath.h
+++ b/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
index b6d613b7ab..b6d613b7ab 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_time.h
+++ b/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
index 8668140e1e..8668140e1e 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_trace.h
+++ b/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
index 7f33a689b4..7f33a689b4 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_typeinfo.h
+++ b/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
index 086880336d..086880336d 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_ucontext.h
+++ b/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
index 5033bf6f1d..5033bf6f1d 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_ulimit.h
+++ b/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
index 942a40c431..942a40c431 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_unistd.h
+++ b/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
index 4d7e762791..4d7e762791 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_utime.h
+++ b/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
index 5c44e5e613..5c44e5e613 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_utmpx.h
+++ b/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
index 62280ad222..62280ad222 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_wchar.h
+++ b/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
index 0a7140e795..0a7140e795 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_wctype.h
+++ b/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
index e4a2bd3c7d..e4a2bd3c7d 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/os_wordexp.h
+++ b/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
index ae9053a38d..ae9053a38d 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_ipc.h
+++ b/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
index 6437d7d923..6437d7d923 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_loadavg.h
+++ b/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
index 2f98bf4b79..2f98bf4b79 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_mman.h
+++ b/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
index 83166e37b7..83166e37b7 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_msg.h
+++ b/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
index 377e83b2e1..377e83b2e1 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_pstat.h
+++ b/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
index 437e2d6e49..437e2d6e49 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_resource.h
+++ b/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
index c9888613f5..c9888613f5 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_select.h
+++ b/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
index 1b3cc860a7..1b3cc860a7 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_sem.h
+++ b/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
index c74edab18f..c74edab18f 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_shm.h
+++ b/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
index 19b0eadb7c..19b0eadb7c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_socket.h
+++ b/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
index d179d5f95c..d179d5f95c 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_stat.h
+++ b/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
index 7f274437a6..7f274437a6 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_statvfs.h
+++ b/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
index 79c716ffc0..79c716ffc0 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_sysctl.h
+++ b/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
index 95b595ff28..95b595ff28 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_sysinfo.h
+++ b/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
index ec981cdc17..ec981cdc17 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_time.h
+++ b/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
index 59177fc745..59177fc745 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_timeb.h
+++ b/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
index 3e2313ba02..3e2313ba02 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_times.h
+++ b/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
index bff05e48e9..bff05e48e9 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_types.h
+++ b/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
index 39343824b2..39343824b2 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_uio.h
+++ b/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
index 4459c009ec..4459c009ec 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_un.h
+++ b/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
index d0201507d5..d0201507d5 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_utsname.h
+++ b/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
index eef8b801e6..eef8b801e6 100644
--- a/modules/worldengine/deps/acelite/ace/os_include/sys/os_wait.h
+++ b/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
index 06d6576c95..06d6576c95 100644
--- a/modules/worldengine/deps/acelite/ace/other.mpb
+++ b/deps/acelite/ace/other.mpb
diff --git a/modules/worldengine/deps/acelite/ace/post.h b/deps/acelite/ace/post.h
index b08fe02ad1..b08fe02ad1 100644
--- a/modules/worldengine/deps/acelite/ace/post.h
+++ b/deps/acelite/ace/post.h
diff --git a/modules/worldengine/deps/acelite/ace/pre.h b/deps/acelite/ace/pre.h
index 647fa3d67d..647fa3d67d 100644
--- a/modules/worldengine/deps/acelite/ace/pre.h
+++ b/deps/acelite/ace/pre.h
diff --git a/modules/worldengine/deps/acelite/ace/streams.h b/deps/acelite/ace/streams.h
index 8a6577eebb..8a6577eebb 100644
--- a/modules/worldengine/deps/acelite/ace/streams.h
+++ b/deps/acelite/ace/streams.h
diff --git a/modules/worldengine/deps/acelite/ace/svc_export.h b/deps/acelite/ace/svc_export.h
index f0e8e1db2f..f0e8e1db2f 100644
--- a/modules/worldengine/deps/acelite/ace/svc_export.h
+++ b/deps/acelite/ace/svc_export.h
diff --git a/modules/worldengine/deps/acelite/ace/svcconf.mpb b/deps/acelite/ace/svcconf.mpb
index 882914654b..882914654b 100644
--- a/modules/worldengine/deps/acelite/ace/svcconf.mpb
+++ b/deps/acelite/ace/svcconf.mpb
diff --git a/modules/worldengine/deps/acelite/ace/svcconfgen.mpc b/deps/acelite/ace/svcconfgen.mpc
index c901537095..c901537095 100644
--- a/modules/worldengine/deps/acelite/ace/svcconfgen.mpc
+++ b/deps/acelite/ace/svcconfgen.mpc
diff --git a/modules/worldengine/deps/acelite/ace/token.mpb b/deps/acelite/ace/token.mpb
index 109e052933..109e052933 100644
--- a/modules/worldengine/deps/acelite/ace/token.mpb
+++ b/deps/acelite/ace/token.mpb
diff --git a/modules/worldengine/deps/acelite/ace/uuid.mpb b/deps/acelite/ace/uuid.mpb
index 49b2185b39..49b2185b39 100644
--- a/modules/worldengine/deps/acelite/ace/uuid.mpb
+++ b/deps/acelite/ace/uuid.mpb
diff --git a/modules/worldengine/deps/bzip2/CMakeLists.txt b/deps/bzip2/CMakeLists.txt
index 4cf8944190..c1c450ec61 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
index cc614178cf..cc614178cf 100644
--- a/modules/worldengine/deps/bzip2/LICENSE
+++ b/deps/bzip2/LICENSE
diff --git a/modules/worldengine/deps/bzip2/README b/deps/bzip2/README
index 9fb0f63601..9fb0f63601 100644
--- a/modules/worldengine/deps/bzip2/README
+++ b/deps/bzip2/README
diff --git a/modules/worldengine/deps/bzip2/blocksort.c b/deps/bzip2/blocksort.c
index d0d662cd4e..d0d662cd4e 100644
--- a/modules/worldengine/deps/bzip2/blocksort.c
+++ b/deps/bzip2/blocksort.c
diff --git a/modules/worldengine/deps/bzip2/bzlib.c b/deps/bzip2/bzlib.c
index bd358a793b..bd358a793b 100644
--- a/modules/worldengine/deps/bzip2/bzlib.c
+++ b/deps/bzip2/bzlib.c
diff --git a/modules/worldengine/deps/bzip2/bzlib.h b/deps/bzip2/bzlib.h
index 8277123da8..8277123da8 100644
--- a/modules/worldengine/deps/bzip2/bzlib.h
+++ b/deps/bzip2/bzlib.h
diff --git a/modules/worldengine/deps/bzip2/bzlib_private.h b/deps/bzip2/bzlib_private.h
index 5d0217f463..5d0217f463 100644
--- a/modules/worldengine/deps/bzip2/bzlib_private.h
+++ b/deps/bzip2/bzlib_private.h
diff --git a/modules/worldengine/deps/bzip2/compress.c b/deps/bzip2/compress.c
index caf7696011..caf7696011 100644
--- a/modules/worldengine/deps/bzip2/compress.c
+++ b/deps/bzip2/compress.c
diff --git a/modules/worldengine/deps/bzip2/crctable.c b/deps/bzip2/crctable.c
index 1fea7e946c..1fea7e946c 100644
--- a/modules/worldengine/deps/bzip2/crctable.c
+++ b/deps/bzip2/crctable.c
diff --git a/modules/worldengine/deps/bzip2/decompress.c b/deps/bzip2/decompress.c
index 311f5668f9..311f5668f9 100644
--- a/modules/worldengine/deps/bzip2/decompress.c
+++ b/deps/bzip2/decompress.c
diff --git a/modules/worldengine/deps/bzip2/huffman.c b/deps/bzip2/huffman.c
index 2283fdbc5a..2283fdbc5a 100644
--- a/modules/worldengine/deps/bzip2/huffman.c
+++ b/deps/bzip2/huffman.c
diff --git a/modules/worldengine/deps/bzip2/randtable.c b/deps/bzip2/randtable.c
index 6d62459906..6d62459906 100644
--- a/modules/worldengine/deps/bzip2/randtable.c
+++ b/deps/bzip2/randtable.c
diff --git a/modules/drassil/cmake-utils/.gitignore b/deps/drassil/cmake-utils/.gitignore
index 92da74b036..92da74b036 100644
--- a/modules/drassil/cmake-utils/.gitignore
+++ b/deps/drassil/cmake-utils/.gitignore
diff --git a/modules/drassil/cmake-utils/utils.cmake b/deps/drassil/cmake-utils/utils.cmake
index 6c89684d67..6c89684d67 100644
--- a/modules/drassil/cmake-utils/utils.cmake
+++ b/deps/drassil/cmake-utils/utils.cmake
diff --git a/modules/drassil/mysql-tools/.gitignore b/deps/drassil/mysql-tools/.gitignore
index fa1ea4671a..fa1ea4671a 100644
--- a/modules/drassil/mysql-tools/.gitignore
+++ b/deps/drassil/mysql-tools/.gitignore
diff --git a/modules/drassil/mysql-tools/README b/deps/drassil/mysql-tools/README
index 453829ce72..453829ce72 100644
--- a/modules/drassil/mysql-tools/README
+++ b/deps/drassil/mysql-tools/README
diff --git a/modules/drassil/mysql-tools/bin/dump-parser b/deps/drassil/mysql-tools/bin/dump-parser
index 6d07b528f1..6d07b528f1 100644
--- a/modules/drassil/mysql-tools/bin/dump-parser
+++ b/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
index 66267a989a..66267a989a 100644
--- a/modules/drassil/mysql-tools/bin/mysql.exe
+++ b/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
index 24355c07c3..24355c07c3 100644
--- a/modules/drassil/mysql-tools/bin/mysqldump.exe
+++ b/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
index 8dc3613870..8dc3613870 100644
--- a/modules/drassil/mysql-tools/bin/mysqlimport.exe
+++ b/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
index a38a195f81..a38a195f81 100644
--- a/modules/drassil/mysql-tools/build-dump-parser.sh
+++ b/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
index a9262d4f92..a9262d4f92 100644
--- a/modules/drassil/mysql-tools/dump-parser.c
+++ b/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
index ca71fc41ea..ca71fc41ea 100644
--- a/modules/drassil/mysql-tools/mysql-config.dist
+++ b/deps/drassil/mysql-tools/mysql-config.dist
diff --git a/modules/drassil/mysql-tools/mysql-dump b/deps/drassil/mysql-tools/mysql-dump
index 33e5e35aca..33e5e35aca 100644
--- a/modules/drassil/mysql-tools/mysql-dump
+++ b/deps/drassil/mysql-tools/mysql-dump
diff --git a/modules/drassil/mysql-tools/mysql-import b/deps/drassil/mysql-tools/mysql-import
index ad05e1bd05..ad05e1bd05 100644
--- a/modules/drassil/mysql-tools/mysql-import
+++ b/deps/drassil/mysql-tools/mysql-import
diff --git a/modules/drassil/mysql-tools/mysql-tools b/deps/drassil/mysql-tools/mysql-tools
index 6f2fad77c6..6f2fad77c6 100644
--- a/modules/drassil/mysql-tools/mysql-tools
+++ b/deps/drassil/mysql-tools/mysql-tools
diff --git a/modules/drassil/mysql-tools/shared-def b/deps/drassil/mysql-tools/shared-def
index 6742fcf3b8..6742fcf3b8 100644
--- a/modules/drassil/mysql-tools/shared-def
+++ b/deps/drassil/mysql-tools/shared-def
diff --git a/modules/worldengine/deps/g3dlite/CMakeLists.txt b/deps/g3dlite/CMakeLists.txt
index 8e75bdf179..120b8741e6 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
index 7988d1f314..7988d1f314 100644
--- a/modules/worldengine/deps/g3dlite/Readme.txt
+++ b/deps/g3dlite/Readme.txt
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AABox.h b/deps/g3dlite/include/G3D/AABox.h
index d57320d73e..d57320d73e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/AABox.h
+++ b/deps/g3dlite/include/G3D/AABox.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Any.h b/deps/g3dlite/include/G3D/Any.h
index e2d0fbe7e6..e2d0fbe7e6 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Any.h
+++ b/deps/g3dlite/include/G3D/Any.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AnyVal.h b/deps/g3dlite/include/G3D/AnyVal.h
index 8c1bc72f20..8c1bc72f20 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/AnyVal.h
+++ b/deps/g3dlite/include/G3D/AnyVal.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AreaMemoryManager.h b/deps/g3dlite/include/G3D/AreaMemoryManager.h
index d8d8f71035..d8d8f71035 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/AreaMemoryManager.h
+++ b/deps/g3dlite/include/G3D/AreaMemoryManager.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Array.h b/deps/g3dlite/include/G3D/Array.h
index cc9e1d9dd0..cc9e1d9dd0 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Array.h
+++ b/deps/g3dlite/include/G3D/Array.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/AtomicInt32.h b/deps/g3dlite/include/G3D/AtomicInt32.h
index 2d63f99835..2d63f99835 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/AtomicInt32.h
+++ b/deps/g3dlite/include/G3D/AtomicInt32.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BinaryFormat.h b/deps/g3dlite/include/G3D/BinaryFormat.h
index f6719a1c54..f6719a1c54 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/BinaryFormat.h
+++ b/deps/g3dlite/include/G3D/BinaryFormat.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BinaryInput.h b/deps/g3dlite/include/G3D/BinaryInput.h
index e8a9b88618..e8a9b88618 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/BinaryInput.h
+++ b/deps/g3dlite/include/G3D/BinaryInput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BinaryOutput.h b/deps/g3dlite/include/G3D/BinaryOutput.h
index d81ec56a67..d81ec56a67 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/BinaryOutput.h
+++ b/deps/g3dlite/include/G3D/BinaryOutput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BoundsTrait.h b/deps/g3dlite/include/G3D/BoundsTrait.h
index 15e1418010..15e1418010 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/BoundsTrait.h
+++ b/deps/g3dlite/include/G3D/BoundsTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Box.h b/deps/g3dlite/include/G3D/Box.h
index 82af9125b0..82af9125b0 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Box.h
+++ b/deps/g3dlite/include/G3D/Box.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Box2D.h b/deps/g3dlite/include/G3D/Box2D.h
index 80accad89d..80accad89d 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Box2D.h
+++ b/deps/g3dlite/include/G3D/Box2D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/BumpMapPreprocess.h b/deps/g3dlite/include/G3D/BumpMapPreprocess.h
index 955f99e61b..955f99e61b 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/BumpMapPreprocess.h
+++ b/deps/g3dlite/include/G3D/BumpMapPreprocess.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Capsule.h b/deps/g3dlite/include/G3D/Capsule.h
index baeea3aa82..baeea3aa82 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Capsule.h
+++ b/deps/g3dlite/include/G3D/Capsule.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/CollisionDetection.h b/deps/g3dlite/include/G3D/CollisionDetection.h
index c8fcf5534c..c8fcf5534c 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/CollisionDetection.h
+++ b/deps/g3dlite/include/G3D/CollisionDetection.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color1.h b/deps/g3dlite/include/G3D/Color1.h
index 0f68c84b36..0f68c84b36 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Color1.h
+++ b/deps/g3dlite/include/G3D/Color1.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color1uint8.h b/deps/g3dlite/include/G3D/Color1uint8.h
index 092099d0d1..092099d0d1 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Color1uint8.h
+++ b/deps/g3dlite/include/G3D/Color1uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color3.h b/deps/g3dlite/include/G3D/Color3.h
index bffe434fc2..bffe434fc2 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Color3.h
+++ b/deps/g3dlite/include/G3D/Color3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color3uint8.h b/deps/g3dlite/include/G3D/Color3uint8.h
index 7a1cc79d94..7a1cc79d94 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Color3uint8.h
+++ b/deps/g3dlite/include/G3D/Color3uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color4.h b/deps/g3dlite/include/G3D/Color4.h
index 0be0c25879..0be0c25879 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Color4.h
+++ b/deps/g3dlite/include/G3D/Color4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Color4uint8.h b/deps/g3dlite/include/G3D/Color4uint8.h
index 2cd3c66278..2cd3c66278 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Color4uint8.h
+++ b/deps/g3dlite/include/G3D/Color4uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Cone.h b/deps/g3dlite/include/G3D/Cone.h
index d801a9b348..d801a9b348 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Cone.h
+++ b/deps/g3dlite/include/G3D/Cone.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ConvexPolyhedron.h b/deps/g3dlite/include/G3D/ConvexPolyhedron.h
index a6fdd62cf9..a6fdd62cf9 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/ConvexPolyhedron.h
+++ b/deps/g3dlite/include/G3D/ConvexPolyhedron.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/CoordinateFrame.h b/deps/g3dlite/include/G3D/CoordinateFrame.h
index c83754abb7..c83754abb7 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/CoordinateFrame.h
+++ b/deps/g3dlite/include/G3D/CoordinateFrame.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Crypto.h b/deps/g3dlite/include/G3D/Crypto.h
index 56c816a497..56c816a497 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Crypto.h
+++ b/deps/g3dlite/include/G3D/Crypto.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Cylinder.h b/deps/g3dlite/include/G3D/Cylinder.h
index 85eba77b79..85eba77b79 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Cylinder.h
+++ b/deps/g3dlite/include/G3D/Cylinder.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/EqualsTrait.h b/deps/g3dlite/include/G3D/EqualsTrait.h
index 349cb5088f..349cb5088f 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/EqualsTrait.h
+++ b/deps/g3dlite/include/G3D/EqualsTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/FileSystem.h b/deps/g3dlite/include/G3D/FileSystem.h
index b2a6e86520..b2a6e86520 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/FileSystem.h
+++ b/deps/g3dlite/include/G3D/FileSystem.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/G3D.h b/deps/g3dlite/include/G3D/G3D.h
index 082d643484..082d643484 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/G3D.h
+++ b/deps/g3dlite/include/G3D/G3D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/G3DAll.h b/deps/g3dlite/include/G3D/G3DAll.h
index 1176fe742e..1176fe742e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/G3DAll.h
+++ b/deps/g3dlite/include/G3D/G3DAll.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/G3DGameUnits.h b/deps/g3dlite/include/G3D/G3DGameUnits.h
index e2bc2c811e..e2bc2c811e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/G3DGameUnits.h
+++ b/deps/g3dlite/include/G3D/G3DGameUnits.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GCamera.h b/deps/g3dlite/include/G3D/GCamera.h
index 1b7b2511b4..1b7b2511b4 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/GCamera.h
+++ b/deps/g3dlite/include/G3D/GCamera.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GImage.h b/deps/g3dlite/include/G3D/GImage.h
index 9a6851d32b..9a6851d32b 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/GImage.h
+++ b/deps/g3dlite/include/G3D/GImage.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GLight.h b/deps/g3dlite/include/G3D/GLight.h
index 48e017d365..48e017d365 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/GLight.h
+++ b/deps/g3dlite/include/G3D/GLight.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GMutex.h b/deps/g3dlite/include/G3D/GMutex.h
index 9fe098d10e..9fe098d10e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/GMutex.h
+++ b/deps/g3dlite/include/G3D/GMutex.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GThread.h b/deps/g3dlite/include/G3D/GThread.h
index 58437efc3f..58437efc3f 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/GThread.h
+++ b/deps/g3dlite/include/G3D/GThread.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/GUniqueID.h b/deps/g3dlite/include/G3D/GUniqueID.h
index c8b775c2e6..c8b775c2e6 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/GUniqueID.h
+++ b/deps/g3dlite/include/G3D/GUniqueID.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/HashTrait.h b/deps/g3dlite/include/G3D/HashTrait.h
index 72de3da52f..72de3da52f 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/HashTrait.h
+++ b/deps/g3dlite/include/G3D/HashTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image1.h b/deps/g3dlite/include/G3D/Image1.h
index 711e83f207..711e83f207 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Image1.h
+++ b/deps/g3dlite/include/G3D/Image1.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image1uint8.h b/deps/g3dlite/include/G3D/Image1uint8.h
index f32e022e92..f32e022e92 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Image1uint8.h
+++ b/deps/g3dlite/include/G3D/Image1uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image3.h b/deps/g3dlite/include/G3D/Image3.h
index 13cb8fa7fa..13cb8fa7fa 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Image3.h
+++ b/deps/g3dlite/include/G3D/Image3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image3uint8.h b/deps/g3dlite/include/G3D/Image3uint8.h
index d4fdbc169c..d4fdbc169c 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Image3uint8.h
+++ b/deps/g3dlite/include/G3D/Image3uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image4.h b/deps/g3dlite/include/G3D/Image4.h
index 21d7f1e79b..21d7f1e79b 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Image4.h
+++ b/deps/g3dlite/include/G3D/Image4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Image4uint8.h b/deps/g3dlite/include/G3D/Image4uint8.h
index 46df6b490b..46df6b490b 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Image4uint8.h
+++ b/deps/g3dlite/include/G3D/Image4uint8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ImageFormat.h b/deps/g3dlite/include/G3D/ImageFormat.h
index 15d2564330..15d2564330 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/ImageFormat.h
+++ b/deps/g3dlite/include/G3D/ImageFormat.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Intersect.h b/deps/g3dlite/include/G3D/Intersect.h
index 8dc4d0c685..8dc4d0c685 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Intersect.h
+++ b/deps/g3dlite/include/G3D/Intersect.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/KDTree.h b/deps/g3dlite/include/G3D/KDTree.h
index 4785ef2bae..4785ef2bae 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/KDTree.h
+++ b/deps/g3dlite/include/G3D/KDTree.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Line.h b/deps/g3dlite/include/G3D/Line.h
index 3579a6bece..3579a6bece 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Line.h
+++ b/deps/g3dlite/include/G3D/Line.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/LineSegment.h b/deps/g3dlite/include/G3D/LineSegment.h
index 70210ec7e0..70210ec7e0 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/LineSegment.h
+++ b/deps/g3dlite/include/G3D/LineSegment.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Log.h b/deps/g3dlite/include/G3D/Log.h
index d252d0c1a1..d252d0c1a1 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Log.h
+++ b/deps/g3dlite/include/G3D/Log.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Map2D.h b/deps/g3dlite/include/G3D/Map2D.h
index 9af9f7242c..9af9f7242c 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Map2D.h
+++ b/deps/g3dlite/include/G3D/Map2D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix.h b/deps/g3dlite/include/G3D/Matrix.h
index 3c5394d9a7..3c5394d9a7 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Matrix.h
+++ b/deps/g3dlite/include/G3D/Matrix.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix2.h b/deps/g3dlite/include/G3D/Matrix2.h
index cab70c83e4..cab70c83e4 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Matrix2.h
+++ b/deps/g3dlite/include/G3D/Matrix2.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h b/deps/g3dlite/include/G3D/Matrix3.h
index 8efb3de55e..8efb3de55e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Matrix3.h
+++ b/deps/g3dlite/include/G3D/Matrix3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Matrix4.h b/deps/g3dlite/include/G3D/Matrix4.h
index 6b810ba77e..6b810ba77e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Matrix4.h
+++ b/deps/g3dlite/include/G3D/Matrix4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/MemoryManager.h b/deps/g3dlite/include/G3D/MemoryManager.h
index 15bf6d8be4..15bf6d8be4 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/MemoryManager.h
+++ b/deps/g3dlite/include/G3D/MemoryManager.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/MeshAlg.h b/deps/g3dlite/include/G3D/MeshAlg.h
index da55d13000..da55d13000 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/MeshAlg.h
+++ b/deps/g3dlite/include/G3D/MeshAlg.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/MeshBuilder.h b/deps/g3dlite/include/G3D/MeshBuilder.h
index 9920d59d7d..9920d59d7d 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/MeshBuilder.h
+++ b/deps/g3dlite/include/G3D/MeshBuilder.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/NetAddress.h b/deps/g3dlite/include/G3D/NetAddress.h
index fd5a199593..fd5a199593 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/NetAddress.h
+++ b/deps/g3dlite/include/G3D/NetAddress.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/NetworkDevice.h b/deps/g3dlite/include/G3D/NetworkDevice.h
index 7a3f8ed4ac..7a3f8ed4ac 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/NetworkDevice.h
+++ b/deps/g3dlite/include/G3D/NetworkDevice.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ParseError.h b/deps/g3dlite/include/G3D/ParseError.h
index f02948e3d2..f02948e3d2 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/ParseError.h
+++ b/deps/g3dlite/include/G3D/ParseError.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrame.h b/deps/g3dlite/include/G3D/PhysicsFrame.h
index 9aee5e5a88..9aee5e5a88 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrame.h
+++ b/deps/g3dlite/include/G3D/PhysicsFrame.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrameSpline.h b/deps/g3dlite/include/G3D/PhysicsFrameSpline.h
index 4a21503df3..4a21503df3 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/PhysicsFrameSpline.h
+++ b/deps/g3dlite/include/G3D/PhysicsFrameSpline.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Plane.h b/deps/g3dlite/include/G3D/Plane.h
index 360bcd2bc7..360bcd2bc7 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Plane.h
+++ b/deps/g3dlite/include/G3D/Plane.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PointHashGrid.h b/deps/g3dlite/include/G3D/PointHashGrid.h
index d0b60a88ae..d0b60a88ae 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/PointHashGrid.h
+++ b/deps/g3dlite/include/G3D/PointHashGrid.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PointKDTree.h b/deps/g3dlite/include/G3D/PointKDTree.h
index 151cbd5f2f..151cbd5f2f 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/PointKDTree.h
+++ b/deps/g3dlite/include/G3D/PointKDTree.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Pointer.h b/deps/g3dlite/include/G3D/Pointer.h
index 6e35062a74..6e35062a74 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Pointer.h
+++ b/deps/g3dlite/include/G3D/Pointer.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PositionTrait.h b/deps/g3dlite/include/G3D/PositionTrait.h
index 67a4f64138..67a4f64138 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/PositionTrait.h
+++ b/deps/g3dlite/include/G3D/PositionTrait.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/PrecomputedRandom.h b/deps/g3dlite/include/G3D/PrecomputedRandom.h
index 411d128c58..411d128c58 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/PrecomputedRandom.h
+++ b/deps/g3dlite/include/G3D/PrecomputedRandom.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Quat.h b/deps/g3dlite/include/G3D/Quat.h
index d8fdfafeca..d8fdfafeca 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Quat.h
+++ b/deps/g3dlite/include/G3D/Quat.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Queue.h b/deps/g3dlite/include/G3D/Queue.h
index 36573265d1..36573265d1 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Queue.h
+++ b/deps/g3dlite/include/G3D/Queue.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Random.h b/deps/g3dlite/include/G3D/Random.h
index 54491d06f1..54491d06f1 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Random.h
+++ b/deps/g3dlite/include/G3D/Random.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Ray.h b/deps/g3dlite/include/G3D/Ray.h
index 1d9bf318d4..1d9bf318d4 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Ray.h
+++ b/deps/g3dlite/include/G3D/Ray.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Rect2D.h b/deps/g3dlite/include/G3D/Rect2D.h
index 2fb58c5046..2fb58c5046 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Rect2D.h
+++ b/deps/g3dlite/include/G3D/Rect2D.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ReferenceCount.h b/deps/g3dlite/include/G3D/ReferenceCount.h
index 84591c6d8e..84591c6d8e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/ReferenceCount.h
+++ b/deps/g3dlite/include/G3D/ReferenceCount.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/RegistryUtil.h b/deps/g3dlite/include/G3D/RegistryUtil.h
index 4b47be5f4b..4b47be5f4b 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/RegistryUtil.h
+++ b/deps/g3dlite/include/G3D/RegistryUtil.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Set.h b/deps/g3dlite/include/G3D/Set.h
index 0ea96b880c..0ea96b880c 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Set.h
+++ b/deps/g3dlite/include/G3D/Set.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/SmallArray.h b/deps/g3dlite/include/G3D/SmallArray.h
index 900d2335ee..900d2335ee 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/SmallArray.h
+++ b/deps/g3dlite/include/G3D/SmallArray.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Sphere.h b/deps/g3dlite/include/G3D/Sphere.h
index d1448261d9..d1448261d9 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Sphere.h
+++ b/deps/g3dlite/include/G3D/Sphere.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Spline.h b/deps/g3dlite/include/G3D/Spline.h
index 89f89194f1..89f89194f1 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Spline.h
+++ b/deps/g3dlite/include/G3D/Spline.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Stopwatch.h b/deps/g3dlite/include/G3D/Stopwatch.h
index 3f2aa9c8d8..3f2aa9c8d8 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Stopwatch.h
+++ b/deps/g3dlite/include/G3D/Stopwatch.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/System.h b/deps/g3dlite/include/G3D/System.h
index 39ea842c93..39ea842c93 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/System.h
+++ b/deps/g3dlite/include/G3D/System.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Table.h b/deps/g3dlite/include/G3D/Table.h
index ab0b114b1c..ab0b114b1c 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Table.h
+++ b/deps/g3dlite/include/G3D/Table.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/TextInput.h b/deps/g3dlite/include/G3D/TextInput.h
index 7aefb50ffa..7aefb50ffa 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/TextInput.h
+++ b/deps/g3dlite/include/G3D/TextInput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/TextOutput.h b/deps/g3dlite/include/G3D/TextOutput.h
index 4c22b7d565..4c22b7d565 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/TextOutput.h
+++ b/deps/g3dlite/include/G3D/TextOutput.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/ThreadSet.h b/deps/g3dlite/include/G3D/ThreadSet.h
index 121f1415a1..121f1415a1 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/ThreadSet.h
+++ b/deps/g3dlite/include/G3D/ThreadSet.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Triangle.h b/deps/g3dlite/include/G3D/Triangle.h
index 590dbaad94..590dbaad94 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Triangle.h
+++ b/deps/g3dlite/include/G3D/Triangle.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/UprightFrame.h b/deps/g3dlite/include/G3D/UprightFrame.h
index ad5157cb14..ad5157cb14 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/UprightFrame.h
+++ b/deps/g3dlite/include/G3D/UprightFrame.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector2.h b/deps/g3dlite/include/G3D/Vector2.h
index dba7353785..dba7353785 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Vector2.h
+++ b/deps/g3dlite/include/G3D/Vector2.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector2int16.h b/deps/g3dlite/include/G3D/Vector2int16.h
index ba72266d75..ba72266d75 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Vector2int16.h
+++ b/deps/g3dlite/include/G3D/Vector2int16.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector3.h b/deps/g3dlite/include/G3D/Vector3.h
index b4e684b92e..b4e684b92e 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Vector3.h
+++ b/deps/g3dlite/include/G3D/Vector3.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector3int16.h b/deps/g3dlite/include/G3D/Vector3int16.h
index 6043aea9f6..6043aea9f6 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Vector3int16.h
+++ b/deps/g3dlite/include/G3D/Vector3int16.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector3int32.h b/deps/g3dlite/include/G3D/Vector3int32.h
index c1a6b21e10..c1a6b21e10 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Vector3int32.h
+++ b/deps/g3dlite/include/G3D/Vector3int32.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector4.h b/deps/g3dlite/include/G3D/Vector4.h
index 5e511451f8..5e511451f8 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Vector4.h
+++ b/deps/g3dlite/include/G3D/Vector4.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Vector4int8.h b/deps/g3dlite/include/G3D/Vector4int8.h
index 544b693e8b..544b693e8b 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Vector4int8.h
+++ b/deps/g3dlite/include/G3D/Vector4int8.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/WeakCache.h b/deps/g3dlite/include/G3D/WeakCache.h
index f9fdc4bbd5..f9fdc4bbd5 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/WeakCache.h
+++ b/deps/g3dlite/include/G3D/WeakCache.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/Welder.h b/deps/g3dlite/include/G3D/Welder.h
index 2c2554da7b..2c2554da7b 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/Welder.h
+++ b/deps/g3dlite/include/G3D/Welder.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/WrapMode.h b/deps/g3dlite/include/G3D/WrapMode.h
index 25a2fb4725..25a2fb4725 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/WrapMode.h
+++ b/deps/g3dlite/include/G3D/WrapMode.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/XML.h b/deps/g3dlite/include/G3D/XML.h
index 9ff98f9d17..9ff98f9d17 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/XML.h
+++ b/deps/g3dlite/include/G3D/XML.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/constants.h b/deps/g3dlite/include/G3D/constants.h
index 4121f744e1..4121f744e1 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/constants.h
+++ b/deps/g3dlite/include/G3D/constants.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/debug.h b/deps/g3dlite/include/G3D/debug.h
index a7697fe9c0..a7697fe9c0 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/debug.h
+++ b/deps/g3dlite/include/G3D/debug.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/debugAssert.h b/deps/g3dlite/include/G3D/debugAssert.h
index edff671061..edff671061 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/debugAssert.h
+++ b/deps/g3dlite/include/G3D/debugAssert.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/debugPrintf.h b/deps/g3dlite/include/G3D/debugPrintf.h
index b42151cae9..b42151cae9 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/debugPrintf.h
+++ b/deps/g3dlite/include/G3D/debugPrintf.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/enumclass.h b/deps/g3dlite/include/G3D/enumclass.h
index 2874a630ad..2874a630ad 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/enumclass.h
+++ b/deps/g3dlite/include/G3D/enumclass.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/fileutils.h b/deps/g3dlite/include/G3D/fileutils.h
index 89b4169020..89b4169020 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/fileutils.h
+++ b/deps/g3dlite/include/G3D/fileutils.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/filter.h b/deps/g3dlite/include/G3D/filter.h
index 609477b79c..609477b79c 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/filter.h
+++ b/deps/g3dlite/include/G3D/filter.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/format.h b/deps/g3dlite/include/G3D/format.h
index 3c7f067887..3c7f067887 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/format.h
+++ b/deps/g3dlite/include/G3D/format.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/g3dfnmatch.h b/deps/g3dlite/include/G3D/g3dfnmatch.h
index 464b3927ee..464b3927ee 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/g3dfnmatch.h
+++ b/deps/g3dlite/include/G3D/g3dfnmatch.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/g3dmath.h b/deps/g3dlite/include/G3D/g3dmath.h
index b0c98aeaf0..b0c98aeaf0 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/g3dmath.h
+++ b/deps/g3dlite/include/G3D/g3dmath.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/netheaders.h b/deps/g3dlite/include/G3D/netheaders.h
index a82d7c36f3..a82d7c36f3 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/netheaders.h
+++ b/deps/g3dlite/include/G3D/netheaders.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/networkHelpers.h b/deps/g3dlite/include/G3D/networkHelpers.h
index 7a532d71ee..7a532d71ee 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/networkHelpers.h
+++ b/deps/g3dlite/include/G3D/networkHelpers.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/platform.h b/deps/g3dlite/include/G3D/platform.h
index 65616f0b53..65616f0b53 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/platform.h
+++ b/deps/g3dlite/include/G3D/platform.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/prompt.h b/deps/g3dlite/include/G3D/prompt.h
index c6df628099..c6df628099 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/prompt.h
+++ b/deps/g3dlite/include/G3D/prompt.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/serialize.h b/deps/g3dlite/include/G3D/serialize.h
index 2382c0ee0f..2382c0ee0f 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/serialize.h
+++ b/deps/g3dlite/include/G3D/serialize.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/splinefunc.h b/deps/g3dlite/include/G3D/splinefunc.h
index 3f3a018c29..3f3a018c29 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/splinefunc.h
+++ b/deps/g3dlite/include/G3D/splinefunc.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/stringutils.h b/deps/g3dlite/include/G3D/stringutils.h
index 42a4886521..42a4886521 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/stringutils.h
+++ b/deps/g3dlite/include/G3D/stringutils.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/uint128.h b/deps/g3dlite/include/G3D/uint128.h
index da1af3ec27..da1af3ec27 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/uint128.h
+++ b/deps/g3dlite/include/G3D/uint128.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/units.h b/deps/g3dlite/include/G3D/units.h
index 2e30304dc6..2e30304dc6 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/units.h
+++ b/deps/g3dlite/include/G3D/units.h
diff --git a/modules/worldengine/deps/g3dlite/include/G3D/vectorMath.h b/deps/g3dlite/include/G3D/vectorMath.h
index ac6d2b32e9..ac6d2b32e9 100644
--- a/modules/worldengine/deps/g3dlite/include/G3D/vectorMath.h
+++ b/deps/g3dlite/include/G3D/vectorMath.h
diff --git a/modules/worldengine/deps/g3dlite/source/AABox.cpp b/deps/g3dlite/source/AABox.cpp
index 8e66456c01..8e66456c01 100644
--- a/modules/worldengine/deps/g3dlite/source/AABox.cpp
+++ b/deps/g3dlite/source/AABox.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Any.cpp b/deps/g3dlite/source/Any.cpp
index 92159bb186..92159bb186 100644
--- a/modules/worldengine/deps/g3dlite/source/Any.cpp
+++ b/deps/g3dlite/source/Any.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/AnyVal.cpp b/deps/g3dlite/source/AnyVal.cpp
index 7b98486523..7b98486523 100644
--- a/modules/worldengine/deps/g3dlite/source/AnyVal.cpp
+++ b/deps/g3dlite/source/AnyVal.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/AreaMemoryManager.cpp b/deps/g3dlite/source/AreaMemoryManager.cpp
index 00cb33dc91..00cb33dc91 100644
--- a/modules/worldengine/deps/g3dlite/source/AreaMemoryManager.cpp
+++ b/deps/g3dlite/source/AreaMemoryManager.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BinaryFormat.cpp b/deps/g3dlite/source/BinaryFormat.cpp
index d3991378f4..d3991378f4 100644
--- a/modules/worldengine/deps/g3dlite/source/BinaryFormat.cpp
+++ b/deps/g3dlite/source/BinaryFormat.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BinaryInput.cpp b/deps/g3dlite/source/BinaryInput.cpp
index 19ab2722c5..19ab2722c5 100644
--- a/modules/worldengine/deps/g3dlite/source/BinaryInput.cpp
+++ b/deps/g3dlite/source/BinaryInput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BinaryOutput.cpp b/deps/g3dlite/source/BinaryOutput.cpp
index 81fa982220..81fa982220 100644
--- a/modules/worldengine/deps/g3dlite/source/BinaryOutput.cpp
+++ b/deps/g3dlite/source/BinaryOutput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Box.cpp b/deps/g3dlite/source/Box.cpp
index f7c112ae3a..f7c112ae3a 100644
--- a/modules/worldengine/deps/g3dlite/source/Box.cpp
+++ b/deps/g3dlite/source/Box.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Box2D.cpp b/deps/g3dlite/source/Box2D.cpp
index ea5a47af1a..ea5a47af1a 100644
--- a/modules/worldengine/deps/g3dlite/source/Box2D.cpp
+++ b/deps/g3dlite/source/Box2D.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/BumpMapPreprocess.cpp b/deps/g3dlite/source/BumpMapPreprocess.cpp
index 20281caf8c..20281caf8c 100644
--- a/modules/worldengine/deps/g3dlite/source/BumpMapPreprocess.cpp
+++ b/deps/g3dlite/source/BumpMapPreprocess.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Capsule.cpp b/deps/g3dlite/source/Capsule.cpp
index 2ad3891c96..2ad3891c96 100644
--- a/modules/worldengine/deps/g3dlite/source/Capsule.cpp
+++ b/deps/g3dlite/source/Capsule.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp b/deps/g3dlite/source/CollisionDetection.cpp
index 4bc15d9fe4..4bc15d9fe4 100644
--- a/modules/worldengine/deps/g3dlite/source/CollisionDetection.cpp
+++ b/deps/g3dlite/source/CollisionDetection.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color1.cpp b/deps/g3dlite/source/Color1.cpp
index 04f3f9412b..04f3f9412b 100644
--- a/modules/worldengine/deps/g3dlite/source/Color1.cpp
+++ b/deps/g3dlite/source/Color1.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color1uint8.cpp b/deps/g3dlite/source/Color1uint8.cpp
index 21cd564ba9..21cd564ba9 100644
--- a/modules/worldengine/deps/g3dlite/source/Color1uint8.cpp
+++ b/deps/g3dlite/source/Color1uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color3.cpp b/deps/g3dlite/source/Color3.cpp
index deb0bd87ee..deb0bd87ee 100644
--- a/modules/worldengine/deps/g3dlite/source/Color3.cpp
+++ b/deps/g3dlite/source/Color3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color3uint8.cpp b/deps/g3dlite/source/Color3uint8.cpp
index a744710c75..a744710c75 100644
--- a/modules/worldengine/deps/g3dlite/source/Color3uint8.cpp
+++ b/deps/g3dlite/source/Color3uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color4.cpp b/deps/g3dlite/source/Color4.cpp
index eab09eb9c7..eab09eb9c7 100644
--- a/modules/worldengine/deps/g3dlite/source/Color4.cpp
+++ b/deps/g3dlite/source/Color4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Color4uint8.cpp b/deps/g3dlite/source/Color4uint8.cpp
index 5cc3a578ac..5cc3a578ac 100644
--- a/modules/worldengine/deps/g3dlite/source/Color4uint8.cpp
+++ b/deps/g3dlite/source/Color4uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Cone.cpp b/deps/g3dlite/source/Cone.cpp
index 3104b8424a..3104b8424a 100644
--- a/modules/worldengine/deps/g3dlite/source/Cone.cpp
+++ b/deps/g3dlite/source/Cone.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ConvexPolyhedron.cpp b/deps/g3dlite/source/ConvexPolyhedron.cpp
index 5fa76e3ed4..5fa76e3ed4 100644
--- a/modules/worldengine/deps/g3dlite/source/ConvexPolyhedron.cpp
+++ b/deps/g3dlite/source/ConvexPolyhedron.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/CoordinateFrame.cpp b/deps/g3dlite/source/CoordinateFrame.cpp
index 7f9a4c098a..7f9a4c098a 100644
--- a/modules/worldengine/deps/g3dlite/source/CoordinateFrame.cpp
+++ b/deps/g3dlite/source/CoordinateFrame.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Crypto.cpp b/deps/g3dlite/source/Crypto.cpp
index c69b23375c..c69b23375c 100644
--- a/modules/worldengine/deps/g3dlite/source/Crypto.cpp
+++ b/deps/g3dlite/source/Crypto.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Crypto_md5.cpp b/deps/g3dlite/source/Crypto_md5.cpp
index c7ee535d61..c7ee535d61 100644
--- a/modules/worldengine/deps/g3dlite/source/Crypto_md5.cpp
+++ b/deps/g3dlite/source/Crypto_md5.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Cylinder.cpp b/deps/g3dlite/source/Cylinder.cpp
index 7a7b9f9440..7a7b9f9440 100644
--- a/modules/worldengine/deps/g3dlite/source/Cylinder.cpp
+++ b/deps/g3dlite/source/Cylinder.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/FileSystem.cpp b/deps/g3dlite/source/FileSystem.cpp
index f082937a90..f082937a90 100644
--- a/modules/worldengine/deps/g3dlite/source/FileSystem.cpp
+++ b/deps/g3dlite/source/FileSystem.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GCamera.cpp b/deps/g3dlite/source/GCamera.cpp
index 0ffc7eb737..0ffc7eb737 100644
--- a/modules/worldengine/deps/g3dlite/source/GCamera.cpp
+++ b/deps/g3dlite/source/GCamera.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage.cpp b/deps/g3dlite/source/GImage.cpp
index 19a2b1e71f..19a2b1e71f 100644
--- a/modules/worldengine/deps/g3dlite/source/GImage.cpp
+++ b/deps/g3dlite/source/GImage.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_bayer.cpp b/deps/g3dlite/source/GImage_bayer.cpp
index 3d08e8ade5..3d08e8ade5 100644
--- a/modules/worldengine/deps/g3dlite/source/GImage_bayer.cpp
+++ b/deps/g3dlite/source/GImage_bayer.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_bmp.cpp b/deps/g3dlite/source/GImage_bmp.cpp
index 425a7e1a1d..425a7e1a1d 100644
--- a/modules/worldengine/deps/g3dlite/source/GImage_bmp.cpp
+++ b/deps/g3dlite/source/GImage_bmp.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_jpeg.cpp b/deps/g3dlite/source/GImage_jpeg.cpp
index 0b0521f31e..0b0521f31e 100644
--- a/modules/worldengine/deps/g3dlite/source/GImage_jpeg.cpp
+++ b/deps/g3dlite/source/GImage_jpeg.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_png.cpp b/deps/g3dlite/source/GImage_png.cpp
index 875c7015cd..875c7015cd 100644
--- a/modules/worldengine/deps/g3dlite/source/GImage_png.cpp
+++ b/deps/g3dlite/source/GImage_png.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_ppm.cpp b/deps/g3dlite/source/GImage_ppm.cpp
index f3065c6038..f3065c6038 100644
--- a/modules/worldengine/deps/g3dlite/source/GImage_ppm.cpp
+++ b/deps/g3dlite/source/GImage_ppm.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GImage_tga.cpp b/deps/g3dlite/source/GImage_tga.cpp
index fdcd59af72..fdcd59af72 100644
--- a/modules/worldengine/deps/g3dlite/source/GImage_tga.cpp
+++ b/deps/g3dlite/source/GImage_tga.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GLight.cpp b/deps/g3dlite/source/GLight.cpp
index 553b493c1a..553b493c1a 100644
--- a/modules/worldengine/deps/g3dlite/source/GLight.cpp
+++ b/deps/g3dlite/source/GLight.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GThread.cpp b/deps/g3dlite/source/GThread.cpp
index 607e4b3572..607e4b3572 100644
--- a/modules/worldengine/deps/g3dlite/source/GThread.cpp
+++ b/deps/g3dlite/source/GThread.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/GUniqueID.cpp b/deps/g3dlite/source/GUniqueID.cpp
index 84c853e0e3..84c853e0e3 100644
--- a/modules/worldengine/deps/g3dlite/source/GUniqueID.cpp
+++ b/deps/g3dlite/source/GUniqueID.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image1.cpp b/deps/g3dlite/source/Image1.cpp
index a61f7faa63..a61f7faa63 100644
--- a/modules/worldengine/deps/g3dlite/source/Image1.cpp
+++ b/deps/g3dlite/source/Image1.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image1uint8.cpp b/deps/g3dlite/source/Image1uint8.cpp
index de2cbbc130..de2cbbc130 100644
--- a/modules/worldengine/deps/g3dlite/source/Image1uint8.cpp
+++ b/deps/g3dlite/source/Image1uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image3.cpp b/deps/g3dlite/source/Image3.cpp
index 0d85bdf45d..0d85bdf45d 100644
--- a/modules/worldengine/deps/g3dlite/source/Image3.cpp
+++ b/deps/g3dlite/source/Image3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image3uint8.cpp b/deps/g3dlite/source/Image3uint8.cpp
index 86595bbd1f..86595bbd1f 100644
--- a/modules/worldengine/deps/g3dlite/source/Image3uint8.cpp
+++ b/deps/g3dlite/source/Image3uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image4.cpp b/deps/g3dlite/source/Image4.cpp
index c6f2b10640..c6f2b10640 100644
--- a/modules/worldengine/deps/g3dlite/source/Image4.cpp
+++ b/deps/g3dlite/source/Image4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Image4uint8.cpp b/deps/g3dlite/source/Image4uint8.cpp
index a94ddb12d0..a94ddb12d0 100644
--- a/modules/worldengine/deps/g3dlite/source/Image4uint8.cpp
+++ b/deps/g3dlite/source/Image4uint8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ImageFormat.cpp b/deps/g3dlite/source/ImageFormat.cpp
index 46618c6448..46618c6448 100644
--- a/modules/worldengine/deps/g3dlite/source/ImageFormat.cpp
+++ b/deps/g3dlite/source/ImageFormat.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ImageFormat_convert.cpp b/deps/g3dlite/source/ImageFormat_convert.cpp
index ecefe6319c..ecefe6319c 100644
--- a/modules/worldengine/deps/g3dlite/source/ImageFormat_convert.cpp
+++ b/deps/g3dlite/source/ImageFormat_convert.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Intersect.cpp b/deps/g3dlite/source/Intersect.cpp
index 929a2e4e67..929a2e4e67 100644
--- a/modules/worldengine/deps/g3dlite/source/Intersect.cpp
+++ b/deps/g3dlite/source/Intersect.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Line.cpp b/deps/g3dlite/source/Line.cpp
index 195ae7197f..195ae7197f 100644
--- a/modules/worldengine/deps/g3dlite/source/Line.cpp
+++ b/deps/g3dlite/source/Line.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/LineSegment.cpp b/deps/g3dlite/source/LineSegment.cpp
index 754600ad55..754600ad55 100644
--- a/modules/worldengine/deps/g3dlite/source/LineSegment.cpp
+++ b/deps/g3dlite/source/LineSegment.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Log.cpp b/deps/g3dlite/source/Log.cpp
index f437351cfb..f437351cfb 100644
--- a/modules/worldengine/deps/g3dlite/source/Log.cpp
+++ b/deps/g3dlite/source/Log.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Matrix.cpp b/deps/g3dlite/source/Matrix.cpp
index 7a668e59e2..7a668e59e2 100644
--- a/modules/worldengine/deps/g3dlite/source/Matrix.cpp
+++ b/deps/g3dlite/source/Matrix.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Matrix3.cpp b/deps/g3dlite/source/Matrix3.cpp
index 7e4de99621..7e4de99621 100644
--- a/modules/worldengine/deps/g3dlite/source/Matrix3.cpp
+++ b/deps/g3dlite/source/Matrix3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Matrix4.cpp b/deps/g3dlite/source/Matrix4.cpp
index fbc918f8f3..fbc918f8f3 100644
--- a/modules/worldengine/deps/g3dlite/source/Matrix4.cpp
+++ b/deps/g3dlite/source/Matrix4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MemoryManager.cpp b/deps/g3dlite/source/MemoryManager.cpp
index 240188a1f0..240188a1f0 100644
--- a/modules/worldengine/deps/g3dlite/source/MemoryManager.cpp
+++ b/deps/g3dlite/source/MemoryManager.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshAlg.cpp b/deps/g3dlite/source/MeshAlg.cpp
index 626fed9292..626fed9292 100644
--- a/modules/worldengine/deps/g3dlite/source/MeshAlg.cpp
+++ b/deps/g3dlite/source/MeshAlg.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshAlgAdjacency.cpp b/deps/g3dlite/source/MeshAlgAdjacency.cpp
index f0bf338213..f0bf338213 100644
--- a/modules/worldengine/deps/g3dlite/source/MeshAlgAdjacency.cpp
+++ b/deps/g3dlite/source/MeshAlgAdjacency.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshAlgWeld.cpp b/deps/g3dlite/source/MeshAlgWeld.cpp
index 6067f17c2f..6067f17c2f 100644
--- a/modules/worldengine/deps/g3dlite/source/MeshAlgWeld.cpp
+++ b/deps/g3dlite/source/MeshAlgWeld.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/MeshBuilder.cpp b/deps/g3dlite/source/MeshBuilder.cpp
index 1bf2bab5d1..1bf2bab5d1 100644
--- a/modules/worldengine/deps/g3dlite/source/MeshBuilder.cpp
+++ b/deps/g3dlite/source/MeshBuilder.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/NetAddress.cpp b/deps/g3dlite/source/NetAddress.cpp
index 64d692d476..64d692d476 100644
--- a/modules/worldengine/deps/g3dlite/source/NetAddress.cpp
+++ b/deps/g3dlite/source/NetAddress.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/NetworkDevice.cpp b/deps/g3dlite/source/NetworkDevice.cpp
index 1fc794479f..1fc794479f 100644
--- a/modules/worldengine/deps/g3dlite/source/NetworkDevice.cpp
+++ b/deps/g3dlite/source/NetworkDevice.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/PhysicsFrame.cpp b/deps/g3dlite/source/PhysicsFrame.cpp
index 30fbdf8d61..30fbdf8d61 100644
--- a/modules/worldengine/deps/g3dlite/source/PhysicsFrame.cpp
+++ b/deps/g3dlite/source/PhysicsFrame.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/PhysicsFrameSpline.cpp b/deps/g3dlite/source/PhysicsFrameSpline.cpp
index 2dfdb6f913..2dfdb6f913 100644
--- a/modules/worldengine/deps/g3dlite/source/PhysicsFrameSpline.cpp
+++ b/deps/g3dlite/source/PhysicsFrameSpline.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Plane.cpp b/deps/g3dlite/source/Plane.cpp
index 9b7991c033..9b7991c033 100644
--- a/modules/worldengine/deps/g3dlite/source/Plane.cpp
+++ b/deps/g3dlite/source/Plane.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/PrecomputedRandom.cpp b/deps/g3dlite/source/PrecomputedRandom.cpp
index 387ded3519..387ded3519 100644
--- a/modules/worldengine/deps/g3dlite/source/PrecomputedRandom.cpp
+++ b/deps/g3dlite/source/PrecomputedRandom.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Quat.cpp b/deps/g3dlite/source/Quat.cpp
index e06483b44c..e06483b44c 100644
--- a/modules/worldengine/deps/g3dlite/source/Quat.cpp
+++ b/deps/g3dlite/source/Quat.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Random.cpp b/deps/g3dlite/source/Random.cpp
index 2dda744a1a..2dda744a1a 100644
--- a/modules/worldengine/deps/g3dlite/source/Random.cpp
+++ b/deps/g3dlite/source/Random.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Ray.cpp b/deps/g3dlite/source/Ray.cpp
index 0436ef0b32..0436ef0b32 100644
--- a/modules/worldengine/deps/g3dlite/source/Ray.cpp
+++ b/deps/g3dlite/source/Ray.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Rect2D.cpp b/deps/g3dlite/source/Rect2D.cpp
index e4148315a5..e4148315a5 100644
--- a/modules/worldengine/deps/g3dlite/source/Rect2D.cpp
+++ b/deps/g3dlite/source/Rect2D.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ReferenceCount.cpp b/deps/g3dlite/source/ReferenceCount.cpp
index 2e1f117e0d..2e1f117e0d 100644
--- a/modules/worldengine/deps/g3dlite/source/ReferenceCount.cpp
+++ b/deps/g3dlite/source/ReferenceCount.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/RegistryUtil.cpp b/deps/g3dlite/source/RegistryUtil.cpp
index 7c9e56f79a..7c9e56f79a 100644
--- a/modules/worldengine/deps/g3dlite/source/RegistryUtil.cpp
+++ b/deps/g3dlite/source/RegistryUtil.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Sphere.cpp b/deps/g3dlite/source/Sphere.cpp
index 4ed0811cb2..4ed0811cb2 100644
--- a/modules/worldengine/deps/g3dlite/source/Sphere.cpp
+++ b/deps/g3dlite/source/Sphere.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/SplineBase.cpp b/deps/g3dlite/source/SplineBase.cpp
index 41221624b0..41221624b0 100644
--- a/modules/worldengine/deps/g3dlite/source/SplineBase.cpp
+++ b/deps/g3dlite/source/SplineBase.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Stopwatch.cpp b/deps/g3dlite/source/Stopwatch.cpp
index 9b785d5029..9b785d5029 100644
--- a/modules/worldengine/deps/g3dlite/source/Stopwatch.cpp
+++ b/deps/g3dlite/source/Stopwatch.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/System.cpp b/deps/g3dlite/source/System.cpp
index 281104d39f..281104d39f 100644
--- a/modules/worldengine/deps/g3dlite/source/System.cpp
+++ b/deps/g3dlite/source/System.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/TextInput.cpp b/deps/g3dlite/source/TextInput.cpp
index 354d0de13c..354d0de13c 100644
--- a/modules/worldengine/deps/g3dlite/source/TextInput.cpp
+++ b/deps/g3dlite/source/TextInput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/TextOutput.cpp b/deps/g3dlite/source/TextOutput.cpp
index 3257f6fb9c..3257f6fb9c 100644
--- a/modules/worldengine/deps/g3dlite/source/TextOutput.cpp
+++ b/deps/g3dlite/source/TextOutput.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/ThreadSet.cpp b/deps/g3dlite/source/ThreadSet.cpp
index ee3895fe9d..ee3895fe9d 100644
--- a/modules/worldengine/deps/g3dlite/source/ThreadSet.cpp
+++ b/deps/g3dlite/source/ThreadSet.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Triangle.cpp b/deps/g3dlite/source/Triangle.cpp
index 253438ad5f..253438ad5f 100644
--- a/modules/worldengine/deps/g3dlite/source/Triangle.cpp
+++ b/deps/g3dlite/source/Triangle.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/UprightFrame.cpp b/deps/g3dlite/source/UprightFrame.cpp
index c80264bf4e..c80264bf4e 100644
--- a/modules/worldengine/deps/g3dlite/source/UprightFrame.cpp
+++ b/deps/g3dlite/source/UprightFrame.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector2.cpp b/deps/g3dlite/source/Vector2.cpp
index ec0737c375..ec0737c375 100644
--- a/modules/worldengine/deps/g3dlite/source/Vector2.cpp
+++ b/deps/g3dlite/source/Vector2.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector2int16.cpp b/deps/g3dlite/source/Vector2int16.cpp
index 2a4035a4d0..2a4035a4d0 100644
--- a/modules/worldengine/deps/g3dlite/source/Vector2int16.cpp
+++ b/deps/g3dlite/source/Vector2int16.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector3.cpp b/deps/g3dlite/source/Vector3.cpp
index 55343e96ec..55343e96ec 100644
--- a/modules/worldengine/deps/g3dlite/source/Vector3.cpp
+++ b/deps/g3dlite/source/Vector3.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector3int16.cpp b/deps/g3dlite/source/Vector3int16.cpp
index 44069b85d8..44069b85d8 100644
--- a/modules/worldengine/deps/g3dlite/source/Vector3int16.cpp
+++ b/deps/g3dlite/source/Vector3int16.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector3int32.cpp b/deps/g3dlite/source/Vector3int32.cpp
index 3bd8e9f2bc..3bd8e9f2bc 100644
--- a/modules/worldengine/deps/g3dlite/source/Vector3int32.cpp
+++ b/deps/g3dlite/source/Vector3int32.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector4.cpp b/deps/g3dlite/source/Vector4.cpp
index b5f23d6995..b5f23d6995 100644
--- a/modules/worldengine/deps/g3dlite/source/Vector4.cpp
+++ b/deps/g3dlite/source/Vector4.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Vector4int8.cpp b/deps/g3dlite/source/Vector4int8.cpp
index 70bd143e01..70bd143e01 100644
--- a/modules/worldengine/deps/g3dlite/source/Vector4int8.cpp
+++ b/deps/g3dlite/source/Vector4int8.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/Welder.cpp b/deps/g3dlite/source/Welder.cpp
index 2db47722e6..2db47722e6 100644
--- a/modules/worldengine/deps/g3dlite/source/Welder.cpp
+++ b/deps/g3dlite/source/Welder.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/WinMain.cpp b/deps/g3dlite/source/WinMain.cpp
index 3cee71084e..3cee71084e 100644
--- a/modules/worldengine/deps/g3dlite/source/WinMain.cpp
+++ b/deps/g3dlite/source/WinMain.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/XML.cpp b/deps/g3dlite/source/XML.cpp
index 51f1a549ba..51f1a549ba 100644
--- a/modules/worldengine/deps/g3dlite/source/XML.cpp
+++ b/deps/g3dlite/source/XML.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/constants.cpp b/deps/g3dlite/source/constants.cpp
index 9ee3eb8736..9ee3eb8736 100644
--- a/modules/worldengine/deps/g3dlite/source/constants.cpp
+++ b/deps/g3dlite/source/constants.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/debugAssert.cpp b/deps/g3dlite/source/debugAssert.cpp
index 41aad02c64..41aad02c64 100644
--- a/modules/worldengine/deps/g3dlite/source/debugAssert.cpp
+++ b/deps/g3dlite/source/debugAssert.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/fileutils.cpp b/deps/g3dlite/source/fileutils.cpp
index 1867bf3338..1867bf3338 100644
--- a/modules/worldengine/deps/g3dlite/source/fileutils.cpp
+++ b/deps/g3dlite/source/fileutils.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/filter.cpp b/deps/g3dlite/source/filter.cpp
index 72d6f0e05a..72d6f0e05a 100644
--- a/modules/worldengine/deps/g3dlite/source/filter.cpp
+++ b/deps/g3dlite/source/filter.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/format.cpp b/deps/g3dlite/source/format.cpp
index d9d1b51639..d9d1b51639 100644
--- a/modules/worldengine/deps/g3dlite/source/format.cpp
+++ b/deps/g3dlite/source/format.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/g3dfnmatch.cpp b/deps/g3dlite/source/g3dfnmatch.cpp
index 2d24c4126e..2d24c4126e 100644
--- a/modules/worldengine/deps/g3dlite/source/g3dfnmatch.cpp
+++ b/deps/g3dlite/source/g3dfnmatch.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/g3dmath.cpp b/deps/g3dlite/source/g3dmath.cpp
index e846f8c608..e846f8c608 100644
--- a/modules/worldengine/deps/g3dlite/source/g3dmath.cpp
+++ b/deps/g3dlite/source/g3dmath.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/license.cpp b/deps/g3dlite/source/license.cpp
index ada04bbd45..ada04bbd45 100644
--- a/modules/worldengine/deps/g3dlite/source/license.cpp
+++ b/deps/g3dlite/source/license.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/prompt.cpp b/deps/g3dlite/source/prompt.cpp
index d2c6f09803..d2c6f09803 100644
--- a/modules/worldengine/deps/g3dlite/source/prompt.cpp
+++ b/deps/g3dlite/source/prompt.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/stringutils.cpp b/deps/g3dlite/source/stringutils.cpp
index c3876ebb6a..c3876ebb6a 100644
--- a/modules/worldengine/deps/g3dlite/source/stringutils.cpp
+++ b/deps/g3dlite/source/stringutils.cpp
diff --git a/modules/worldengine/deps/g3dlite/source/uint128.cpp b/deps/g3dlite/source/uint128.cpp
index 1f596fc3e5..1f596fc3e5 100644
--- a/modules/worldengine/deps/g3dlite/source/uint128.cpp
+++ b/deps/g3dlite/source/uint128.cpp
diff --git a/modules/worldengine/deps/gsoap/CMakeLists.txt b/deps/gsoap/CMakeLists.txt
index bdcadf6e4d..bdcadf6e4d 100644
--- a/modules/worldengine/deps/gsoap/CMakeLists.txt
+++ b/deps/gsoap/CMakeLists.txt
diff --git a/modules/worldengine/deps/gsoap/gsoap.stub b/deps/gsoap/gsoap.stub
index be215b4665..be215b4665 100644
--- a/modules/worldengine/deps/gsoap/gsoap.stub
+++ b/deps/gsoap/gsoap.stub
diff --git a/modules/worldengine/deps/gsoap/soapC.cpp b/deps/gsoap/soapC.cpp
index cc332c4854..cc332c4854 100644
--- a/modules/worldengine/deps/gsoap/soapC.cpp
+++ b/deps/gsoap/soapC.cpp
diff --git a/modules/worldengine/deps/gsoap/soapH.h b/deps/gsoap/soapH.h
index f3def95426..f3def95426 100644
--- a/modules/worldengine/deps/gsoap/soapH.h
+++ b/deps/gsoap/soapH.h
diff --git a/modules/worldengine/deps/gsoap/soapServer.cpp b/deps/gsoap/soapServer.cpp
index f8fa479718..f8fa479718 100644
--- a/modules/worldengine/deps/gsoap/soapServer.cpp
+++ b/deps/gsoap/soapServer.cpp
diff --git a/modules/worldengine/deps/gsoap/soapStub.h b/deps/gsoap/soapStub.h
index ce1a2546ef..ce1a2546ef 100644
--- a/modules/worldengine/deps/gsoap/soapStub.h
+++ b/deps/gsoap/soapStub.h
diff --git a/modules/worldengine/deps/gsoap/stdsoap2.cpp b/deps/gsoap/stdsoap2.cpp
index bec1d4b02a..bec1d4b02a 100644
--- a/modules/worldengine/deps/gsoap/stdsoap2.cpp
+++ b/deps/gsoap/stdsoap2.cpp
diff --git a/modules/worldengine/deps/gsoap/stdsoap2.h b/deps/gsoap/stdsoap2.h
index 7b1a0eb8b7..7b1a0eb8b7 100644
--- a/modules/worldengine/deps/gsoap/stdsoap2.h
+++ b/deps/gsoap/stdsoap2.h
diff --git a/modules/worldengine/deps/gsoap/tc_upgrades.txt b/deps/gsoap/tc_upgrades.txt
index cda096cd0f..cda096cd0f 100644
--- a/modules/worldengine/deps/gsoap/tc_upgrades.txt
+++ b/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
index b791a600fb..b791a600fb 100644
--- a/modules/hw-core/bash-lib-event/src/hooks.sh
+++ b/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
index d3af413e9c..d3af413e9c 100755..100644
--- a/modules/hw-core/bash-lib-git/bin/git-subtree-list
+++ b/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
index 08820e6405..08820e6405 100644
--- a/modules/hw-core/bash-lib-git/src/subtree.sh
+++ b/deps/hw-core/bash-lib-git/src/subtree.sh
diff --git a/modules/worldengine/deps/jemalloc/CMakeLists.txt b/deps/jemalloc/CMakeLists.txt
index 7bb7d55519..8e937b67c1 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
index e308632a81..e308632a81 100644
--- a/modules/worldengine/deps/jemalloc/COPYING
+++ b/deps/jemalloc/COPYING
diff --git a/modules/worldengine/deps/jemalloc/ChangeLog b/deps/jemalloc/ChangeLog
index ee1b7ead39..ee1b7ead39 100644
--- a/modules/worldengine/deps/jemalloc/ChangeLog
+++ b/deps/jemalloc/ChangeLog
diff --git a/modules/worldengine/deps/jemalloc/README b/deps/jemalloc/README
index 3a6e0d2725..3a6e0d2725 100644
--- a/modules/worldengine/deps/jemalloc/README
+++ b/deps/jemalloc/README
diff --git a/modules/worldengine/deps/jemalloc/TC_NOTE.txt b/deps/jemalloc/TC_NOTE.txt
index 7a44e3563c..7a44e3563c 100644
--- a/modules/worldengine/deps/jemalloc/TC_NOTE.txt
+++ b/deps/jemalloc/TC_NOTE.txt
diff --git a/modules/worldengine/deps/jemalloc/VERSION b/deps/jemalloc/VERSION
index dace31ba7b..dace31ba7b 100644
--- a/modules/worldengine/deps/jemalloc/VERSION
+++ b/deps/jemalloc/VERSION
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena.h b/deps/jemalloc/include/jemalloc/internal/arena.h
index 9d000c03de..9d000c03de 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/arena.h
+++ b/deps/jemalloc/include/jemalloc/internal/arena.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic.h b/deps/jemalloc/include/jemalloc/internal/atomic.h
index adadb1a3ac..adadb1a3ac 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/atomic.h
+++ b/deps/jemalloc/include/jemalloc/internal/atomic.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/base.h b/deps/jemalloc/include/jemalloc/internal/base.h
index 9cf75ffb0b..9cf75ffb0b 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/base.h
+++ b/deps/jemalloc/include/jemalloc/internal/base.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/bitmap.h b/deps/jemalloc/include/jemalloc/internal/bitmap.h
index ac990290a5..ac990290a5 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/bitmap.h
+++ b/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
index 87d8700dac..87d8700dac 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk.h
+++ b/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
index 4535ce09c0..4535ce09c0 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk_dss.h
+++ b/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
index f24abac753..f24abac753 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/chunk_mmap.h
+++ b/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
index 7b3850bc16..7b3850bc16 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ckh.h
+++ b/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
index a91c4cf556..a91c4cf556 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ctl.h
+++ b/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
index ba95ca816b..ba95ca816b 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/extent.h
+++ b/deps/jemalloc/include/jemalloc/internal/extent.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/hash.h b/deps/jemalloc/include/jemalloc/internal/hash.h
index 188296cf0e..188296cf0e 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/hash.h
+++ b/deps/jemalloc/include/jemalloc/internal/hash.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/huge.h b/deps/jemalloc/include/jemalloc/internal/huge.h
index a2b9c77919..a2b9c77919 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/huge.h
+++ b/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
index cf171326c2..cf171326c2 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h
+++ b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/mb.h b/deps/jemalloc/include/jemalloc/internal/mb.h
index 3cfa787294..3cfa787294 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/mb.h
+++ b/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
index 6520c2512d..6520c2512d 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/mutex.h
+++ b/deps/jemalloc/include/jemalloc/internal/mutex.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/private_namespace.h b/deps/jemalloc/include/jemalloc/internal/private_namespace.h
index 7ebeeba826..7ebeeba826 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/private_namespace.h
+++ b/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
index 15cc2d18fa..15cc2d18fa 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prng.h
+++ b/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
index 6f162d21e8..6f162d21e8 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/prof.h
+++ b/deps/jemalloc/include/jemalloc/internal/prof.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ql.h b/deps/jemalloc/include/jemalloc/internal/ql.h
index 8029040771..8029040771 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/ql.h
+++ b/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
index 1e1056b386..1e1056b386 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/qr.h
+++ b/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
index 16f677f73d..16f677f73d 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/quarantine.h
+++ b/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
index 47fa5ca99b..47fa5ca99b 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/rb.h
+++ b/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
index b5d4db3988..b5d4db3988 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/rtree.h
+++ b/deps/jemalloc/include/jemalloc/internal/rtree.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/size_classes.h b/deps/jemalloc/include/jemalloc/internal/size_classes.h
index 0b7d3cd369..0b7d3cd369 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/size_classes.h
+++ b/deps/jemalloc/include/jemalloc/internal/size_classes.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/stats.h b/deps/jemalloc/include/jemalloc/internal/stats.h
index 1198779ab9..1198779ab9 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/stats.h
+++ b/deps/jemalloc/include/jemalloc/internal/stats.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache.h b/deps/jemalloc/include/jemalloc/internal/tcache.h
index c3d4b58d4d..c3d4b58d4d 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tcache.h
+++ b/deps/jemalloc/include/jemalloc/internal/tcache.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd.h b/deps/jemalloc/include/jemalloc/internal/tsd.h
index 155a2ec6c4..155a2ec6c4 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/tsd.h
+++ b/deps/jemalloc/include/jemalloc/internal/tsd.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/util.h b/deps/jemalloc/include/jemalloc/internal/util.h
index 304cb545af..304cb545af 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/internal/util.h
+++ b/deps/jemalloc/include/jemalloc/internal/util.h
diff --git a/modules/worldengine/deps/jemalloc/include/jemalloc/jemalloc.h b/deps/jemalloc/include/jemalloc/jemalloc.h
index 6ffe5c71b3..6ffe5c71b3 100644
--- a/modules/worldengine/deps/jemalloc/include/jemalloc/jemalloc.h
+++ b/deps/jemalloc/include/jemalloc/jemalloc.h
diff --git a/modules/worldengine/deps/jemalloc/include/msvc_compat/inttypes.h b/deps/jemalloc/include/msvc_compat/inttypes.h
index a4e6b75cb9..a4e6b75cb9 100644
--- a/modules/worldengine/deps/jemalloc/include/msvc_compat/inttypes.h
+++ b/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
index da9ee8b809..da9ee8b809 100644
--- a/modules/worldengine/deps/jemalloc/include/msvc_compat/stdbool.h
+++ b/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
index d02608a597..d02608a597 100644
--- a/modules/worldengine/deps/jemalloc/include/msvc_compat/stdint.h
+++ b/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
index 996f256ce8..996f256ce8 100644
--- a/modules/worldengine/deps/jemalloc/include/msvc_compat/strings.h
+++ b/deps/jemalloc/include/msvc_compat/strings.h
diff --git a/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake b/deps/jemalloc/jemalloc_defs.h.in.cmake
index 769aa227c7..769aa227c7 100644
--- a/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake
+++ b/deps/jemalloc/jemalloc_defs.h.in.cmake
diff --git a/modules/worldengine/deps/jemalloc/src/arena.c b/deps/jemalloc/src/arena.c
index 632fce5233..632fce5233 100644
--- a/modules/worldengine/deps/jemalloc/src/arena.c
+++ b/deps/jemalloc/src/arena.c
diff --git a/modules/worldengine/deps/jemalloc/src/atomic.c b/deps/jemalloc/src/atomic.c
index 77ee313113..77ee313113 100644
--- a/modules/worldengine/deps/jemalloc/src/atomic.c
+++ b/deps/jemalloc/src/atomic.c
diff --git a/modules/worldengine/deps/jemalloc/src/base.c b/deps/jemalloc/src/base.c
index 97078b134d..97078b134d 100644
--- a/modules/worldengine/deps/jemalloc/src/base.c
+++ b/deps/jemalloc/src/base.c
diff --git a/modules/worldengine/deps/jemalloc/src/bitmap.c b/deps/jemalloc/src/bitmap.c
index 468b3178eb..468b3178eb 100644
--- a/modules/worldengine/deps/jemalloc/src/bitmap.c
+++ b/deps/jemalloc/src/bitmap.c
diff --git a/modules/worldengine/deps/jemalloc/src/chunk.c b/deps/jemalloc/src/chunk.c
index 90ab116ae5..90ab116ae5 100644
--- a/modules/worldengine/deps/jemalloc/src/chunk.c
+++ b/deps/jemalloc/src/chunk.c
diff --git a/modules/worldengine/deps/jemalloc/src/chunk_dss.c b/deps/jemalloc/src/chunk_dss.c
index 510bb8bee8..510bb8bee8 100644
--- a/modules/worldengine/deps/jemalloc/src/chunk_dss.c
+++ b/deps/jemalloc/src/chunk_dss.c
diff --git a/modules/worldengine/deps/jemalloc/src/chunk_mmap.c b/deps/jemalloc/src/chunk_mmap.c
index 2056d793f0..2056d793f0 100644
--- a/modules/worldengine/deps/jemalloc/src/chunk_mmap.c
+++ b/deps/jemalloc/src/chunk_mmap.c
diff --git a/modules/worldengine/deps/jemalloc/src/ckh.c b/deps/jemalloc/src/ckh.c
index e95e0a3ed5..e95e0a3ed5 100644
--- a/modules/worldengine/deps/jemalloc/src/ckh.c
+++ b/deps/jemalloc/src/ckh.c
diff --git a/modules/worldengine/deps/jemalloc/src/ctl.c b/deps/jemalloc/src/ctl.c
index 36bc8fb5b7..36bc8fb5b7 100644
--- a/modules/worldengine/deps/jemalloc/src/ctl.c
+++ b/deps/jemalloc/src/ctl.c
diff --git a/modules/worldengine/deps/jemalloc/src/extent.c b/deps/jemalloc/src/extent.c
index fa45c84d34..fa45c84d34 100644
--- a/modules/worldengine/deps/jemalloc/src/extent.c
+++ b/deps/jemalloc/src/extent.c
diff --git a/modules/worldengine/deps/jemalloc/src/hash.c b/deps/jemalloc/src/hash.c
index 7b2bdc2bd6..7b2bdc2bd6 100644
--- a/modules/worldengine/deps/jemalloc/src/hash.c
+++ b/deps/jemalloc/src/hash.c
diff --git a/modules/worldengine/deps/jemalloc/src/huge.c b/deps/jemalloc/src/huge.c
index d72f213570..d72f213570 100644
--- a/modules/worldengine/deps/jemalloc/src/huge.c
+++ b/deps/jemalloc/src/huge.c
diff --git a/modules/worldengine/deps/jemalloc/src/jemalloc.c b/deps/jemalloc/src/jemalloc.c
index 0ee8ad48b9..0ee8ad48b9 100644
--- a/modules/worldengine/deps/jemalloc/src/jemalloc.c
+++ b/deps/jemalloc/src/jemalloc.c
diff --git a/modules/worldengine/deps/jemalloc/src/mb.c b/deps/jemalloc/src/mb.c
index dc2c0a256f..dc2c0a256f 100644
--- a/modules/worldengine/deps/jemalloc/src/mb.c
+++ b/deps/jemalloc/src/mb.c
diff --git a/modules/worldengine/deps/jemalloc/src/mutex.c b/deps/jemalloc/src/mutex.c
index a528ef0c24..a528ef0c24 100644
--- a/modules/worldengine/deps/jemalloc/src/mutex.c
+++ b/deps/jemalloc/src/mutex.c
diff --git a/modules/worldengine/deps/jemalloc/src/prof.c b/deps/jemalloc/src/prof.c
index 975722c4c3..975722c4c3 100644
--- a/modules/worldengine/deps/jemalloc/src/prof.c
+++ b/deps/jemalloc/src/prof.c
diff --git a/modules/worldengine/deps/jemalloc/src/quarantine.c b/deps/jemalloc/src/quarantine.c
index 5431511640..5431511640 100644
--- a/modules/worldengine/deps/jemalloc/src/quarantine.c
+++ b/deps/jemalloc/src/quarantine.c
diff --git a/modules/worldengine/deps/jemalloc/src/rtree.c b/deps/jemalloc/src/rtree.c
index 53702cf723..53702cf723 100644
--- a/modules/worldengine/deps/jemalloc/src/rtree.c
+++ b/deps/jemalloc/src/rtree.c
diff --git a/modules/worldengine/deps/jemalloc/src/stats.c b/deps/jemalloc/src/stats.c
index 087df7676e..087df7676e 100644
--- a/modules/worldengine/deps/jemalloc/src/stats.c
+++ b/deps/jemalloc/src/stats.c
diff --git a/modules/worldengine/deps/jemalloc/src/tcache.c b/deps/jemalloc/src/tcache.c
index 936ef3140d..936ef3140d 100644
--- a/modules/worldengine/deps/jemalloc/src/tcache.c
+++ b/deps/jemalloc/src/tcache.c
diff --git a/modules/worldengine/deps/jemalloc/src/tsd.c b/deps/jemalloc/src/tsd.c
index f968992f2b..f968992f2b 100644
--- a/modules/worldengine/deps/jemalloc/src/tsd.c
+++ b/deps/jemalloc/src/tsd.c
diff --git a/modules/worldengine/deps/jemalloc/src/util.c b/deps/jemalloc/src/util.c
index 93a19fd16f..93a19fd16f 100644
--- a/modules/worldengine/deps/jemalloc/src/util.c
+++ b/deps/jemalloc/src/util.c
diff --git a/modules/worldengine/deps/jemalloc/src/zone.c b/deps/jemalloc/src/zone.c
index 9d3b7b4952..9d3b7b4952 100644
--- a/modules/worldengine/deps/jemalloc/src/zone.c
+++ b/deps/jemalloc/src/zone.c
diff --git a/modules/worldengine/deps/libmpq/AUTHORS b/deps/libmpq/AUTHORS
index 3d7da7bec9..3d7da7bec9 100644
--- a/modules/worldengine/deps/libmpq/AUTHORS
+++ b/deps/libmpq/AUTHORS
diff --git a/modules/worldengine/deps/libmpq/CMakeLists.txt b/deps/libmpq/CMakeLists.txt
index c3e20934d3..34e1c35217 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
index 4189933be9..4189933be9 100644
--- a/modules/worldengine/deps/libmpq/COPYING
+++ b/deps/libmpq/COPYING
diff --git a/modules/worldengine/deps/libmpq/FAQ b/deps/libmpq/FAQ
index 52ca9f3c70..52ca9f3c70 100644
--- a/modules/worldengine/deps/libmpq/FAQ
+++ b/deps/libmpq/FAQ
diff --git a/modules/worldengine/deps/libmpq/INSTALL b/deps/libmpq/INSTALL
index b42a17ac46..b42a17ac46 100644
--- a/modules/worldengine/deps/libmpq/INSTALL
+++ b/deps/libmpq/INSTALL
diff --git a/modules/worldengine/deps/libmpq/Makefile.am b/deps/libmpq/Makefile.am
index 0a9b54c252..0a9b54c252 100644
--- a/modules/worldengine/deps/libmpq/Makefile.am
+++ b/deps/libmpq/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/NEWS b/deps/libmpq/NEWS
index 74850a8a5b..74850a8a5b 100644
--- a/modules/worldengine/deps/libmpq/NEWS
+++ b/deps/libmpq/NEWS
diff --git a/modules/worldengine/deps/libmpq/README b/deps/libmpq/README
index 3f1bd3a1e9..3f1bd3a1e9 100644
--- a/modules/worldengine/deps/libmpq/README
+++ b/deps/libmpq/README
diff --git a/modules/worldengine/deps/libmpq/THANKS b/deps/libmpq/THANKS
index 42da123547..42da123547 100644
--- a/modules/worldengine/deps/libmpq/THANKS
+++ b/deps/libmpq/THANKS
diff --git a/modules/worldengine/deps/libmpq/TODO b/deps/libmpq/TODO
index 0c1951f0b4..0c1951f0b4 100644
--- a/modules/worldengine/deps/libmpq/TODO
+++ b/deps/libmpq/TODO
diff --git a/modules/worldengine/deps/libmpq/autogen.sh b/deps/libmpq/autogen.sh
index 16871edd70..16871edd70 100644
--- a/modules/worldengine/deps/libmpq/autogen.sh
+++ b/deps/libmpq/autogen.sh
diff --git a/modules/worldengine/deps/libmpq/bindings/Makefile.am b/deps/libmpq/bindings/Makefile.am
index b9fefe306e..b9fefe306e 100644
--- a/modules/worldengine/deps/libmpq/bindings/Makefile.am
+++ b/deps/libmpq/bindings/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/bindings/d/Makefile.am b/deps/libmpq/bindings/d/Makefile.am
index 4de7285ae5..4de7285ae5 100644
--- a/modules/worldengine/deps/libmpq/bindings/d/Makefile.am
+++ b/deps/libmpq/bindings/d/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/bindings/d/dsss.conf b/deps/libmpq/bindings/d/dsss.conf
index 252482c493..252482c493 100644
--- a/modules/worldengine/deps/libmpq/bindings/d/dsss.conf
+++ b/deps/libmpq/bindings/d/dsss.conf
diff --git a/modules/worldengine/deps/libmpq/bindings/d/mpq.d b/deps/libmpq/bindings/d/mpq.d
index d72c2d2a98..d72c2d2a98 100644
--- a/modules/worldengine/deps/libmpq/bindings/d/mpq.d
+++ b/deps/libmpq/bindings/d/mpq.d
diff --git a/modules/worldengine/deps/libmpq/bindings/python/Makefile.am b/deps/libmpq/bindings/python/Makefile.am
index 6971a9b2f6..6971a9b2f6 100644
--- a/modules/worldengine/deps/libmpq/bindings/python/Makefile.am
+++ b/deps/libmpq/bindings/python/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/bindings/python/mpq-info b/deps/libmpq/bindings/python/mpq-info
index 2c67aa1d0c..2c67aa1d0c 100644
--- a/modules/worldengine/deps/libmpq/bindings/python/mpq-info
+++ b/deps/libmpq/bindings/python/mpq-info
diff --git a/modules/worldengine/deps/libmpq/bindings/python/mpq.py b/deps/libmpq/bindings/python/mpq.py
index cf6ecaae80..cf6ecaae80 100644
--- a/modules/worldengine/deps/libmpq/bindings/python/mpq.py
+++ b/deps/libmpq/bindings/python/mpq.py
diff --git a/modules/worldengine/deps/libmpq/config.h b/deps/libmpq/config.h
index c69fb13211..c69fb13211 100644
--- a/modules/worldengine/deps/libmpq/config.h
+++ b/deps/libmpq/config.h
diff --git a/modules/worldengine/deps/libmpq/configure.ac b/deps/libmpq/configure.ac
index d274eab07c..d274eab07c 100644
--- a/modules/worldengine/deps/libmpq/configure.ac
+++ b/deps/libmpq/configure.ac
diff --git a/modules/worldengine/deps/libmpq/debian/changelog b/deps/libmpq/debian/changelog
index 55d2d91875..55d2d91875 100644
--- a/modules/worldengine/deps/libmpq/debian/changelog
+++ b/deps/libmpq/debian/changelog
diff --git a/modules/worldengine/deps/libmpq/debian/compat b/deps/libmpq/debian/compat
index 7f8f011eb7..7f8f011eb7 100644
--- a/modules/worldengine/deps/libmpq/debian/compat
+++ b/deps/libmpq/debian/compat
diff --git a/modules/worldengine/deps/libmpq/debian/control b/deps/libmpq/debian/control
index f35bb06001..f35bb06001 100644
--- a/modules/worldengine/deps/libmpq/debian/control
+++ b/deps/libmpq/debian/control
diff --git a/modules/worldengine/deps/libmpq/debian/copyright b/deps/libmpq/debian/copyright
index f014cf14de..f014cf14de 100644
--- a/modules/worldengine/deps/libmpq/debian/copyright
+++ b/deps/libmpq/debian/copyright
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq-dev.dirs b/deps/libmpq/debian/libmpq-dev.dirs
index 7b6c7ee6ec..7b6c7ee6ec 100644
--- a/modules/worldengine/deps/libmpq/debian/libmpq-dev.dirs
+++ b/deps/libmpq/debian/libmpq-dev.dirs
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq-dev.install b/deps/libmpq/debian/libmpq-dev.install
index 4e6ab3278e..4e6ab3278e 100644
--- a/modules/worldengine/deps/libmpq/debian/libmpq-dev.install
+++ b/deps/libmpq/debian/libmpq-dev.install
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq0.dirs b/deps/libmpq/debian/libmpq0.dirs
index 68457717bd..68457717bd 100644
--- a/modules/worldengine/deps/libmpq/debian/libmpq0.dirs
+++ b/deps/libmpq/debian/libmpq0.dirs
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq0.docs b/deps/libmpq/debian/libmpq0.docs
index 5ac7060850..5ac7060850 100644
--- a/modules/worldengine/deps/libmpq/debian/libmpq0.docs
+++ b/deps/libmpq/debian/libmpq0.docs
diff --git a/modules/worldengine/deps/libmpq/debian/libmpq0.install b/deps/libmpq/debian/libmpq0.install
index 8aa4466a68..8aa4466a68 100644
--- a/modules/worldengine/deps/libmpq/debian/libmpq0.install
+++ b/deps/libmpq/debian/libmpq0.install
diff --git a/modules/worldengine/deps/libmpq/debian/python-mpq.install b/deps/libmpq/debian/python-mpq.install
index a7aba2013b..a7aba2013b 100644
--- a/modules/worldengine/deps/libmpq/debian/python-mpq.install
+++ b/deps/libmpq/debian/python-mpq.install
diff --git a/modules/worldengine/deps/libmpq/debian/rules b/deps/libmpq/debian/rules
index 1e101be5fa..1e101be5fa 100644
--- a/modules/worldengine/deps/libmpq/debian/rules
+++ b/deps/libmpq/debian/rules
diff --git a/modules/worldengine/deps/libmpq/doc/Makefile.am b/deps/libmpq/doc/Makefile.am
index e7ccd5f451..e7ccd5f451 100644
--- a/modules/worldengine/deps/libmpq/doc/Makefile.am
+++ b/deps/libmpq/doc/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/doc/man1/Makefile.am b/deps/libmpq/doc/man1/Makefile.am
index 055f1aab53..055f1aab53 100644
--- a/modules/worldengine/deps/libmpq/doc/man1/Makefile.am
+++ b/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
index c025f5ce4f..c025f5ce4f 100644
--- a/modules/worldengine/deps/libmpq/doc/man1/libmpq-config.1
+++ b/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
index cad3d865dc..cad3d865dc 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/Makefile.am
+++ b/deps/libmpq/doc/man3/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/doc/man3/libmpq.3 b/deps/libmpq/doc/man3/libmpq.3
index 768dab0a71..768dab0a71 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq.3
+++ b/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
index dfc652a672..dfc652a672 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_close.3
+++ b/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
index 6663b99161..6663b99161 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_files.3
+++ b/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
index 696ac5e809..696ac5e809 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_offset.3
+++ b/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
index 02c021f894..02c021f894 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_open.3
+++ b/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
index 6c3061f203..6c3061f203 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_packed_size.3
+++ b/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
index d2ba923c8f..d2ba923c8f 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_unpacked_size.3
+++ b/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
index 1764046895..1764046895 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__archive_version.3
+++ b/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
index 1ec0c06f70..1ec0c06f70 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_close_offset.3
+++ b/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
index a60b133f40..a60b133f40 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_open_offset.3
+++ b/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
index 3272c64c7e..3272c64c7e 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_read.3
+++ b/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
index a21ca48159..a21ca48159 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__block_unpacked_size.3
+++ b/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
index 85baeffc60..85baeffc60 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_blocks.3
+++ b/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
index 24b44f0b66..24b44f0b66 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_compressed.3
+++ b/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
index 798f4019c7..798f4019c7 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_encrypted.3
+++ b/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
index 9adce38cb5..9adce38cb5 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_imploded.3
+++ b/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
index 8d7a47769e..8d7a47769e 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_number.3
+++ b/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
index 392a66d0b0..392a66d0b0 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_offset.3
+++ b/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
index b584ddf77d..b584ddf77d 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_packed_size.3
+++ b/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
index cbfafbd0f4..cbfafbd0f4 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_read.3
+++ b/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
index a81cf7a4e7..a81cf7a4e7 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__file_unpacked_size.3
+++ b/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
index 246f422eed..246f422eed 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__strerror.3
+++ b/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
index 5500d7314f..5500d7314f 100644
--- a/modules/worldengine/deps/libmpq/doc/man3/libmpq__version.3
+++ b/deps/libmpq/doc/man3/libmpq__version.3
diff --git a/modules/worldengine/deps/libmpq/libmpq-config.in b/deps/libmpq/libmpq-config.in
index d345efdbe0..d345efdbe0 100644
--- a/modules/worldengine/deps/libmpq/libmpq-config.in
+++ b/deps/libmpq/libmpq-config.in
diff --git a/modules/worldengine/deps/libmpq/libmpq.pc.in b/deps/libmpq/libmpq.pc.in
index 8c53bea35a..8c53bea35a 100644
--- a/modules/worldengine/deps/libmpq/libmpq.pc.in
+++ b/deps/libmpq/libmpq.pc.in
diff --git a/modules/worldengine/deps/libmpq/libmpq/Makefile.am b/deps/libmpq/libmpq/Makefile.am
index 409e3dfe02..409e3dfe02 100644
--- a/modules/worldengine/deps/libmpq/libmpq/Makefile.am
+++ b/deps/libmpq/libmpq/Makefile.am
diff --git a/modules/worldengine/deps/libmpq/libmpq/common.c b/deps/libmpq/libmpq/common.c
index 879bd902b5..879bd902b5 100644
--- a/modules/worldengine/deps/libmpq/libmpq/common.c
+++ b/deps/libmpq/libmpq/common.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/common.h b/deps/libmpq/libmpq/common.h
index b9e0312643..b9e0312643 100644
--- a/modules/worldengine/deps/libmpq/libmpq/common.h
+++ b/deps/libmpq/libmpq/common.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/crypt_buf.h b/deps/libmpq/libmpq/crypt_buf.h
index 34184b017f..34184b017f 100644
--- a/modules/worldengine/deps/libmpq/libmpq/crypt_buf.h
+++ b/deps/libmpq/libmpq/crypt_buf.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/explode.c b/deps/libmpq/libmpq/explode.c
index 2d778d25c3..2d778d25c3 100644
--- a/modules/worldengine/deps/libmpq/libmpq/explode.c
+++ b/deps/libmpq/libmpq/explode.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/explode.h b/deps/libmpq/libmpq/explode.h
index 1d14dfc0e0..1d14dfc0e0 100644
--- a/modules/worldengine/deps/libmpq/libmpq/explode.h
+++ b/deps/libmpq/libmpq/explode.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/extract.c b/deps/libmpq/libmpq/extract.c
index 11de107168..11de107168 100644
--- a/modules/worldengine/deps/libmpq/libmpq/extract.c
+++ b/deps/libmpq/libmpq/extract.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/extract.h b/deps/libmpq/libmpq/extract.h
index d6ea794f16..d6ea794f16 100644
--- a/modules/worldengine/deps/libmpq/libmpq/extract.h
+++ b/deps/libmpq/libmpq/extract.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/huffman.c b/deps/libmpq/libmpq/huffman.c
index 8fc87be2f6..8fc87be2f6 100644
--- a/modules/worldengine/deps/libmpq/libmpq/huffman.c
+++ b/deps/libmpq/libmpq/huffman.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/huffman.h b/deps/libmpq/libmpq/huffman.h
index 6f691088fa..6f691088fa 100644
--- a/modules/worldengine/deps/libmpq/libmpq/huffman.h
+++ b/deps/libmpq/libmpq/huffman.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/mpq-internal.h b/deps/libmpq/libmpq/mpq-internal.h
index 76eabe4190..76eabe4190 100644
--- a/modules/worldengine/deps/libmpq/libmpq/mpq-internal.h
+++ b/deps/libmpq/libmpq/mpq-internal.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/mpq.c b/deps/libmpq/libmpq/mpq.c
index a6ab5db82d..a6ab5db82d 100644
--- a/modules/worldengine/deps/libmpq/libmpq/mpq.c
+++ b/deps/libmpq/libmpq/mpq.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/mpq.h b/deps/libmpq/libmpq/mpq.h
index abd4862c33..abd4862c33 100644
--- a/modules/worldengine/deps/libmpq/libmpq/mpq.h
+++ b/deps/libmpq/libmpq/mpq.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/pack_begin.h b/deps/libmpq/libmpq/pack_begin.h
index eb4a6ddebb..eb4a6ddebb 100644
--- a/modules/worldengine/deps/libmpq/libmpq/pack_begin.h
+++ b/deps/libmpq/libmpq/pack_begin.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/pack_end.h b/deps/libmpq/libmpq/pack_end.h
index a8a35113bf..a8a35113bf 100644
--- a/modules/worldengine/deps/libmpq/libmpq/pack_end.h
+++ b/deps/libmpq/libmpq/pack_end.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/platform.h b/deps/libmpq/libmpq/platform.h
index 68fdfdc5de..68fdfdc5de 100644
--- a/modules/worldengine/deps/libmpq/libmpq/platform.h
+++ b/deps/libmpq/libmpq/platform.h
diff --git a/modules/worldengine/deps/libmpq/libmpq/wave.c b/deps/libmpq/libmpq/wave.c
index 628593fce8..628593fce8 100644
--- a/modules/worldengine/deps/libmpq/libmpq/wave.c
+++ b/deps/libmpq/libmpq/wave.c
diff --git a/modules/worldengine/deps/libmpq/libmpq/wave.h b/deps/libmpq/libmpq/wave.h
index 1b9491bd70..1b9491bd70 100644
--- a/modules/worldengine/deps/libmpq/libmpq/wave.h
+++ b/deps/libmpq/libmpq/wave.h
diff --git a/modules/worldengine/deps/libmpq/tools/Makefile.am b/deps/libmpq/tools/Makefile.am
index 607205379a..607205379a 100644
--- a/modules/worldengine/deps/libmpq/tools/Makefile.am
+++ b/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
index 3d150fc661..3d150fc661 100644
--- a/modules/worldengine/deps/libmpq/tools/crypt_buf_gen.c
+++ b/deps/libmpq/tools/crypt_buf_gen.c
diff --git a/modules/worldengine/deps/libmpq/win/config.h b/deps/libmpq/win/config.h
index 6833494624..6833494624 100644
--- a/modules/worldengine/deps/libmpq/win/config.h
+++ b/deps/libmpq/win/config.h
diff --git a/modules/worldengine/deps/libmpq/win/dirent.h b/deps/libmpq/win/dirent.h
index 6425174092..6425174092 100644
--- a/modules/worldengine/deps/libmpq/win/dirent.h
+++ b/deps/libmpq/win/dirent.h
diff --git a/modules/worldengine/deps/libmpq/win/stdint.h b/deps/libmpq/win/stdint.h
index d02608a597..d02608a597 100644
--- a/modules/worldengine/deps/libmpq/win/stdint.h
+++ b/deps/libmpq/win/stdint.h
diff --git a/modules/worldengine/deps/mysqllite/CMakeLists.txt b/deps/mysqllite/CMakeLists.txt
index 29fda18131..8d169d56f3 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
index d511905c16..d511905c16 100644
--- a/modules/worldengine/deps/mysqllite/COPYING
+++ b/deps/mysqllite/COPYING
diff --git a/modules/worldengine/deps/mysqllite/README b/deps/mysqllite/README
index 769313d7e6..769313d7e6 100644
--- a/modules/worldengine/deps/mysqllite/README
+++ b/deps/mysqllite/README
diff --git a/modules/worldengine/deps/mysqllite/VERSION b/deps/mysqllite/VERSION
index f85cac84d7..f85cac84d7 100644
--- a/modules/worldengine/deps/mysqllite/VERSION
+++ b/deps/mysqllite/VERSION
diff --git a/modules/worldengine/deps/mysqllite/cmake/character_sets.cmake b/deps/mysqllite/cmake/character_sets.cmake
index 6b7df9039c..6b7df9039c 100644
--- a/modules/worldengine/deps/mysqllite/cmake/character_sets.cmake
+++ b/deps/mysqllite/cmake/character_sets.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/mysql_version.cmake b/deps/mysqllite/cmake/mysql_version.cmake
index 3c20f77e9d..3c20f77e9d 100644
--- a/modules/worldengine/deps/mysqllite/cmake/mysql_version.cmake
+++ b/deps/mysqllite/cmake/mysql_version.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/os/Windows.cmake b/deps/mysqllite/cmake/os/Windows.cmake
index 19c230cc3d..19c230cc3d 100644
--- a/modules/worldengine/deps/mysqllite/cmake/os/Windows.cmake
+++ b/deps/mysqllite/cmake/os/Windows.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/os/WindowsCache.cmake b/deps/mysqllite/cmake/os/WindowsCache.cmake
index ff068bfeaf..ff068bfeaf 100644
--- a/modules/worldengine/deps/mysqllite/cmake/os/WindowsCache.cmake
+++ b/deps/mysqllite/cmake/os/WindowsCache.cmake
diff --git a/modules/worldengine/deps/mysqllite/cmake/stack_direction.c b/deps/mysqllite/cmake/stack_direction.c
index 11bcf803bf..11bcf803bf 100644
--- a/modules/worldengine/deps/mysqllite/cmake/stack_direction.c
+++ b/deps/mysqllite/cmake/stack_direction.c
diff --git a/modules/worldengine/deps/mysqllite/cmake/versioninfo.rc.in b/deps/mysqllite/cmake/versioninfo.rc.in
index 11cedc38a3..11cedc38a3 100644
--- a/modules/worldengine/deps/mysqllite/cmake/versioninfo.rc.in
+++ b/deps/mysqllite/cmake/versioninfo.rc.in
diff --git a/modules/worldengine/deps/mysqllite/config.h.cmake b/deps/mysqllite/config.h.cmake
index 204e103241..204e103241 100644
--- a/modules/worldengine/deps/mysqllite/config.h.cmake
+++ b/deps/mysqllite/config.h.cmake
diff --git a/modules/worldengine/deps/mysqllite/configure.cmake b/deps/mysqllite/configure.cmake
index 49e2fbb07a..49e2fbb07a 100644
--- a/modules/worldengine/deps/mysqllite/configure.cmake
+++ b/deps/mysqllite/configure.cmake
diff --git a/modules/worldengine/deps/mysqllite/dbug/dbug.c b/deps/mysqllite/dbug/dbug.c
index 2c06eeff95..2c06eeff95 100644
--- a/modules/worldengine/deps/mysqllite/dbug/dbug.c
+++ b/deps/mysqllite/dbug/dbug.c
diff --git a/modules/worldengine/deps/mysqllite/dbug/dbug_long.h b/deps/mysqllite/dbug/dbug_long.h
index 829df181ef..829df181ef 100644
--- a/modules/worldengine/deps/mysqllite/dbug/dbug_long.h
+++ b/deps/mysqllite/dbug/dbug_long.h
diff --git a/modules/worldengine/deps/mysqllite/dbug/monty.doc b/deps/mysqllite/dbug/monty.doc
index 1af67b81d4..1af67b81d4 100644
--- a/modules/worldengine/deps/mysqllite/dbug/monty.doc
+++ b/deps/mysqllite/dbug/monty.doc
diff --git a/modules/worldengine/deps/mysqllite/dbug/user.r b/deps/mysqllite/dbug/user.r
index 5628f5a4fa..5628f5a4fa 100644
--- a/modules/worldengine/deps/mysqllite/dbug/user.r
+++ b/deps/mysqllite/dbug/user.r
diff --git a/modules/worldengine/deps/mysqllite/include/decimal.h b/deps/mysqllite/include/decimal.h
index 530ed9e175..530ed9e175 100644
--- a/modules/worldengine/deps/mysqllite/include/decimal.h
+++ b/deps/mysqllite/include/decimal.h
diff --git a/modules/worldengine/deps/mysqllite/include/errmsg.h b/deps/mysqllite/include/errmsg.h
index f1d7dd65f9..f1d7dd65f9 100644
--- a/modules/worldengine/deps/mysqllite/include/errmsg.h
+++ b/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
index d03d28f572..d03d28f572 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/atomic/gcc_builtins.h
+++ b/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
index a84cde6b2c..a84cde6b2c 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/atomic/generic-msvc.h
+++ b/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
index 4c871473b6..4c871473b6 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/atomic/nolock.h
+++ b/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
index a31f8ed6ca..a31f8ed6ca 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/atomic/rwlock.h
+++ b/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
index 5643f878cd..5643f878cd 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/atomic/solaris.h
+++ b/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
index ea3202aa9c..ea3202aa9c 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/atomic/x86-gcc.h
+++ b/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
index 4ac0aa72ad..4ac0aa72ad 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/base64.h
+++ b/deps/mysqllite/include/internal/base64.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/hash.h b/deps/mysqllite/include/internal/hash.h
index d390cb7d4e..d390cb7d4e 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/hash.h
+++ b/deps/mysqllite/include/internal/hash.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/lf.h b/deps/mysqllite/include/internal/lf.h
index e9fb094493..e9fb094493 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/lf.h
+++ b/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
index 2e2a66b496..2e2a66b496 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_aes.h
+++ b/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
index fa396cf02f..fa396cf02f 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_alarm.h
+++ b/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
index c2d514012d..c2d514012d 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_atomic.h
+++ b/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
index 347bda01be..347bda01be 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_base.h
+++ b/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
index b396b84b0d..b396b84b0d 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_bit.h
+++ b/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
index 78b33b09a5..78b33b09a5 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_bitmap.h
+++ b/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
index ba0d3fc313..ba0d3fc313 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_handler.h
+++ b/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
index 8235c00d8f..8235c00d8f 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_libwrap.h
+++ b/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
index 782bef8a27..782bef8a27 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_md5.h
+++ b/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
index 96ba6d4c46..96ba6d4c46 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_nosys.h
+++ b/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
index 81bc1aafb5..81bc1aafb5 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_rdtsc.h
+++ b/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
index 8c2c97c68e..8c2c97c68e 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_stacktrace.h
+++ b/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
index fdfe130c45..fdfe130c45 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_time.h
+++ b/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
index 0958a37fb4..0958a37fb4 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_tree.h
+++ b/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
index 580eb646e1..580eb646e1 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/my_uctype.h
+++ b/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
index ecf35520a8..ecf35520a8 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/myisampack.h
+++ b/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
index 04a43f2c96..04a43f2c96 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/mysql_version.h.in
+++ b/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
index 22ac74302a..22ac74302a 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/mysys_err.h
+++ b/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
index e75b09297a..e75b09297a 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/password.h
+++ b/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
index 13491c661f..13491c661f 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/probes_mysql.h
+++ b/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
index bc3b65a00e..bc3b65a00e 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/probes_mysql_nodtrace.h
+++ b/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
index 07962f0920..07962f0920 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/queues.h
+++ b/deps/mysqllite/include/internal/queues.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/rijndael.h b/deps/mysqllite/include/internal/rijndael.h
index 71df1c48db..71df1c48db 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/rijndael.h
+++ b/deps/mysqllite/include/internal/rijndael.h
diff --git a/modules/worldengine/deps/mysqllite/include/internal/sha1.h b/deps/mysqllite/include/internal/sha1.h
index d60d5e17c6..d60d5e17c6 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/sha1.h
+++ b/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
index 15600019cd..15600019cd 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/t_ctype.h
+++ b/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
index 8c91fc0b89..8c91fc0b89 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/thr_alarm.h
+++ b/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
index 91473737be..91473737be 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/thr_lock.h
+++ b/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
index f408321689..f408321689 100644
--- a/modules/worldengine/deps/mysqllite/include/internal/violite.h
+++ b/deps/mysqllite/include/internal/violite.h
diff --git a/modules/worldengine/deps/mysqllite/include/keycache.h b/deps/mysqllite/include/keycache.h
index fefa31afd8..fefa31afd8 100644
--- a/modules/worldengine/deps/mysqllite/include/keycache.h
+++ b/deps/mysqllite/include/keycache.h
diff --git a/modules/worldengine/deps/mysqllite/include/m_ctype.h b/deps/mysqllite/include/m_ctype.h
index bb7f5ddfb3..bb7f5ddfb3 100644
--- a/modules/worldengine/deps/mysqllite/include/m_ctype.h
+++ b/deps/mysqllite/include/m_ctype.h
diff --git a/modules/worldengine/deps/mysqllite/include/m_string.h b/deps/mysqllite/include/m_string.h
index d219485858..d219485858 100644
--- a/modules/worldengine/deps/mysqllite/include/m_string.h
+++ b/deps/mysqllite/include/m_string.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_alloc.h b/deps/mysqllite/include/my_alloc.h
index 4b1ffd3d44..4b1ffd3d44 100644
--- a/modules/worldengine/deps/mysqllite/include/my_alloc.h
+++ b/deps/mysqllite/include/my_alloc.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_attribute.h b/deps/mysqllite/include/my_attribute.h
index d35b3013bd..d35b3013bd 100644
--- a/modules/worldengine/deps/mysqllite/include/my_attribute.h
+++ b/deps/mysqllite/include/my_attribute.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_compiler.h b/deps/mysqllite/include/my_compiler.h
index 5f89862115..5f89862115 100644
--- a/modules/worldengine/deps/mysqllite/include/my_compiler.h
+++ b/deps/mysqllite/include/my_compiler.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_dbug.h b/deps/mysqllite/include/my_dbug.h
index 7f8f5a1578..7f8f5a1578 100644
--- a/modules/worldengine/deps/mysqllite/include/my_dbug.h
+++ b/deps/mysqllite/include/my_dbug.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_dir.h b/deps/mysqllite/include/my_dir.h
index de21bee738..de21bee738 100644
--- a/modules/worldengine/deps/mysqllite/include/my_dir.h
+++ b/deps/mysqllite/include/my_dir.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_getopt.h b/deps/mysqllite/include/my_getopt.h
index 47feb21d85..47feb21d85 100644
--- a/modules/worldengine/deps/mysqllite/include/my_getopt.h
+++ b/deps/mysqllite/include/my_getopt.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_global.h b/deps/mysqllite/include/my_global.h
index dd0a18f7a7..dd0a18f7a7 100644
--- a/modules/worldengine/deps/mysqllite/include/my_global.h
+++ b/deps/mysqllite/include/my_global.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_list.h b/deps/mysqllite/include/my_list.h
index ff086e1725..ff086e1725 100644
--- a/modules/worldengine/deps/mysqllite/include/my_list.h
+++ b/deps/mysqllite/include/my_list.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_net.h b/deps/mysqllite/include/my_net.h
index 5762f5da06..5762f5da06 100644
--- a/modules/worldengine/deps/mysqllite/include/my_net.h
+++ b/deps/mysqllite/include/my_net.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_pthread.h b/deps/mysqllite/include/my_pthread.h
index f1636cad13..f1636cad13 100644
--- a/modules/worldengine/deps/mysqllite/include/my_pthread.h
+++ b/deps/mysqllite/include/my_pthread.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_sys.h b/deps/mysqllite/include/my_sys.h
index 96b40415c5..96b40415c5 100644
--- a/modules/worldengine/deps/mysqllite/include/my_sys.h
+++ b/deps/mysqllite/include/my_sys.h
diff --git a/modules/worldengine/deps/mysqllite/include/my_xml.h b/deps/mysqllite/include/my_xml.h
index 6a453ee90b..6a453ee90b 100644
--- a/modules/worldengine/deps/mysqllite/include/my_xml.h
+++ b/deps/mysqllite/include/my_xml.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql.h b/deps/mysqllite/include/mysql.h
index 0755846bc8..0755846bc8 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql.h
+++ b/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
index cc3f468040..cc3f468040 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/client_plugin.h
+++ b/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
index 5406c292b1..5406c292b1 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/innodb_priv.h
+++ b/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
index 7ec68ff504..7ec68ff504 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/plugin.h
+++ b/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
index 8811c83294..8811c83294 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/plugin_audit.h
+++ b/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
index 420eb3bb80..420eb3bb80 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/plugin_auth.h
+++ b/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
index 4ad92d01bf..4ad92d01bf 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/plugin_auth_common.h
+++ b/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
index 7f9bde3a6a..7f9bde3a6a 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/plugin_ftparser.h
+++ b/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
index 6fc6689c47..6fc6689c47 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/psi/mysql_file.h
+++ b/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
index 5b8ea3dc5d..5b8ea3dc5d 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/psi/mysql_thread.h
+++ b/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
index 562e4a80fd..562e4a80fd 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/psi/psi.h
+++ b/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
index 0f62291696..0f62291696 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/psi/psi_abi_v1.h
+++ b/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
index 08bca609b4..08bca609b4 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/psi/psi_abi_v2.h
+++ b/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
index f6b4aa39dc..f6b4aa39dc 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/service_my_snprintf.h
+++ b/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
index 7061c2bd4d..7061c2bd4d 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/service_thd_alloc.h
+++ b/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
index 2a8f5e610a..2a8f5e610a 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/service_thd_wait.h
+++ b/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
index a4396b721b..a4396b721b 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/service_thread_scheduler.h
+++ b/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
index 6c67a582fb..6c67a582fb 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql/services.h
+++ b/deps/mysqllite/include/mysql/services.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql_com.h b/deps/mysqllite/include/mysql_com.h
index f4c023721d..f4c023721d 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql_com.h
+++ b/deps/mysqllite/include/mysql_com.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql_embed.h b/deps/mysqllite/include/mysql_embed.h
index e860a4486e..e860a4486e 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql_embed.h
+++ b/deps/mysqllite/include/mysql_embed.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysql_time.h b/deps/mysqllite/include/mysql_time.h
index 0a3f17a81f..0a3f17a81f 100644
--- a/modules/worldengine/deps/mysqllite/include/mysql_time.h
+++ b/deps/mysqllite/include/mysql_time.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysqld_ername.h b/deps/mysqllite/include/mysqld_ername.h
index 7697b59d1e..7697b59d1e 100644
--- a/modules/worldengine/deps/mysqllite/include/mysqld_ername.h
+++ b/deps/mysqllite/include/mysqld_ername.h
diff --git a/modules/worldengine/deps/mysqllite/include/mysqld_error.h b/deps/mysqllite/include/mysqld_error.h
index b886241cfb..b886241cfb 100644
--- a/modules/worldengine/deps/mysqllite/include/mysqld_error.h
+++ b/deps/mysqllite/include/mysqld_error.h
diff --git a/modules/worldengine/deps/mysqllite/include/plugin.h b/deps/mysqllite/include/plugin.h
index 7ec68ff504..7ec68ff504 100644
--- a/modules/worldengine/deps/mysqllite/include/plugin.h
+++ b/deps/mysqllite/include/plugin.h
diff --git a/modules/worldengine/deps/mysqllite/include/plugin_audit.h b/deps/mysqllite/include/plugin_audit.h
index 8811c83294..8811c83294 100644
--- a/modules/worldengine/deps/mysqllite/include/plugin_audit.h
+++ b/deps/mysqllite/include/plugin_audit.h
diff --git a/modules/worldengine/deps/mysqllite/include/plugin_ftparser.h b/deps/mysqllite/include/plugin_ftparser.h
index 7f9bde3a6a..7f9bde3a6a 100644
--- a/modules/worldengine/deps/mysqllite/include/plugin_ftparser.h
+++ b/deps/mysqllite/include/plugin_ftparser.h
diff --git a/modules/worldengine/deps/mysqllite/include/sql_common.h b/deps/mysqllite/include/sql_common.h
index a9a3168b69..a9a3168b69 100644
--- a/modules/worldengine/deps/mysqllite/include/sql_common.h
+++ b/deps/mysqllite/include/sql_common.h
diff --git a/modules/worldengine/deps/mysqllite/include/sql_state.h b/deps/mysqllite/include/sql_state.h
index edd6f694bd..edd6f694bd 100644
--- a/modules/worldengine/deps/mysqllite/include/sql_state.h
+++ b/deps/mysqllite/include/sql_state.h
diff --git a/modules/worldengine/deps/mysqllite/include/sslopt-case.h b/deps/mysqllite/include/sslopt-case.h
index 3b64a225fe..3b64a225fe 100644
--- a/modules/worldengine/deps/mysqllite/include/sslopt-case.h
+++ b/deps/mysqllite/include/sslopt-case.h
diff --git a/modules/worldengine/deps/mysqllite/include/sslopt-longopts.h b/deps/mysqllite/include/sslopt-longopts.h
index 5315b2e12b..5315b2e12b 100644
--- a/modules/worldengine/deps/mysqllite/include/sslopt-longopts.h
+++ b/deps/mysqllite/include/sslopt-longopts.h
diff --git a/modules/worldengine/deps/mysqllite/include/sslopt-vars.h b/deps/mysqllite/include/sslopt-vars.h
index d0eec3b6d7..d0eec3b6d7 100644
--- a/modules/worldengine/deps/mysqllite/include/sslopt-vars.h
+++ b/deps/mysqllite/include/sslopt-vars.h
diff --git a/modules/worldengine/deps/mysqllite/include/typelib.h b/deps/mysqllite/include/typelib.h
index 3badb14c96..3badb14c96 100644
--- a/modules/worldengine/deps/mysqllite/include/typelib.h
+++ b/deps/mysqllite/include/typelib.h
diff --git a/modules/worldengine/deps/mysqllite/libmysql/client_settings.h b/deps/mysqllite/libmysql/client_settings.h
index c5a08ce1fc..c5a08ce1fc 100644
--- a/modules/worldengine/deps/mysqllite/libmysql/client_settings.h
+++ b/deps/mysqllite/libmysql/client_settings.h
diff --git a/modules/worldengine/deps/mysqllite/libmysql/errmsg.c b/deps/mysqllite/libmysql/errmsg.c
index b99b3f2de3..b99b3f2de3 100644
--- a/modules/worldengine/deps/mysqllite/libmysql/errmsg.c
+++ b/deps/mysqllite/libmysql/errmsg.c
diff --git a/modules/worldengine/deps/mysqllite/libmysql/get_password.c b/deps/mysqllite/libmysql/get_password.c
index 455b4b3c8f..455b4b3c8f 100644
--- a/modules/worldengine/deps/mysqllite/libmysql/get_password.c
+++ b/deps/mysqllite/libmysql/get_password.c
diff --git a/modules/worldengine/deps/mysqllite/libmysql/libmysql.c b/deps/mysqllite/libmysql/libmysql.c
index 3af9165de8..3af9165de8 100644
--- a/modules/worldengine/deps/mysqllite/libmysql/libmysql.c
+++ b/deps/mysqllite/libmysql/libmysql.c
diff --git a/modules/worldengine/deps/mysqllite/libmysql/libmysql_exports.def b/deps/mysqllite/libmysql/libmysql_exports.def
index b871320f3a..b871320f3a 100644
--- a/modules/worldengine/deps/mysqllite/libmysql/libmysql_exports.def
+++ b/deps/mysqllite/libmysql/libmysql_exports.def
diff --git a/modules/worldengine/deps/mysqllite/mysys/ChangeLog b/deps/mysqllite/mysys/ChangeLog
index 7a42610666..7a42610666 100644
--- a/modules/worldengine/deps/mysqllite/mysys/ChangeLog
+++ b/deps/mysqllite/mysys/ChangeLog
diff --git a/modules/worldengine/deps/mysqllite/mysys/array.c b/deps/mysqllite/mysys/array.c
index 70c7a59aa3..70c7a59aa3 100644
--- a/modules/worldengine/deps/mysqllite/mysys/array.c
+++ b/deps/mysqllite/mysys/array.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/base64.c b/deps/mysqllite/mysys/base64.c
index ab66715c92..ab66715c92 100644
--- a/modules/worldengine/deps/mysqllite/mysys/base64.c
+++ b/deps/mysqllite/mysys/base64.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/charset-def.c b/deps/mysqllite/mysys/charset-def.c
index 9089347f00..9089347f00 100644
--- a/modules/worldengine/deps/mysqllite/mysys/charset-def.c
+++ b/deps/mysqllite/mysys/charset-def.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/charset.c b/deps/mysqllite/mysys/charset.c
index 167d6b8ff6..167d6b8ff6 100644
--- a/modules/worldengine/deps/mysqllite/mysys/charset.c
+++ b/deps/mysqllite/mysys/charset.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/checksum.c b/deps/mysqllite/mysys/checksum.c
index a96ea31ea0..a96ea31ea0 100644
--- a/modules/worldengine/deps/mysqllite/mysys/checksum.c
+++ b/deps/mysqllite/mysys/checksum.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/default.c b/deps/mysqllite/mysys/default.c
index 75eb4709e1..75eb4709e1 100644
--- a/modules/worldengine/deps/mysqllite/mysys/default.c
+++ b/deps/mysqllite/mysys/default.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/errors.c b/deps/mysqllite/mysys/errors.c
index c74ed29290..c74ed29290 100644
--- a/modules/worldengine/deps/mysqllite/mysys/errors.c
+++ b/deps/mysqllite/mysys/errors.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/hash.c b/deps/mysqllite/mysys/hash.c
index f54ac1a4ab..f54ac1a4ab 100644
--- a/modules/worldengine/deps/mysqllite/mysys/hash.c
+++ b/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
index 4ed01ac808..4ed01ac808 100644
--- a/modules/worldengine/deps/mysqllite/mysys/lf_alloc-pin.c
+++ b/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
index 0941c8762b..0941c8762b 100644
--- a/modules/worldengine/deps/mysqllite/mysys/lf_dynarray.c
+++ b/deps/mysqllite/mysys/lf_dynarray.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/lf_hash.c b/deps/mysqllite/mysys/lf_hash.c
index e7bf82fc6c..e7bf82fc6c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/lf_hash.c
+++ b/deps/mysqllite/mysys/lf_hash.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/list.c b/deps/mysqllite/mysys/list.c
index e68fbf519d..e68fbf519d 100644
--- a/modules/worldengine/deps/mysqllite/mysys/list.c
+++ b/deps/mysqllite/mysys/list.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/md5.c b/deps/mysqllite/mysys/md5.c
index 2388cebedc..2388cebedc 100644
--- a/modules/worldengine/deps/mysqllite/mysys/md5.c
+++ b/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
index 1edbea9df4..1edbea9df4 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_arr_appstr.c
+++ b/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
index 691532c0d8..691532c0d8 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_cache.c
+++ b/deps/mysqllite/mysys/mf_cache.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_dirname.c b/deps/mysqllite/mysys/mf_dirname.c
index 5a9440483e..5a9440483e 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_dirname.c
+++ b/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
index c872f2993c..c872f2993c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_fn_ext.c
+++ b/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
index 6afa2938fa..6afa2938fa 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_format.c
+++ b/deps/mysqllite/mysys/mf_format.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_getdate.c b/deps/mysqllite/mysys/mf_getdate.c
index 9475bebd10..9475bebd10 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_getdate.c
+++ b/deps/mysqllite/mysys/mf_getdate.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_iocache.c b/deps/mysqllite/mysys/mf_iocache.c
index 62e51ffb62..62e51ffb62 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_iocache.c
+++ b/deps/mysqllite/mysys/mf_iocache.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_iocache2.c b/deps/mysqllite/mysys/mf_iocache2.c
index 8962a037da..8962a037da 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_iocache2.c
+++ b/deps/mysqllite/mysys/mf_iocache2.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_keycache.c b/deps/mysqllite/mysys/mf_keycache.c
index 42cdea65f3..42cdea65f3 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_keycache.c
+++ b/deps/mysqllite/mysys/mf_keycache.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_keycaches.c b/deps/mysqllite/mysys/mf_keycaches.c
index 93b7eab456..93b7eab456 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_keycaches.c
+++ b/deps/mysqllite/mysys/mf_keycaches.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_loadpath.c b/deps/mysqllite/mysys/mf_loadpath.c
index 9350babc17..9350babc17 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_loadpath.c
+++ b/deps/mysqllite/mysys/mf_loadpath.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_pack.c b/deps/mysqllite/mysys/mf_pack.c
index 292cd8c045..292cd8c045 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_pack.c
+++ b/deps/mysqllite/mysys/mf_pack.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_path.c b/deps/mysqllite/mysys/mf_path.c
index 92cb62e682..92cb62e682 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_path.c
+++ b/deps/mysqllite/mysys/mf_path.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_qsort.c b/deps/mysqllite/mysys/mf_qsort.c
index 4b3ecb603a..4b3ecb603a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_qsort.c
+++ b/deps/mysqllite/mysys/mf_qsort.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_qsort2.c b/deps/mysqllite/mysys/mf_qsort2.c
index ca2bd1a495..ca2bd1a495 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_qsort2.c
+++ b/deps/mysqllite/mysys/mf_qsort2.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_radix.c b/deps/mysqllite/mysys/mf_radix.c
index 582ca76b8f..582ca76b8f 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_radix.c
+++ b/deps/mysqllite/mysys/mf_radix.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_same.c b/deps/mysqllite/mysys/mf_same.c
index 6738dc8051..6738dc8051 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_same.c
+++ b/deps/mysqllite/mysys/mf_same.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_sort.c b/deps/mysqllite/mysys/mf_sort.c
index a3e7465ead..a3e7465ead 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_sort.c
+++ b/deps/mysqllite/mysys/mf_sort.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_soundex.c b/deps/mysqllite/mysys/mf_soundex.c
index fe30d8c81a..fe30d8c81a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_soundex.c
+++ b/deps/mysqllite/mysys/mf_soundex.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_tempdir.c b/deps/mysqllite/mysys/mf_tempdir.c
index c84987cfc9..c84987cfc9 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_tempdir.c
+++ b/deps/mysqllite/mysys/mf_tempdir.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_tempfile.c b/deps/mysqllite/mysys/mf_tempfile.c
index e85124fb4c..e85124fb4c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_tempfile.c
+++ b/deps/mysqllite/mysys/mf_tempfile.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_unixpath.c b/deps/mysqllite/mysys/mf_unixpath.c
index ee81aae458..ee81aae458 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_unixpath.c
+++ b/deps/mysqllite/mysys/mf_unixpath.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mf_wcomp.c b/deps/mysqllite/mysys/mf_wcomp.c
index 4786537d1a..4786537d1a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mf_wcomp.c
+++ b/deps/mysqllite/mysys/mf_wcomp.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mulalloc.c b/deps/mysqllite/mysys/mulalloc.c
index f4ca3d9f9a..f4ca3d9f9a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mulalloc.c
+++ b/deps/mysqllite/mysys/mulalloc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_access.c b/deps/mysqllite/mysys/my_access.c
index 210946d50a..210946d50a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_access.c
+++ b/deps/mysqllite/mysys/my_access.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_aes.c b/deps/mysqllite/mysys/my_aes.c
index 575d4702de..575d4702de 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_aes.c
+++ b/deps/mysqllite/mysys/my_aes.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_alarm.c b/deps/mysqllite/mysys/my_alarm.c
index d6a0da1bd1..d6a0da1bd1 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_alarm.c
+++ b/deps/mysqllite/mysys/my_alarm.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_alloc.c b/deps/mysqllite/mysys/my_alloc.c
index 903826dd97..903826dd97 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_alloc.c
+++ b/deps/mysqllite/mysys/my_alloc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_atomic.c b/deps/mysqllite/mysys/my_atomic.c
index 7cbe15cfb7..7cbe15cfb7 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_atomic.c
+++ b/deps/mysqllite/mysys/my_atomic.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_bit.c b/deps/mysqllite/mysys/my_bit.c
index f072f24376..f072f24376 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_bit.c
+++ b/deps/mysqllite/mysys/my_bit.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_bitmap.c b/deps/mysqllite/mysys/my_bitmap.c
index dc15014121..dc15014121 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_bitmap.c
+++ b/deps/mysqllite/mysys/my_bitmap.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_chsize.c b/deps/mysqllite/mysys/my_chsize.c
index b9013811b3..b9013811b3 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_chsize.c
+++ b/deps/mysqllite/mysys/my_chsize.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_compress.c b/deps/mysqllite/mysys/my_compress.c
index 360390d376..360390d376 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_compress.c
+++ b/deps/mysqllite/mysys/my_compress.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_conio.c b/deps/mysqllite/mysys/my_conio.c
index 5dbd31193a..5dbd31193a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_conio.c
+++ b/deps/mysqllite/mysys/my_conio.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_copy.c b/deps/mysqllite/mysys/my_copy.c
index 35324dd4ce..35324dd4ce 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_copy.c
+++ b/deps/mysqllite/mysys/my_copy.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_create.c b/deps/mysqllite/mysys/my_create.c
index 49529f9b7b..49529f9b7b 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_create.c
+++ b/deps/mysqllite/mysys/my_create.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_delete.c b/deps/mysqllite/mysys/my_delete.c
index 4a23fedb5a..4a23fedb5a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_delete.c
+++ b/deps/mysqllite/mysys/my_delete.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_div.c b/deps/mysqllite/mysys/my_div.c
index d29d366885..d29d366885 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_div.c
+++ b/deps/mysqllite/mysys/my_div.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_error.c b/deps/mysqllite/mysys/my_error.c
index fa62cc604b..fa62cc604b 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_error.c
+++ b/deps/mysqllite/mysys/my_error.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_file.c b/deps/mysqllite/mysys/my_file.c
index e4b7cd7779..e4b7cd7779 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_file.c
+++ b/deps/mysqllite/mysys/my_file.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_fopen.c b/deps/mysqllite/mysys/my_fopen.c
index e184c8308f..e184c8308f 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_fopen.c
+++ b/deps/mysqllite/mysys/my_fopen.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_fstream.c b/deps/mysqllite/mysys/my_fstream.c
index 83cb0d261c..83cb0d261c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_fstream.c
+++ b/deps/mysqllite/mysys/my_fstream.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_gethostbyname.c b/deps/mysqllite/mysys/my_gethostbyname.c
index 28ecec13ef..28ecec13ef 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_gethostbyname.c
+++ b/deps/mysqllite/mysys/my_gethostbyname.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_gethwaddr.c b/deps/mysqllite/mysys/my_gethwaddr.c
index ab44bac43d..ab44bac43d 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_gethwaddr.c
+++ b/deps/mysqllite/mysys/my_gethwaddr.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getncpus.c b/deps/mysqllite/mysys/my_getncpus.c
index 5be961e3bc..5be961e3bc 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_getncpus.c
+++ b/deps/mysqllite/mysys/my_getncpus.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getopt.c b/deps/mysqllite/mysys/my_getopt.c
index 51c45ff130..51c45ff130 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_getopt.c
+++ b/deps/mysqllite/mysys/my_getopt.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getpagesize.c b/deps/mysqllite/mysys/my_getpagesize.c
index b0560cede3..b0560cede3 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_getpagesize.c
+++ b/deps/mysqllite/mysys/my_getpagesize.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getsystime.c b/deps/mysqllite/mysys/my_getsystime.c
index 614f49fc42..614f49fc42 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_getsystime.c
+++ b/deps/mysqllite/mysys/my_getsystime.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_getwd.c b/deps/mysqllite/mysys/my_getwd.c
index ace14c8a3c..ace14c8a3c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_getwd.c
+++ b/deps/mysqllite/mysys/my_getwd.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_handler.c b/deps/mysqllite/mysys/my_handler.c
index bd1e313d06..bd1e313d06 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_handler.c
+++ b/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
index e4e62f47fe..e4e62f47fe 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_handler_errors.h
+++ b/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
index 9b0939c1c7..9b0939c1c7 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_init.c
+++ b/deps/mysqllite/mysys/my_init.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_largepage.c b/deps/mysqllite/mysys/my_largepage.c
index 9f5ab01a2b..9f5ab01a2b 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_largepage.c
+++ b/deps/mysqllite/mysys/my_largepage.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_lib.c b/deps/mysqllite/mysys/my_lib.c
index 06f9521a66..06f9521a66 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_lib.c
+++ b/deps/mysqllite/mysys/my_lib.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_libwrap.c b/deps/mysqllite/mysys/my_libwrap.c
index e72334ba80..e72334ba80 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_libwrap.c
+++ b/deps/mysqllite/mysys/my_libwrap.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_lock.c b/deps/mysqllite/mysys/my_lock.c
index 49c94ea838..49c94ea838 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_lock.c
+++ b/deps/mysqllite/mysys/my_lock.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_lockmem.c b/deps/mysqllite/mysys/my_lockmem.c
index a37db6b208..a37db6b208 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_lockmem.c
+++ b/deps/mysqllite/mysys/my_lockmem.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_malloc.c b/deps/mysqllite/mysys/my_malloc.c
index fc2dc98c3c..fc2dc98c3c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_malloc.c
+++ b/deps/mysqllite/mysys/my_malloc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_memmem.c b/deps/mysqllite/mysys/my_memmem.c
index c000f14bc6..c000f14bc6 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_memmem.c
+++ b/deps/mysqllite/mysys/my_memmem.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_mess.c b/deps/mysqllite/mysys/my_mess.c
index 513afe3905..513afe3905 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_mess.c
+++ b/deps/mysqllite/mysys/my_mess.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_mkdir.c b/deps/mysqllite/mysys/my_mkdir.c
index 676c6c1cd5..676c6c1cd5 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_mkdir.c
+++ b/deps/mysqllite/mysys/my_mkdir.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_mmap.c b/deps/mysqllite/mysys/my_mmap.c
index 82ee1562bc..82ee1562bc 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_mmap.c
+++ b/deps/mysqllite/mysys/my_mmap.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_new.cc b/deps/mysqllite/mysys/my_new.cc
index 7da54ffac8..7da54ffac8 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_new.cc
+++ b/deps/mysqllite/mysys/my_new.cc
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_once.c b/deps/mysqllite/mysys/my_once.c
index 32d0780202..32d0780202 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_once.c
+++ b/deps/mysqllite/mysys/my_once.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_open.c b/deps/mysqllite/mysys/my_open.c
index 2aef97b3e3..2aef97b3e3 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_open.c
+++ b/deps/mysqllite/mysys/my_open.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_port.c b/deps/mysqllite/mysys/my_port.c
index 9ad333421c..9ad333421c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_port.c
+++ b/deps/mysqllite/mysys/my_port.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_pread.c b/deps/mysqllite/mysys/my_pread.c
index e006360c11..e006360c11 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_pread.c
+++ b/deps/mysqllite/mysys/my_pread.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_pthread.c b/deps/mysqllite/mysys/my_pthread.c
index 150bde3fb3..150bde3fb3 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_pthread.c
+++ b/deps/mysqllite/mysys/my_pthread.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_quick.c b/deps/mysqllite/mysys/my_quick.c
index b93e7e1722..b93e7e1722 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_quick.c
+++ b/deps/mysqllite/mysys/my_quick.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_rdtsc.c b/deps/mysqllite/mysys/my_rdtsc.c
index 2afe3ec31d..2afe3ec31d 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_rdtsc.c
+++ b/deps/mysqllite/mysys/my_rdtsc.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_read.c b/deps/mysqllite/mysys/my_read.c
index dbe9006a1d..dbe9006a1d 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_read.c
+++ b/deps/mysqllite/mysys/my_read.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_redel.c b/deps/mysqllite/mysys/my_redel.c
index 92aa6e4207..92aa6e4207 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_redel.c
+++ b/deps/mysqllite/mysys/my_redel.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_rename.c b/deps/mysqllite/mysys/my_rename.c
index 1a4e7b2b40..1a4e7b2b40 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_rename.c
+++ b/deps/mysqllite/mysys/my_rename.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_seek.c b/deps/mysqllite/mysys/my_seek.c
index ca12a2e95d..ca12a2e95d 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_seek.c
+++ b/deps/mysqllite/mysys/my_seek.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_sleep.c b/deps/mysqllite/mysys/my_sleep.c
index 6d1bdd5dc5..6d1bdd5dc5 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_sleep.c
+++ b/deps/mysqllite/mysys/my_sleep.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_static.c b/deps/mysqllite/mysys/my_static.c
index ec8d66ab0c..ec8d66ab0c 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_static.c
+++ b/deps/mysqllite/mysys/my_static.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_static.h b/deps/mysqllite/mysys/my_static.h
index 7fde15ff13..7fde15ff13 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_static.h
+++ b/deps/mysqllite/mysys/my_static.h
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_symlink.c b/deps/mysqllite/mysys/my_symlink.c
index 053fc887fe..053fc887fe 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_symlink.c
+++ b/deps/mysqllite/mysys/my_symlink.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_symlink2.c b/deps/mysqllite/mysys/my_symlink2.c
index 7c3ddbb911..7c3ddbb911 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_symlink2.c
+++ b/deps/mysqllite/mysys/my_symlink2.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_sync.c b/deps/mysqllite/mysys/my_sync.c
index e33a9342af..e33a9342af 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_sync.c
+++ b/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
index c4b56cde85..c4b56cde85 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_thr_init.c
+++ b/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
index 58c09e332d..58c09e332d 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_wincond.c
+++ b/deps/mysqllite/mysys/my_wincond.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_windac.c b/deps/mysqllite/mysys/my_windac.c
index 0c92418862..0c92418862 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_windac.c
+++ b/deps/mysqllite/mysys/my_windac.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_winerr.c b/deps/mysqllite/mysys/my_winerr.c
index 534078b673..534078b673 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_winerr.c
+++ b/deps/mysqllite/mysys/my_winerr.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_winfile.c b/deps/mysqllite/mysys/my_winfile.c
index 4d80d774da..4d80d774da 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_winfile.c
+++ b/deps/mysqllite/mysys/my_winfile.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_winthread.c b/deps/mysqllite/mysys/my_winthread.c
index 49534370a2..49534370a2 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_winthread.c
+++ b/deps/mysqllite/mysys/my_winthread.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/my_write.c b/deps/mysqllite/mysys/my_write.c
index 64f7546620..64f7546620 100644
--- a/modules/worldengine/deps/mysqllite/mysys/my_write.c
+++ b/deps/mysqllite/mysys/my_write.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/mysys_priv.h b/deps/mysqllite/mysys/mysys_priv.h
index 4e642b7e3d..4e642b7e3d 100644
--- a/modules/worldengine/deps/mysqllite/mysys/mysys_priv.h
+++ b/deps/mysqllite/mysys/mysys_priv.h
diff --git a/modules/worldengine/deps/mysqllite/mysys/ptr_cmp.c b/deps/mysqllite/mysys/ptr_cmp.c
index dcafe13291..dcafe13291 100644
--- a/modules/worldengine/deps/mysqllite/mysys/ptr_cmp.c
+++ b/deps/mysqllite/mysys/ptr_cmp.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/queues.c b/deps/mysqllite/mysys/queues.c
index 25a310c075..25a310c075 100644
--- a/modules/worldengine/deps/mysqllite/mysys/queues.c
+++ b/deps/mysqllite/mysys/queues.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/rijndael.c b/deps/mysqllite/mysys/rijndael.c
index 2d622efad8..2d622efad8 100644
--- a/modules/worldengine/deps/mysqllite/mysys/rijndael.c
+++ b/deps/mysqllite/mysys/rijndael.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/sha1.c b/deps/mysqllite/mysys/sha1.c
index e5b33a9ad1..e5b33a9ad1 100644
--- a/modules/worldengine/deps/mysqllite/mysys/sha1.c
+++ b/deps/mysqllite/mysys/sha1.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/stacktrace.c b/deps/mysqllite/mysys/stacktrace.c
index 48cdaaa6c9..48cdaaa6c9 100644
--- a/modules/worldengine/deps/mysqllite/mysys/stacktrace.c
+++ b/deps/mysqllite/mysys/stacktrace.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/string.c b/deps/mysqllite/mysys/string.c
index b1eded0664..b1eded0664 100644
--- a/modules/worldengine/deps/mysqllite/mysys/string.c
+++ b/deps/mysqllite/mysys/string.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_alarm.c b/deps/mysqllite/mysys/thr_alarm.c
index 2e427f96bd..2e427f96bd 100644
--- a/modules/worldengine/deps/mysqllite/mysys/thr_alarm.c
+++ b/deps/mysqllite/mysys/thr_alarm.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_lock.c b/deps/mysqllite/mysys/thr_lock.c
index 2ab283e068..2ab283e068 100644
--- a/modules/worldengine/deps/mysqllite/mysys/thr_lock.c
+++ b/deps/mysqllite/mysys/thr_lock.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_mutex.c b/deps/mysqllite/mysys/thr_mutex.c
index 37ced4f763..37ced4f763 100644
--- a/modules/worldengine/deps/mysqllite/mysys/thr_mutex.c
+++ b/deps/mysqllite/mysys/thr_mutex.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/thr_rwlock.c b/deps/mysqllite/mysys/thr_rwlock.c
index bad80b43ee..bad80b43ee 100644
--- a/modules/worldengine/deps/mysqllite/mysys/thr_rwlock.c
+++ b/deps/mysqllite/mysys/thr_rwlock.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/tree.c b/deps/mysqllite/mysys/tree.c
index 8ea7102ed4..8ea7102ed4 100644
--- a/modules/worldengine/deps/mysqllite/mysys/tree.c
+++ b/deps/mysqllite/mysys/tree.c
diff --git a/modules/worldengine/deps/mysqllite/mysys/typelib.c b/deps/mysqllite/mysys/typelib.c
index 7681ff581a..7681ff581a 100644
--- a/modules/worldengine/deps/mysqllite/mysys/typelib.c
+++ b/deps/mysqllite/mysys/typelib.c
diff --git a/modules/worldengine/deps/mysqllite/sql-common/client.c b/deps/mysqllite/sql-common/client.c
index 354c04b717..354c04b717 100644
--- a/modules/worldengine/deps/mysqllite/sql-common/client.c
+++ b/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
index 6b4cca8aee..6b4cca8aee 100644
--- a/modules/worldengine/deps/mysqllite/sql-common/client_plugin.c
+++ b/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
index 38384600fc..38384600fc 100644
--- a/modules/worldengine/deps/mysqllite/sql-common/my_time.c
+++ b/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
index 7ff89471b4..7ff89471b4 100644
--- a/modules/worldengine/deps/mysqllite/sql-common/pack.c
+++ b/deps/mysqllite/sql-common/pack.c
diff --git a/modules/worldengine/deps/mysqllite/sql/net_serv.cc b/deps/mysqllite/sql/net_serv.cc
index d60e2051cc..d60e2051cc 100644
--- a/modules/worldengine/deps/mysqllite/sql/net_serv.cc
+++ b/deps/mysqllite/sql/net_serv.cc
diff --git a/modules/worldengine/deps/mysqllite/sql/password.c b/deps/mysqllite/sql/password.c
index 3b69705cc8..3b69705cc8 100644
--- a/modules/worldengine/deps/mysqllite/sql/password.c
+++ b/deps/mysqllite/sql/password.c
diff --git a/modules/worldengine/deps/mysqllite/strings/CHARSET_INFO.txt b/deps/mysqllite/strings/CHARSET_INFO.txt
index 6f0a810be3..6f0a810be3 100644
--- a/modules/worldengine/deps/mysqllite/strings/CHARSET_INFO.txt
+++ b/deps/mysqllite/strings/CHARSET_INFO.txt
diff --git a/modules/worldengine/deps/mysqllite/strings/README b/deps/mysqllite/strings/README
index ddb811ede5..ddb811ede5 100644
--- a/modules/worldengine/deps/mysqllite/strings/README
+++ b/deps/mysqllite/strings/README
diff --git a/modules/worldengine/deps/mysqllite/strings/bchange.c b/deps/mysqllite/strings/bchange.c
index 0b2c62019b..0b2c62019b 100644
--- a/modules/worldengine/deps/mysqllite/strings/bchange.c
+++ b/deps/mysqllite/strings/bchange.c
diff --git a/modules/worldengine/deps/mysqllite/strings/bmove_upp.c b/deps/mysqllite/strings/bmove_upp.c
index 05e786837f..05e786837f 100644
--- a/modules/worldengine/deps/mysqllite/strings/bmove_upp.c
+++ b/deps/mysqllite/strings/bmove_upp.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-big5.c b/deps/mysqllite/strings/ctype-big5.c
index 3007d76a5a..3007d76a5a 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-big5.c
+++ b/deps/mysqllite/strings/ctype-big5.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-bin.c b/deps/mysqllite/strings/ctype-bin.c
index 3b6a977e47..3b6a977e47 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-bin.c
+++ b/deps/mysqllite/strings/ctype-bin.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-cp932.c b/deps/mysqllite/strings/ctype-cp932.c
index df4083c9f8..df4083c9f8 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-cp932.c
+++ b/deps/mysqllite/strings/ctype-cp932.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-czech.c b/deps/mysqllite/strings/ctype-czech.c
index 27a7bb39e6..27a7bb39e6 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-czech.c
+++ b/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
index 7329f9ec09..7329f9ec09 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-euc_kr.c
+++ b/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
index f89a45d6ed..f89a45d6ed 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-extra.c
+++ b/deps/mysqllite/strings/ctype-extra.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-gb2312.c b/deps/mysqllite/strings/ctype-gb2312.c
index b1acd643df..b1acd643df 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-gb2312.c
+++ b/deps/mysqllite/strings/ctype-gb2312.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-gbk.c b/deps/mysqllite/strings/ctype-gbk.c
index 547c882122..547c882122 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-gbk.c
+++ b/deps/mysqllite/strings/ctype-gbk.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-latin1.c b/deps/mysqllite/strings/ctype-latin1.c
index 028a1be674..028a1be674 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-latin1.c
+++ b/deps/mysqllite/strings/ctype-latin1.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-mb.c b/deps/mysqllite/strings/ctype-mb.c
index 8b985b7405..8b985b7405 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-mb.c
+++ b/deps/mysqllite/strings/ctype-mb.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-simple.c b/deps/mysqllite/strings/ctype-simple.c
index 2e5f78a30b..2e5f78a30b 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-simple.c
+++ b/deps/mysqllite/strings/ctype-simple.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-tis620.c b/deps/mysqllite/strings/ctype-tis620.c
index 14b661ab0f..14b661ab0f 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-tis620.c
+++ b/deps/mysqllite/strings/ctype-tis620.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-uca.c b/deps/mysqllite/strings/ctype-uca.c
index 2f7bf030d9..2f7bf030d9 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-uca.c
+++ b/deps/mysqllite/strings/ctype-uca.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-ucs2.c b/deps/mysqllite/strings/ctype-ucs2.c
index 67be793c3d..67be793c3d 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-ucs2.c
+++ b/deps/mysqllite/strings/ctype-ucs2.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-utf8.c b/deps/mysqllite/strings/ctype-utf8.c
index 324f6b9aaf..324f6b9aaf 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-utf8.c
+++ b/deps/mysqllite/strings/ctype-utf8.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype-win1250ch.c b/deps/mysqllite/strings/ctype-win1250ch.c
index d9d092beb8..d9d092beb8 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype-win1250ch.c
+++ b/deps/mysqllite/strings/ctype-win1250ch.c
diff --git a/modules/worldengine/deps/mysqllite/strings/ctype.c b/deps/mysqllite/strings/ctype.c
index 4891e657b6..4891e657b6 100644
--- a/modules/worldengine/deps/mysqllite/strings/ctype.c
+++ b/deps/mysqllite/strings/ctype.c
diff --git a/modules/worldengine/deps/mysqllite/strings/decimal.c b/deps/mysqllite/strings/decimal.c
index 762773f045..762773f045 100644
--- a/modules/worldengine/deps/mysqllite/strings/decimal.c
+++ b/deps/mysqllite/strings/decimal.c
diff --git a/modules/worldengine/deps/mysqllite/strings/dtoa.c b/deps/mysqllite/strings/dtoa.c
index d64c420b49..d64c420b49 100644
--- a/modules/worldengine/deps/mysqllite/strings/dtoa.c
+++ b/deps/mysqllite/strings/dtoa.c
diff --git a/modules/worldengine/deps/mysqllite/strings/int2str.c b/deps/mysqllite/strings/int2str.c
index ecc214d58d..ecc214d58d 100644
--- a/modules/worldengine/deps/mysqllite/strings/int2str.c
+++ b/deps/mysqllite/strings/int2str.c
diff --git a/modules/worldengine/deps/mysqllite/strings/is_prefix.c b/deps/mysqllite/strings/is_prefix.c
index 451cd468b7..451cd468b7 100644
--- a/modules/worldengine/deps/mysqllite/strings/is_prefix.c
+++ b/deps/mysqllite/strings/is_prefix.c
diff --git a/modules/worldengine/deps/mysqllite/strings/latin2.def b/deps/mysqllite/strings/latin2.def
index 159d01894f..159d01894f 100644
--- a/modules/worldengine/deps/mysqllite/strings/latin2.def
+++ b/deps/mysqllite/strings/latin2.def
diff --git a/modules/worldengine/deps/mysqllite/strings/llstr.c b/deps/mysqllite/strings/llstr.c
index 643cf36a31..643cf36a31 100644
--- a/modules/worldengine/deps/mysqllite/strings/llstr.c
+++ b/deps/mysqllite/strings/llstr.c
diff --git a/modules/worldengine/deps/mysqllite/strings/longlong2str.c b/deps/mysqllite/strings/longlong2str.c
index 641ae0955d..641ae0955d 100644
--- a/modules/worldengine/deps/mysqllite/strings/longlong2str.c
+++ b/deps/mysqllite/strings/longlong2str.c
diff --git a/modules/worldengine/deps/mysqllite/strings/my_strchr.c b/deps/mysqllite/strings/my_strchr.c
index 08fa51ba17..08fa51ba17 100644
--- a/modules/worldengine/deps/mysqllite/strings/my_strchr.c
+++ b/deps/mysqllite/strings/my_strchr.c
diff --git a/modules/worldengine/deps/mysqllite/strings/my_strtoll10.c b/deps/mysqllite/strings/my_strtoll10.c
index b9fc4b4be8..b9fc4b4be8 100644
--- a/modules/worldengine/deps/mysqllite/strings/my_strtoll10.c
+++ b/deps/mysqllite/strings/my_strtoll10.c
diff --git a/modules/worldengine/deps/mysqllite/strings/my_vsnprintf.c b/deps/mysqllite/strings/my_vsnprintf.c
index e9786dacfd..e9786dacfd 100644
--- a/modules/worldengine/deps/mysqllite/strings/my_vsnprintf.c
+++ b/deps/mysqllite/strings/my_vsnprintf.c
diff --git a/modules/worldengine/deps/mysqllite/strings/str2int.c b/deps/mysqllite/strings/str2int.c
index c4a4c07eef..c4a4c07eef 100644
--- a/modules/worldengine/deps/mysqllite/strings/str2int.c
+++ b/deps/mysqllite/strings/str2int.c
diff --git a/modules/worldengine/deps/mysqllite/strings/str_alloc.c b/deps/mysqllite/strings/str_alloc.c
index 615ad1ba1e..615ad1ba1e 100644
--- a/modules/worldengine/deps/mysqllite/strings/str_alloc.c
+++ b/deps/mysqllite/strings/str_alloc.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strappend.c b/deps/mysqllite/strings/strappend.c
index bb926f7466..bb926f7466 100644
--- a/modules/worldengine/deps/mysqllite/strings/strappend.c
+++ b/deps/mysqllite/strings/strappend.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strcend.c b/deps/mysqllite/strings/strcend.c
index e08ad2b1e7..e08ad2b1e7 100644
--- a/modules/worldengine/deps/mysqllite/strings/strcend.c
+++ b/deps/mysqllite/strings/strcend.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strcont.c b/deps/mysqllite/strings/strcont.c
index 5a518a3550..5a518a3550 100644
--- a/modules/worldengine/deps/mysqllite/strings/strcont.c
+++ b/deps/mysqllite/strings/strcont.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strend.c b/deps/mysqllite/strings/strend.c
index d70a5d648d..d70a5d648d 100644
--- a/modules/worldengine/deps/mysqllite/strings/strend.c
+++ b/deps/mysqllite/strings/strend.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strfill.c b/deps/mysqllite/strings/strfill.c
index 4b1fe67b20..4b1fe67b20 100644
--- a/modules/worldengine/deps/mysqllite/strings/strfill.c
+++ b/deps/mysqllite/strings/strfill.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strmake.c b/deps/mysqllite/strings/strmake.c
index 2d5fa5e36a..2d5fa5e36a 100644
--- a/modules/worldengine/deps/mysqllite/strings/strmake.c
+++ b/deps/mysqllite/strings/strmake.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strmov.c b/deps/mysqllite/strings/strmov.c
index 4d4915d27a..4d4915d27a 100644
--- a/modules/worldengine/deps/mysqllite/strings/strmov.c
+++ b/deps/mysqllite/strings/strmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strnlen.c b/deps/mysqllite/strings/strnlen.c
index 826cd5ae5d..826cd5ae5d 100644
--- a/modules/worldengine/deps/mysqllite/strings/strnlen.c
+++ b/deps/mysqllite/strings/strnlen.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strnmov.c b/deps/mysqllite/strings/strnmov.c
index 7e26877637..7e26877637 100644
--- a/modules/worldengine/deps/mysqllite/strings/strnmov.c
+++ b/deps/mysqllite/strings/strnmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strxmov.c b/deps/mysqllite/strings/strxmov.c
index 9dd2c93662..9dd2c93662 100644
--- a/modules/worldengine/deps/mysqllite/strings/strxmov.c
+++ b/deps/mysqllite/strings/strxmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/strxnmov.c b/deps/mysqllite/strings/strxnmov.c
index 16469be6e4..16469be6e4 100644
--- a/modules/worldengine/deps/mysqllite/strings/strxnmov.c
+++ b/deps/mysqllite/strings/strxnmov.c
diff --git a/modules/worldengine/deps/mysqllite/strings/t_ctype.h b/deps/mysqllite/strings/t_ctype.h
index af4f3ebbaa..af4f3ebbaa 100644
--- a/modules/worldengine/deps/mysqllite/strings/t_ctype.h
+++ b/deps/mysqllite/strings/t_ctype.h
diff --git a/modules/worldengine/deps/mysqllite/strings/xml.c b/deps/mysqllite/strings/xml.c
index f3cfaad54f..f3cfaad54f 100644
--- a/modules/worldengine/deps/mysqllite/strings/xml.c
+++ b/deps/mysqllite/strings/xml.c
diff --git a/modules/worldengine/deps/mysqllite/vio/vio.c b/deps/mysqllite/vio/vio.c
index 48f103c33e..48f103c33e 100644
--- a/modules/worldengine/deps/mysqllite/vio/vio.c
+++ b/deps/mysqllite/vio/vio.c
diff --git a/modules/worldengine/deps/mysqllite/vio/vio_priv.h b/deps/mysqllite/vio/vio_priv.h
index 1bfb857b03..1bfb857b03 100644
--- a/modules/worldengine/deps/mysqllite/vio/vio_priv.h
+++ b/deps/mysqllite/vio/vio_priv.h
diff --git a/modules/worldengine/deps/mysqllite/vio/viosocket.c b/deps/mysqllite/vio/viosocket.c
index 163eb279d4..163eb279d4 100644
--- a/modules/worldengine/deps/mysqllite/vio/viosocket.c
+++ b/deps/mysqllite/vio/viosocket.c
diff --git a/modules/worldengine/deps/mysqllite/vio/viossl.c b/deps/mysqllite/vio/viossl.c
index 5cb5f36f20..5cb5f36f20 100644
--- a/modules/worldengine/deps/mysqllite/vio/viossl.c
+++ b/deps/mysqllite/vio/viossl.c
diff --git a/modules/worldengine/deps/mysqllite/vio/viosslfactories.c b/deps/mysqllite/vio/viosslfactories.c
index 4971dec37f..4971dec37f 100644
--- a/modules/worldengine/deps/mysqllite/vio/viosslfactories.c
+++ b/deps/mysqllite/vio/viosslfactories.c
diff --git a/modules/worldengine/deps/recastnavigation/CMakeLists.txt b/deps/recastnavigation/CMakeLists.txt
index dd28884eb1..dd28884eb1 100644
--- a/modules/worldengine/deps/recastnavigation/CMakeLists.txt
+++ b/deps/recastnavigation/CMakeLists.txt
diff --git a/modules/worldengine/deps/recastnavigation/Detour/CMakeLists.txt b/deps/recastnavigation/Detour/CMakeLists.txt
index 12be71d32b..be271211b3 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/License.txt b/deps/recastnavigation/License.txt
index 95f4bfc965..95f4bfc965 100644
--- a/modules/worldengine/deps/recastnavigation/License.txt
+++ b/deps/recastnavigation/License.txt
diff --git a/modules/worldengine/deps/recastnavigation/Recast/CMakeLists.txt b/deps/recastnavigation/Recast/CMakeLists.txt
index 1eac4e7539..30265cb7e4 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/utf8cpp/utf8.h b/deps/utf8cpp/utf8.h
index 82b13f59f9..82b13f59f9 100644
--- a/modules/worldengine/deps/utf8cpp/utf8.h
+++ b/deps/utf8cpp/utf8.h
diff --git a/modules/worldengine/deps/utf8cpp/utf8/checked.h b/deps/utf8cpp/utf8/checked.h
index 1331155138..1331155138 100644
--- a/modules/worldengine/deps/utf8cpp/utf8/checked.h
+++ b/deps/utf8cpp/utf8/checked.h
diff --git a/modules/worldengine/deps/utf8cpp/utf8/core.h b/deps/utf8cpp/utf8/core.h
index 693d388c07..693d388c07 100644
--- a/modules/worldengine/deps/utf8cpp/utf8/core.h
+++ b/deps/utf8cpp/utf8/core.h
diff --git a/modules/worldengine/deps/utf8cpp/utf8/unchecked.h b/deps/utf8cpp/utf8/unchecked.h
index cb2427166b..cb2427166b 100644
--- a/modules/worldengine/deps/utf8cpp/utf8/unchecked.h
+++ b/deps/utf8cpp/utf8/unchecked.h
diff --git a/modules/worldengine/deps/zlib/CMakeLists.txt b/deps/zlib/CMakeLists.txt
index dd50284d95..dd50284d95 100644
--- a/modules/worldengine/deps/zlib/CMakeLists.txt
+++ b/deps/zlib/CMakeLists.txt
diff --git a/modules/worldengine/deps/zlib/adler32.c b/deps/zlib/adler32.c
index a868f073d8..a868f073d8 100644
--- a/modules/worldengine/deps/zlib/adler32.c
+++ b/deps/zlib/adler32.c
diff --git a/modules/worldengine/deps/zlib/compress.c b/deps/zlib/compress.c
index ea4dfbe9d7..ea4dfbe9d7 100644
--- a/modules/worldengine/deps/zlib/compress.c
+++ b/deps/zlib/compress.c
diff --git a/modules/worldengine/deps/zlib/crc32.c b/deps/zlib/crc32.c
index 979a7190a3..979a7190a3 100644
--- a/modules/worldengine/deps/zlib/crc32.c
+++ b/deps/zlib/crc32.c
diff --git a/modules/worldengine/deps/zlib/crc32.h b/deps/zlib/crc32.h
index 9e0c778102..9e0c778102 100644
--- a/modules/worldengine/deps/zlib/crc32.h
+++ b/deps/zlib/crc32.h
diff --git a/modules/worldengine/deps/zlib/deflate.c b/deps/zlib/deflate.c
index 9e4c2cbc8a..9e4c2cbc8a 100644
--- a/modules/worldengine/deps/zlib/deflate.c
+++ b/deps/zlib/deflate.c
diff --git a/modules/worldengine/deps/zlib/deflate.h b/deps/zlib/deflate.h
index fbac44d908..fbac44d908 100644
--- a/modules/worldengine/deps/zlib/deflate.h
+++ b/deps/zlib/deflate.h
diff --git a/modules/worldengine/deps/zlib/example.c b/deps/zlib/example.c
index 604736f15f..604736f15f 100644
--- a/modules/worldengine/deps/zlib/example.c
+++ b/deps/zlib/example.c
diff --git a/modules/worldengine/deps/zlib/gzclose.c b/deps/zlib/gzclose.c
index caeb99a317..caeb99a317 100644
--- a/modules/worldengine/deps/zlib/gzclose.c
+++ b/deps/zlib/gzclose.c
diff --git a/modules/worldengine/deps/zlib/gzguts.h b/deps/zlib/gzguts.h
index ee3f281aa5..ee3f281aa5 100644
--- a/modules/worldengine/deps/zlib/gzguts.h
+++ b/deps/zlib/gzguts.h
diff --git a/modules/worldengine/deps/zlib/gzlib.c b/deps/zlib/gzlib.c
index ca55c6ea92..ca55c6ea92 100644
--- a/modules/worldengine/deps/zlib/gzlib.c
+++ b/deps/zlib/gzlib.c
diff --git a/modules/worldengine/deps/zlib/gzread.c b/deps/zlib/gzread.c
index 3493d34d4e..3493d34d4e 100644
--- a/modules/worldengine/deps/zlib/gzread.c
+++ b/deps/zlib/gzread.c
diff --git a/modules/worldengine/deps/zlib/gzwrite.c b/deps/zlib/gzwrite.c
index 27cb3428e3..27cb3428e3 100644
--- a/modules/worldengine/deps/zlib/gzwrite.c
+++ b/deps/zlib/gzwrite.c
diff --git a/modules/worldengine/deps/zlib/infback.c b/deps/zlib/infback.c
index 981aff17c2..981aff17c2 100644
--- a/modules/worldengine/deps/zlib/infback.c
+++ b/deps/zlib/infback.c
diff --git a/modules/worldengine/deps/zlib/inffast.c b/deps/zlib/inffast.c
index 2f1d60b43b..2f1d60b43b 100644
--- a/modules/worldengine/deps/zlib/inffast.c
+++ b/deps/zlib/inffast.c
diff --git a/modules/worldengine/deps/zlib/inffast.h b/deps/zlib/inffast.h
index e5c1aa4ca8..e5c1aa4ca8 100644
--- a/modules/worldengine/deps/zlib/inffast.h
+++ b/deps/zlib/inffast.h
diff --git a/modules/worldengine/deps/zlib/inffixed.h b/deps/zlib/inffixed.h
index d628327769..d628327769 100644
--- a/modules/worldengine/deps/zlib/inffixed.h
+++ b/deps/zlib/inffixed.h
diff --git a/modules/worldengine/deps/zlib/inflate.c b/deps/zlib/inflate.c
index 47418a1e1e..47418a1e1e 100644
--- a/modules/worldengine/deps/zlib/inflate.c
+++ b/deps/zlib/inflate.c
diff --git a/modules/worldengine/deps/zlib/inflate.h b/deps/zlib/inflate.h
index 95f4986d40..95f4986d40 100644
--- a/modules/worldengine/deps/zlib/inflate.h
+++ b/deps/zlib/inflate.h
diff --git a/modules/worldengine/deps/zlib/inftrees.c b/deps/zlib/inftrees.c
index abcd7c45ed..abcd7c45ed 100644
--- a/modules/worldengine/deps/zlib/inftrees.c
+++ b/deps/zlib/inftrees.c
diff --git a/modules/worldengine/deps/zlib/inftrees.h b/deps/zlib/inftrees.h
index baa53a0b1a..baa53a0b1a 100644
--- a/modules/worldengine/deps/zlib/inftrees.h
+++ b/deps/zlib/inftrees.h
diff --git a/modules/worldengine/deps/zlib/minigzip.c b/deps/zlib/minigzip.c
index 9825ccc3a7..9825ccc3a7 100644
--- a/modules/worldengine/deps/zlib/minigzip.c
+++ b/deps/zlib/minigzip.c
diff --git a/modules/worldengine/deps/zlib/trees.c b/deps/zlib/trees.c
index 8c32b214b1..8c32b214b1 100644
--- a/modules/worldengine/deps/zlib/trees.c
+++ b/deps/zlib/trees.c
diff --git a/modules/worldengine/deps/zlib/trees.h b/deps/zlib/trees.h
index d35639d82a..d35639d82a 100644
--- a/modules/worldengine/deps/zlib/trees.h
+++ b/deps/zlib/trees.h
diff --git a/modules/worldengine/deps/zlib/uncompr.c b/deps/zlib/uncompr.c
index ad98be3a5d..ad98be3a5d 100644
--- a/modules/worldengine/deps/zlib/uncompr.c
+++ b/deps/zlib/uncompr.c
diff --git a/modules/worldengine/deps/zlib/zconf.h b/deps/zlib/zconf.h
index 8a46a58b30..8a46a58b30 100644
--- a/modules/worldengine/deps/zlib/zconf.h
+++ b/deps/zlib/zconf.h
diff --git a/modules/worldengine/deps/zlib/zlib.h b/deps/zlib/zlib.h
index 3edf3acdb5..3edf3acdb5 100644
--- a/modules/worldengine/deps/zlib/zlib.h
+++ b/deps/zlib/zlib.h
diff --git a/modules/worldengine/deps/zlib/zutil.c b/deps/zlib/zutil.c
index 65e0d3b72b..65e0d3b72b 100644
--- a/modules/worldengine/deps/zlib/zutil.c
+++ b/deps/zlib/zutil.c
diff --git a/modules/worldengine/deps/zlib/zutil.h b/deps/zlib/zutil.h
index 4e3dcc6ae9..4e3dcc6ae9 100644
--- a/modules/worldengine/deps/zlib/zutil.h
+++ b/deps/zlib/zutil.h
diff --git a/env/dist/.gitkeep b/env/dist/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/env/dist/.gitkeep
diff --git a/env/user/.gitkeep b/env/user/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/env/user/.gitkeep
diff --git a/install.sh b/install.sh
index 8be9c99700..af88b78e1a 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 0000000000..e69de29bb2
--- /dev/null
+++ b/modules/.gitkeep
diff --git a/modules/acore/extractors/mmaps_generator/CMakeLists.txt b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
deleted file mode 100644
index 9beb46eb2f..0000000000
--- 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 4b43d67e3e..0000000000
--- 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 dbbe355815..0000000000
--- 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 94b4628ba7..0000000000
--- 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 7b1c00bd67..0000000000
--- 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 6c1fefefb6..0000000000
--- 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 4b43d67e3e..0000000000
--- 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 dbbe355815..0000000000
--- 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 57db910a2c..0000000000
--- 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 febd4f0ab6..0000000000
--- 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 dbbe355815..0000000000
--- 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 8c7513ff03..0000000000
--- 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 4d106ab3a2..12df311743 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,12 +19,5 @@ endif()
 add_subdirectory(genrev)
 
 if( SERVERS )
-  set(sources_windows_Debugging
-    ${CMAKE_SOURCE_DIR}/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
index 055860c999..055860c999 100644
--- a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
+++ b/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
index c4597c5071..c4597c5071 100644
--- a/modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake
+++ b/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
index 133bc15e59..133bc15e59 100644
--- a/modules/worldengine/nucleus/src/cmake/compiler/icc/settings.cmake
+++ b/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
index 68156bd0b6..68156bd0b6 100644
--- a/modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake
+++ b/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
index 7ce1f7f200..7ce1f7f200 100644
--- a/modules/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake
+++ b/src/cmake/compiler/msvc/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/CheckBuildDir.cmake b/src/cmake/macros/CheckBuildDir.cmake
index 085ca32746..085ca32746 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/CheckBuildDir.cmake
+++ b/src/cmake/macros/CheckBuildDir.cmake
diff --git a/src/cmake/macros/CheckPlatform.cmake b/src/cmake/macros/CheckPlatform.cmake
new file mode 100644
index 0000000000..5ef5f6d9a5
--- /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
index a85e12abb7..a85e12abb7 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake
+++ b/src/cmake/macros/EnsureVersion.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindACE.cmake b/src/cmake/macros/FindACE.cmake
index 10d762f301..10d762f301 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/FindACE.cmake
+++ b/src/cmake/macros/FindACE.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindGit.cmake b/src/cmake/macros/FindGit.cmake
index ca37cd7d6e..a37370c849 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
index f35104d2f9..f35104d2f9 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/FindGperftools.cmake
+++ b/src/cmake/macros/FindGperftools.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake
index 4f432ca4c8..4f432ca4c8 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake
+++ b/src/cmake/macros/FindMySQL.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindOpenSSL.cmake b/src/cmake/macros/FindOpenSSL.cmake
index 245a91d419..245a91d419 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/FindOpenSSL.cmake
+++ b/src/cmake/macros/FindOpenSSL.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindPCHSupport.cmake b/src/cmake/macros/FindPCHSupport.cmake
index b068b69c26..b068b69c26 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/FindPCHSupport.cmake
+++ b/src/cmake/macros/FindPCHSupport.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindReadline.cmake b/src/cmake/macros/FindReadline.cmake
index 07c6b368df..07c6b368df 100644
--- a/modules/worldengine/nucleus/src/cmake/macros/FindReadline.cmake
+++ b/src/cmake/macros/FindReadline.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake b/src/cmake/platform/after_platform.cmake
index bf02e719d8..bf02e719d8 100644
--- a/modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake
+++ b/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
index 06f9c8263a..06f9c8263a 100644
--- a/modules/worldengine/nucleus/src/cmake/platform/cmake_uninstall.in.cmake
+++ b/src/cmake/platform/cmake_uninstall.in.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/platform/settings.cmake b/src/cmake/platform/settings.cmake
index 6df5bc2165..6df5bc2165 100644
--- a/modules/worldengine/nucleus/src/cmake/platform/settings.cmake
+++ b/src/cmake/platform/settings.cmake
diff --git a/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake b/src/cmake/platform/unix/settings.cmake
index 632df48fef..34ac006d66 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
index 319164f76e..78aa97b0b0 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
index 508056d489..508056d489 100644
--- a/modules/worldengine/nucleus/src/AutoPtr.h
+++ b/src/common/AutoPtr.h
diff --git a/modules/worldengine/nucleus/src/CMakeLists.txt b/src/common/CMakeLists.txt
index a7f3f81eb0..9a44d33028 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
index fde804a303..fde804a303 100644
--- a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchy.cpp
+++ b/src/common/Collision/BoundingIntervalHierarchy.cpp
diff --git a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h
index 7b3eb5af0d..7b3eb5af0d 100644
--- a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchy.h
+++ b/src/common/Collision/BoundingIntervalHierarchy.h
diff --git a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h
index 5d0fa47020..5d0fa47020 100644
--- a/modules/worldengine/lib-collision/src/BoundingIntervalHierarchyWrapper.h
+++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h
diff --git a/src/common/Collision/CMakeLists.txt b/src/common/Collision/CMakeLists.txt
new file mode 100644
index 0000000000..a1c6b8b840
--- /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
index adf29a8a6e..adf29a8a6e 100644
--- a/modules/worldengine/lib-collision/src/DynamicTree.cpp
+++ b/src/common/Collision/DynamicTree.cpp
diff --git a/modules/worldengine/lib-collision/src/DynamicTree.h b/src/common/Collision/DynamicTree.h
index a8f45d9800..a8f45d9800 100644
--- a/modules/worldengine/lib-collision/src/DynamicTree.h
+++ b/src/common/Collision/DynamicTree.h
diff --git a/modules/worldengine/lib-collision/src/Management/IMMAPManager.h b/src/common/Collision/Management/IMMAPManager.h
index b2df8a2232..b2df8a2232 100644
--- a/modules/worldengine/lib-collision/src/Management/IMMAPManager.h
+++ b/src/common/Collision/Management/IMMAPManager.h
diff --git a/modules/worldengine/lib-collision/src/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h
index d37b0e1c54..d37b0e1c54 100644
--- a/modules/worldengine/lib-collision/src/Management/IVMapManager.h
+++ b/src/common/Collision/Management/IVMapManager.h
diff --git a/modules/worldengine/lib-collision/src/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp
index 798fecaadb..798fecaadb 100644
--- a/modules/worldengine/lib-collision/src/Management/MMapFactory.cpp
+++ b/src/common/Collision/Management/MMapFactory.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h
index 84799f8118..84799f8118 100644
--- a/modules/worldengine/lib-collision/src/Management/MMapFactory.h
+++ b/src/common/Collision/Management/MMapFactory.h
diff --git a/modules/worldengine/lib-collision/src/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index 43355b834b..43355b834b 100644
--- a/modules/worldengine/lib-collision/src/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h
index 842fe47fbf..842fe47fbf 100644
--- a/modules/worldengine/lib-collision/src/Management/MMapManager.h
+++ b/src/common/Collision/Management/MMapManager.h
diff --git a/modules/worldengine/lib-collision/src/Management/VMapFactory.cpp b/src/common/Collision/Management/VMapFactory.cpp
index 17be9ddfa4..17be9ddfa4 100644
--- a/modules/worldengine/lib-collision/src/Management/VMapFactory.cpp
+++ b/src/common/Collision/Management/VMapFactory.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/VMapFactory.h b/src/common/Collision/Management/VMapFactory.h
index 43a4060d14..43a4060d14 100644
--- a/modules/worldengine/lib-collision/src/Management/VMapFactory.h
+++ b/src/common/Collision/Management/VMapFactory.h
diff --git a/modules/worldengine/lib-collision/src/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
index 6897ffa56a..6897ffa56a 100644
--- a/modules/worldengine/lib-collision/src/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
diff --git a/modules/worldengine/lib-collision/src/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
index ac07d79458..ac07d79458 100644
--- a/modules/worldengine/lib-collision/src/Management/VMapManager2.h
+++ b/src/common/Collision/Management/VMapManager2.h
diff --git a/modules/worldengine/lib-collision/src/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp
index c2056c90b9..c2056c90b9 100644
--- a/modules/worldengine/lib-collision/src/Maps/MapTree.cpp
+++ b/src/common/Collision/Maps/MapTree.cpp
diff --git a/modules/worldengine/lib-collision/src/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
index b9ec50d5d9..b9ec50d5d9 100644
--- a/modules/worldengine/lib-collision/src/Maps/MapTree.h
+++ b/src/common/Collision/Maps/MapTree.h
diff --git a/modules/worldengine/lib-collision/src/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index 93a11367d8..93a11367d8 100644
--- a/modules/worldengine/lib-collision/src/Maps/TileAssembler.cpp
+++ b/src/common/Collision/Maps/TileAssembler.cpp
diff --git a/modules/worldengine/lib-collision/src/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h
index d93662d7fc..d93662d7fc 100644
--- a/modules/worldengine/lib-collision/src/Maps/TileAssembler.h
+++ b/src/common/Collision/Maps/TileAssembler.h
diff --git a/modules/worldengine/lib-collision/src/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp
index d548ddb432..d548ddb432 100644
--- a/modules/worldengine/lib-collision/src/Models/GameObjectModel.cpp
+++ b/src/common/Collision/Models/GameObjectModel.cpp
diff --git a/modules/worldengine/lib-collision/src/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
index f5b545014e..f5b545014e 100644
--- a/modules/worldengine/lib-collision/src/Models/GameObjectModel.h
+++ b/src/common/Collision/Models/GameObjectModel.h
diff --git a/modules/worldengine/lib-collision/src/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp
index 18faf11e5d..18faf11e5d 100644
--- a/modules/worldengine/lib-collision/src/Models/ModelInstance.cpp
+++ b/src/common/Collision/Models/ModelInstance.cpp
diff --git a/modules/worldengine/lib-collision/src/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h
index 16a9c34ca7..16a9c34ca7 100644
--- a/modules/worldengine/lib-collision/src/Models/ModelInstance.h
+++ b/src/common/Collision/Models/ModelInstance.h
diff --git a/modules/worldengine/lib-collision/src/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp
index 622fb55212..622fb55212 100644
--- a/modules/worldengine/lib-collision/src/Models/WorldModel.cpp
+++ b/src/common/Collision/Models/WorldModel.cpp
diff --git a/modules/worldengine/lib-collision/src/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h
index 32ac6d9915..32ac6d9915 100644
--- a/modules/worldengine/lib-collision/src/Models/WorldModel.h
+++ b/src/common/Collision/Models/WorldModel.h
diff --git a/modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.cpp b/src/common/Collision/PrecompiledHeaders/collisionPCH.cpp
index 36eae8e2b0..36eae8e2b0 100644
--- a/modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.cpp
+++ b/src/common/Collision/PrecompiledHeaders/collisionPCH.cpp
diff --git a/modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.h b/src/common/Collision/PrecompiledHeaders/collisionPCH.h
index ece2ef1b8e..ece2ef1b8e 100644
--- a/modules/worldengine/lib-collision/src/PrecompiledHeaders/collisionPCH.h
+++ b/src/common/Collision/PrecompiledHeaders/collisionPCH.h
diff --git a/modules/worldengine/lib-collision/src/RegularGrid.h b/src/common/Collision/RegularGrid.h
index f3e0f62e6a..f3e0f62e6a 100644
--- a/modules/worldengine/lib-collision/src/RegularGrid.h
+++ b/src/common/Collision/RegularGrid.h
diff --git a/modules/worldengine/lib-collision/src/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h
index 3ff01cba2d..3ff01cba2d 100644
--- a/modules/worldengine/lib-collision/src/VMapDefinitions.h
+++ b/src/common/Collision/VMapDefinitions.h
diff --git a/modules/worldengine/lib-collision/src/VMapTools.h b/src/common/Collision/VMapTools.h
index 908a02c622..908a02c622 100644
--- a/modules/worldengine/lib-collision/src/VMapTools.h
+++ b/src/common/Collision/VMapTools.h
diff --git a/modules/worldengine/nucleus/src/Common.cpp b/src/common/Common.cpp
index 1bde202041..1bde202041 100644
--- a/modules/worldengine/nucleus/src/Common.cpp
+++ b/src/common/Common.cpp
diff --git a/modules/worldengine/nucleus/src/Common.h b/src/common/Common.h
index 9fb4d30c69..9fb4d30c69 100644
--- a/modules/worldengine/nucleus/src/Common.h
+++ b/src/common/Common.h
diff --git a/modules/worldengine/nucleus/src/CompilerDefs.h b/src/common/CompilerDefs.h
index e189799c3f..e189799c3f 100644
--- a/modules/worldengine/nucleus/src/CompilerDefs.h
+++ b/src/common/CompilerDefs.h
diff --git a/modules/worldengine/nucleus/src/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index e467fc3697..e467fc3697 100644
--- a/modules/worldengine/nucleus/src/Configuration/Config.cpp
+++ b/src/common/Configuration/Config.cpp
diff --git a/modules/worldengine/nucleus/src/Configuration/Config.h b/src/common/Configuration/Config.h
index 5ef1099635..5ef1099635 100644
--- a/modules/worldengine/nucleus/src/Configuration/Config.h
+++ b/src/common/Configuration/Config.h
diff --git a/modules/worldengine/nucleus/src/Containers.h b/src/common/Containers.h
index d5974cefab..d5974cefab 100644
--- a/modules/worldengine/nucleus/src/Containers.h
+++ b/src/common/Containers.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/ARC4.cpp b/src/common/Cryptography/ARC4.cpp
index 429abfcdf3..429abfcdf3 100644
--- a/modules/worldengine/nucleus/src/Cryptography/ARC4.cpp
+++ b/src/common/Cryptography/ARC4.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/ARC4.h b/src/common/Cryptography/ARC4.h
index bb25410e28..bb25410e28 100644
--- a/modules/worldengine/nucleus/src/Cryptography/ARC4.h
+++ b/src/common/Cryptography/ARC4.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.cpp b/src/common/Cryptography/Authentication/AuthCrypt.cpp
index 171939cfb5..171939cfb5 100644
--- a/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.cpp
+++ b/src/common/Cryptography/Authentication/AuthCrypt.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.h b/src/common/Cryptography/Authentication/AuthCrypt.h
index 061841679a..061841679a 100644
--- a/modules/worldengine/nucleus/src/Cryptography/Authentication/AuthCrypt.h
+++ b/src/common/Cryptography/Authentication/AuthCrypt.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/BigNumber.cpp b/src/common/Cryptography/BigNumber.cpp
index c43265ec89..c43265ec89 100644
--- a/modules/worldengine/nucleus/src/Cryptography/BigNumber.cpp
+++ b/src/common/Cryptography/BigNumber.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h
index 337dee9db1..337dee9db1 100644
--- a/modules/worldengine/nucleus/src/Cryptography/BigNumber.h
+++ b/src/common/Cryptography/BigNumber.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.cpp b/src/common/Cryptography/HMACSHA1.cpp
index 93872d2716..93872d2716 100644
--- a/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.cpp
+++ b/src/common/Cryptography/HMACSHA1.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.h b/src/common/Cryptography/HMACSHA1.h
index 3c99dc0838..3c99dc0838 100644
--- a/modules/worldengine/nucleus/src/Cryptography/HMACSHA1.h
+++ b/src/common/Cryptography/HMACSHA1.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp
index d8b1b7c6e9..d8b1b7c6e9 100644
--- a/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.cpp
+++ b/src/common/Cryptography/OpenSSLCrypto.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.h b/src/common/Cryptography/OpenSSLCrypto.h
index 4285f7d750..4285f7d750 100644
--- a/modules/worldengine/nucleus/src/Cryptography/OpenSSLCrypto.h
+++ b/src/common/Cryptography/OpenSSLCrypto.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/SHA1.cpp b/src/common/Cryptography/SHA1.cpp
index a4176eecc6..a4176eecc6 100644
--- a/modules/worldengine/nucleus/src/Cryptography/SHA1.cpp
+++ b/src/common/Cryptography/SHA1.cpp
diff --git a/modules/worldengine/nucleus/src/Cryptography/SHA1.h b/src/common/Cryptography/SHA1.h
index afa6667439..afa6667439 100644
--- a/modules/worldengine/nucleus/src/Cryptography/SHA1.h
+++ b/src/common/Cryptography/SHA1.h
diff --git a/modules/worldengine/nucleus/src/Cryptography/WardenKeyGeneration.h b/src/common/Cryptography/WardenKeyGeneration.h
index 5d73b3037a..5d73b3037a 100644
--- a/modules/worldengine/nucleus/src/Cryptography/WardenKeyGeneration.h
+++ b/src/common/Cryptography/WardenKeyGeneration.h
diff --git a/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp
index 6d5790b383..6d5790b383 100644
--- a/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.cpp
+++ b/src/common/DataStores/DBCFileLoader.cpp
diff --git a/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h
index 2afba9579e..2afba9579e 100644
--- a/modules/worldengine/nucleus/src/DataStores/DBCFileLoader.h
+++ b/src/common/DataStores/DBCFileLoader.h
diff --git a/modules/worldengine/nucleus/src/DataStores/DBCStore.h b/src/common/DataStores/DBCStore.h
index 533e542041..533e542041 100644
--- a/modules/worldengine/nucleus/src/DataStores/DBCStore.h
+++ b/src/common/DataStores/DBCStore.h
diff --git a/modules/worldengine/nucleus/src/Database/AdhocStatement.cpp b/src/common/Database/AdhocStatement.cpp
index e752ab9e7d..e752ab9e7d 100644
--- a/modules/worldengine/nucleus/src/Database/AdhocStatement.cpp
+++ b/src/common/Database/AdhocStatement.cpp
diff --git a/modules/worldengine/nucleus/src/Database/AdhocStatement.h b/src/common/Database/AdhocStatement.h
index b527efcada..b527efcada 100644
--- a/modules/worldengine/nucleus/src/Database/AdhocStatement.h
+++ b/src/common/Database/AdhocStatement.h
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseEnv.h b/src/common/Database/DatabaseEnv.h
index cfa9eef24a..cfa9eef24a 100644
--- a/modules/worldengine/nucleus/src/Database/DatabaseEnv.h
+++ b/src/common/Database/DatabaseEnv.h
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseWorker.cpp b/src/common/Database/DatabaseWorker.cpp
index aa6a5ba16c..aa6a5ba16c 100644
--- a/modules/worldengine/nucleus/src/Database/DatabaseWorker.cpp
+++ b/src/common/Database/DatabaseWorker.cpp
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseWorker.h b/src/common/Database/DatabaseWorker.h
index 6fa544d452..6fa544d452 100644
--- a/modules/worldengine/nucleus/src/Database/DatabaseWorker.h
+++ b/src/common/Database/DatabaseWorker.h
diff --git a/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h b/src/common/Database/DatabaseWorkerPool.h
index 87957b206a..87957b206a 100644
--- a/modules/worldengine/nucleus/src/Database/DatabaseWorkerPool.h
+++ b/src/common/Database/DatabaseWorkerPool.h
diff --git a/modules/worldengine/nucleus/src/Database/Field.cpp b/src/common/Database/Field.cpp
index fdc5ded657..fdc5ded657 100644
--- a/modules/worldengine/nucleus/src/Database/Field.cpp
+++ b/src/common/Database/Field.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Field.h b/src/common/Database/Field.h
index 6ba3c9e92e..6ba3c9e92e 100644
--- a/modules/worldengine/nucleus/src/Database/Field.h
+++ b/src/common/Database/Field.h
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp b/src/common/Database/Implementation/CharacterDatabase.cpp
index c1ace0ccaa..c1ace0ccaa 100644
--- a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.cpp
+++ b/src/common/Database/Implementation/CharacterDatabase.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h b/src/common/Database/Implementation/CharacterDatabase.h
index 7ec0d094a8..7ec0d094a8 100644
--- a/modules/worldengine/nucleus/src/Database/Implementation/CharacterDatabase.h
+++ b/src/common/Database/Implementation/CharacterDatabase.h
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.cpp b/src/common/Database/Implementation/LoginDatabase.cpp
index 66d1755c7a..66d1755c7a 100644
--- a/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.cpp
+++ b/src/common/Database/Implementation/LoginDatabase.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.h b/src/common/Database/Implementation/LoginDatabase.h
index 0bde70d161..0bde70d161 100644
--- a/modules/worldengine/nucleus/src/Database/Implementation/LoginDatabase.h
+++ b/src/common/Database/Implementation/LoginDatabase.h
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.cpp b/src/common/Database/Implementation/WorldDatabase.cpp
index 2dd28018ed..2dd28018ed 100644
--- a/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.cpp
+++ b/src/common/Database/Implementation/WorldDatabase.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.h b/src/common/Database/Implementation/WorldDatabase.h
index df42677077..df42677077 100644
--- a/modules/worldengine/nucleus/src/Database/Implementation/WorldDatabase.h
+++ b/src/common/Database/Implementation/WorldDatabase.h
diff --git a/modules/worldengine/nucleus/src/Database/MySQLConnection.cpp b/src/common/Database/MySQLConnection.cpp
index 6b554ce8e7..6b554ce8e7 100644
--- a/modules/worldengine/nucleus/src/Database/MySQLConnection.cpp
+++ b/src/common/Database/MySQLConnection.cpp
diff --git a/modules/worldengine/nucleus/src/Database/MySQLConnection.h b/src/common/Database/MySQLConnection.h
index 2631ba2fd3..2631ba2fd3 100644
--- a/modules/worldengine/nucleus/src/Database/MySQLConnection.h
+++ b/src/common/Database/MySQLConnection.h
diff --git a/modules/worldengine/nucleus/src/Database/MySQLThreading.h b/src/common/Database/MySQLThreading.h
index 726fd7cb81..726fd7cb81 100644
--- a/modules/worldengine/nucleus/src/Database/MySQLThreading.h
+++ b/src/common/Database/MySQLThreading.h
diff --git a/modules/worldengine/nucleus/src/Database/PreparedStatement.cpp b/src/common/Database/PreparedStatement.cpp
index f3ec96fa48..f3ec96fa48 100644
--- a/modules/worldengine/nucleus/src/Database/PreparedStatement.cpp
+++ b/src/common/Database/PreparedStatement.cpp
diff --git a/modules/worldengine/nucleus/src/Database/PreparedStatement.h b/src/common/Database/PreparedStatement.h
index 0d55c24d8a..0d55c24d8a 100644
--- a/modules/worldengine/nucleus/src/Database/PreparedStatement.h
+++ b/src/common/Database/PreparedStatement.h
diff --git a/modules/worldengine/nucleus/src/Database/QueryHolder.cpp b/src/common/Database/QueryHolder.cpp
index dd98f117aa..dd98f117aa 100644
--- a/modules/worldengine/nucleus/src/Database/QueryHolder.cpp
+++ b/src/common/Database/QueryHolder.cpp
diff --git a/modules/worldengine/nucleus/src/Database/QueryHolder.h b/src/common/Database/QueryHolder.h
index efd45c383f..efd45c383f 100644
--- a/modules/worldengine/nucleus/src/Database/QueryHolder.h
+++ b/src/common/Database/QueryHolder.h
diff --git a/modules/worldengine/nucleus/src/Database/QueryResult.cpp b/src/common/Database/QueryResult.cpp
index aea203080c..aea203080c 100644
--- a/modules/worldengine/nucleus/src/Database/QueryResult.cpp
+++ b/src/common/Database/QueryResult.cpp
diff --git a/modules/worldengine/nucleus/src/Database/QueryResult.h b/src/common/Database/QueryResult.h
index dd6cec32d0..dd6cec32d0 100644
--- a/modules/worldengine/nucleus/src/Database/QueryResult.h
+++ b/src/common/Database/QueryResult.h
diff --git a/modules/worldengine/nucleus/src/Database/SQLOperation.h b/src/common/Database/SQLOperation.h
index 72ce6fd6a0..72ce6fd6a0 100644
--- a/modules/worldengine/nucleus/src/Database/SQLOperation.h
+++ b/src/common/Database/SQLOperation.h
diff --git a/modules/worldengine/nucleus/src/Database/Transaction.cpp b/src/common/Database/Transaction.cpp
index a2dfb9beea..a2dfb9beea 100644
--- a/modules/worldengine/nucleus/src/Database/Transaction.cpp
+++ b/src/common/Database/Transaction.cpp
diff --git a/modules/worldengine/nucleus/src/Database/Transaction.h b/src/common/Database/Transaction.h
index 48afc65a4f..48afc65a4f 100644
--- a/modules/worldengine/nucleus/src/Database/Transaction.h
+++ b/src/common/Database/Transaction.h
diff --git a/modules/worldengine/nucleus/src/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp
index 3ed8dc5e0a..3ed8dc5e0a 100644
--- a/modules/worldengine/nucleus/src/Debugging/Errors.cpp
+++ b/src/common/Debugging/Errors.cpp
diff --git a/modules/worldengine/nucleus/src/Debugging/Errors.h b/src/common/Debugging/Errors.h
index 81dc27c241..81dc27c241 100644
--- a/modules/worldengine/nucleus/src/Debugging/Errors.h
+++ b/src/common/Debugging/Errors.h
diff --git a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp b/src/common/Debugging/WheatyExceptionReport.cpp
index 7bb12cf6c5..7bb12cf6c5 100644
--- a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp
+++ b/src/common/Debugging/WheatyExceptionReport.cpp
diff --git a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h b/src/common/Debugging/WheatyExceptionReport.h
index f6d6b7f4b9..f6d6b7f4b9 100644
--- a/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h
+++ b/src/common/Debugging/WheatyExceptionReport.h
diff --git a/modules/worldengine/nucleus/src/Define.h b/src/common/Define.h
index 3494531019..3494531019 100644
--- a/modules/worldengine/nucleus/src/Define.h
+++ b/src/common/Define.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/FactoryHolder.h b/src/common/Dynamic/FactoryHolder.h
index a53b55abc7..a53b55abc7 100644
--- a/modules/worldengine/nucleus/src/Dynamic/FactoryHolder.h
+++ b/src/common/Dynamic/FactoryHolder.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/HashNamespace.h b/src/common/Dynamic/HashNamespace.h
index b9cbe5e658..b9cbe5e658 100644
--- a/modules/worldengine/nucleus/src/Dynamic/HashNamespace.h
+++ b/src/common/Dynamic/HashNamespace.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/LinkedList.h b/src/common/Dynamic/LinkedList.h
index cc353d9695..cc353d9695 100644
--- a/modules/worldengine/nucleus/src/Dynamic/LinkedList.h
+++ b/src/common/Dynamic/LinkedList.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/LinkedReference/RefManager.h b/src/common/Dynamic/LinkedReference/RefManager.h
index 52e397c86a..52e397c86a 100644
--- a/modules/worldengine/nucleus/src/Dynamic/LinkedReference/RefManager.h
+++ b/src/common/Dynamic/LinkedReference/RefManager.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/LinkedReference/Reference.h b/src/common/Dynamic/LinkedReference/Reference.h
index 9bf2509f6a..9bf2509f6a 100644
--- a/modules/worldengine/nucleus/src/Dynamic/LinkedReference/Reference.h
+++ b/src/common/Dynamic/LinkedReference/Reference.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/ObjectRegistry.h b/src/common/Dynamic/ObjectRegistry.h
index 27388ebf76..27388ebf76 100644
--- a/modules/worldengine/nucleus/src/Dynamic/ObjectRegistry.h
+++ b/src/common/Dynamic/ObjectRegistry.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h
index 3bd5fbd919..3bd5fbd919 100644
--- a/modules/worldengine/nucleus/src/Dynamic/TypeContainer.h
+++ b/src/common/Dynamic/TypeContainer.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h
index 50c31699e2..50c31699e2 100644
--- a/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctions.h
+++ b/src/common/Dynamic/TypeContainerFunctions.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h
index 6237094016..6237094016 100644
--- a/modules/worldengine/nucleus/src/Dynamic/TypeContainerFunctionsPtr.h
+++ b/src/common/Dynamic/TypeContainerFunctionsPtr.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeContainerVisitor.h b/src/common/Dynamic/TypeContainerVisitor.h
index 58725a7f65..58725a7f65 100644
--- a/modules/worldengine/nucleus/src/Dynamic/TypeContainerVisitor.h
+++ b/src/common/Dynamic/TypeContainerVisitor.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/TypeList.h b/src/common/Dynamic/TypeList.h
index 65767107cc..65767107cc 100644
--- a/modules/worldengine/nucleus/src/Dynamic/TypeList.h
+++ b/src/common/Dynamic/TypeList.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/UnorderedMap.h b/src/common/Dynamic/UnorderedMap.h
index 8b50eb80bc..8b50eb80bc 100644
--- a/modules/worldengine/nucleus/src/Dynamic/UnorderedMap.h
+++ b/src/common/Dynamic/UnorderedMap.h
diff --git a/modules/worldengine/nucleus/src/Dynamic/UnorderedSet.h b/src/common/Dynamic/UnorderedSet.h
index c7f096480b..c7f096480b 100644
--- a/modules/worldengine/nucleus/src/Dynamic/UnorderedSet.h
+++ b/src/common/Dynamic/UnorderedSet.h
diff --git a/modules/worldengine/nucleus/src/Logging/Log.cpp b/src/common/Logging/Log.cpp
index 0a3c875a43..0a3c875a43 100644
--- a/modules/worldengine/nucleus/src/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
diff --git a/modules/worldengine/nucleus/src/Logging/Log.h b/src/common/Logging/Log.h
index d534b92ec7..d534b92ec7 100644
--- a/modules/worldengine/nucleus/src/Logging/Log.h
+++ b/src/common/Logging/Log.h
diff --git a/modules/worldengine/nucleus/src/Packets/ByteBuffer.cpp b/src/common/Packets/ByteBuffer.cpp
index 653d45c089..653d45c089 100644
--- a/modules/worldengine/nucleus/src/Packets/ByteBuffer.cpp
+++ b/src/common/Packets/ByteBuffer.cpp
diff --git a/modules/worldengine/nucleus/src/Packets/ByteBuffer.h b/src/common/Packets/ByteBuffer.h
index 7c6cdb2d43..7c6cdb2d43 100644
--- a/modules/worldengine/nucleus/src/Packets/ByteBuffer.h
+++ b/src/common/Packets/ByteBuffer.h
diff --git a/modules/worldengine/nucleus/src/Packets/WorldPacket.h b/src/common/Packets/WorldPacket.h
index 8781834f80..8781834f80 100644
--- a/modules/worldengine/nucleus/src/Packets/WorldPacket.h
+++ b/src/common/Packets/WorldPacket.h
diff --git a/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.cpp b/src/common/PrecompiledHeaders/sharedPCH.cpp
index 36eb3a877f..36eb3a877f 100644
--- a/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.cpp
+++ b/src/common/PrecompiledHeaders/sharedPCH.cpp
diff --git a/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.h b/src/common/PrecompiledHeaders/sharedPCH.h
index d0c15b17f0..d0c15b17f0 100644
--- a/modules/worldengine/nucleus/src/PrecompiledHeaders/sharedPCH.h
+++ b/src/common/PrecompiledHeaders/sharedPCH.h
diff --git a/modules/worldengine/nucleus/src/SystemConfig.h b/src/common/SystemConfig.h
index 0c1585bf7f..0c1585bf7f 100644
--- a/modules/worldengine/nucleus/src/SystemConfig.h
+++ b/src/common/SystemConfig.h
diff --git a/modules/worldengine/nucleus/src/Threading/Callback.h b/src/common/Threading/Callback.h
index b2a04b69ff..b2a04b69ff 100644
--- a/modules/worldengine/nucleus/src/Threading/Callback.h
+++ b/src/common/Threading/Callback.h
diff --git a/modules/worldengine/nucleus/src/Threading/DelayExecutor.cpp b/src/common/Threading/DelayExecutor.cpp
index 99d8133f81..99d8133f81 100644
--- a/modules/worldengine/nucleus/src/Threading/DelayExecutor.cpp
+++ b/src/common/Threading/DelayExecutor.cpp
diff --git a/modules/worldengine/nucleus/src/Threading/DelayExecutor.h b/src/common/Threading/DelayExecutor.h
index 23994b1e7b..23994b1e7b 100644
--- a/modules/worldengine/nucleus/src/Threading/DelayExecutor.h
+++ b/src/common/Threading/DelayExecutor.h
diff --git a/modules/worldengine/nucleus/src/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h
index 2c4491e74f..2c4491e74f 100644
--- a/modules/worldengine/nucleus/src/Threading/LockedQueue.h
+++ b/src/common/Threading/LockedQueue.h
diff --git a/modules/worldengine/nucleus/src/Threading/Threading.cpp b/src/common/Threading/Threading.cpp
index e62d92dea8..e62d92dea8 100644
--- a/modules/worldengine/nucleus/src/Threading/Threading.cpp
+++ b/src/common/Threading/Threading.cpp
diff --git a/modules/worldengine/nucleus/src/Threading/Threading.h b/src/common/Threading/Threading.h
index ad6d52639c..ad6d52639c 100644
--- a/modules/worldengine/nucleus/src/Threading/Threading.h
+++ b/src/common/Threading/Threading.h
diff --git a/modules/worldengine/nucleus/src/Utilities/ByteConverter.h b/src/common/Utilities/ByteConverter.h
index 882f10fff9..882f10fff9 100644
--- a/modules/worldengine/nucleus/src/Utilities/ByteConverter.h
+++ b/src/common/Utilities/ByteConverter.h
diff --git a/modules/worldengine/nucleus/src/Utilities/EventProcessor.cpp b/src/common/Utilities/EventProcessor.cpp
index 74506fb0d0..74506fb0d0 100644
--- a/modules/worldengine/nucleus/src/Utilities/EventProcessor.cpp
+++ b/src/common/Utilities/EventProcessor.cpp
diff --git a/modules/worldengine/nucleus/src/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h
index 9d12c7efbb..9d12c7efbb 100644
--- a/modules/worldengine/nucleus/src/Utilities/EventProcessor.h
+++ b/src/common/Utilities/EventProcessor.h
diff --git a/modules/worldengine/nucleus/src/Utilities/ServiceWin32.cpp b/src/common/Utilities/ServiceWin32.cpp
index d384ce16fc..d384ce16fc 100644
--- a/modules/worldengine/nucleus/src/Utilities/ServiceWin32.cpp
+++ b/src/common/Utilities/ServiceWin32.cpp
diff --git a/modules/worldengine/nucleus/src/Utilities/ServiceWin32.h b/src/common/Utilities/ServiceWin32.h
index ef7d262c09..ef7d262c09 100644
--- a/modules/worldengine/nucleus/src/Utilities/ServiceWin32.h
+++ b/src/common/Utilities/ServiceWin32.h
diff --git a/modules/worldengine/nucleus/src/Utilities/SignalHandler.h b/src/common/Utilities/SignalHandler.h
index 3086f3ce8c..3086f3ce8c 100644
--- a/modules/worldengine/nucleus/src/Utilities/SignalHandler.h
+++ b/src/common/Utilities/SignalHandler.h
diff --git a/modules/worldengine/nucleus/src/Utilities/Timer.h b/src/common/Utilities/Timer.h
index bed9f7dcbc..bed9f7dcbc 100644
--- a/modules/worldengine/nucleus/src/Utilities/Timer.h
+++ b/src/common/Utilities/Timer.h
diff --git a/modules/worldengine/nucleus/src/Utilities/Util.cpp b/src/common/Utilities/Util.cpp
index ea3d81e8e6..ea3d81e8e6 100644
--- a/modules/worldengine/nucleus/src/Utilities/Util.cpp
+++ b/src/common/Utilities/Util.cpp
diff --git a/modules/worldengine/nucleus/src/Utilities/Util.h b/src/common/Utilities/Util.h
index 9887412220..9887412220 100644
--- a/modules/worldengine/nucleus/src/Utilities/Util.h
+++ b/src/common/Utilities/Util.h
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
deleted file mode 100644
index 3b6202072f..0000000000
--- 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 0000000000..d6a3e97362
--- /dev/null
+++ b/src/server/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Copyright (C) 
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+if( SERVERS )
+set(sources_windows_Debugging
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
+  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h
+)
+
+add_subdirectory(game)
+add_subdirectory(authserver)
+add_subdirectory(scripts)
+add_subdirectory(worldserver)
+endif()
diff --git a/src/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp
index 201787ecf9..201787ecf9 100644
--- a/src/authserver/Authentication/AuthCodes.cpp
+++ b/src/server/authserver/Authentication/AuthCodes.cpp
diff --git a/src/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h
index a63044e918..a63044e918 100644
--- a/src/authserver/Authentication/AuthCodes.h
+++ b/src/server/authserver/Authentication/AuthCodes.h
diff --git a/src/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 4fa2f788e1..65c4ed58e8 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
index 57ed11e458..57ed11e458 100644
--- a/src/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
diff --git a/src/authserver/PrecompiledHeaders/authPCH.cpp b/src/server/authserver/PrecompiledHeaders/authPCH.cpp
index eed50cb2c0..eed50cb2c0 100644
--- a/src/authserver/PrecompiledHeaders/authPCH.cpp
+++ b/src/server/authserver/PrecompiledHeaders/authPCH.cpp
diff --git a/src/authserver/PrecompiledHeaders/authPCH.h b/src/server/authserver/PrecompiledHeaders/authPCH.h
index 5fc3b0a341..5fc3b0a341 100644
--- a/src/authserver/PrecompiledHeaders/authPCH.h
+++ b/src/server/authserver/PrecompiledHeaders/authPCH.h
diff --git a/src/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp
index 660554cd26..660554cd26 100644
--- a/src/authserver/Realms/RealmList.cpp
+++ b/src/server/authserver/Realms/RealmList.cpp
diff --git a/src/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h
index a24507bf9e..a24507bf9e 100644
--- a/src/authserver/Realms/RealmList.h
+++ b/src/server/authserver/Realms/RealmList.h
diff --git a/src/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index c662f544f6..c662f544f6 100644
--- a/src/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
diff --git a/src/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h
index 2c8d64c7ca..2c8d64c7ca 100644
--- a/src/authserver/Server/AuthSocket.h
+++ b/src/server/authserver/Server/AuthSocket.h
diff --git a/src/authserver/Server/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h
index 523fbde415..523fbde415 100644
--- a/src/authserver/Server/RealmAcceptor.h
+++ b/src/server/authserver/Server/RealmAcceptor.h
diff --git a/src/authserver/Server/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp
index 6fd6f9cb64..6fd6f9cb64 100644
--- a/src/authserver/Server/RealmSocket.cpp
+++ b/src/server/authserver/Server/RealmSocket.cpp
diff --git a/src/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h
index b1bfffa93d..b1bfffa93d 100644
--- a/src/authserver/Server/RealmSocket.h
+++ b/src/server/authserver/Server/RealmSocket.h
diff --git a/src/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index 2ab525b97d..2ab525b97d 100644
--- a/src/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
diff --git a/src/authserver/authserver.ico b/src/server/authserver/authserver.ico
index da318f48a8..da318f48a8 100644
--- a/src/authserver/authserver.ico
+++ b/src/server/authserver/authserver.ico
diff --git a/src/authserver/authserver.rc b/src/server/authserver/authserver.rc
index d21bd638bd..d21bd638bd 100644
--- a/src/authserver/authserver.rc
+++ b/src/server/authserver/authserver.rc
diff --git a/src/authserver/resource.h b/src/server/authserver/resource.h
index 5415d15d80..5415d15d80 100644
--- a/src/authserver/resource.h
+++ b/src/server/authserver/resource.h
diff --git a/src/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp
index 3d7d67665c..3d7d67665c 100644
--- a/src/game/AI/CoreAI/CombatAI.cpp
+++ b/src/server/game/AI/CoreAI/CombatAI.cpp
diff --git a/src/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h
index 17459fab46..17459fab46 100644
--- a/src/game/AI/CoreAI/CombatAI.h
+++ b/src/server/game/AI/CoreAI/CombatAI.h
diff --git a/src/game/AI/CoreAI/GameObjectAI.cpp b/src/server/game/AI/CoreAI/GameObjectAI.cpp
index 935273b44c..935273b44c 100644
--- a/src/game/AI/CoreAI/GameObjectAI.cpp
+++ b/src/server/game/AI/CoreAI/GameObjectAI.cpp
diff --git a/src/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h
index 9b0024d3ee..9b0024d3ee 100644
--- a/src/game/AI/CoreAI/GameObjectAI.h
+++ b/src/server/game/AI/CoreAI/GameObjectAI.h
diff --git a/src/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp
index 59ee6932f9..59ee6932f9 100644
--- a/src/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
diff --git a/src/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h
index 80de456e0e..80de456e0e 100644
--- a/src/game/AI/CoreAI/GuardAI.h
+++ b/src/server/game/AI/CoreAI/GuardAI.h
diff --git a/src/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp
index 3f5b4397be..3f5b4397be 100644
--- a/src/game/AI/CoreAI/PassiveAI.cpp
+++ b/src/server/game/AI/CoreAI/PassiveAI.cpp
diff --git a/src/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h
index e71f790ad2..e71f790ad2 100644
--- a/src/game/AI/CoreAI/PassiveAI.h
+++ b/src/server/game/AI/CoreAI/PassiveAI.h
diff --git a/src/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 8a0b979513..8a0b979513 100644
--- a/src/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
diff --git a/src/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h
index a00d7be528..a00d7be528 100644
--- a/src/game/AI/CoreAI/PetAI.h
+++ b/src/server/game/AI/CoreAI/PetAI.h
diff --git a/src/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp
index fa2699d78c..fa2699d78c 100644
--- a/src/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
diff --git a/src/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h
index a222402b81..a222402b81 100644
--- a/src/game/AI/CoreAI/ReactorAI.h
+++ b/src/server/game/AI/CoreAI/ReactorAI.h
diff --git a/src/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp
index 5d5c302465..5d5c302465 100644
--- a/src/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
diff --git a/src/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h
index 7e153cca24..7e153cca24 100644
--- a/src/game/AI/CoreAI/TotemAI.h
+++ b/src/server/game/AI/CoreAI/TotemAI.h
diff --git a/src/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp
index 1018bc307f..1018bc307f 100644
--- a/src/game/AI/CoreAI/UnitAI.cpp
+++ b/src/server/game/AI/CoreAI/UnitAI.cpp
diff --git a/src/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h
index d2c2f1f3df..d2c2f1f3df 100644
--- a/src/game/AI/CoreAI/UnitAI.h
+++ b/src/server/game/AI/CoreAI/UnitAI.h
diff --git a/src/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp
index 981ff1b5ff..981ff1b5ff 100644
--- a/src/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
diff --git a/src/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index 67e69476d7..67e69476d7 100644
--- a/src/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
diff --git a/src/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
index 6249fc347b..6249fc347b 100644
--- a/src/game/AI/CreatureAIFactory.h
+++ b/src/server/game/AI/CreatureAIFactory.h
diff --git a/src/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h
index 556058c1d4..556058c1d4 100644
--- a/src/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
diff --git a/src/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index c2b8d2920a..c2b8d2920a 100644
--- a/src/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
diff --git a/src/game/AI/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h
index 381385172a..381385172a 100644
--- a/src/game/AI/CreatureAIRegistry.h
+++ b/src/server/game/AI/CreatureAIRegistry.h
diff --git a/src/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp
index 85f0bc75ad..85f0bc75ad 100644
--- a/src/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
diff --git a/src/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h
index 6d49f51cc9..6d49f51cc9 100644
--- a/src/game/AI/CreatureAISelector.h
+++ b/src/server/game/AI/CreatureAISelector.h
diff --git a/src/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index 349b57eb57..349b57eb57 100644
--- a/src/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
index 54f5c87d50..54f5c87d50 100644
--- a/src/game/AI/ScriptedAI/ScriptedCreature.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
diff --git a/src/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
index 4e0d88fe79..4e0d88fe79 100644
--- a/src/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedEscortAI.h b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
index 4557569bd9..4557569bd9 100644
--- a/src/game/AI/ScriptedAI/ScriptedEscortAI.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
diff --git a/src/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
index b44ec3ca0f..b44ec3ca0f 100644
--- a/src/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedFollowerAI.h b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
index 926e3f7fa8..926e3f7fa8 100644
--- a/src/game/AI/ScriptedAI/ScriptedFollowerAI.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h
diff --git a/src/game/AI/ScriptedAI/ScriptedGossip.cpp b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
index cf0846108c..cf0846108c 100644
--- a/src/game/AI/ScriptedAI/ScriptedGossip.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
diff --git a/src/game/AI/ScriptedAI/ScriptedGossip.h b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
index 68de534736..68de534736 100644
--- a/src/game/AI/ScriptedAI/ScriptedGossip.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.h
diff --git a/src/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 77044f0924..77044f0924 100644
--- a/src/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
diff --git a/src/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h
index 5f6a8ac104..5f6a8ac104 100644
--- a/src/game/AI/SmartScripts/SmartAI.h
+++ b/src/server/game/AI/SmartScripts/SmartAI.h
diff --git a/src/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index ed7868baf3..ed7868baf3 100644
--- a/src/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
diff --git a/src/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h
index 548e123317..548e123317 100644
--- a/src/game/AI/SmartScripts/SmartScript.h
+++ b/src/server/game/AI/SmartScripts/SmartScript.h
diff --git a/src/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
index f133d0b35e..f133d0b35e 100644
--- a/src/game/AI/SmartScripts/SmartScriptMgr.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
diff --git a/src/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
index 3b02da9c64..3b02da9c64 100644
--- a/src/game/AI/SmartScripts/SmartScriptMgr.h
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
diff --git a/src/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp
index 27601bd5d0..27601bd5d0 100644
--- a/src/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
diff --git a/src/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index 3028191c7c..3028191c7c 100644
--- a/src/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
diff --git a/src/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index ac8d218c1b..ac8d218c1b 100644
--- a/src/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
diff --git a/src/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h
index 74fe0046ef..74fe0046ef 100644
--- a/src/game/Achievements/AchievementMgr.h
+++ b/src/server/game/Achievements/AchievementMgr.h
diff --git a/modules/acore/game-framework/src/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp
index a8bcdc875e..a8bcdc875e 100644
--- a/modules/acore/game-framework/src/Addons/AddonMgr.cpp
+++ b/src/server/game/Addons/AddonMgr.cpp
diff --git a/modules/acore/game-framework/src/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h
index 24113ff8a5..24113ff8a5 100644
--- a/modules/acore/game-framework/src/Addons/AddonMgr.h
+++ b/src/server/game/Addons/AddonMgr.h
diff --git a/src/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h
index f60cf9d9f7..f60cf9d9f7 100644
--- a/src/game/ArenaSpectator/ArenaSpectator.h
+++ b/src/server/game/ArenaSpectator/ArenaSpectator.h
diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 500c44d85b..500c44d85b 100644
--- a/src/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
diff --git a/src/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 15f4db18c9..15f4db18c9 100644
--- a/src/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
diff --git a/src/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index 1ab8f8c2e6..1ab8f8c2e6 100644
--- a/src/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
diff --git a/src/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
index 7655678ff4..7655678ff4 100644
--- a/src/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
diff --git a/src/game/Battlefield/BattlefieldHandler.cpp b/src/server/game/Battlefield/BattlefieldHandler.cpp
index 50c944dc6d..50c944dc6d 100644
--- a/src/game/Battlefield/BattlefieldHandler.cpp
+++ b/src/server/game/Battlefield/BattlefieldHandler.cpp
diff --git a/src/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp
index 32a452a626..32a452a626 100644
--- a/src/game/Battlefield/BattlefieldMgr.cpp
+++ b/src/server/game/Battlefield/BattlefieldMgr.cpp
diff --git a/src/game/Battlefield/BattlefieldMgr.h b/src/server/game/Battlefield/BattlefieldMgr.h
index 2834271ad8..2834271ad8 100644
--- a/src/game/Battlefield/BattlefieldMgr.h
+++ b/src/server/game/Battlefield/BattlefieldMgr.h
diff --git a/src/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index 804b3b5e55..804b3b5e55 100644
--- a/src/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
diff --git a/src/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h
index 87658e3b22..87658e3b22 100644
--- a/src/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
diff --git a/src/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp
index 1a5370b49b..1a5370b49b 100644
--- a/src/game/Battlegrounds/ArenaTeam.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeam.cpp
diff --git a/src/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h
index 6baec58265..6baec58265 100644
--- a/src/game/Battlegrounds/ArenaTeam.h
+++ b/src/server/game/Battlegrounds/ArenaTeam.h
diff --git a/src/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
index 80bcdecea4..80bcdecea4 100644
--- a/src/game/Battlegrounds/ArenaTeamMgr.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
diff --git a/src/game/Battlegrounds/ArenaTeamMgr.h b/src/server/game/Battlegrounds/ArenaTeamMgr.h
index 85224dd2c1..85224dd2c1 100644
--- a/src/game/Battlegrounds/ArenaTeamMgr.h
+++ b/src/server/game/Battlegrounds/ArenaTeamMgr.h
diff --git a/src/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index e4ac0d3901..e4ac0d3901 100644
--- a/src/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
diff --git a/src/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index 4ca4de3466..4ca4de3466 100644
--- a/src/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
diff --git a/src/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
index f2b53bec3a..f2b53bec3a 100644
--- a/src/game/Battlegrounds/BattlegroundMgr.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
diff --git a/src/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h
index 48482b7995..48482b7995 100644
--- a/src/game/Battlegrounds/BattlegroundMgr.h
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.h
diff --git a/src/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
index 75202db3ca..75202db3ca 100644
--- a/src/game/Battlegrounds/BattlegroundQueue.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
diff --git a/src/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h
index a1e68b858e..a1e68b858e 100644
--- a/src/game/Battlegrounds/BattlegroundQueue.h
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
index d58f6b5431..d58f6b5431 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundAB.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
index ddb5ba5d83..ddb5ba5d83 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundAB.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
index 11416b1df4..11416b1df4 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundAV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
index 2aa518cb6a..2aa518cb6a 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundAV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
index de43c5bfdc..de43c5bfdc 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundBE.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h
index fc61e697bd..fc61e697bd 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundBE.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
index 4fd7785f30..4fd7785f30 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundDS.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
index f378495edd..f378495edd 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundDS.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
index 5ab0747557..5ab0747557 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundEY.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
index 5d96953524..5d96953524 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundEY.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
index e1fed2c96e..e1fed2c96e 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundIC.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
index b12e775d60..b12e775d60 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundIC.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
index 49ece01053..49ece01053 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundNA.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h
index 44ac45a2b6..44ac45a2b6 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundNA.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
index ca26e2b013..ca26e2b013 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundRL.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h
index 561cc47736..561cc47736 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundRL.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
index 1936da03c4..1936da03c4 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundRV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
index 394b4bf6c9..394b4bf6c9 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundRV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
index 47f2b3437b..47f2b3437b 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundSA.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
index a9de456ea8..a9de456ea8 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundSA.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h
diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
index 16bb9c7e0b..16bb9c7e0b 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundWS.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
diff --git a/src/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
index 6faed44f2c..6faed44f2c 100644
--- a/src/game/Battlegrounds/Zones/BattlegroundWS.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h
diff --git a/src/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 5638e7f2f7..2b4f7c26ae 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
index a0031fdc7f..a0031fdc7f 100644
--- a/src/game/Calendar/CalendarMgr.cpp
+++ b/src/server/game/Calendar/CalendarMgr.cpp
diff --git a/src/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h
index b61df6e482..b61df6e482 100644
--- a/src/game/Calendar/CalendarMgr.h
+++ b/src/server/game/Calendar/CalendarMgr.h
diff --git a/src/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index 420d436a10..420d436a10 100644
--- a/src/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
diff --git a/src/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index 8b6b243308..8b6b243308 100644
--- a/src/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
diff --git a/src/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index 49b78129e0..49b78129e0 100644
--- a/src/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
diff --git a/src/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index 5775c84acd..5775c84acd 100644
--- a/src/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
diff --git a/src/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 79986a7538..79986a7538 100644
--- a/src/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
diff --git a/src/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index dc0e6c65ca..dc0e6c65ca 100644
--- a/src/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
diff --git a/src/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp
index ee5787963c..ee5787963c 100644
--- a/src/game/Chat/ChatLink.cpp
+++ b/src/server/game/Chat/ChatLink.cpp
diff --git a/src/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h
index e004350b1e..e004350b1e 100644
--- a/src/game/Chat/ChatLink.h
+++ b/src/server/game/Chat/ChatLink.h
diff --git a/src/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp
index 503f35022f..503f35022f 100644
--- a/src/game/Combat/HostileRefManager.cpp
+++ b/src/server/game/Combat/HostileRefManager.cpp
diff --git a/src/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h
index a69567a8a4..a69567a8a4 100644
--- a/src/game/Combat/HostileRefManager.h
+++ b/src/server/game/Combat/HostileRefManager.h
diff --git a/src/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index e5c952d53d..e5c952d53d 100644
--- a/src/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
diff --git a/src/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h
index cb746a2c34..cb746a2c34 100644
--- a/src/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
diff --git a/src/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h
index c63ce5112f..c63ce5112f 100644
--- a/src/game/Combat/UnitEvents.h
+++ b/src/server/game/Combat/UnitEvents.h
diff --git a/src/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index ccf36914cf..ccf36914cf 100644
--- a/src/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
diff --git a/src/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 2195ef87c8..2195ef87c8 100644
--- a/src/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
diff --git a/src/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp
index 0a5c838826..0a5c838826 100644
--- a/src/game/Conditions/DisableMgr.cpp
+++ b/src/server/game/Conditions/DisableMgr.cpp
diff --git a/src/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h
index 075123d257..075123d257 100644
--- a/src/game/Conditions/DisableMgr.h
+++ b/src/server/game/Conditions/DisableMgr.h
diff --git a/src/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 97034d0a4a..97034d0a4a 100644
--- a/src/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
diff --git a/src/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index d92d3f78a2..d92d3f78a2 100644
--- a/src/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
diff --git a/src/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index 5b241f6fcb..5b241f6fcb 100644
--- a/src/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
diff --git a/src/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index e43351b9dd..e43351b9dd 100644
--- a/src/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
diff --git a/src/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 8e1a6c3395..8e1a6c3395 100644
--- a/src/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
diff --git a/src/game/DungeonFinding/LFG.cpp b/src/server/game/DungeonFinding/LFG.cpp
index 880ed01a4e..880ed01a4e 100644
--- a/src/game/DungeonFinding/LFG.cpp
+++ b/src/server/game/DungeonFinding/LFG.cpp
diff --git a/src/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h
index e5b9c5a833..e5b9c5a833 100644
--- a/src/game/DungeonFinding/LFG.h
+++ b/src/server/game/DungeonFinding/LFG.h
diff --git a/src/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp
index 70b9e7a582..70b9e7a582 100644
--- a/src/game/DungeonFinding/LFGGroupData.cpp
+++ b/src/server/game/DungeonFinding/LFGGroupData.cpp
diff --git a/src/game/DungeonFinding/LFGGroupData.h b/src/server/game/DungeonFinding/LFGGroupData.h
index 3ec0d42d19..3ec0d42d19 100644
--- a/src/game/DungeonFinding/LFGGroupData.h
+++ b/src/server/game/DungeonFinding/LFGGroupData.h
diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 415a73ede1..415a73ede1 100644
--- a/src/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
diff --git a/src/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index c9c33f402e..c9c33f402e 100644
--- a/src/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
diff --git a/src/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp
index 952c64fea6..952c64fea6 100644
--- a/src/game/DungeonFinding/LFGPlayerData.cpp
+++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp
diff --git a/src/game/DungeonFinding/LFGPlayerData.h b/src/server/game/DungeonFinding/LFGPlayerData.h
index 2731eda359..2731eda359 100644
--- a/src/game/DungeonFinding/LFGPlayerData.h
+++ b/src/server/game/DungeonFinding/LFGPlayerData.h
diff --git a/src/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp
index 68ba72437c..68ba72437c 100644
--- a/src/game/DungeonFinding/LFGQueue.cpp
+++ b/src/server/game/DungeonFinding/LFGQueue.cpp
diff --git a/src/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h
index 9e042067bd..9e042067bd 100644
--- a/src/game/DungeonFinding/LFGQueue.h
+++ b/src/server/game/DungeonFinding/LFGQueue.h
diff --git a/src/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
index 63dfe243bc..63dfe243bc 100644
--- a/src/game/DungeonFinding/LFGScripts.cpp
+++ b/src/server/game/DungeonFinding/LFGScripts.cpp
diff --git a/src/game/DungeonFinding/LFGScripts.h b/src/server/game/DungeonFinding/LFGScripts.h
index 786de4c6d1..786de4c6d1 100644
--- a/src/game/DungeonFinding/LFGScripts.h
+++ b/src/server/game/DungeonFinding/LFGScripts.h
diff --git a/src/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp
index 9e833f105f..9e833f105f 100644
--- a/src/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
diff --git a/src/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
index 0bd0b00356..0bd0b00356 100644
--- a/src/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
diff --git a/src/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 8a2a0f3a13..8a2a0f3a13 100644
--- a/src/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
diff --git a/src/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 6411337a9b..6411337a9b 100644
--- a/src/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
diff --git a/src/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp
index dc3d0cbbb5..dc3d0cbbb5 100644
--- a/src/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
diff --git a/src/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h
index 8b3ac94c0a..8b3ac94c0a 100644
--- a/src/game/Entities/Creature/CreatureGroups.h
+++ b/src/server/game/Entities/Creature/CreatureGroups.h
diff --git a/src/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index 209c9d3b10..209c9d3b10 100644
--- a/src/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
diff --git a/src/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index 683f6388e7..683f6388e7 100644
--- a/src/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
diff --git a/src/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
index 231ce0d187..231ce0d187 100644
--- a/src/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
diff --git a/src/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h
index e8024f8303..e8024f8303 100644
--- a/src/game/Entities/Creature/TemporarySummon.h
+++ b/src/server/game/Entities/Creature/TemporarySummon.h
diff --git a/src/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
index 6a1529cb19..6a1529cb19 100644
--- a/src/game/Entities/DynamicObject/DynamicObject.cpp
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
diff --git a/src/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h
index 6d4f4f483d..6d4f4f483d 100644
--- a/src/game/Entities/DynamicObject/DynamicObject.h
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.h
diff --git a/src/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 735dfefedd..735dfefedd 100644
--- a/src/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
diff --git a/src/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index d2283dfb8c..d2283dfb8c 100644
--- a/src/game/Entities/GameObject/GameObject.h
+++ b/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
index 5f24a9ff4d..5f24a9ff4d 100644
--- a/src/game/Entities/Item/Container/Bag.cpp
+++ b/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
index 4ea856d649..4ea856d649 100644
--- a/src/game/Entities/Item/Container/Bag.h
+++ b/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
index 9a5e5531bc..9a5e5531bc 100644
--- a/src/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
diff --git a/src/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h
index 9145842202..9145842202 100644
--- a/src/game/Entities/Item/Item.h
+++ b/src/server/game/Entities/Item/Item.h
diff --git a/src/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
index a018aa6d0c..a018aa6d0c 100644
--- a/src/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
diff --git a/src/game/Entities/Item/ItemEnchantmentMgr.h b/src/server/game/Entities/Item/ItemEnchantmentMgr.h
index 91566e7178..91566e7178 100644
--- a/src/game/Entities/Item/ItemEnchantmentMgr.h
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.h
diff --git a/src/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 7764d3a95c..7764d3a95c 100644
--- a/src/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
diff --git a/src/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index d1731510ea..d1731510ea 100644
--- a/src/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
diff --git a/src/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
index 68b8bda28c..68b8bda28c 100644
--- a/src/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
diff --git a/src/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
index ceb154d5c0..ceb154d5c0 100644
--- a/src/game/Entities/Object/ObjectDefines.h
+++ b/src/server/game/Entities/Object/ObjectDefines.h
diff --git a/src/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp
index c5af622e78..c5af622e78 100644
--- a/src/game/Entities/Object/ObjectPosSelector.cpp
+++ b/src/server/game/Entities/Object/ObjectPosSelector.cpp
diff --git a/src/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h
index 49c675597b..49c675597b 100644
--- a/src/game/Entities/Object/ObjectPosSelector.h
+++ b/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
index 7bb23719fa..7bb23719fa 100644
--- a/src/game/Entities/Object/Updates/UpdateData.cpp
+++ b/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
index 64aee6d400..64aee6d400 100644
--- a/src/game/Entities/Object/Updates/UpdateData.h
+++ b/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
index 0c02b555cd..0c02b555cd 100644
--- a/src/game/Entities/Object/Updates/UpdateFieldFlags.cpp
+++ b/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
index 096cf5b9ea..096cf5b9ea 100644
--- a/src/game/Entities/Object/Updates/UpdateFieldFlags.h
+++ b/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
index 166d354279..166d354279 100644
--- a/src/game/Entities/Object/Updates/UpdateFields.h
+++ b/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
index 05940643a3..05940643a3 100644
--- a/src/game/Entities/Object/Updates/UpdateMask.h
+++ b/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
index e887d6cb60..e887d6cb60 100644
--- a/src/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
diff --git a/src/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
index 65f7735ec7..65f7735ec7 100644
--- a/src/game/Entities/Pet/Pet.h
+++ b/src/server/game/Entities/Pet/Pet.h
diff --git a/src/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h
index 6994bf62fb..6994bf62fb 100644
--- a/src/game/Entities/Pet/PetDefines.h
+++ b/src/server/game/Entities/Pet/PetDefines.h
diff --git a/src/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index ece890078a..ece890078a 100644
--- a/src/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
diff --git a/src/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 3e879bf1e6..3e879bf1e6 100644
--- a/src/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
diff --git a/src/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
index 7319dbcac3..7319dbcac3 100644
--- a/src/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
diff --git a/src/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h
index c7ccfab68a..c7ccfab68a 100644
--- a/src/game/Entities/Player/SocialMgr.h
+++ b/src/server/game/Entities/Player/SocialMgr.h
diff --git a/src/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp
index bf6079fd07..bf6079fd07 100644
--- a/src/game/Entities/Totem/Totem.cpp
+++ b/src/server/game/Entities/Totem/Totem.cpp
diff --git a/src/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h
index 91b0c37121..91b0c37121 100644
--- a/src/game/Entities/Totem/Totem.h
+++ b/src/server/game/Entities/Totem/Totem.h
diff --git a/src/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index 9e67aecea1..9e67aecea1 100644
--- a/src/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
diff --git a/src/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h
index 15dfad2287..15dfad2287 100644
--- a/src/game/Entities/Transport/Transport.h
+++ b/src/server/game/Entities/Transport/Transport.h
diff --git a/src/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index e45e3b83c1..e45e3b83c1 100644
--- a/src/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
diff --git a/src/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index d0bcf5d290..d0bcf5d290 100644
--- a/src/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
diff --git a/src/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index bb8dca9134..bb8dca9134 100644
--- a/src/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
diff --git a/src/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 25bed66c27..25bed66c27 100644
--- a/src/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
diff --git a/src/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h
index 65bf9d2f5d..65bf9d2f5d 100644
--- a/src/game/Entities/Vehicle/Vehicle.h
+++ b/src/server/game/Entities/Vehicle/Vehicle.h
diff --git a/src/game/Entities/Vehicle/VehicleDefines.h b/src/server/game/Entities/Vehicle/VehicleDefines.h
index 1c1f0da978..1c1f0da978 100644
--- a/src/game/Entities/Vehicle/VehicleDefines.h
+++ b/src/server/game/Entities/Vehicle/VehicleDefines.h
diff --git a/src/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index 26670a333a..26670a333a 100644
--- a/src/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
diff --git a/src/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h
index 64f1659882..64f1659882 100644
--- a/src/game/Events/GameEventMgr.h
+++ b/src/server/game/Events/GameEventMgr.h
diff --git a/src/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index 03c0fa21d4..03c0fa21d4 100644
--- a/src/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
diff --git a/src/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h
index b51df205c0..b51df205c0 100644
--- a/src/game/Globals/ObjectAccessor.h
+++ b/src/server/game/Globals/ObjectAccessor.h
diff --git a/src/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index c82ad20e9c..c82ad20e9c 100644
--- a/src/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
diff --git a/src/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 1340400aa6..1340400aa6 100644
--- a/src/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
diff --git a/src/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h
index bb19abdf24..bb19abdf24 100644
--- a/src/game/Grids/Cells/Cell.h
+++ b/src/server/game/Grids/Cells/Cell.h
diff --git a/src/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h
index 0b683ec5a7..0b683ec5a7 100644
--- a/src/game/Grids/Cells/CellImpl.h
+++ b/src/server/game/Grids/Cells/CellImpl.h
diff --git a/src/game/Grids/Grid.h b/src/server/game/Grids/Grid.h
index dcf7e6cd61..dcf7e6cd61 100644
--- a/src/game/Grids/Grid.h
+++ b/src/server/game/Grids/Grid.h
diff --git a/src/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h
index 5554a731e4..5554a731e4 100644
--- a/src/game/Grids/GridDefines.h
+++ b/src/server/game/Grids/GridDefines.h
diff --git a/src/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h
index 3520515ab5..3520515ab5 100644
--- a/src/game/Grids/GridLoader.h
+++ b/src/server/game/Grids/GridLoader.h
diff --git a/src/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h
index b2120e633f..b2120e633f 100644
--- a/src/game/Grids/GridRefManager.h
+++ b/src/server/game/Grids/GridRefManager.h
diff --git a/src/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h
index cffa719256..cffa719256 100644
--- a/src/game/Grids/GridReference.h
+++ b/src/server/game/Grids/GridReference.h
diff --git a/src/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index a5f586e4cf..a5f586e4cf 100644
--- a/src/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
diff --git a/src/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
index 844d2a7fdb..844d2a7fdb 100644
--- a/src/game/Grids/Notifiers/GridNotifiers.cpp
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp
diff --git a/src/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h
index e0f52dc8ee..e0f52dc8ee 100644
--- a/src/game/Grids/Notifiers/GridNotifiers.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiers.h
diff --git a/src/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
index 1a8fbed5d1..1a8fbed5d1 100644
--- a/src/game/Grids/Notifiers/GridNotifiersImpl.h
+++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h
diff --git a/src/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
index 0c97bdf2b2..0c97bdf2b2 100644
--- a/src/game/Grids/ObjectGridLoader.cpp
+++ b/src/server/game/Grids/ObjectGridLoader.cpp
diff --git a/src/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
index 184c9638df..184c9638df 100644
--- a/src/game/Grids/ObjectGridLoader.h
+++ b/src/server/game/Grids/ObjectGridLoader.h
diff --git a/src/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 6e970365af..6e970365af 100644
--- a/src/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
diff --git a/src/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 427d11eacf..427d11eacf 100644
--- a/src/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
diff --git a/src/game/Groups/GroupMgr.cpp b/src/server/game/Groups/GroupMgr.cpp
index 745b7ac320..745b7ac320 100644
--- a/src/game/Groups/GroupMgr.cpp
+++ b/src/server/game/Groups/GroupMgr.cpp
diff --git a/src/game/Groups/GroupMgr.h b/src/server/game/Groups/GroupMgr.h
index 5bec7df5db..5bec7df5db 100644
--- a/src/game/Groups/GroupMgr.h
+++ b/src/server/game/Groups/GroupMgr.h
diff --git a/src/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h
index b796897277..b796897277 100644
--- a/src/game/Groups/GroupRefManager.h
+++ b/src/server/game/Groups/GroupRefManager.h
diff --git a/src/game/Groups/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp
index 2544332d8f..2544332d8f 100644
--- a/src/game/Groups/GroupReference.cpp
+++ b/src/server/game/Groups/GroupReference.cpp
diff --git a/src/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h
index dc7ab36371..dc7ab36371 100644
--- a/src/game/Groups/GroupReference.h
+++ b/src/server/game/Groups/GroupReference.h
diff --git a/src/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 9c3a093e24..9c3a093e24 100644
--- a/src/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
diff --git a/src/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index c2f66ffe79..c2f66ffe79 100644
--- a/src/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
diff --git a/src/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
index 496db63e84..496db63e84 100644
--- a/src/game/Guilds/GuildMgr.cpp
+++ b/src/server/game/Guilds/GuildMgr.cpp
diff --git a/src/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h
index b53f6432b3..b53f6432b3 100644
--- a/src/game/Guilds/GuildMgr.h
+++ b/src/server/game/Guilds/GuildMgr.h
diff --git a/src/game/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp
index d1b30c027a..d1b30c027a 100644
--- a/src/game/Handlers/AddonHandler.cpp
+++ b/src/server/game/Handlers/AddonHandler.cpp
diff --git a/src/game/Handlers/AddonHandler.h b/src/server/game/Handlers/AddonHandler.h
index 75b3448667..75b3448667 100644
--- a/src/game/Handlers/AddonHandler.h
+++ b/src/server/game/Handlers/AddonHandler.h
diff --git a/src/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp
index 1095ff194c..1095ff194c 100644
--- a/src/game/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Handlers/ArenaTeamHandler.cpp
diff --git a/src/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp
index f8c0b178a1..f8c0b178a1 100644
--- a/src/game/Handlers/AuctionHouseHandler.cpp
+++ b/src/server/game/Handlers/AuctionHouseHandler.cpp
diff --git a/src/game/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp
index da0b9b974b..da0b9b974b 100644
--- a/src/game/Handlers/AuthHandler.cpp
+++ b/src/server/game/Handlers/AuthHandler.cpp
diff --git a/src/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index c1b10240c0..c1b10240c0 100644
--- a/src/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
diff --git a/src/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp
index c09ce07a12..c09ce07a12 100644
--- a/src/game/Handlers/CalendarHandler.cpp
+++ b/src/server/game/Handlers/CalendarHandler.cpp
diff --git a/src/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp
index a74a3e91c6..a74a3e91c6 100644
--- a/src/game/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Handlers/ChannelHandler.cpp
diff --git a/src/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 3679c824ca..3679c824ca 100644
--- a/src/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
diff --git a/src/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index d0e2d9fd2d..d0e2d9fd2d 100644
--- a/src/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
diff --git a/src/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp
index c59d10bdbd..c59d10bdbd 100644
--- a/src/game/Handlers/CombatHandler.cpp
+++ b/src/server/game/Handlers/CombatHandler.cpp
diff --git a/src/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp
index 5ceb57a4bf..5ceb57a4bf 100644
--- a/src/game/Handlers/DuelHandler.cpp
+++ b/src/server/game/Handlers/DuelHandler.cpp
diff --git a/src/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp
index e1e6143592..e1e6143592 100644
--- a/src/game/Handlers/GroupHandler.cpp
+++ b/src/server/game/Handlers/GroupHandler.cpp
diff --git a/src/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp
index c76126ff02..c76126ff02 100644
--- a/src/game/Handlers/GuildHandler.cpp
+++ b/src/server/game/Handlers/GuildHandler.cpp
diff --git a/src/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index b4aa9ef81c..b4aa9ef81c 100644
--- a/src/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
diff --git a/src/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp
index 5e0fd64483..5e0fd64483 100644
--- a/src/game/Handlers/LFGHandler.cpp
+++ b/src/server/game/Handlers/LFGHandler.cpp
diff --git a/src/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp
index 1299042b0c..1299042b0c 100644
--- a/src/game/Handlers/LootHandler.cpp
+++ b/src/server/game/Handlers/LootHandler.cpp
diff --git a/src/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp
index 24b213472b..24b213472b 100644
--- a/src/game/Handlers/MailHandler.cpp
+++ b/src/server/game/Handlers/MailHandler.cpp
diff --git a/src/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index ec48d7221b..ec48d7221b 100644
--- a/src/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
diff --git a/src/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 8d435b303d..8d435b303d 100644
--- a/src/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
diff --git a/src/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp
index 3458895bcc..3458895bcc 100644
--- a/src/game/Handlers/NPCHandler.cpp
+++ b/src/server/game/Handlers/NPCHandler.cpp
diff --git a/src/game/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h
index efd2cb254f..efd2cb254f 100644
--- a/src/game/Handlers/NPCHandler.h
+++ b/src/server/game/Handlers/NPCHandler.h
diff --git a/src/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index 722c6a3348..722c6a3348 100644
--- a/src/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
diff --git a/src/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp
index c5d40fdfc0..c5d40fdfc0 100644
--- a/src/game/Handlers/PetitionsHandler.cpp
+++ b/src/server/game/Handlers/PetitionsHandler.cpp
diff --git a/src/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp
index 99ae110297..99ae110297 100644
--- a/src/game/Handlers/QueryHandler.cpp
+++ b/src/server/game/Handlers/QueryHandler.cpp
diff --git a/src/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp
index 8650e309cf..8650e309cf 100644
--- a/src/game/Handlers/QuestHandler.cpp
+++ b/src/server/game/Handlers/QuestHandler.cpp
diff --git a/src/game/Handlers/ReferAFriendHandler.cpp b/src/server/game/Handlers/ReferAFriendHandler.cpp
index ecf654952c..ecf654952c 100644
--- a/src/game/Handlers/ReferAFriendHandler.cpp
+++ b/src/server/game/Handlers/ReferAFriendHandler.cpp
diff --git a/src/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp
index ab6884b13e..ab6884b13e 100644
--- a/src/game/Handlers/SkillHandler.cpp
+++ b/src/server/game/Handlers/SkillHandler.cpp
diff --git a/src/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index b87646b149..b87646b149 100644
--- a/src/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
diff --git a/src/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp
index 92bcddc72d..92bcddc72d 100644
--- a/src/game/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Handlers/TaxiHandler.cpp
diff --git a/src/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp
index 5b92cb4099..5b92cb4099 100644
--- a/src/game/Handlers/TicketHandler.cpp
+++ b/src/server/game/Handlers/TicketHandler.cpp
diff --git a/src/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp
index 0b5732479e..0b5732479e 100644
--- a/src/game/Handlers/TradeHandler.cpp
+++ b/src/server/game/Handlers/TradeHandler.cpp
diff --git a/src/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp
index f0b211f599..f0b211f599 100644
--- a/src/game/Handlers/VehicleHandler.cpp
+++ b/src/server/game/Handlers/VehicleHandler.cpp
diff --git a/src/game/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp
index 2bef115378..2bef115378 100644
--- a/src/game/Handlers/VoiceChatHandler.cpp
+++ b/src/server/game/Handlers/VoiceChatHandler.cpp
diff --git a/src/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index 850457d34e..850457d34e 100644
--- a/src/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
diff --git a/src/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 410d783942..410d783942 100644
--- a/src/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
diff --git a/src/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index 05ebf650d1..05ebf650d1 100644
--- a/src/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
diff --git a/src/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h
index 3d1958d604..3d1958d604 100644
--- a/src/game/Instances/InstanceScript.h
+++ b/src/server/game/Instances/InstanceScript.h
diff --git a/src/game/Loot/LootItemStorage.cpp b/src/server/game/Loot/LootItemStorage.cpp
index beaecc87ca..beaecc87ca 100644
--- a/src/game/Loot/LootItemStorage.cpp
+++ b/src/server/game/Loot/LootItemStorage.cpp
diff --git a/src/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h
index a55cda8473..a55cda8473 100644
--- a/src/game/Loot/LootItemStorage.h
+++ b/src/server/game/Loot/LootItemStorage.h
diff --git a/src/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
index e25cd1c362..e25cd1c362 100644
--- a/src/game/Loot/LootMgr.cpp
+++ b/src/server/game/Loot/LootMgr.cpp
diff --git a/src/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h
index fc08f030af..fc08f030af 100644
--- a/src/game/Loot/LootMgr.h
+++ b/src/server/game/Loot/LootMgr.h
diff --git a/src/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp
index a4a50ccccd..a4a50ccccd 100644
--- a/src/game/Mails/Mail.cpp
+++ b/src/server/game/Mails/Mail.cpp
diff --git a/src/game/Mails/Mail.h b/src/server/game/Mails/Mail.h
index d655767972..d655767972 100644
--- a/src/game/Mails/Mail.h
+++ b/src/server/game/Mails/Mail.h
diff --git a/src/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 4e6a595a55..4e6a595a55 100644
--- a/src/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
diff --git a/src/game/Maps/Map.h b/src/server/game/Maps/Map.h
index aa8939638e..aa8939638e 100644
--- a/src/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
diff --git a/src/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index 31c139e2ef..31c139e2ef 100644
--- a/src/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
diff --git a/src/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h
index fd0b815052..fd0b815052 100644
--- a/src/game/Maps/MapInstanced.h
+++ b/src/server/game/Maps/MapInstanced.h
diff --git a/src/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index c865f73569..c865f73569 100644
--- a/src/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
diff --git a/src/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h
index d8ca015251..d8ca015251 100644
--- a/src/game/Maps/MapManager.h
+++ b/src/server/game/Maps/MapManager.h
diff --git a/src/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h
index 6e8287ac19..6e8287ac19 100644
--- a/src/game/Maps/MapRefManager.h
+++ b/src/server/game/Maps/MapRefManager.h
diff --git a/src/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h
index ca07d4ac01..ca07d4ac01 100644
--- a/src/game/Maps/MapReference.h
+++ b/src/server/game/Maps/MapReference.h
diff --git a/src/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 3377b7455d..3377b7455d 100644
--- a/src/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
diff --git a/src/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index 7afbfd5cb8..7afbfd5cb8 100644
--- a/src/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
diff --git a/src/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp
index 3aa65c1635..3aa65c1635 100644
--- a/src/game/Maps/TransportMgr.cpp
+++ b/src/server/game/Maps/TransportMgr.cpp
diff --git a/src/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h
index 80d0a7b9db..80d0a7b9db 100644
--- a/src/game/Maps/TransportMgr.h
+++ b/src/server/game/Maps/TransportMgr.h
diff --git a/src/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h
index 157322a055..157322a055 100644
--- a/src/game/Maps/ZoneScript.h
+++ b/src/server/game/Maps/ZoneScript.h
diff --git a/src/game/Misc/AsyncAuctionListing.cpp b/src/server/game/Misc/AsyncAuctionListing.cpp
index 35b042c526..35b042c526 100644
--- a/src/game/Misc/AsyncAuctionListing.cpp
+++ b/src/server/game/Misc/AsyncAuctionListing.cpp
diff --git a/src/game/Misc/AsyncAuctionListing.h b/src/server/game/Misc/AsyncAuctionListing.h
index 55abb27e78..55abb27e78 100644
--- a/src/game/Misc/AsyncAuctionListing.h
+++ b/src/server/game/Misc/AsyncAuctionListing.h
diff --git a/src/game/Misc/AvgDiffTracker.cpp b/src/server/game/Misc/AvgDiffTracker.cpp
index 208a3a1829..208a3a1829 100644
--- a/src/game/Misc/AvgDiffTracker.cpp
+++ b/src/server/game/Misc/AvgDiffTracker.cpp
diff --git a/src/game/Misc/AvgDiffTracker.h b/src/server/game/Misc/AvgDiffTracker.h
index 58119df52d..58119df52d 100644
--- a/src/game/Misc/AvgDiffTracker.h
+++ b/src/server/game/Misc/AvgDiffTracker.h
diff --git a/src/game/Misc/DynamicVisibility.cpp b/src/server/game/Misc/DynamicVisibility.cpp
index 66fe7055ff..66fe7055ff 100644
--- a/src/game/Misc/DynamicVisibility.cpp
+++ b/src/server/game/Misc/DynamicVisibility.cpp
diff --git a/src/game/Misc/DynamicVisibility.h b/src/server/game/Misc/DynamicVisibility.h
index 49a8958337..49a8958337 100644
--- a/src/game/Misc/DynamicVisibility.h
+++ b/src/server/game/Misc/DynamicVisibility.h
diff --git a/src/game/Misc/SavingSystem.cpp b/src/server/game/Misc/SavingSystem.cpp
index 3f35d34db8..3f35d34db8 100644
--- a/src/game/Misc/SavingSystem.cpp
+++ b/src/server/game/Misc/SavingSystem.cpp
diff --git a/src/game/Misc/SavingSystem.h b/src/server/game/Misc/SavingSystem.h
index f53153f957..f53153f957 100644
--- a/src/game/Misc/SavingSystem.h
+++ b/src/server/game/Misc/SavingSystem.h
diff --git a/src/game/Misc/WhoListCache.cpp b/src/server/game/Misc/WhoListCache.cpp
index 7b6873f1c7..7b6873f1c7 100644
--- a/src/game/Misc/WhoListCache.cpp
+++ b/src/server/game/Misc/WhoListCache.cpp
diff --git a/src/game/Misc/WhoListCache.h b/src/server/game/Misc/WhoListCache.h
index bd82883e67..bd82883e67 100644
--- a/src/game/Misc/WhoListCache.h
+++ b/src/server/game/Misc/WhoListCache.h
diff --git a/src/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h
index 01bfad042b..01bfad042b 100644
--- a/src/game/Miscellaneous/Formulas.h
+++ b/src/server/game/Miscellaneous/Formulas.h
diff --git a/src/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h
index 9a00adb1c1..9a00adb1c1 100644
--- a/src/game/Miscellaneous/Language.h
+++ b/src/server/game/Miscellaneous/Language.h
diff --git a/src/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 751024f46a..751024f46a 100644
--- a/src/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
diff --git a/src/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h
index a0146f60c0..a0146f60c0 100644
--- a/src/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
diff --git a/src/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp
index 383173d237..383173d237 100644
--- a/src/game/Movement/FollowerReference.cpp
+++ b/src/server/game/Movement/FollowerReference.cpp
diff --git a/src/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h
index 1ad745a2a8..1ad745a2a8 100644
--- a/src/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
diff --git a/src/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index 9b17749f51..9b17749f51 100644
--- a/src/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
diff --git a/src/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index 5cb1f146e0..5cb1f146e0 100644
--- a/src/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
diff --git a/src/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp
index 4ad366c0cb..4ad366c0cb 100644
--- a/src/game/Movement/MovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h
index 86863c664c..86863c664c 100644
--- a/src/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
diff --git a/src/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h
index a0fecbd177..a0fecbd177 100644
--- a/src/game/Movement/MovementGeneratorImpl.h
+++ b/src/server/game/Movement/MovementGeneratorImpl.h
diff --git a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
index a03b36e07b..a03b36e07b 100644
--- a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
index 5f14adc0b8..5f14adc0b8 100644
--- a/src/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/EscortMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
index 47e40f6ae3..47e40f6ae3 100644
--- a/src/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/EscortMovementGenerator.h b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h
index a3495e44eb..a3495e44eb 100644
--- a/src/game/Movement/MovementGenerators/EscortMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
index 0e74cdbdb8..0e74cdbdb8 100644
--- a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
index 7927bf1043..7927bf1043 100644
--- a/src/game/Movement/MovementGenerators/FleeingMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
index ae94e77a54..ae94e77a54 100644
--- a/src/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
index 47a0ad44b4..47a0ad44b4 100644
--- a/src/game/Movement/MovementGenerators/HomeMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
index 80de496d94..80de496d94 100644
--- a/src/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
index 72b3c95f51..72b3c95f51 100644
--- a/src/game/Movement/MovementGenerators/IdleMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/PathGenerator.cpp b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp
index 0a55b66d23..0a55b66d23 100644
--- a/src/game/Movement/MovementGenerators/PathGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/PathGenerator.h b/src/server/game/Movement/MovementGenerators/PathGenerator.h
index b6c6e72e0d..b6c6e72e0d 100644
--- a/src/game/Movement/MovementGenerators/PathGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PathGenerator.h
diff --git a/src/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
index abe8cecb3d..abe8cecb3d 100644
--- a/src/game/Movement/MovementGenerators/PointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
index b29fece3f6..b29fece3f6 100644
--- a/src/game/Movement/MovementGenerators/PointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
index f706b7108d..f706b7108d 100644
--- a/src/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
index 5881536256..5881536256 100644
--- a/src/game/Movement/MovementGenerators/RandomMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
index 97ffaa4437..97ffaa4437 100644
--- a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
index 19afaa6c3f..19afaa6c3f 100644
--- a/src/game/Movement/MovementGenerators/TargetedMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
diff --git a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index da316b5224..da316b5224 100644
--- a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
diff --git a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
index e0e8f87a2f..e0e8f87a2f 100644
--- a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
diff --git a/src/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp
index 684c14e1ab..684c14e1ab 100644
--- a/src/game/Movement/Spline/MoveSpline.cpp
+++ b/src/server/game/Movement/Spline/MoveSpline.cpp
diff --git a/src/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h
index b8df80953f..b8df80953f 100644
--- a/src/game/Movement/Spline/MoveSpline.h
+++ b/src/server/game/Movement/Spline/MoveSpline.h
diff --git a/src/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h
index 7c5da0f39b..7c5da0f39b 100644
--- a/src/game/Movement/Spline/MoveSplineFlag.h
+++ b/src/server/game/Movement/Spline/MoveSplineFlag.h
diff --git a/src/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
index 345517e9df..345517e9df 100644
--- a/src/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp
diff --git a/src/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h
index 83a03eaeff..83a03eaeff 100644
--- a/src/game/Movement/Spline/MoveSplineInit.h
+++ b/src/server/game/Movement/Spline/MoveSplineInit.h
diff --git a/src/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
index edde1fbf02..edde1fbf02 100644
--- a/src/game/Movement/Spline/MoveSplineInitArgs.h
+++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
diff --git a/src/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
index a9efd52593..a9efd52593 100644
--- a/src/game/Movement/Spline/MovementPacketBuilder.cpp
+++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
diff --git a/src/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h
index 66f3074c3e..66f3074c3e 100644
--- a/src/game/Movement/Spline/MovementPacketBuilder.h
+++ b/src/server/game/Movement/Spline/MovementPacketBuilder.h
diff --git a/src/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h
index 5c92745820..5c92745820 100644
--- a/src/game/Movement/Spline/MovementTypedefs.h
+++ b/src/server/game/Movement/Spline/MovementTypedefs.h
diff --git a/src/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp
index c7b6e4b601..c7b6e4b601 100644
--- a/src/game/Movement/Spline/MovementUtil.cpp
+++ b/src/server/game/Movement/Spline/MovementUtil.cpp
diff --git a/src/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp
index 88ddb48537..88ddb48537 100644
--- a/src/game/Movement/Spline/Spline.cpp
+++ b/src/server/game/Movement/Spline/Spline.cpp
diff --git a/src/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h
index 8084c18e19..8084c18e19 100644
--- a/src/game/Movement/Spline/Spline.h
+++ b/src/server/game/Movement/Spline/Spline.h
diff --git a/src/game/Movement/Spline/SplineImpl.h b/src/server/game/Movement/Spline/SplineImpl.h
index 1cd60707ef..1cd60707ef 100644
--- a/src/game/Movement/Spline/SplineImpl.h
+++ b/src/server/game/Movement/Spline/SplineImpl.h
diff --git a/src/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp
index 094843b997..094843b997 100644
--- a/src/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
diff --git a/src/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h
index a978213a70..a978213a70 100644
--- a/src/game/Movement/Waypoints/WaypointManager.h
+++ b/src/server/game/Movement/Waypoints/WaypointManager.h
diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
index b2a1502652..b2a1502652 100644
--- a/src/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp
diff --git a/src/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
index 2f94c5ca75..2f94c5ca75 100644
--- a/src/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.h
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
index 315c5055fc..315c5055fc 100644
--- a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
index 5d7483620b..5d7483620b 100644
--- a/src/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
diff --git a/src/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp
index 7011c19ab4..7011c19ab4 100644
--- a/src/game/Petitions/PetitionMgr.cpp
+++ b/src/server/game/Petitions/PetitionMgr.cpp
diff --git a/src/game/Petitions/PetitionMgr.h b/src/server/game/Petitions/PetitionMgr.h
index 67476e6009..67476e6009 100644
--- a/src/game/Petitions/PetitionMgr.h
+++ b/src/server/game/Petitions/PetitionMgr.h
diff --git a/src/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index 2d22777854..2d22777854 100644
--- a/src/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
diff --git a/src/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h
index 3bceee5c06..3bceee5c06 100644
--- a/src/game/Pools/PoolMgr.h
+++ b/src/server/game/Pools/PoolMgr.h
diff --git a/src/game/PrecompiledHeaders/gamePCH.cpp b/src/server/game/PrecompiledHeaders/gamePCH.cpp
index 11e501ec7f..11e501ec7f 100644
--- a/src/game/PrecompiledHeaders/gamePCH.cpp
+++ b/src/server/game/PrecompiledHeaders/gamePCH.cpp
diff --git a/src/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h
index 68f628430c..68f628430c 100644
--- a/src/game/PrecompiledHeaders/gamePCH.h
+++ b/src/server/game/PrecompiledHeaders/gamePCH.h
diff --git a/src/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index a74bdddff4..a74bdddff4 100644
--- a/src/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
diff --git a/src/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index eb83715793..eb83715793 100644
--- a/src/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
diff --git a/src/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp
index dde87c8462..dde87c8462 100644
--- a/src/game/Reputation/ReputationMgr.cpp
+++ b/src/server/game/Reputation/ReputationMgr.cpp
diff --git a/src/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index 232e021067..232e021067 100644
--- a/src/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
diff --git a/src/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp
index 9e9e9f28a4..9e9e9f28a4 100644
--- a/src/game/Scripting/MapScripts.cpp
+++ b/src/server/game/Scripting/MapScripts.cpp
diff --git a/src/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 2c2bf165c6..2c2bf165c6 100644
--- a/src/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
diff --git a/src/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index c71c45dbff..c71c45dbff 100644
--- a/src/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
diff --git a/src/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 042319a961..042319a961 100644
--- a/src/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
diff --git a/src/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index cbf4225909..cbf4225909 100644
--- a/src/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
diff --git a/src/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 7878857174..7878857174 100644
--- a/src/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
diff --git a/src/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index b6fe7e0521..b6fe7e0521 100644
--- a/src/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
diff --git a/src/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp
index bac1b078a3..bac1b078a3 100644
--- a/src/game/Server/Protocol/PacketLog.cpp
+++ b/src/server/game/Server/Protocol/PacketLog.cpp
diff --git a/src/game/Server/Protocol/PacketLog.h b/src/server/game/Server/Protocol/PacketLog.h
index e9e8052fd7..e9e8052fd7 100644
--- a/src/game/Server/Protocol/PacketLog.h
+++ b/src/server/game/Server/Protocol/PacketLog.h
diff --git a/src/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index a92ee83563..a92ee83563 100644
--- a/src/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
diff --git a/src/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index ec786c6fef..ec786c6fef 100644
--- a/src/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
diff --git a/src/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index c774ba134e..c774ba134e 100644
--- a/src/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
diff --git a/src/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index cfbbe3795a..cfbbe3795a 100644
--- a/src/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
diff --git a/src/game/Server/WorldSocketAcceptor.h b/src/server/game/Server/WorldSocketAcceptor.h
index 342d501868..342d501868 100644
--- a/src/game/Server/WorldSocketAcceptor.h
+++ b/src/server/game/Server/WorldSocketAcceptor.h
diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index 89367ee4a9..89367ee4a9 100644
--- a/src/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
diff --git a/src/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
index 3ef767aec2..3ef767aec2 100644
--- a/src/game/Server/WorldSocketMgr.h
+++ b/src/server/game/Server/WorldSocketMgr.h
diff --git a/src/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp
index b464725aaa..b464725aaa 100644
--- a/src/game/Skills/SkillDiscovery.cpp
+++ b/src/server/game/Skills/SkillDiscovery.cpp
diff --git a/src/game/Skills/SkillDiscovery.h b/src/server/game/Skills/SkillDiscovery.h
index 6638a325ee..6638a325ee 100644
--- a/src/game/Skills/SkillDiscovery.h
+++ b/src/server/game/Skills/SkillDiscovery.h
diff --git a/src/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp
index e443844d3e..e443844d3e 100644
--- a/src/game/Skills/SkillExtraItems.cpp
+++ b/src/server/game/Skills/SkillExtraItems.cpp
diff --git a/src/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h
index 366d5c0545..366d5c0545 100644
--- a/src/game/Skills/SkillExtraItems.h
+++ b/src/server/game/Skills/SkillExtraItems.h
diff --git a/src/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
index 6d2eebcdda..6d2eebcdda 100644
--- a/src/game/Spells/Auras/SpellAuraDefines.h
+++ b/src/server/game/Spells/Auras/SpellAuraDefines.h
diff --git a/src/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 99759c7329..99759c7329 100644
--- a/src/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
diff --git a/src/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h
index e5e00956a5..e5e00956a5 100644
--- a/src/game/Spells/Auras/SpellAuraEffects.h
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.h
diff --git a/src/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp
index c50ecc2bc0..c50ecc2bc0 100644
--- a/src/game/Spells/Auras/SpellAuras.cpp
+++ b/src/server/game/Spells/Auras/SpellAuras.cpp
diff --git a/src/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h
index 1587f9fadf..1587f9fadf 100644
--- a/src/game/Spells/Auras/SpellAuras.h
+++ b/src/server/game/Spells/Auras/SpellAuras.h
diff --git a/src/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 8bf57153b9..8bf57153b9 100644
--- a/src/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
diff --git a/src/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index 880bb1fdc8..880bb1fdc8 100644
--- a/src/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
diff --git a/src/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 4ec091f78a..4ec091f78a 100644
--- a/src/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
diff --git a/src/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 46d5b708b4..46d5b708b4 100644
--- a/src/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
diff --git a/src/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h
index 19cb345688..19cb345688 100644
--- a/src/game/Spells/SpellInfo.h
+++ b/src/server/game/Spells/SpellInfo.h
diff --git a/src/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index d8dbd3aa8f..d8dbd3aa8f 100644
--- a/src/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
diff --git a/src/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h
index ba76683a67..ba76683a67 100644
--- a/src/game/Spells/SpellMgr.h
+++ b/src/server/game/Spells/SpellMgr.h
diff --git a/src/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
index 3cabe23d56..3cabe23d56 100644
--- a/src/game/Spells/SpellScript.cpp
+++ b/src/server/game/Spells/SpellScript.cpp
diff --git a/src/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h
index 5bf754eef1..5bf754eef1 100644
--- a/src/game/Spells/SpellScript.h
+++ b/src/server/game/Spells/SpellScript.h
diff --git a/src/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp
index 3465859d63..3465859d63 100644
--- a/src/game/Texts/CreatureTextMgr.cpp
+++ b/src/server/game/Texts/CreatureTextMgr.cpp
diff --git a/src/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h
index 05a1469830..05a1469830 100644
--- a/src/game/Texts/CreatureTextMgr.h
+++ b/src/server/game/Texts/CreatureTextMgr.h
diff --git a/src/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index ce7c46a5b8..ce7c46a5b8 100644
--- a/src/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
diff --git a/src/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h
index 94ebd74db5..94ebd74db5 100644
--- a/src/game/Tickets/TicketMgr.h
+++ b/src/server/game/Tickets/TicketMgr.h
diff --git a/src/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
index 59151ea866..59151ea866 100644
--- a/src/game/Tools/CharacterDatabaseCleaner.cpp
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
diff --git a/src/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h
index 2ad7436d53..2ad7436d53 100644
--- a/src/game/Tools/CharacterDatabaseCleaner.h
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.h
diff --git a/src/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp
index 36b958f6bc..36b958f6bc 100644
--- a/src/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
diff --git a/src/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h
index 3afbaa806a..3afbaa806a 100644
--- a/src/game/Tools/PlayerDump.h
+++ b/src/server/game/Tools/PlayerDump.h
diff --git a/src/game/Warden/Modules/WardenModuleMac.h b/src/server/game/Warden/Modules/WardenModuleMac.h
index f3609c037e..f3609c037e 100644
--- a/src/game/Warden/Modules/WardenModuleMac.h
+++ b/src/server/game/Warden/Modules/WardenModuleMac.h
diff --git a/src/game/Warden/Modules/WardenModuleWin.h b/src/server/game/Warden/Modules/WardenModuleWin.h
index 64a2d9ca11..64a2d9ca11 100644
--- a/src/game/Warden/Modules/WardenModuleWin.h
+++ b/src/server/game/Warden/Modules/WardenModuleWin.h
diff --git a/src/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp
index 5771a8a22a..5771a8a22a 100644
--- a/src/game/Warden/Warden.cpp
+++ b/src/server/game/Warden/Warden.cpp
diff --git a/src/game/Warden/Warden.h b/src/server/game/Warden/Warden.h
index 78a6b8c9d0..78a6b8c9d0 100644
--- a/src/game/Warden/Warden.h
+++ b/src/server/game/Warden/Warden.h
diff --git a/src/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp
index 3f153b0c1f..3f153b0c1f 100644
--- a/src/game/Warden/WardenCheckMgr.cpp
+++ b/src/server/game/Warden/WardenCheckMgr.cpp
diff --git a/src/game/Warden/WardenCheckMgr.h b/src/server/game/Warden/WardenCheckMgr.h
index 2485c6d541..2485c6d541 100644
--- a/src/game/Warden/WardenCheckMgr.h
+++ b/src/server/game/Warden/WardenCheckMgr.h
diff --git a/src/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
index 251e5525bf..251e5525bf 100644
--- a/src/game/Warden/WardenMac.cpp
+++ b/src/server/game/Warden/WardenMac.cpp
diff --git a/src/game/Warden/WardenMac.h b/src/server/game/Warden/WardenMac.h
index 1d74cfc1b0..1d74cfc1b0 100644
--- a/src/game/Warden/WardenMac.h
+++ b/src/server/game/Warden/WardenMac.h
diff --git a/src/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp
index 52f1206544..52f1206544 100644
--- a/src/game/Warden/WardenWin.cpp
+++ b/src/server/game/Warden/WardenWin.cpp
diff --git a/src/game/Warden/WardenWin.h b/src/server/game/Warden/WardenWin.h
index 834acc2fa3..834acc2fa3 100644
--- a/src/game/Warden/WardenWin.h
+++ b/src/server/game/Warden/WardenWin.h
diff --git a/src/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
index 54c3cb471b..54c3cb471b 100644
--- a/src/game/Weather/Weather.cpp
+++ b/src/server/game/Weather/Weather.cpp
diff --git a/src/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
index a455586e3e..a455586e3e 100644
--- a/src/game/Weather/Weather.h
+++ b/src/server/game/Weather/Weather.h
diff --git a/src/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
index ad9f493dc7..ad9f493dc7 100644
--- a/src/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
diff --git a/src/game/Weather/WeatherMgr.h b/src/server/game/Weather/WeatherMgr.h
index 450a17b4d4..450a17b4d4 100644
--- a/src/game/Weather/WeatherMgr.h
+++ b/src/server/game/Weather/WeatherMgr.h
diff --git a/src/game/World/World.cpp b/src/server/game/World/World.cpp
index 3ec460da9e..3ec460da9e 100644
--- a/src/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
diff --git a/src/game/World/World.h b/src/server/game/World/World.h
index 6408e0d2dd..6408e0d2dd 100644
--- a/src/game/World/World.h
+++ b/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 0000000000..a3373a007d
--- /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
index f1e5aa4932..f1e5aa4932 100644
--- a/src/scripts/Commands/CMakeLists.txt
+++ b/src/server/scripts/Commands/CMakeLists.txt
diff --git a/src/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index 4b6ba7d79f..4b6ba7d79f 100644
--- a/src/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
diff --git a/src/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp
index 1af4da6c2a..1af4da6c2a 100644
--- a/src/scripts/Commands/cs_achievement.cpp
+++ b/src/server/scripts/Commands/cs_achievement.cpp
diff --git a/src/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp
index b0cc058a7f..b0cc058a7f 100644
--- a/src/scripts/Commands/cs_ban.cpp
+++ b/src/server/scripts/Commands/cs_ban.cpp
diff --git a/src/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp
index 6544edff3e..6544edff3e 100644
--- a/src/scripts/Commands/cs_bf.cpp
+++ b/src/server/scripts/Commands/cs_bf.cpp
diff --git a/src/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp
index 3e4a599b0a..3e4a599b0a 100644
--- a/src/scripts/Commands/cs_cast.cpp
+++ b/src/server/scripts/Commands/cs_cast.cpp
diff --git a/src/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
index d874108406..d874108406 100644
--- a/src/scripts/Commands/cs_character.cpp
+++ b/src/server/scripts/Commands/cs_character.cpp
diff --git a/src/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 5b627d9693..5b627d9693 100644
--- a/src/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
diff --git a/src/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp
index 95f4238f2c..95f4238f2c 100644
--- a/src/scripts/Commands/cs_disable.cpp
+++ b/src/server/scripts/Commands/cs_disable.cpp
diff --git a/src/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp
index 596750f5a8..596750f5a8 100644
--- a/src/scripts/Commands/cs_event.cpp
+++ b/src/server/scripts/Commands/cs_event.cpp
diff --git a/src/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index 0967aa170d..0967aa170d 100644
--- a/src/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
diff --git a/src/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp
index 4a6235ddee..4a6235ddee 100644
--- a/src/scripts/Commands/cs_go.cpp
+++ b/src/server/scripts/Commands/cs_go.cpp
diff --git a/src/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 9d1c34c5a1..9d1c34c5a1 100644
--- a/src/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
diff --git a/src/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp
index 6389430608..6389430608 100644
--- a/src/scripts/Commands/cs_guild.cpp
+++ b/src/server/scripts/Commands/cs_guild.cpp
diff --git a/src/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp
index 7ec5c8c957..7ec5c8c957 100644
--- a/src/scripts/Commands/cs_honor.cpp
+++ b/src/server/scripts/Commands/cs_honor.cpp
diff --git a/src/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp
index 2a6f28d135..2a6f28d135 100644
--- a/src/scripts/Commands/cs_instance.cpp
+++ b/src/server/scripts/Commands/cs_instance.cpp
diff --git a/src/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
index 95641beaa2..95641beaa2 100644
--- a/src/scripts/Commands/cs_learn.cpp
+++ b/src/server/scripts/Commands/cs_learn.cpp
diff --git a/src/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp
index b491c45b3a..b491c45b3a 100644
--- a/src/scripts/Commands/cs_lfg.cpp
+++ b/src/server/scripts/Commands/cs_lfg.cpp
diff --git a/src/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp
index 4e5b3f5625..4e5b3f5625 100644
--- a/src/scripts/Commands/cs_list.cpp
+++ b/src/server/scripts/Commands/cs_list.cpp
diff --git a/src/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index 60f5ce165c..60f5ce165c 100644
--- a/src/scripts/Commands/cs_lookup.cpp
+++ b/src/server/scripts/Commands/cs_lookup.cpp
diff --git a/src/scripts/Commands/cs_message.cpp b/src/server/scripts/Commands/cs_message.cpp
index 15cd13a876..15cd13a876 100644
--- a/src/scripts/Commands/cs_message.cpp
+++ b/src/server/scripts/Commands/cs_message.cpp
diff --git a/src/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 268248f5bb..268248f5bb 100644
--- a/src/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
diff --git a/src/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index f1cdea9832..f1cdea9832 100644
--- a/src/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
diff --git a/src/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 928569fbc7..928569fbc7 100644
--- a/src/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
diff --git a/src/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp
index fff4ccf45b..fff4ccf45b 100644
--- a/src/scripts/Commands/cs_quest.cpp
+++ b/src/server/scripts/Commands/cs_quest.cpp
diff --git a/src/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index 2bb77bd07c..2bb77bd07c 100644
--- a/src/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
diff --git a/src/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index efeb967442..efeb967442 100644
--- a/src/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
diff --git a/src/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index a0055f594a..a0055f594a 100644
--- a/src/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
diff --git a/src/scripts/Commands/cs_spectator.cpp b/src/server/scripts/Commands/cs_spectator.cpp
index 06ac648944..06ac648944 100644
--- a/src/scripts/Commands/cs_spectator.cpp
+++ b/src/server/scripts/Commands/cs_spectator.cpp
diff --git a/src/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp
index 95a1ed5f5e..95a1ed5f5e 100644
--- a/src/scripts/Commands/cs_tele.cpp
+++ b/src/server/scripts/Commands/cs_tele.cpp
diff --git a/src/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp
index d3b757a68d..d3b757a68d 100644
--- a/src/scripts/Commands/cs_ticket.cpp
+++ b/src/server/scripts/Commands/cs_ticket.cpp
diff --git a/src/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp
index a6b83ddfe8..a6b83ddfe8 100644
--- a/src/scripts/Commands/cs_titles.cpp
+++ b/src/server/scripts/Commands/cs_titles.cpp
diff --git a/src/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 870fb95e52..870fb95e52 100644
--- a/src/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
diff --git a/src/scripts/Custom/README.md b/src/server/scripts/Custom/README.md
index 05944b8706..05944b8706 100644
--- a/src/scripts/Custom/README.md
+++ b/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
index 3da3d09577..3da3d09577 100644
--- a/src/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+++ b/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
index 69aff5830e..69aff5830e 100644
--- a/src/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/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
index a2235fedc6..a2235fedc6 100644
--- a/src/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+++ b/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
index 41f2e6c6ab..41f2e6c6ab 100644
--- a/src/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
+++ b/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
index 35fa03608d..35fa03608d 100644
--- a/src/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+++ b/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
index 467fb10f40..467fb10f40 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+++ b/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
index 4e2f2e5ac9..4e2f2e5ac9 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
+++ b/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
index 4b2feebae5..4b2feebae5 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/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
index ef4a430fb4..ef4a430fb4 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
+++ b/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
index 0aaea2484e..0aaea2484e 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/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
index 4d0ae24715..4d0ae24715 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+++ b/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
index 4820dccdfc..4820dccdfc 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/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
index 2f3b15b0b5..2f3b15b0b5 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
+++ b/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
index c4ef036036..c4ef036036 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/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
index 018eb1d2e8..018eb1d2e8 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+++ b/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
index 88cc083d65..88cc083d65 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/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
index a901fd41e5..a901fd41e5 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/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
index 53757fdcc3..53757fdcc3 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/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
index 4073401b96..4073401b96 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
+++ b/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
index 36c1cb3eee..36c1cb3eee 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
+++ b/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
index 0bb28b78c2..0bb28b78c2 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
+++ b/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
index b94a3fc487..b94a3fc487 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+++ b/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
index 10bfa8bdf1..10bfa8bdf1 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
+++ b/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
index 51d4b00bcd..51d4b00bcd 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
+++ b/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
index 2b5371ddf2..2b5371ddf2 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
+++ b/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
index 76f434d120..76f434d120 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
+++ b/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
index d4cad44590..d4cad44590 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
+++ b/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
index 0bfc0e35ba..0bfc0e35ba 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/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
index f0b55062eb..f0b55062eb 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
+++ b/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
index da072be449..da072be449 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/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
index 5cb0d993f6..5cb0d993f6 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
+++ b/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
index 2343c8aaab..2343c8aaab 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
+++ b/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
index c57e83d741..c57e83d741 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
+++ b/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
index 795f5b00f2..795f5b00f2 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
+++ b/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
index 98bd6fbec6..98bd6fbec6 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/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
index 7d29ec85fb..7d29ec85fb 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
+++ b/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
index 0948764f6f..0948764f6f 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/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
index 6eebc16c2c..6eebc16c2c 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
+++ b/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
index a3fe26b4b1..a3fe26b4b1 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
+++ b/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
index a7576e21af..a7576e21af 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
+++ b/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
index c632b37c32..c632b37c32 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
+++ b/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
index d87fe137be..d87fe137be 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/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
index 9182797b61..9182797b61 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
+++ b/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
index 0962608908..0962608908 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/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
index a215557d52..a215557d52 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/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
index 5dd5f76259..5dd5f76259 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
+++ b/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
index 402bbbed8d..402bbbed8d 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
+++ b/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
index c73c8c74b2..c73c8c74b2 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
+++ b/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
index 5b44d39437..5b44d39437 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
+++ b/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
index 3b459be7db..3b459be7db 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
+++ b/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
index 0908b5b107..0908b5b107 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
+++ b/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
index ebf5aa3a2d..ebf5aa3a2d 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/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
index dceeab6c86..dceeab6c86 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+++ b/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
index 245386c8bb..245386c8bb 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
+++ b/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
index 2383092777..2383092777 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
+++ b/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
index 8b0fba3cc9..8b0fba3cc9 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+++ b/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
index ae4531435d..ae4531435d 100644
--- a/src/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
diff --git a/src/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt
index 42220f43f4..42220f43f4 100644
--- a/src/scripts/EasternKingdoms/CMakeLists.txt
+++ b/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
index e0eb4874e6..e0eb4874e6 100644
--- a/src/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/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
index 77f075cf1d..77f075cf1d 100644
--- a/src/scripts/EasternKingdoms/Deadmines/deadmines.h
+++ b/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
index d5771f9c22..d5771f9c22 100644
--- a/src/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/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
index 93e1ee73be..93e1ee73be 100644
--- a/src/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+++ b/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
index ac8220bc3b..ac8220bc3b 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+++ b/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
index fda5f665c9..fda5f665c9 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
+++ b/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
index 690e514eb3..690e514eb3 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
+++ b/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
index c294d00893..c294d00893 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
+++ b/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
index 86b19b2a58..86b19b2a58 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
+++ b/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
index da543ce312..da543ce312 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+++ b/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
index 9a2e90b6d8..9a2e90b6d8 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/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
index 8084d481e0..8084d481e0 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
+++ b/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
index c6badbf302..c6badbf302 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/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
index b163cd1e74..b163cd1e74 100644
--- a/src/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+++ b/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
index 721ad64ff9..721ad64ff9 100644
--- a/src/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/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
index f6a76e367a..f6a76e367a 100644
--- a/src/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/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
index 8af6ac53fa..8af6ac53fa 100644
--- a/src/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
diff --git a/src/scripts/EasternKingdoms/Karazhan/karazhan.h b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
index 4240244640..4240244640 100644
--- a/src/scripts/EasternKingdoms/Karazhan/karazhan.h
+++ b/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
index 0232394821..0232394821 100644
--- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/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
index fe6aa57bb7..fe6aa57bb7 100644
--- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/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
index 45595f8ee4..45595f8ee4 100644
--- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/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
index 072042c6f1..072042c6f1 100644
--- a/src/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+++ b/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
index afd2add9f5..afd2add9f5 100644
--- a/src/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/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
index 59138de53c..59138de53c 100644
--- a/src/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
+++ b/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
index a2a74d0e16..a2a74d0e16 100644
--- a/src/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index 950fca072c..950fca072c 100644
--- a/src/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
diff --git a/src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index bd63c62b21..bd63c62b21 100644
--- a/src/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/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
index 889f7883ed..889f7883ed 100644
--- a/src/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
+++ b/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
index 0793279daa..0793279daa 100644
--- a/src/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/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
index 689659052b..689659052b 100644
--- a/src/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+++ b/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
index 6771f6c42c..6771f6c42c 100644
--- a/src/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/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
index 46dd5d175b..46dd5d175b 100644
--- a/src/scripts/EasternKingdoms/Scholomance/scholomance.h
+++ b/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
index 3edf7aee10..3edf7aee10 100644
--- a/src/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/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
index 7856020078..7856020078 100644
--- a/src/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/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
index 8e14117944..8e14117944 100644
--- a/src/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/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
index 0ee7b2a1bd..0ee7b2a1bd 100644
--- a/src/scripts/EasternKingdoms/Stratholme/stratholme.h
+++ b/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
index 4ab94eefde..4ab94eefde 100644
--- a/src/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+++ b/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
index a8497e3366..a8497e3366 100644
--- a/src/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
+++ b/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
index 0ae8006142..0ae8006142 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/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
index a69ab27306..a69ab27306 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/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
index d82cbbbb26..d82cbbbb26 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/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
index 5d5194d4ae..5d5194d4ae 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/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
index 58464a96f4..58464a96f4 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/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
index 2b449feea3..2b449feea3 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/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
index 2d1eb7352c..2d1eb7352c 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/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
index d56b48de1a..d56b48de1a 100644
--- a/src/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
+++ b/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
index bf0eded85c..bf0eded85c 100644
--- a/src/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
+++ b/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
index 50660a8b8f..50660a8b8f 100644
--- a/src/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/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
index 62216c3b66..62216c3b66 100644
--- a/src/scripts/EasternKingdoms/Uldaman/uldaman.h
+++ b/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
index d629c582d8..d629c582d8 100644
--- a/src/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/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
index df3428d7b8..df3428d7b8 100644
--- a/src/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/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
index be458ee88a..be458ee88a 100644
--- a/src/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/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
index b44d358f3b..b44d358f3b 100644
--- a/src/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/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
index b5fb0f732a..b5fb0f732a 100644
--- a/src/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/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
index 11cada5b5e..11cada5b5e 100644
--- a/src/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/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
index 0e8740e622..0e8740e622 100644
--- a/src/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/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
index f3c8a98075..f3c8a98075 100644
--- a/src/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
diff --git a/src/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
index 68c35c72c6..68c35c72c6 100644
--- a/src/scripts/EasternKingdoms/ZulAman/zulaman.h
+++ b/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
index 6f22e93443..6f22e93443 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/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
index 4de805483b..4de805483b 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/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
index 3d5aea29fb..3d5aea29fb 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/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
index 2bcc2754a2..2bcc2754a2 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/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
index 93eefb191a..93eefb191a 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/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
index c8acc56683..c8acc56683 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/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
index 62b0e501ef..62b0e501ef 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/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
index 6ff8bcaa75..6ff8bcaa75 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/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
index 7f4bfc6d6a..7f4bfc6d6a 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/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
index 8f33ae17a9..8f33ae17a9 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/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
index 717fec9210..717fec9210 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/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
index 4aa983ca76..4aa983ca76 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/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
index c2681db085..c2681db085 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/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
index ede549be0a..ede549be0a 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/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
index bd0989661a..bd0989661a 100644
--- a/src/scripts/EasternKingdoms/ZulGurub/zulgurub.h
+++ b/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
index 95ca4ead5c..95ca4ead5c 100644
--- a/src/scripts/EasternKingdoms/zone_alterac_mountains.cpp
+++ b/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
index 832ab472b1..832ab472b1 100644
--- a/src/scripts/EasternKingdoms/zone_arathi_highlands.cpp
+++ b/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
index 329c9421e4..329c9421e4 100644
--- a/src/scripts/EasternKingdoms/zone_blasted_lands.cpp
+++ b/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
index be2fd2dcaa..be2fd2dcaa 100644
--- a/src/scripts/EasternKingdoms/zone_burning_steppes.cpp
+++ b/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
index d55ef28887..d55ef28887 100644
--- a/src/scripts/EasternKingdoms/zone_duskwood.cpp
+++ b/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
index 13b95c97d6..13b95c97d6 100644
--- a/src/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
+++ b/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
index 437e90b793..437e90b793 100644
--- a/src/scripts/EasternKingdoms/zone_eversong_woods.cpp
+++ b/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
index e82f7ab110..e82f7ab110 100644
--- a/src/scripts/EasternKingdoms/zone_ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
index a09f7df1b5..a09f7df1b5 100644
--- a/src/scripts/EasternKingdoms/zone_hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
diff --git a/src/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp
index 1e74603eda..1e74603eda 100644
--- a/src/scripts/EasternKingdoms/zone_ironforge.cpp
+++ b/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
index 4c4b17e316..4c4b17e316 100644
--- a/src/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
+++ b/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
index 7c41add62f..7c41add62f 100644
--- a/src/scripts/EasternKingdoms/zone_loch_modan.cpp
+++ b/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
index b4bf684736..b4bf684736 100644
--- a/src/scripts/EasternKingdoms/zone_redridge_mountains.cpp
+++ b/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
index 40fc81bdb4..40fc81bdb4 100644
--- a/src/scripts/EasternKingdoms/zone_silverpine_forest.cpp
+++ b/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
index 7ce43574db..7ce43574db 100644
--- a/src/scripts/EasternKingdoms/zone_stormwind_city.cpp
+++ b/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
index 30bc490a7d..30bc490a7d 100644
--- a/src/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
+++ b/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
index 8f1071cf4c..8f1071cf4c 100644
--- a/src/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
+++ b/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
index 6699160312..6699160312 100644
--- a/src/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
+++ b/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
index d8916585ca..d8916585ca 100644
--- a/src/scripts/EasternKingdoms/zone_undercity.cpp
+++ b/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
index bc6efa8338..bc6efa8338 100644
--- a/src/scripts/EasternKingdoms/zone_western_plaguelands.cpp
+++ b/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
index e243aacee3..e243aacee3 100644
--- a/src/scripts/EasternKingdoms/zone_westfall.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp
diff --git a/src/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
index 56de698287..56de698287 100644
--- a/src/scripts/EasternKingdoms/zone_wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
diff --git a/src/scripts/Events/CMakeLists.txt b/src/server/scripts/Events/CMakeLists.txt
index 38d39ef0a7..38d39ef0a7 100644
--- a/src/scripts/Events/CMakeLists.txt
+++ b/src/server/scripts/Events/CMakeLists.txt
diff --git a/src/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp
index 18c109ea9a..18c109ea9a 100644
--- a/src/scripts/Events/brewfest.cpp
+++ b/src/server/scripts/Events/brewfest.cpp
diff --git a/src/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp
index e6c579cbda..e6c579cbda 100644
--- a/src/scripts/Events/childrens_week.cpp
+++ b/src/server/scripts/Events/childrens_week.cpp
diff --git a/src/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp
index 84ad89bd53..84ad89bd53 100644
--- a/src/scripts/Events/hallows_end.cpp
+++ b/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
index b0a12e6f47..b0a12e6f47 100644
--- a/src/scripts/Events/love_in_air.cpp
+++ b/src/server/scripts/Events/love_in_air.cpp
diff --git a/src/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp
index 6f7fcec5d2..6f7fcec5d2 100644
--- a/src/scripts/Events/midsummer.cpp
+++ b/src/server/scripts/Events/midsummer.cpp
diff --git a/src/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp
index 1936a1c318..1936a1c318 100644
--- a/src/scripts/Events/pilgrims_bounty.cpp
+++ b/src/server/scripts/Events/pilgrims_bounty.cpp
diff --git a/src/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp
index 84f53a63fc..84f53a63fc 100644
--- a/src/scripts/Events/winter_veil.cpp
+++ b/src/server/scripts/Events/winter_veil.cpp
diff --git a/src/scripts/GenLoader.cpp.cmake b/src/server/scripts/GenLoader.cpp.cmake
index 4049313d04..4049313d04 100644
--- a/src/scripts/GenLoader.cpp.cmake
+++ b/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
index 2d359d5842..2d359d5842 100644
--- a/src/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
+++ b/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
index 86b12ed427..86b12ed427 100644
--- a/src/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
diff --git a/src/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt
index 7a37f14361..7a37f14361 100644
--- a/src/scripts/Kalimdor/CMakeLists.txt
+++ b/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
index c90c412686..c90c412686 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/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
index 92baf7ac4b..92baf7ac4b 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/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
index d21afdf461..d21afdf461 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/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
index c151303968..c151303968 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/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
index 9d1a0eca34..9d1a0eca34 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
+++ b/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
index 82dded2a0b..82dded2a0b 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
+++ b/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
index 5e09cd6c1e..5e09cd6c1e 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
+++ b/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
index 26732f3a71..26732f3a71 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/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
index 9d1ccad32d..9d1ccad32d 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+++ b/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
index 78df6c9150..78df6c9150 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/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
index 73594df6a7..73594df6a7 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
+++ b/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
index 5a675efaf8..5a675efaf8 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/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
index eb52a0b1e4..eb52a0b1e4 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
+++ b/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
index acd5271dbb..acd5271dbb 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
+++ b/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
index c1e57bfbc2..c1e57bfbc2 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
+++ b/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
index c5811914f9..c5811914f9 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
+++ b/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
index 3f2186893b..3f2186893b 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+++ b/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
index f147653083..f147653083 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/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
index 5a047c4ead..5a047c4ead 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
+++ b/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
index 1b38bf1eec..1b38bf1eec 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/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
index cadb59d8e7..cadb59d8e7 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
+++ b/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
index 1d06971981..1d06971981 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+++ b/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
index 801557387c..801557387c 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
+++ b/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
index 568fee34e5..568fee34e5 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/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
index 3f0acebf4d..3f0acebf4d 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/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
index aedafa001e..aedafa001e 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
+++ b/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
index cdd7f8e307..cdd7f8e307 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
+++ b/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
index 366f854a2d..366f854a2d 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
+++ b/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
index dc6bc7a20c..dc6bc7a20c 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
+++ b/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
index 5ac0d97fb1..5ac0d97fb1 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+++ b/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
index cd98b9d8c1..cd98b9d8c1 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
+++ b/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
index 1e8ee41869..1e8ee41869 100644
--- a/src/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
+++ b/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
index 24eebbebd2..24eebbebd2 100644
--- a/src/scripts/Kalimdor/DireMaul/dire_maul.h
+++ b/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
index 67527309ea..67527309ea 100644
--- a/src/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
+++ b/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
index eb911b5be8..eb911b5be8 100644
--- a/src/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
+++ b/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
index 7dd686e9c1..7dd686e9c1 100644
--- a/src/scripts/Kalimdor/Maraudon/maraudon.h
+++ b/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
index 908bec18ea..908bec18ea 100644
--- a/src/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/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
index ae6cbf79f9..ae6cbf79f9 100644
--- a/src/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/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
index 37102f512a..37102f512a 100644
--- a/src/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
+++ b/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
index 2b04ac0e7c..2b04ac0e7c 100644
--- a/src/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
+++ b/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
index 8d8b0e382e..8d8b0e382e 100644
--- a/src/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/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
index 866e3c3045..866e3c3045 100644
--- a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
+++ b/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
index c2182b022d..c2182b022d 100644
--- a/src/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
+++ b/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
index c7ffa947e8..c7ffa947e8 100644
--- a/src/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/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
index 3278c123f4..3278c123f4 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+++ b/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
index 29bc61250f..29bc61250f 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/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
index 828f74e78b..828f74e78b 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
+++ b/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
index 116e4f277f..116e4f277f 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
+++ b/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
index d458f8ad52..d458f8ad52 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/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
index 75cc49f1e4..75cc49f1e4 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/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
index 444f92aa8a..444f92aa8a 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/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
index 564d65087b..564d65087b 100644
--- a/src/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
+++ b/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
index ad6c5bbbb7..ad6c5bbbb7 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+++ b/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
index c1bb94ac05..c1bb94ac05 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/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
index caa1ded859..caa1ded859 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+++ b/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
index 3ae6669536..3ae6669536 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+++ b/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
index a1663deb2c..a1663deb2c 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+++ b/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
index f6188bc415..f6188bc415 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+++ b/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
index ae97faae47..ae97faae47 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/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
index 5c413d31f2..5c413d31f2 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
+++ b/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
index f96acaaabf..f96acaaabf 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+++ b/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
index f33f7e7562..f33f7e7562 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/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
index 3f99e53e91..3f99e53e91 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
+++ b/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
index 12e6bad3d7..12e6bad3d7 100644
--- a/src/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
+++ b/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
index ff878d5338..ff878d5338 100644
--- a/src/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/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
index 3bb3a80bba..3bb3a80bba 100644
--- a/src/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
+++ b/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
index 88fe309af3..88fe309af3 100644
--- a/src/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/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
index d31f7a30db..d31f7a30db 100644
--- a/src/scripts/Kalimdor/ZulFarrak/zulfarrak.h
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
diff --git a/src/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index 5fd6ed1954..5fd6ed1954 100644
--- a/src/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
diff --git a/src/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 8335ddde64..8335ddde64 100644
--- a/src/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
diff --git a/src/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
index 8cadb8fc64..8cadb8fc64 100644
--- a/src/scripts/Kalimdor/zone_azshara.cpp
+++ b/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
index 3d15765cb4..3d15765cb4 100644
--- a/src/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/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
index c327b86fc0..c327b86fc0 100644
--- a/src/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/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
index bc7d6d8ec7..bc7d6d8ec7 100644
--- a/src/scripts/Kalimdor/zone_darkshore.cpp
+++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp
diff --git a/src/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index edf7070a85..edf7070a85 100644
--- a/src/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
diff --git a/src/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index a98d27f665..a98d27f665 100644
--- a/src/scripts/Kalimdor/zone_durotar.cpp
+++ b/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
index e69ca6f681..e69ca6f681 100644
--- a/src/scripts/Kalimdor/zone_dustwallow_marsh.cpp
+++ b/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
index a6092baebb..a6092baebb 100644
--- a/src/scripts/Kalimdor/zone_felwood.cpp
+++ b/src/server/scripts/Kalimdor/zone_felwood.cpp
diff --git a/src/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp
index 0db8541646..0db8541646 100644
--- a/src/scripts/Kalimdor/zone_feralas.cpp
+++ b/src/server/scripts/Kalimdor/zone_feralas.cpp
diff --git a/src/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index b432be1aed..b432be1aed 100644
--- a/src/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
diff --git a/src/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp
index e56b276e34..e56b276e34 100644
--- a/src/scripts/Kalimdor/zone_mulgore.cpp
+++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp
diff --git a/src/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
index be7543eaff..be7543eaff 100644
--- a/src/scripts/Kalimdor/zone_orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
diff --git a/src/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index abb9dc6fce..abb9dc6fce 100644
--- a/src/scripts/Kalimdor/zone_silithus.cpp
+++ b/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
index 376cf43e0e..376cf43e0e 100644
--- a/src/scripts/Kalimdor/zone_stonetalon_mountains.cpp
+++ b/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
index 156be76719..156be76719 100644
--- a/src/scripts/Kalimdor/zone_tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
diff --git a/src/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp
index df1c91d6cb..df1c91d6cb 100644
--- a/src/scripts/Kalimdor/zone_teldrassil.cpp
+++ b/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
index f75bd2576e..f75bd2576e 100644
--- a/src/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/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
index 5c0e9e5387..5c0e9e5387 100644
--- a/src/scripts/Kalimdor/zone_thousand_needles.cpp
+++ b/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
index b9db57aa77..b9db57aa77 100644
--- a/src/scripts/Kalimdor/zone_thunder_bluff.cpp
+++ b/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
index 0b0c38701c..0b0c38701c 100644
--- a/src/scripts/Kalimdor/zone_ungoro_crater.cpp
+++ b/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
index cf097b4861..cf097b4861 100644
--- a/src/scripts/Kalimdor/zone_winterspring.cpp
+++ b/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
index 2d87bc49e2..2d87bc49e2 100644
--- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
+++ b/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
index b6b87be23a..b6b87be23a 100644
--- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/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
index 92a83451ca..92a83451ca 100644
--- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/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
index ded193d8f9..ded193d8f9 100644
--- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/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
index 3dbc0a82d9..3dbc0a82d9 100644
--- a/src/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/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
index d90c32b273..d90c32b273 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
+++ b/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
index f18069e227..f18069e227 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+++ b/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
index de6313817b..de6313817b 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
+++ b/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
index 6d238af7f3..6d238af7f3 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+++ b/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
index b451c6c0d7..b451c6c0d7 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/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
index 250f1702d4..250f1702d4 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/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
index 492420bfd0..492420bfd0 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
+++ b/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
index cd055ce0dc..cd055ce0dc 100644
--- a/src/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
diff --git a/src/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt
index 41218b3f31..41218b3f31 100644
--- a/src/scripts/Northrend/CMakeLists.txt
+++ b/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
index 07269e503e..07269e503e 100644
--- a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
+++ b/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
index eed9462eec..eed9462eec 100644
--- a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/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
index 1962bf094d..1962bf094d 100644
--- a/src/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
+++ b/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
index 7e90681e61..7e90681e61 100644
--- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/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
index c8f9b4322a..c8f9b4322a 100644
--- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+++ b/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
index a9204522c4..a9204522c4 100644
--- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/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
index 3c93711b1a..3c93711b1a 100644
--- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
+++ b/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
index ccb61b35c4..ccb61b35c4 100644
--- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/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
index 0c57f3ff05..0c57f3ff05 100644
--- a/src/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
+++ b/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
index 1c935dc0ab..1c935dc0ab 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/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
index e8033a58f2..e8033a58f2 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/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
index 2bd1f0f12e..2bd1f0f12e 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+++ b/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
index fdcd5d44e1..fdcd5d44e1 100644
--- 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
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
index 8a0c1d407e..8a0c1d407e 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/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
index 5db3b9571a..5db3b9571a 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
+++ b/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
index 9b608b50dc..9b608b50dc 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/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
index 733ab51a15..733ab51a15 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/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
index 0790b0412e..0790b0412e 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/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
index a165baf6c6..a165baf6c6 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/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
index 02f15f8726..02f15f8726 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/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
index b333891736..b333891736 100644
--- 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
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
index d323e9bf7f..d323e9bf7f 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/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
index e1da98fd2c..e1da98fd2c 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/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
index ee5cd92e57..ee5cd92e57 100644
--- a/src/scripts/Northrend/DraktharonKeep/boss_dred.cpp
+++ b/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
index 73b3493638..73b3493638 100644
--- a/src/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/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
index 5404cbf131..5404cbf131 100644
--- a/src/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/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
index acf0964d5d..acf0964d5d 100644
--- a/src/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/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
index c48ca051bc..c48ca051bc 100644
--- a/src/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
+++ b/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
index 0d971c5d7c..0d971c5d7c 100644
--- a/src/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/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
index 8852bff0e4..8852bff0e4 100644
--- a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/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
index a0e1b39707..a0e1b39707 100644
--- a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/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
index 3933c7d136..3933c7d136 100644
--- a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/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
index da7889aa63..da7889aa63 100644
--- a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
+++ b/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
index 7bc88051d9..7bc88051d9 100644
--- a/src/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/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
index 3bbd47dcb9..3bbd47dcb9 100644
--- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+++ b/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
index bfc4f797bd..bfc4f797bd 100644
--- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/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
index 91d95c64ec..91d95c64ec 100644
--- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/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
index 6504f7e2b1..6504f7e2b1 100644
--- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
+++ b/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
index 5f48069dd1..5f48069dd1 100644
--- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/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
index 55b6f71780..55b6f71780 100644
--- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/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
index 84121bfbe2..84121bfbe2 100644
--- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/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
index f65d109ac2..f65d109ac2 100644
--- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/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
index d356efb217..d356efb217 100644
--- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/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
index a9b806a641..a9b806a641 100644
--- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/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
index 0180e27011..0180e27011 100644
--- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
+++ b/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
index f0a8149a28..f0a8149a28 100644
--- a/src/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
+++ b/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
index c387063b48..c387063b48 100644
--- a/src/scripts/Northrend/Gundrak/boss_eck.cpp
+++ b/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
index 9ec01e4244..9ec01e4244 100644
--- a/src/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/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
index 9a328ae630..9a328ae630 100644
--- a/src/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/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
index 75df7449d5..75df7449d5 100644
--- a/src/scripts/Northrend/Gundrak/boss_slad_ran.cpp
+++ b/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
index e42805daf7..e42805daf7 100644
--- a/src/scripts/Northrend/Gundrak/gundrak.h
+++ b/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
index 0f4be20d46..0f4be20d46 100644
--- a/src/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/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
index 4cea79ea3f..4cea79ea3f 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/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
index 1c0c120ae5..1c0c120ae5 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/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
index dc91f42d8b..dc91f42d8b 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/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
index d347688dc6..d347688dc6 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/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
index c28ca40965..c28ca40965 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/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
index 2a46155b29..2a46155b29 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/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
index d2399f035d..d2399f035d 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/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
index ec64a7a0f8..ec64a7a0f8 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/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
index 4101de86a2..4101de86a2 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/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
index 3932c2b56d..3932c2b56d 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/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
index dd4f6b2e76..dd4f6b2e76 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/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
index f85c00f293..f85c00f293 100644
--- a/src/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/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
index 5e2a882b91..5e2a882b91 100644
--- a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/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
index 441753ce39..441753ce39 100644
--- a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+++ b/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
index 30ff0c7070..30ff0c7070 100644
--- a/src/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
+++ b/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
index b6d11e8967..b6d11e8967 100644
--- a/src/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/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
index 461ce780a9..461ce780a9 100644
--- a/src/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/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
index 96961d1ae2..96961d1ae2 100644
--- a/src/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/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
index 21cff6286e..21cff6286e 100644
--- a/src/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/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
index fdc4a5e6a8..fdc4a5e6a8 100644
--- a/src/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/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
index 897103e475..897103e475 100644
--- a/src/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/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
index aa8b87531b..aa8b87531b 100644
--- a/src/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/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
index c6039bac60..c6039bac60 100644
--- a/src/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/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
index 5af8fbd6aa..5af8fbd6aa 100644
--- a/src/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/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
index 165ff01329..165ff01329 100644
--- a/src/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/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
index f93e5758cb..f93e5758cb 100644
--- a/src/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/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
index 95f81ca99b..95f81ca99b 100644
--- a/src/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/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
index 18910bbcd3..18910bbcd3 100644
--- a/src/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
+++ b/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
index def339cf5e..def339cf5e 100644
--- a/src/scripts/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/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
index 2514682c95..2514682c95 100644
--- a/src/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/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
index 51e8f5b6ca..51e8f5b6ca 100644
--- a/src/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/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
index 93db29caea..93db29caea 100644
--- a/src/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/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
index 25a1bed6d4..25a1bed6d4 100644
--- a/src/scripts/Northrend/Naxxramas/naxxramas.h
+++ b/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
index fa79afb015..fa79afb015 100644
--- a/src/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/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
index b6e462ba4a..b6e462ba4a 100644
--- a/src/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
+++ b/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
index 0777a07cd7..0777a07cd7 100644
--- a/src/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/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
index 6d553d3b6a..6d553d3b6a 100644
--- a/src/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/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
index 472997072b..472997072b 100644
--- a/src/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
+++ b/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
index 8cbeab6595..8cbeab6595 100644
--- a/src/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/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
index e8aff23c76..e8aff23c76 100644
--- a/src/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/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
index 2fa3d1d333..2fa3d1d333 100644
--- a/src/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/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
index ee607d70b6..ee607d70b6 100644
--- a/src/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/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
index 93ac0fd72a..93ac0fd72a 100644
--- a/src/scripts/Northrend/Nexus/Nexus/nexus.h
+++ b/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
index 850056c192..850056c192 100644
--- a/src/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/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
index ad75502597..ad75502597 100644
--- a/src/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/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
index 9a358c7b4e..9a358c7b4e 100644
--- a/src/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/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
index 1d4709d4b4..1d4709d4b4 100644
--- a/src/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/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
index 4b1bbf6e0b..4b1bbf6e0b 100644
--- a/src/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/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
index 4fb6a201f1..4fb6a201f1 100644
--- a/src/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/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
index e4c7e108ca..e4c7e108ca 100644
--- a/src/scripts/Northrend/Nexus/Oculus/oculus.h
+++ b/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
index 65dddf7656..65dddf7656 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/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
index 27d4b70f87..27d4b70f87 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+++ b/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
index 68d02b0a36..68d02b0a36 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/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
index 0c5add648b..0c5add648b 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/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
index 7e28179c02..7e28179c02 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
+++ b/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
index a596e7b481..a596e7b481 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/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
index 081b55844e..081b55844e 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/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
index 69327f1c98..69327f1c98 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
+++ b/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
index 5c8e621aaa..5c8e621aaa 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/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
index 70f7887af2..70f7887af2 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
+++ b/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
index 59f2923b28..59f2923b28 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
+++ b/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
index 735a1738d0..735a1738d0 100644
--- a/src/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/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
index 5ff7ce6aa9..5ff7ce6aa9 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/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
index 40ea95036b..40ea95036b 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/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
index 7cceaed168..7cceaed168 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/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
index 1179ab4320..1179ab4320 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/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
index 853fce3acb..853fce3acb 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/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
index eab9d0cde9..eab9d0cde9 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/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
index 755a3a36d3..755a3a36d3 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/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
index 93681e56fc..93681e56fc 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/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
index eb0e6be6fc..eb0e6be6fc 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/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
index b758cbe3e4..b758cbe3e4 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/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
index 33f04a71a3..33f04a71a3 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/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
index ce57e00534..ce57e00534 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/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
index 3498289fe7..3498289fe7 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/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
index 04d3d59125..04d3d59125 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+++ b/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
index 6fbd1a2be8..6fbd1a2be8 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/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
index cd0ce62943..cd0ce62943 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
+++ b/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
index e0c45592ee..e0c45592ee 100644
--- a/src/scripts/Northrend/Ulduar/Ulduar/ulduar.h
+++ b/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
index a3b12cf5b6..a3b12cf5b6 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/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
index 816db299ae..816db299ae 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/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
index 26ff5be0ee..26ff5be0ee 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/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
index acbbd3003b..acbbd3003b 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/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
index 71158e115f..71158e115f 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/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
index 1c5d445b2f..1c5d445b2f 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
+++ b/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
index 887fe986da..887fe986da 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/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
index f3d398446f..f3d398446f 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/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
index 9cf127207a..9cf127207a 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/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
index 50ca2c08f9..50ca2c08f9 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/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
index b2a5bb3fb2..b2a5bb3fb2 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+++ b/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
index 893b302d84..893b302d84 100644
--- a/src/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
+++ b/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
index 15e987ba6b..15e987ba6b 100644
--- a/src/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
+++ b/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
index d6a05807a7..d6a05807a7 100644
--- a/src/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
+++ b/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
index 3e8c0d91e9..3e8c0d91e9 100644
--- a/src/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/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
index fdeb0ce80e..fdeb0ce80e 100644
--- a/src/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/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
index e588c1f37b..e588c1f37b 100644
--- a/src/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/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
index f91aaf00bd..f91aaf00bd 100644
--- a/src/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
+++ b/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
index 9252d15722..9252d15722 100644
--- a/src/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/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
index 52c2e4fc22..52c2e4fc22 100644
--- a/src/scripts/Northrend/VioletHold/boss_erekem.cpp
+++ b/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
index 23aaf8df09..23aaf8df09 100644
--- a/src/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/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
index 6fbd85da3f..6fbd85da3f 100644
--- a/src/scripts/Northrend/VioletHold/boss_lavanthor.cpp
+++ b/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
index 018325c846..018325c846 100644
--- a/src/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/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
index cfc1c0b7af..cfc1c0b7af 100644
--- a/src/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/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
index 5c28132d37..5c28132d37 100644
--- a/src/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/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
index d62f9b659d..d62f9b659d 100644
--- a/src/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/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
index 1490012da8..1490012da8 100644
--- a/src/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/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
index 95221eb1e4..95221eb1e4 100644
--- a/src/scripts/Northrend/VioletHold/violet_hold.h
+++ b/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
index 5bd0cd5bfe..5bd0cd5bfe 100644
--- a/src/scripts/Northrend/isle_of_conquest.cpp
+++ b/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
index 50db4397db..50db4397db 100644
--- a/src/scripts/Northrend/zone_borean_tundra.cpp
+++ b/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
index c6101dc6a4..c6101dc6a4 100644
--- a/src/scripts/Northrend/zone_crystalsong_forest.cpp
+++ b/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
index 140029352a..140029352a 100644
--- a/src/scripts/Northrend/zone_dalaran.cpp
+++ b/src/server/scripts/Northrend/zone_dalaran.cpp
diff --git a/src/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
index 53cbacbd68..53cbacbd68 100644
--- a/src/scripts/Northrend/zone_dragonblight.cpp
+++ b/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
index d847aba9bb..d847aba9bb 100644
--- a/src/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/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
index c32010f326..c32010f326 100644
--- a/src/scripts/Northrend/zone_howling_fjord.cpp
+++ b/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
index a3ac53d19f..a3ac53d19f 100644
--- a/src/scripts/Northrend/zone_icecrown.cpp
+++ b/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
index 5d0e2c5dad..5d0e2c5dad 100644
--- a/src/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/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
index a3bbc43a93..a3bbc43a93 100644
--- a/src/scripts/Northrend/zone_storm_peaks.cpp
+++ b/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
index e14c1197d8..e14c1197d8 100644
--- a/src/scripts/Northrend/zone_wintergrasp.cpp
+++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp
diff --git a/src/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 88797fe361..88797fe361 100644
--- a/src/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
diff --git a/src/scripts/OutdoorPvP/CMakeLists.txt b/src/server/scripts/OutdoorPvP/CMakeLists.txt
index ed8aabe46b..ed8aabe46b 100644
--- a/src/scripts/OutdoorPvP/CMakeLists.txt
+++ b/src/server/scripts/OutdoorPvP/CMakeLists.txt
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
index 11b8b9418c..11b8b9418c 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPEP.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
index a97556349a..a97556349a 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPEP.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
index c0b7610e31..c0b7610e31 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPGH.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPGH.h b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.h
index 79a02ca6d5..79a02ca6d5 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPGH.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
index 8c5de0cc70..8c5de0cc70 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
index 76d897ba5a..76d897ba5a 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPHP.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
index 7b18c2f0fc..7b18c2f0fc 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
index ec1530a53b..ec1530a53b 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPNA.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
index b67892f4d4..b67892f4d4 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
index 5337fbbfdd..5337fbbfdd 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPSI.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
index e5d62b7c92..e5d62b7c92 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
index 16425ebafd..16425ebafd 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPTF.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
index 3794a5b03e..3794a5b03e 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
diff --git a/src/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
index 09fe65003d..09fe65003d 100644
--- a/src/scripts/OutdoorPvP/OutdoorPvPZM.h
+++ b/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
index f92d2f1737..f92d2f1737 100644
--- a/src/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/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
index 8741ce2ad0..8741ce2ad0 100644
--- 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
diff --git a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index c7a3c4bf45..c7a3c4bf45 100644
--- a/src/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/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
index 8a2285b1ca..8a2285b1ca 100644
--- a/src/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/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
index b08dfe7b75..b08dfe7b75 100644
--- a/src/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
+++ b/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
index f6562bcba9..f6562bcba9 100644
--- a/src/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
+++ b/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
index 462e6c7d5e..462e6c7d5e 100644
--- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
+++ b/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
index fa4e912358..fa4e912358 100644
--- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/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
index 6625997db2..6625997db2 100644
--- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
+++ b/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
index cc7ed758f3..cc7ed758f3 100644
--- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/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
index 239f3288b7..239f3288b7 100644
--- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/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
index 6ae39e7f02..6ae39e7f02 100644
--- a/src/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/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
index 7e418cb089..7e418cb089 100644
--- a/src/scripts/Outland/BlackTemple/black_temple.h
+++ b/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
index 2b07e6e4a0..2b07e6e4a0 100644
--- a/src/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/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
index 3e4c0d7b2a..3e4c0d7b2a 100644
--- a/src/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/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
index b02872ec4f..b02872ec4f 100644
--- a/src/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/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
index 8a4baf5b9c..8a4baf5b9c 100644
--- a/src/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/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
index c6799b1dd0..c6799b1dd0 100644
--- a/src/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/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
index 61ee5df57b..61ee5df57b 100644
--- a/src/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/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
index e8bd1e6d50..e8bd1e6d50 100644
--- a/src/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/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
index f0a0e448ea..f0a0e448ea 100644
--- a/src/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/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
index 714d8b8945..714d8b8945 100644
--- a/src/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/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
index ccb78d99d9..ccb78d99d9 100644
--- a/src/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
diff --git a/src/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt
index dc384ced3b..dc384ced3b 100644
--- a/src/scripts/Outland/CMakeLists.txt
+++ b/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
index f789ca815b..f789ca815b 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/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
index 7a57ccaf24..7a57ccaf24 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/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
index 2cdeea8202..2cdeea8202 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/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
index d99578c6d6..d99578c6d6 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/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
index f52047d1a3..f52047d1a3 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/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
index 470afeaa9a..470afeaa9a 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/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
index 1bbc6e2123..1bbc6e2123 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/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
index e0c4ce0d38..e0c4ce0d38 100644
--- a/src/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/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
index 90ea14d659..90ea14d659 100644
--- a/src/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
+++ b/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
index 71df727f6f..71df727f6f 100644
--- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/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
index 852ca8fc24..852ca8fc24 100644
--- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/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
index 759cfef66f..759cfef66f 100644
--- a/src/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/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
index e51a3c930e..e51a3c930e 100644
--- a/src/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/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
index e5785ede7d..e5785ede7d 100644
--- a/src/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/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
index 5a3ddeb9b2..5a3ddeb9b2 100644
--- a/src/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/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
index 3d374c5068..3d374c5068 100644
--- a/src/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/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
index 17cc3e20fd..17cc3e20fd 100644
--- a/src/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/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
index 46fe1d09b1..46fe1d09b1 100644
--- a/src/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/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
index b35e16dee1..b35e16dee1 100644
--- a/src/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/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
index 688b3a754d..688b3a754d 100644
--- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
+++ b/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
index 858cbdb557..858cbdb557 100644
--- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/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
index 8e23f708e5..8e23f708e5 100644
--- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+++ b/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
index d1e8adea12..d1e8adea12 100644
--- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+++ b/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
index 0f4dd28486..0f4dd28486 100644
--- a/src/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/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
index c0aa882ebd..c0aa882ebd 100644
--- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/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
index f73032c23b..f73032c23b 100644
--- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/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
index b2ee872a32..b2ee872a32 100644
--- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/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
index 50e671c878..50e671c878 100644
--- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/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
index 406ed503e9..406ed503e9 100644
--- a/src/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/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
index 18579172ff..18579172ff 100644
--- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/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
index 061ec65769..061ec65769 100644
--- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/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
index de9ca91cc6..de9ca91cc6 100644
--- a/src/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/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
index 73b4747e06..73b4747e06 100644
--- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/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
index 2d11a988f6..2d11a988f6 100644
--- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/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
index 7b348c709d..7b348c709d 100644
--- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+++ b/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
index 513b02eba2..513b02eba2 100644
--- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/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
index c9304cc97c..c9304cc97c 100644
--- a/src/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/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
index 4ef3f64cb4..4ef3f64cb4 100644
--- a/src/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/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
index f009c0c8a5..f009c0c8a5 100644
--- a/src/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/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
index 4ee5a42080..4ee5a42080 100644
--- a/src/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/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
index db15167069..db15167069 100644
--- a/src/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/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
index e0ff41600a..e0ff41600a 100644
--- a/src/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/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
index a43cf5a9fa..a43cf5a9fa 100644
--- a/src/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/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
index 90d5706727..90d5706727 100644
--- a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/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
index e1fcc625e3..e1fcc625e3 100644
--- a/src/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
+++ b/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
index 5297bbc4ce..5297bbc4ce 100644
--- a/src/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/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
index c9ce1de89c..c9ce1de89c 100644
--- a/src/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/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
index 699cdbc838..699cdbc838 100644
--- a/src/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/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
index f34dc51b07..f34dc51b07 100644
--- a/src/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
+++ b/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
index 9530f908e1..9530f908e1 100644
--- a/src/scripts/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/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
index c88197c3cc..c88197c3cc 100644
--- a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/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
index 098ceb124d..098ceb124d 100644
--- a/src/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/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
index 288abd2b3b..288abd2b3b 100644
--- a/src/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
+++ b/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
index fbb01edf06..fbb01edf06 100644
--- a/src/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/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
index b5fbbccf94..b5fbbccf94 100644
--- a/src/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/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
index f128f2c782..f128f2c782 100644
--- a/src/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
+++ b/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
index f167cacf93..f167cacf93 100644
--- a/src/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/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
index 0e3b19f0da..0e3b19f0da 100644
--- a/src/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/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
index 35b93d074a..35b93d074a 100644
--- a/src/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
+++ b/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
index f2c1ce3a4c..f2c1ce3a4c 100644
--- a/src/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+++ b/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
index 26eeaddf75..26eeaddf75 100644
--- a/src/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
+++ b/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
index 7b9d8ec3a3..7b9d8ec3a3 100644
--- a/src/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/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
index bdbcf81136..bdbcf81136 100644
--- a/src/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/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
index f49d11cd67..f49d11cd67 100644
--- a/src/scripts/Outland/TempestKeep/botanica/the_botanica.h
+++ b/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
index e39378759e..e39378759e 100644
--- a/src/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/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
index ccd719573f..ccd719573f 100644
--- a/src/scripts/Outland/boss_doomwalker.cpp
+++ b/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
index f2d172b93e..f2d172b93e 100644
--- a/src/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/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
index 116785af5b..116785af5b 100644
--- a/src/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/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
index 0ed661c360..0ed661c360 100644
--- a/src/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
diff --git a/src/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index 55a402b2ee..55a402b2ee 100644
--- a/src/scripts/Outland/zone_netherstorm.cpp
+++ b/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
index c603b2b6e1..c603b2b6e1 100644
--- a/src/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/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
index bc9b280381..bc9b280381 100644
--- a/src/scripts/Outland/zone_shattrath_city.cpp
+++ b/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
index 9a9745ff54..9a9745ff54 100644
--- a/src/scripts/Outland/zone_terokkar_forest.cpp
+++ b/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
index 8fb4aba974..8fb4aba974 100644
--- a/src/scripts/Outland/zone_zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp
diff --git a/src/scripts/Pet/CMakeLists.txt b/src/server/scripts/Pet/CMakeLists.txt
index 617106b756..617106b756 100644
--- a/src/scripts/Pet/CMakeLists.txt
+++ b/src/server/scripts/Pet/CMakeLists.txt
diff --git a/src/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index 80267d7981..80267d7981 100644
--- a/src/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
diff --git a/src/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index 6304cc8ec4..6304cc8ec4 100644
--- a/src/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
diff --git a/src/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index ed59a2491e..ed59a2491e 100644
--- a/src/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
diff --git a/src/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index 4642e9a131..4642e9a131 100644
--- a/src/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
diff --git a/src/scripts/Pet/pet_priest.cpp b/src/server/scripts/Pet/pet_priest.cpp
index 2a2f305d55..2a2f305d55 100644
--- a/src/scripts/Pet/pet_priest.cpp
+++ b/src/server/scripts/Pet/pet_priest.cpp
diff --git a/src/scripts/Pet/pet_shaman.cpp b/src/server/scripts/Pet/pet_shaman.cpp
index 605a60cb5a..605a60cb5a 100644
--- a/src/scripts/Pet/pet_shaman.cpp
+++ b/src/server/scripts/Pet/pet_shaman.cpp
diff --git a/src/scripts/PrecompiledHeaders/ScriptPCH.cpp b/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
index df6fc55876..df6fc55876 100644
--- a/src/scripts/PrecompiledHeaders/ScriptPCH.cpp
+++ b/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
diff --git a/src/scripts/PrecompiledHeaders/ScriptPCH.h b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h
index 0d03b3700a..0d03b3700a 100644
--- a/src/scripts/PrecompiledHeaders/ScriptPCH.h
+++ b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h
diff --git a/src/scripts/ScriptLoader.cpp b/src/server/scripts/ScriptLoader.cpp
index a5e9f710e9..a5e9f710e9 100644
--- a/src/scripts/ScriptLoader.cpp
+++ b/src/server/scripts/ScriptLoader.cpp
diff --git a/src/scripts/ScriptLoader.h b/src/server/scripts/ScriptLoader.h
index 6ac5ef0fe2..6ac5ef0fe2 100644
--- a/src/scripts/ScriptLoader.h
+++ b/src/server/scripts/ScriptLoader.h
diff --git a/src/scripts/Spells/CMakeLists.txt b/src/server/scripts/Spells/CMakeLists.txt
index e0ecd2cc34..e0ecd2cc34 100644
--- a/src/scripts/Spells/CMakeLists.txt
+++ b/src/server/scripts/Spells/CMakeLists.txt
diff --git a/src/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 27263233f8..27263233f8 100644
--- a/src/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
diff --git a/src/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index cea3cdf484..cea3cdf484 100644
--- a/src/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
diff --git a/src/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index f0ac73e39c..f0ac73e39c 100644
--- a/src/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
diff --git a/src/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 61a4b35b88..61a4b35b88 100644
--- a/src/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
diff --git a/src/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index d6d93cfd19..d6d93cfd19 100644
--- a/src/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
diff --git a/src/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 7edcf0e58d..7edcf0e58d 100644
--- a/src/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
diff --git a/src/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 164980aee6..164980aee6 100644
--- a/src/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
diff --git a/src/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 7389f4e536..7389f4e536 100644
--- a/src/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
diff --git a/src/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index ef45557438..ef45557438 100644
--- a/src/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
diff --git a/src/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index 7526dc71f0..7526dc71f0 100644
--- a/src/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
diff --git a/src/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index 6fe929a10a..6fe929a10a 100644
--- a/src/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
diff --git a/src/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index f7b649b247..f7b649b247 100644
--- a/src/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
diff --git a/src/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 45b3ac2640..45b3ac2640 100644
--- a/src/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
diff --git a/src/scripts/World/CMakeLists.txt b/src/server/scripts/World/CMakeLists.txt
index 42ba3faccb..42ba3faccb 100644
--- a/src/scripts/World/CMakeLists.txt
+++ b/src/server/scripts/World/CMakeLists.txt
diff --git a/src/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp
index 95c4db4801..95c4db4801 100644
--- a/src/scripts/World/achievement_scripts.cpp
+++ b/src/server/scripts/World/achievement_scripts.cpp
diff --git a/src/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 19936e8271..19936e8271 100644
--- a/src/scripts/World/areatrigger_scripts.cpp
+++ b/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
index 43e697f76a..43e697f76a 100644
--- a/src/scripts/World/boss_emerald_dragons.cpp
+++ b/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
index 597dd87a0e..597dd87a0e 100644
--- a/src/scripts/World/character_creation.cpp
+++ b/src/server/scripts/World/character_creation.cpp
diff --git a/src/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp
index 0b219d3056..0b219d3056 100644
--- a/src/scripts/World/chat_log.cpp
+++ b/src/server/scripts/World/chat_log.cpp
diff --git a/src/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index ce6c3f69c7..ce6c3f69c7 100644
--- a/src/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
diff --git a/src/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index e069247903..e069247903 100644
--- a/src/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
diff --git a/src/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index eb55715e20..eb55715e20 100644
--- a/src/scripts/World/item_scripts.cpp
+++ b/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
index 3eed9ed39b..3eed9ed39b 100644
--- a/src/scripts/World/mob_generic_creature.cpp
+++ b/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
index dd765a7909..dd765a7909 100644
--- a/src/scripts/World/npc_innkeeper.cpp
+++ b/src/server/scripts/World/npc_innkeeper.cpp
diff --git a/src/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index f154f8dd2a..f154f8dd2a 100644
--- a/src/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
diff --git a/src/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index 9bd364dbd7..9bd364dbd7 100644
--- a/src/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
diff --git a/src/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index a161a6fa77..a161a6fa77 100644
--- a/src/scripts/World/npcs_special.cpp
+++ b/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 0000000000..fdc17078bc
--- /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
index be47d408d2..be47d408d2 100644
--- a/src/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
diff --git a/src/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h
index 025a68d6cb..025a68d6cb 100644
--- a/src/worldserver/CommandLine/CliRunnable.h
+++ b/src/server/worldserver/CommandLine/CliRunnable.h
diff --git a/src/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 5110a2ce12..5110a2ce12 100644
--- a/src/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
diff --git a/src/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 340f3ca29a..340f3ca29a 100644
--- a/src/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
diff --git a/src/worldserver/Master.h b/src/server/worldserver/Master.h
index c3e7d62432..c3e7d62432 100644
--- a/src/worldserver/Master.h
+++ b/src/server/worldserver/Master.h
diff --git a/src/worldserver/PrecompiledHeaders/worldPCH.cpp b/src/server/worldserver/PrecompiledHeaders/worldPCH.cpp
index 99c2400ecc..99c2400ecc 100644
--- a/src/worldserver/PrecompiledHeaders/worldPCH.cpp
+++ b/src/server/worldserver/PrecompiledHeaders/worldPCH.cpp
diff --git a/src/worldserver/PrecompiledHeaders/worldPCH.h b/src/server/worldserver/PrecompiledHeaders/worldPCH.h
index f94dd953bb..f94dd953bb 100644
--- a/src/worldserver/PrecompiledHeaders/worldPCH.h
+++ b/src/server/worldserver/PrecompiledHeaders/worldPCH.h
diff --git a/src/worldserver/RemoteAccess/RARunnable.cpp b/src/server/worldserver/RemoteAccess/RARunnable.cpp
index 4099574a5b..4099574a5b 100644
--- a/src/worldserver/RemoteAccess/RARunnable.cpp
+++ b/src/server/worldserver/RemoteAccess/RARunnable.cpp
diff --git a/src/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h
index badc2a3f10..badc2a3f10 100644
--- a/src/worldserver/RemoteAccess/RARunnable.h
+++ b/src/server/worldserver/RemoteAccess/RARunnable.h
diff --git a/src/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp
index dc445d550a..dc445d550a 100644
--- a/src/worldserver/RemoteAccess/RASocket.cpp
+++ b/src/server/worldserver/RemoteAccess/RASocket.cpp
diff --git a/src/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h
index 11bd1b00e0..11bd1b00e0 100644
--- a/src/worldserver/RemoteAccess/RASocket.h
+++ b/src/server/worldserver/RemoteAccess/RASocket.h
diff --git a/src/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp
index 6d2ce72d87..6d2ce72d87 100644
--- a/src/worldserver/TCSoap/TCSoap.cpp
+++ b/src/server/worldserver/TCSoap/TCSoap.cpp
diff --git a/src/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h
index c2bcef9621..c2bcef9621 100644
--- a/src/worldserver/TCSoap/TCSoap.h
+++ b/src/server/worldserver/TCSoap/TCSoap.h
diff --git a/src/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index f02dafbabf..f02dafbabf 100644
--- a/src/worldserver/WorldThread/WorldRunnable.cpp
+++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp
diff --git a/src/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h
index 970838d17c..970838d17c 100644
--- a/src/worldserver/WorldThread/WorldRunnable.h
+++ b/src/server/worldserver/WorldThread/WorldRunnable.h
diff --git a/src/worldserver/resource.h b/src/server/worldserver/resource.h
index 5415d15d80..5415d15d80 100644
--- a/src/worldserver/resource.h
+++ b/src/server/worldserver/resource.h
diff --git a/src/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 66fa7fb615..66fa7fb615 100644
--- a/src/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
diff --git a/src/worldserver/worldserver.ico b/src/server/worldserver/worldserver.ico
index 6f0a572195..6f0a572195 100644
--- a/src/worldserver/worldserver.ico
+++ b/src/server/worldserver/worldserver.ico
diff --git a/src/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc
index b89204f708..b89204f708 100644
--- a/src/worldserver/worldserver.rc
+++ b/src/server/worldserver/worldserver.rc
diff --git a/modules/acore/extractors/CMakeLists.txt b/src/tools/CMakeLists.txt
index 14845d92fe..14845d92fe 100644
--- a/modules/acore/extractors/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
diff --git a/modules/acore/extractors/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 020f8a02e9..f127b496a1 100644
--- a/modules/acore/extractors/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -12,9 +12,9 @@
 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}/src/common/Utilities
+    ${CMAKE_SOURCE_DIR}/src/common
+    ${CMAKE_SOURCE_DIR}/deps/libmpq
     ${CMAKE_SOURCE_DIR}/modules/worldengine/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
index a22abb3ded..a22abb3ded 100644
--- a/modules/acore/extractors/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
diff --git a/modules/acore/extractors/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp
index 257d0171aa..257d0171aa 100644
--- a/modules/acore/extractors/map_extractor/adt.cpp
+++ b/src/tools/map_extractor/adt.cpp
diff --git a/modules/acore/extractors/map_extractor/adt.h b/src/tools/map_extractor/adt.h
index 94b830c4ef..94b830c4ef 100644
--- a/modules/acore/extractors/map_extractor/adt.h
+++ b/src/tools/map_extractor/adt.h
diff --git a/modules/acore/extractors/map_extractor/dbcfile.cpp b/src/tools/map_extractor/dbcfile.cpp
index 59217aaed5..59217aaed5 100644
--- a/modules/acore/extractors/map_extractor/dbcfile.cpp
+++ b/src/tools/map_extractor/dbcfile.cpp
diff --git a/modules/acore/extractors/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h
index 37993f20a6..37993f20a6 100644
--- a/modules/acore/extractors/map_extractor/dbcfile.h
+++ b/src/tools/map_extractor/dbcfile.h
diff --git a/modules/acore/extractors/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
index 1219ef78b5..1219ef78b5 100644
--- a/modules/acore/extractors/map_extractor/loadlib.cpp
+++ b/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
index e500f25e6e..e500f25e6e 100644
--- a/modules/acore/extractors/map_extractor/loadlib/loadlib.h
+++ b/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
index be8164f442..be8164f442 100644
--- a/modules/acore/extractors/map_extractor/mpq_libmpq.cpp
+++ b/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
index cd67710906..cd67710906 100644
--- a/modules/acore/extractors/map_extractor/mpq_libmpq04.h
+++ b/src/tools/map_extractor/mpq_libmpq04.h
diff --git a/modules/acore/extractors/map_extractor/wdt.cpp b/src/tools/map_extractor/wdt.cpp
index 82a5e32f24..82a5e32f24 100644
--- a/modules/acore/extractors/map_extractor/wdt.cpp
+++ b/src/tools/map_extractor/wdt.cpp
diff --git a/modules/acore/extractors/map_extractor/wdt.h b/src/tools/map_extractor/wdt.h
index f65d6d9386..f65d6d9386 100644
--- a/modules/acore/extractors/map_extractor/wdt.h
+++ b/src/tools/map_extractor/wdt.h
diff --git a/modules/acore/extractors/mesh_extractor/ADT.cpp b/src/tools/mesh_extractor/ADT.cpp
index 85d81e3db5..85d81e3db5 100644
--- a/modules/acore/extractors/mesh_extractor/ADT.cpp
+++ b/src/tools/mesh_extractor/ADT.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ADT.h b/src/tools/mesh_extractor/ADT.h
index 9a4532303f..9a4532303f 100644
--- a/modules/acore/extractors/mesh_extractor/ADT.h
+++ b/src/tools/mesh_extractor/ADT.h
diff --git a/modules/acore/extractors/mesh_extractor/CMakeLists.txt b/src/tools/mesh_extractor/CMakeLists.txt
index 445532ba98..7c330adcee 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
index dafed276ec..dafed276ec 100644
--- a/modules/acore/extractors/mesh_extractor/Cache.h
+++ b/src/tools/mesh_extractor/Cache.h
diff --git a/modules/acore/extractors/mesh_extractor/Chunk.cpp b/src/tools/mesh_extractor/Chunk.cpp
index cad81d03ae..cad81d03ae 100644
--- a/modules/acore/extractors/mesh_extractor/Chunk.cpp
+++ b/src/tools/mesh_extractor/Chunk.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Chunk.h b/src/tools/mesh_extractor/Chunk.h
index 4b2317d656..4b2317d656 100644
--- a/modules/acore/extractors/mesh_extractor/Chunk.h
+++ b/src/tools/mesh_extractor/Chunk.h
diff --git a/modules/acore/extractors/mesh_extractor/ChunkedData.cpp b/src/tools/mesh_extractor/ChunkedData.cpp
index 8b9ddd186c..8b9ddd186c 100644
--- a/modules/acore/extractors/mesh_extractor/ChunkedData.cpp
+++ b/src/tools/mesh_extractor/ChunkedData.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ChunkedData.h b/src/tools/mesh_extractor/ChunkedData.h
index 74a8b7a443..74a8b7a443 100644
--- a/modules/acore/extractors/mesh_extractor/ChunkedData.h
+++ b/src/tools/mesh_extractor/ChunkedData.h
diff --git a/modules/acore/extractors/mesh_extractor/Constants.h b/src/tools/mesh_extractor/Constants.h
index f34cf01fd5..f34cf01fd5 100644
--- a/modules/acore/extractors/mesh_extractor/Constants.h
+++ b/src/tools/mesh_extractor/Constants.h
diff --git a/modules/acore/extractors/mesh_extractor/ContinentBuilder.cpp b/src/tools/mesh_extractor/ContinentBuilder.cpp
index 123d4efe02..123d4efe02 100644
--- a/modules/acore/extractors/mesh_extractor/ContinentBuilder.cpp
+++ b/src/tools/mesh_extractor/ContinentBuilder.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ContinentBuilder.h b/src/tools/mesh_extractor/ContinentBuilder.h
index b8c07aee09..b8c07aee09 100644
--- a/modules/acore/extractors/mesh_extractor/ContinentBuilder.h
+++ b/src/tools/mesh_extractor/ContinentBuilder.h
diff --git a/modules/acore/extractors/mesh_extractor/DBC.cpp b/src/tools/mesh_extractor/DBC.cpp
index 2ecf21e813..2ecf21e813 100644
--- a/modules/acore/extractors/mesh_extractor/DBC.cpp
+++ b/src/tools/mesh_extractor/DBC.cpp
diff --git a/modules/acore/extractors/mesh_extractor/DBC.h b/src/tools/mesh_extractor/DBC.h
index 8521f6111b..8521f6111b 100644
--- a/modules/acore/extractors/mesh_extractor/DBC.h
+++ b/src/tools/mesh_extractor/DBC.h
diff --git a/modules/acore/extractors/mesh_extractor/DoodadHandler.cpp b/src/tools/mesh_extractor/DoodadHandler.cpp
index 67b4ae567a..67b4ae567a 100644
--- a/modules/acore/extractors/mesh_extractor/DoodadHandler.cpp
+++ b/src/tools/mesh_extractor/DoodadHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/DoodadHandler.h b/src/tools/mesh_extractor/DoodadHandler.h
index 319010f092..319010f092 100644
--- a/modules/acore/extractors/mesh_extractor/DoodadHandler.h
+++ b/src/tools/mesh_extractor/DoodadHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/Geometry.cpp b/src/tools/mesh_extractor/Geometry.cpp
index 23105306cf..23105306cf 100644
--- a/modules/acore/extractors/mesh_extractor/Geometry.cpp
+++ b/src/tools/mesh_extractor/Geometry.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Geometry.h b/src/tools/mesh_extractor/Geometry.h
index 23f6777119..23f6777119 100644
--- a/modules/acore/extractors/mesh_extractor/Geometry.h
+++ b/src/tools/mesh_extractor/Geometry.h
diff --git a/modules/acore/extractors/mesh_extractor/LiquidHandler.cpp b/src/tools/mesh_extractor/LiquidHandler.cpp
index 22069aedf0..22069aedf0 100644
--- a/modules/acore/extractors/mesh_extractor/LiquidHandler.cpp
+++ b/src/tools/mesh_extractor/LiquidHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/LiquidHandler.h b/src/tools/mesh_extractor/LiquidHandler.h
index bf38514be1..bf38514be1 100644
--- a/modules/acore/extractors/mesh_extractor/LiquidHandler.h
+++ b/src/tools/mesh_extractor/LiquidHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/MPQ.cpp b/src/tools/mesh_extractor/MPQ.cpp
index 93c5eebb5b..93c5eebb5b 100644
--- a/modules/acore/extractors/mesh_extractor/MPQ.cpp
+++ b/src/tools/mesh_extractor/MPQ.cpp
diff --git a/modules/acore/extractors/mesh_extractor/MPQ.h b/src/tools/mesh_extractor/MPQ.h
index 7cdab23b3c..7cdab23b3c 100644
--- a/modules/acore/extractors/mesh_extractor/MPQ.h
+++ b/src/tools/mesh_extractor/MPQ.h
diff --git a/modules/acore/extractors/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQManager.cpp
index ffb353edc4..ffb353edc4 100644
--- a/modules/acore/extractors/mesh_extractor/MPQManager.cpp
+++ b/src/tools/mesh_extractor/MPQManager.cpp
diff --git a/modules/acore/extractors/mesh_extractor/MPQManager.h b/src/tools/mesh_extractor/MPQManager.h
index 72102e892a..72102e892a 100644
--- a/modules/acore/extractors/mesh_extractor/MPQManager.h
+++ b/src/tools/mesh_extractor/MPQManager.h
diff --git a/modules/acore/extractors/mesh_extractor/MapChunk.cpp b/src/tools/mesh_extractor/MapChunk.cpp
index ced96f985c..ced96f985c 100644
--- a/modules/acore/extractors/mesh_extractor/MapChunk.cpp
+++ b/src/tools/mesh_extractor/MapChunk.cpp
diff --git a/modules/acore/extractors/mesh_extractor/MapChunk.h b/src/tools/mesh_extractor/MapChunk.h
index 0db4286f2b..0db4286f2b 100644
--- a/modules/acore/extractors/mesh_extractor/MapChunk.h
+++ b/src/tools/mesh_extractor/MapChunk.h
diff --git a/modules/acore/extractors/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp
index 22c564cadc..22c564cadc 100644
--- a/modules/acore/extractors/mesh_extractor/MeshExtractor.cpp
+++ b/src/tools/mesh_extractor/MeshExtractor.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Model.cpp b/src/tools/mesh_extractor/Model.cpp
index d696cb7990..d696cb7990 100644
--- a/modules/acore/extractors/mesh_extractor/Model.cpp
+++ b/src/tools/mesh_extractor/Model.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Model.h b/src/tools/mesh_extractor/Model.h
index 235f518814..235f518814 100644
--- a/modules/acore/extractors/mesh_extractor/Model.h
+++ b/src/tools/mesh_extractor/Model.h
diff --git a/modules/acore/extractors/mesh_extractor/ObjectDataHandler.cpp b/src/tools/mesh_extractor/ObjectDataHandler.cpp
index a61b3c8564..a61b3c8564 100644
--- a/modules/acore/extractors/mesh_extractor/ObjectDataHandler.cpp
+++ b/src/tools/mesh_extractor/ObjectDataHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/ObjectDataHandler.h b/src/tools/mesh_extractor/ObjectDataHandler.h
index c159c6477e..c159c6477e 100644
--- a/modules/acore/extractors/mesh_extractor/ObjectDataHandler.h
+++ b/src/tools/mesh_extractor/ObjectDataHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/TileBuilder.cpp b/src/tools/mesh_extractor/TileBuilder.cpp
index 156c073cf5..156c073cf5 100644
--- a/modules/acore/extractors/mesh_extractor/TileBuilder.cpp
+++ b/src/tools/mesh_extractor/TileBuilder.cpp
diff --git a/modules/acore/extractors/mesh_extractor/TileBuilder.h b/src/tools/mesh_extractor/TileBuilder.h
index 37bb4792c1..37bb4792c1 100644
--- a/modules/acore/extractors/mesh_extractor/TileBuilder.h
+++ b/src/tools/mesh_extractor/TileBuilder.h
diff --git a/modules/acore/extractors/mesh_extractor/Utils.cpp b/src/tools/mesh_extractor/Utils.cpp
index f568e26cc0..f568e26cc0 100644
--- a/modules/acore/extractors/mesh_extractor/Utils.cpp
+++ b/src/tools/mesh_extractor/Utils.cpp
diff --git a/modules/acore/extractors/mesh_extractor/Utils.h b/src/tools/mesh_extractor/Utils.h
index 2daa23d854..2daa23d854 100644
--- a/modules/acore/extractors/mesh_extractor/Utils.h
+++ b/src/tools/mesh_extractor/Utils.h
diff --git a/modules/acore/extractors/mesh_extractor/WDT.cpp b/src/tools/mesh_extractor/WDT.cpp
index fea92a9821..fea92a9821 100644
--- a/modules/acore/extractors/mesh_extractor/WDT.cpp
+++ b/src/tools/mesh_extractor/WDT.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WDT.h b/src/tools/mesh_extractor/WDT.h
index 98033a4e4d..98033a4e4d 100644
--- a/modules/acore/extractors/mesh_extractor/WDT.h
+++ b/src/tools/mesh_extractor/WDT.h
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelGroup.cpp b/src/tools/mesh_extractor/WorldModelGroup.cpp
index a9412c5221..a9412c5221 100644
--- a/modules/acore/extractors/mesh_extractor/WorldModelGroup.cpp
+++ b/src/tools/mesh_extractor/WorldModelGroup.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelGroup.h b/src/tools/mesh_extractor/WorldModelGroup.h
index d4b6f82c59..d4b6f82c59 100644
--- a/modules/acore/extractors/mesh_extractor/WorldModelGroup.h
+++ b/src/tools/mesh_extractor/WorldModelGroup.h
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp
index 7028450ec5..7028450ec5 100644
--- a/modules/acore/extractors/mesh_extractor/WorldModelHandler.cpp
+++ b/src/tools/mesh_extractor/WorldModelHandler.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelHandler.h b/src/tools/mesh_extractor/WorldModelHandler.h
index b5a9be50d6..b5a9be50d6 100644
--- a/modules/acore/extractors/mesh_extractor/WorldModelHandler.h
+++ b/src/tools/mesh_extractor/WorldModelHandler.h
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelRoot.cpp b/src/tools/mesh_extractor/WorldModelRoot.cpp
index 5e25589cf3..5e25589cf3 100644
--- a/modules/acore/extractors/mesh_extractor/WorldModelRoot.cpp
+++ b/src/tools/mesh_extractor/WorldModelRoot.cpp
diff --git a/modules/acore/extractors/mesh_extractor/WorldModelRoot.h b/src/tools/mesh_extractor/WorldModelRoot.h
index fff149cfcb..fff149cfcb 100644
--- a/modules/acore/extractors/mesh_extractor/WorldModelRoot.h
+++ b/src/tools/mesh_extractor/WorldModelRoot.h
diff --git a/modules/acore/extractors/mesh_extractor/readme b/src/tools/mesh_extractor/readme
index 85cd7cfc97..85cd7cfc97 100644
--- a/modules/acore/extractors/mesh_extractor/readme
+++ b/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 0000000000..6c3a932b9a
--- /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
index 8059add00e..8059add00e 100644
--- a/modules/acore/extractors/mmaps_generator/Info/readme.txt
+++ b/src/tools/mmaps_generator/Info/readme.txt
diff --git a/modules/acore/extractors/mmaps_generator/IntermediateValues.cpp b/src/tools/mmaps_generator/IntermediateValues.cpp
index 6dc63e7faa..6dc63e7faa 100644
--- a/modules/acore/extractors/mmaps_generator/IntermediateValues.cpp
+++ b/src/tools/mmaps_generator/IntermediateValues.cpp
diff --git a/modules/acore/extractors/mmaps_generator/IntermediateValues.h b/src/tools/mmaps_generator/IntermediateValues.h
index 37832f853c..37832f853c 100644
--- a/modules/acore/extractors/mmaps_generator/IntermediateValues.h
+++ b/src/tools/mmaps_generator/IntermediateValues.h
diff --git a/modules/acore/extractors/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 94780d7422..94780d7422 100644
--- a/modules/acore/extractors/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
diff --git a/modules/acore/extractors/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h
index 877102af7e..877102af7e 100644
--- a/modules/acore/extractors/mmaps_generator/MapBuilder.h
+++ b/src/tools/mmaps_generator/MapBuilder.h
diff --git a/modules/acore/extractors/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
index e3f23b1a76..e3f23b1a76 100644
--- a/modules/acore/extractors/mmaps_generator/PathCommon.h
+++ b/src/tools/mmaps_generator/PathCommon.h
diff --git a/modules/acore/extractors/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp
index 1ce6137fc2..1ce6137fc2 100644
--- a/modules/acore/extractors/mmaps_generator/PathGenerator.cpp
+++ b/src/tools/mmaps_generator/PathGenerator.cpp
diff --git a/modules/acore/extractors/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 3445013bd8..3445013bd8 100644
--- a/modules/acore/extractors/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
diff --git a/modules/acore/extractors/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index 3e536fd14b..52773320fd 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
index ee3b028d63..ee3b028d63 100644
--- a/modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
+++ b/src/tools/mmaps_generator/VMapExtensions.cpp
diff --git a/modules/acore/extractors/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index 177550f9a7..f15181217f 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
index 3b0e4e0a7c..3b0e4e0a7c 100644
--- a/modules/acore/extractors/vmap4_assembler/VMapAssembler.cpp
+++ b/src/tools/vmap4_assembler/VMapAssembler.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
index 4cc103ecf7..f84093b39d 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
index 748b1c3744..748b1c3744 100644
--- a/modules/acore/extractors/vmap4_extractor/adtfile.cpp
+++ b/src/tools/vmap4_extractor/adtfile.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h
index fcae8d4f39..fcae8d4f39 100644
--- a/modules/acore/extractors/vmap4_extractor/adtfile.h
+++ b/src/tools/vmap4_extractor/adtfile.h
diff --git a/modules/acore/extractors/vmap4_extractor/dbcfile.cpp b/src/tools/vmap4_extractor/dbcfile.cpp
index 2ee2b3de5a..2ee2b3de5a 100644
--- a/modules/acore/extractors/vmap4_extractor/dbcfile.cpp
+++ b/src/tools/vmap4_extractor/dbcfile.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/dbcfile.h b/src/tools/vmap4_extractor/dbcfile.h
index 711d8257b3..711d8257b3 100644
--- a/modules/acore/extractors/vmap4_extractor/dbcfile.h
+++ b/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
index e307aea6f5..e307aea6f5 100644
--- a/modules/acore/extractors/vmap4_extractor/gameobject_extract.cpp
+++ b/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
index 989f665934..989f665934 100644
--- a/modules/acore/extractors/vmap4_extractor/loadlib/loadlib.h
+++ b/src/tools/vmap4_extractor/loadlib/loadlib.h
diff --git a/modules/acore/extractors/vmap4_extractor/model.cpp b/src/tools/vmap4_extractor/model.cpp
index 07f1f3ec16..07f1f3ec16 100644
--- a/modules/acore/extractors/vmap4_extractor/model.cpp
+++ b/src/tools/vmap4_extractor/model.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h
index b403129c6f..b403129c6f 100644
--- a/modules/acore/extractors/vmap4_extractor/model.h
+++ b/src/tools/vmap4_extractor/model.h
diff --git a/modules/acore/extractors/vmap4_extractor/modelheaders.h b/src/tools/vmap4_extractor/modelheaders.h
index aa878ba435..aa878ba435 100644
--- a/modules/acore/extractors/vmap4_extractor/modelheaders.h
+++ b/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
index 70a02e5acc..70a02e5acc 100644
--- a/modules/acore/extractors/vmap4_extractor/mpq_libmpq.cpp
+++ b/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
index 80041b16d5..80041b16d5 100644
--- a/modules/acore/extractors/vmap4_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap4_extractor/mpq_libmpq04.h
diff --git a/modules/acore/extractors/vmap4_extractor/vec3d.h b/src/tools/vmap4_extractor/vec3d.h
index ead433644a..ead433644a 100644
--- a/modules/acore/extractors/vmap4_extractor/vec3d.h
+++ b/src/tools/vmap4_extractor/vec3d.h
diff --git a/modules/acore/extractors/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index ff28ae97e2..ff28ae97e2 100644
--- a/modules/acore/extractors/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/vmapexport.h b/src/tools/vmap4_extractor/vmapexport.h
index 47c16d89ce..47c16d89ce 100644
--- a/modules/acore/extractors/vmap4_extractor/vmapexport.h
+++ b/src/tools/vmap4_extractor/vmapexport.h
diff --git a/modules/acore/extractors/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
index a79bec03c5..a79bec03c5 100644
--- a/modules/acore/extractors/vmap4_extractor/wdtfile.cpp
+++ b/src/tools/vmap4_extractor/wdtfile.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
index 21dd5bb2ce..21dd5bb2ce 100644
--- a/modules/acore/extractors/vmap4_extractor/wdtfile.h
+++ b/src/tools/vmap4_extractor/wdtfile.h
diff --git a/modules/acore/extractors/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp
index e699b2845d..e699b2845d 100644
--- a/modules/acore/extractors/vmap4_extractor/wmo.cpp
+++ b/src/tools/vmap4_extractor/wmo.cpp
diff --git a/modules/acore/extractors/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index 42d771c77f..42d771c77f 100644
--- a/modules/acore/extractors/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
diff --git a/src/worldserver/CMakeLists.txt b/src/worldserver/CMakeLists.txt
deleted file mode 100644
index 2c4b52f37b..0000000000
--- 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 0000000000..e69de29bb2
--- /dev/null
+++ b/var/build/.gitkeep