diff --git a/.gitignore b/.gitignore
index f243cc106..3521a66dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,10 @@ modules/*
 !modules/*
 modules/*/*
 !modules/*/.gitignore
+!modules/uwd/*
+!modules/uwd/cmake-utils/*
+modules/uwd/joiner
+!modules/acore/*
 
 build*/
 
diff --git a/install.sh b/install.sh
index 36e2f97bb..3facec10e 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@
 CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PATH_MODULES="$CUR_PATH/modules/"
 [ ! -d $PATH_MODULES/udw/joiner ] && git clone https://github.com/udw/joiner $PATH_MODULES/udw/joiner -b master
-source "$PATH_MODULES/udw/joiner/joiner.sh"
+source "$PATH_MODULES/uw-dev/joiner/joiner.sh"
 
 
 
diff --git a/modules/dep/.gitignore b/modules/acore/deps/.gitignore
similarity index 100%
rename from modules/dep/.gitignore
rename to modules/acore/deps/.gitignore
diff --git a/modules/dep/CMakeLists.txt b/modules/acore/deps/CMakeLists.txt
similarity index 100%
rename from modules/dep/CMakeLists.txt
rename to modules/acore/deps/CMakeLists.txt
diff --git a/modules/dep/PackageList.txt b/modules/acore/deps/PackageList.txt
similarity index 100%
rename from modules/dep/PackageList.txt
rename to modules/acore/deps/PackageList.txt
diff --git a/modules/dep/SFMT/SFMT.h b/modules/acore/deps/SFMT/SFMT.h
similarity index 100%
rename from modules/dep/SFMT/SFMT.h
rename to modules/acore/deps/SFMT/SFMT.h
diff --git a/modules/dep/SFMT/randomc.h b/modules/acore/deps/SFMT/randomc.h
similarity index 100%
rename from modules/dep/SFMT/randomc.h
rename to modules/acore/deps/SFMT/randomc.h
diff --git a/modules/dep/acelite/AUTHORS b/modules/acore/deps/acelite/AUTHORS
similarity index 100%
rename from modules/dep/acelite/AUTHORS
rename to modules/acore/deps/acelite/AUTHORS
diff --git a/modules/dep/acelite/CMakeLists.txt b/modules/acore/deps/acelite/CMakeLists.txt
similarity index 100%
rename from modules/dep/acelite/CMakeLists.txt
rename to modules/acore/deps/acelite/CMakeLists.txt
diff --git a/modules/dep/acelite/COPYING b/modules/acore/deps/acelite/COPYING
similarity index 100%
rename from modules/dep/acelite/COPYING
rename to modules/acore/deps/acelite/COPYING
diff --git a/modules/dep/acelite/NEWS b/modules/acore/deps/acelite/NEWS
similarity index 100%
rename from modules/dep/acelite/NEWS
rename to modules/acore/deps/acelite/NEWS
diff --git a/modules/dep/acelite/README b/modules/acore/deps/acelite/README
similarity index 100%
rename from modules/dep/acelite/README
rename to modules/acore/deps/acelite/README
diff --git a/modules/dep/acelite/THANKS b/modules/acore/deps/acelite/THANKS
similarity index 100%
rename from modules/dep/acelite/THANKS
rename to modules/acore/deps/acelite/THANKS
diff --git a/modules/dep/acelite/VERSION b/modules/acore/deps/acelite/VERSION
similarity index 100%
rename from modules/dep/acelite/VERSION
rename to modules/acore/deps/acelite/VERSION
diff --git a/modules/dep/acelite/ace/ACE.cpp b/modules/acore/deps/acelite/ace/ACE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ACE.cpp
rename to modules/acore/deps/acelite/ace/ACE.cpp
diff --git a/modules/dep/acelite/ace/ACE.h b/modules/acore/deps/acelite/ace/ACE.h
similarity index 100%
rename from modules/dep/acelite/ace/ACE.h
rename to modules/acore/deps/acelite/ace/ACE.h
diff --git a/modules/dep/acelite/ace/ACE.inl b/modules/acore/deps/acelite/ace/ACE.inl
similarity index 100%
rename from modules/dep/acelite/ace/ACE.inl
rename to modules/acore/deps/acelite/ace/ACE.inl
diff --git a/modules/dep/acelite/ace/ACE.pc.in b/modules/acore/deps/acelite/ace/ACE.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/ACE.pc.in
rename to modules/acore/deps/acelite/ace/ACE.pc.in
diff --git a/modules/dep/acelite/ace/ACE_crc32.cpp b/modules/acore/deps/acelite/ace/ACE_crc32.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ACE_crc32.cpp
rename to modules/acore/deps/acelite/ace/ACE_crc32.cpp
diff --git a/modules/dep/acelite/ace/ACE_crc_ccitt.cpp b/modules/acore/deps/acelite/ace/ACE_crc_ccitt.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ACE_crc_ccitt.cpp
rename to modules/acore/deps/acelite/ace/ACE_crc_ccitt.cpp
diff --git a/modules/dep/acelite/ace/ACE_export.h b/modules/acore/deps/acelite/ace/ACE_export.h
similarity index 100%
rename from modules/dep/acelite/ace/ACE_export.h
rename to modules/acore/deps/acelite/ace/ACE_export.h
diff --git a/modules/dep/acelite/ace/ARGV.cpp b/modules/acore/deps/acelite/ace/ARGV.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ARGV.cpp
rename to modules/acore/deps/acelite/ace/ARGV.cpp
diff --git a/modules/dep/acelite/ace/ARGV.h b/modules/acore/deps/acelite/ace/ARGV.h
similarity index 100%
rename from modules/dep/acelite/ace/ARGV.h
rename to modules/acore/deps/acelite/ace/ARGV.h
diff --git a/modules/dep/acelite/ace/ARGV.inl b/modules/acore/deps/acelite/ace/ARGV.inl
similarity index 100%
rename from modules/dep/acelite/ace/ARGV.inl
rename to modules/acore/deps/acelite/ace/ARGV.inl
diff --git a/modules/dep/acelite/ace/ATM_Acceptor.cpp b/modules/acore/deps/acelite/ace/ATM_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/ATM_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/ATM_Acceptor.h b/modules/acore/deps/acelite/ace/ATM_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Acceptor.h
rename to modules/acore/deps/acelite/ace/ATM_Acceptor.h
diff --git a/modules/dep/acelite/ace/ATM_Acceptor.inl b/modules/acore/deps/acelite/ace/ATM_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Acceptor.inl
rename to modules/acore/deps/acelite/ace/ATM_Acceptor.inl
diff --git a/modules/dep/acelite/ace/ATM_Addr.cpp b/modules/acore/deps/acelite/ace/ATM_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Addr.cpp
rename to modules/acore/deps/acelite/ace/ATM_Addr.cpp
diff --git a/modules/dep/acelite/ace/ATM_Addr.h b/modules/acore/deps/acelite/ace/ATM_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Addr.h
rename to modules/acore/deps/acelite/ace/ATM_Addr.h
diff --git a/modules/dep/acelite/ace/ATM_Addr.inl b/modules/acore/deps/acelite/ace/ATM_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Addr.inl
rename to modules/acore/deps/acelite/ace/ATM_Addr.inl
diff --git a/modules/dep/acelite/ace/ATM_Connector.cpp b/modules/acore/deps/acelite/ace/ATM_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Connector.cpp
rename to modules/acore/deps/acelite/ace/ATM_Connector.cpp
diff --git a/modules/dep/acelite/ace/ATM_Connector.h b/modules/acore/deps/acelite/ace/ATM_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Connector.h
rename to modules/acore/deps/acelite/ace/ATM_Connector.h
diff --git a/modules/dep/acelite/ace/ATM_Connector.inl b/modules/acore/deps/acelite/ace/ATM_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Connector.inl
rename to modules/acore/deps/acelite/ace/ATM_Connector.inl
diff --git a/modules/dep/acelite/ace/ATM_Params.cpp b/modules/acore/deps/acelite/ace/ATM_Params.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Params.cpp
rename to modules/acore/deps/acelite/ace/ATM_Params.cpp
diff --git a/modules/dep/acelite/ace/ATM_Params.h b/modules/acore/deps/acelite/ace/ATM_Params.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Params.h
rename to modules/acore/deps/acelite/ace/ATM_Params.h
diff --git a/modules/dep/acelite/ace/ATM_Params.inl b/modules/acore/deps/acelite/ace/ATM_Params.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Params.inl
rename to modules/acore/deps/acelite/ace/ATM_Params.inl
diff --git a/modules/dep/acelite/ace/ATM_QoS.cpp b/modules/acore/deps/acelite/ace/ATM_QoS.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_QoS.cpp
rename to modules/acore/deps/acelite/ace/ATM_QoS.cpp
diff --git a/modules/dep/acelite/ace/ATM_QoS.h b/modules/acore/deps/acelite/ace/ATM_QoS.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_QoS.h
rename to modules/acore/deps/acelite/ace/ATM_QoS.h
diff --git a/modules/dep/acelite/ace/ATM_QoS.inl b/modules/acore/deps/acelite/ace/ATM_QoS.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_QoS.inl
rename to modules/acore/deps/acelite/ace/ATM_QoS.inl
diff --git a/modules/dep/acelite/ace/ATM_Stream.cpp b/modules/acore/deps/acelite/ace/ATM_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Stream.cpp
rename to modules/acore/deps/acelite/ace/ATM_Stream.cpp
diff --git a/modules/dep/acelite/ace/ATM_Stream.h b/modules/acore/deps/acelite/ace/ATM_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Stream.h
rename to modules/acore/deps/acelite/ace/ATM_Stream.h
diff --git a/modules/dep/acelite/ace/ATM_Stream.inl b/modules/acore/deps/acelite/ace/ATM_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Stream.inl
rename to modules/acore/deps/acelite/ace/ATM_Stream.inl
diff --git a/modules/dep/acelite/ace/Abstract_Timer_Queue.cpp b/modules/acore/deps/acelite/ace/Abstract_Timer_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Abstract_Timer_Queue.cpp
rename to modules/acore/deps/acelite/ace/Abstract_Timer_Queue.cpp
diff --git a/modules/dep/acelite/ace/Abstract_Timer_Queue.h b/modules/acore/deps/acelite/ace/Abstract_Timer_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Abstract_Timer_Queue.h
rename to modules/acore/deps/acelite/ace/Abstract_Timer_Queue.h
diff --git a/modules/dep/acelite/ace/Acceptor.cpp b/modules/acore/deps/acelite/ace/Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Acceptor.cpp
rename to modules/acore/deps/acelite/ace/Acceptor.cpp
diff --git a/modules/dep/acelite/ace/Acceptor.h b/modules/acore/deps/acelite/ace/Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/Acceptor.h
rename to modules/acore/deps/acelite/ace/Acceptor.h
diff --git a/modules/dep/acelite/ace/Activation_Queue.cpp b/modules/acore/deps/acelite/ace/Activation_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Activation_Queue.cpp
rename to modules/acore/deps/acelite/ace/Activation_Queue.cpp
diff --git a/modules/dep/acelite/ace/Activation_Queue.h b/modules/acore/deps/acelite/ace/Activation_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Activation_Queue.h
rename to modules/acore/deps/acelite/ace/Activation_Queue.h
diff --git a/modules/dep/acelite/ace/Activation_Queue.inl b/modules/acore/deps/acelite/ace/Activation_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Activation_Queue.inl
rename to modules/acore/deps/acelite/ace/Activation_Queue.inl
diff --git a/modules/dep/acelite/ace/Active_Map_Manager.cpp b/modules/acore/deps/acelite/ace/Active_Map_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager.cpp
rename to modules/acore/deps/acelite/ace/Active_Map_Manager.cpp
diff --git a/modules/dep/acelite/ace/Active_Map_Manager.h b/modules/acore/deps/acelite/ace/Active_Map_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager.h
rename to modules/acore/deps/acelite/ace/Active_Map_Manager.h
diff --git a/modules/dep/acelite/ace/Active_Map_Manager.inl b/modules/acore/deps/acelite/ace/Active_Map_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager.inl
rename to modules/acore/deps/acelite/ace/Active_Map_Manager.inl
diff --git a/modules/dep/acelite/ace/Active_Map_Manager_T.cpp b/modules/acore/deps/acelite/ace/Active_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager_T.cpp
rename to modules/acore/deps/acelite/ace/Active_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Active_Map_Manager_T.h b/modules/acore/deps/acelite/ace/Active_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager_T.h
rename to modules/acore/deps/acelite/ace/Active_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Active_Map_Manager_T.inl b/modules/acore/deps/acelite/ace/Active_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager_T.inl
rename to modules/acore/deps/acelite/ace/Active_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Addr.cpp b/modules/acore/deps/acelite/ace/Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Addr.cpp
rename to modules/acore/deps/acelite/ace/Addr.cpp
diff --git a/modules/dep/acelite/ace/Addr.h b/modules/acore/deps/acelite/ace/Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/Addr.h
rename to modules/acore/deps/acelite/ace/Addr.h
diff --git a/modules/dep/acelite/ace/Addr.inl b/modules/acore/deps/acelite/ace/Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Addr.inl
rename to modules/acore/deps/acelite/ace/Addr.inl
diff --git a/modules/dep/acelite/ace/Arg_Shifter.cpp b/modules/acore/deps/acelite/ace/Arg_Shifter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Arg_Shifter.cpp
rename to modules/acore/deps/acelite/ace/Arg_Shifter.cpp
diff --git a/modules/dep/acelite/ace/Arg_Shifter.h b/modules/acore/deps/acelite/ace/Arg_Shifter.h
similarity index 100%
rename from modules/dep/acelite/ace/Arg_Shifter.h
rename to modules/acore/deps/acelite/ace/Arg_Shifter.h
diff --git a/modules/dep/acelite/ace/Argv_Type_Converter.cpp b/modules/acore/deps/acelite/ace/Argv_Type_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Argv_Type_Converter.cpp
rename to modules/acore/deps/acelite/ace/Argv_Type_Converter.cpp
diff --git a/modules/dep/acelite/ace/Argv_Type_Converter.h b/modules/acore/deps/acelite/ace/Argv_Type_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/Argv_Type_Converter.h
rename to modules/acore/deps/acelite/ace/Argv_Type_Converter.h
diff --git a/modules/dep/acelite/ace/Argv_Type_Converter.inl b/modules/acore/deps/acelite/ace/Argv_Type_Converter.inl
similarity index 100%
rename from modules/dep/acelite/ace/Argv_Type_Converter.inl
rename to modules/acore/deps/acelite/ace/Argv_Type_Converter.inl
diff --git a/modules/dep/acelite/ace/Array_Base.cpp b/modules/acore/deps/acelite/ace/Array_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Array_Base.cpp
rename to modules/acore/deps/acelite/ace/Array_Base.cpp
diff --git a/modules/dep/acelite/ace/Array_Base.h b/modules/acore/deps/acelite/ace/Array_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Array_Base.h
rename to modules/acore/deps/acelite/ace/Array_Base.h
diff --git a/modules/dep/acelite/ace/Array_Base.inl b/modules/acore/deps/acelite/ace/Array_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Array_Base.inl
rename to modules/acore/deps/acelite/ace/Array_Base.inl
diff --git a/modules/dep/acelite/ace/Array_Map.cpp b/modules/acore/deps/acelite/ace/Array_Map.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Array_Map.cpp
rename to modules/acore/deps/acelite/ace/Array_Map.cpp
diff --git a/modules/dep/acelite/ace/Array_Map.h b/modules/acore/deps/acelite/ace/Array_Map.h
similarity index 100%
rename from modules/dep/acelite/ace/Array_Map.h
rename to modules/acore/deps/acelite/ace/Array_Map.h
diff --git a/modules/dep/acelite/ace/Array_Map.inl b/modules/acore/deps/acelite/ace/Array_Map.inl
similarity index 100%
rename from modules/dep/acelite/ace/Array_Map.inl
rename to modules/acore/deps/acelite/ace/Array_Map.inl
diff --git a/modules/dep/acelite/ace/Assert.cpp b/modules/acore/deps/acelite/ace/Assert.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Assert.cpp
rename to modules/acore/deps/acelite/ace/Assert.cpp
diff --git a/modules/dep/acelite/ace/Assert.h b/modules/acore/deps/acelite/ace/Assert.h
similarity index 100%
rename from modules/dep/acelite/ace/Assert.h
rename to modules/acore/deps/acelite/ace/Assert.h
diff --git a/modules/dep/acelite/ace/Asynch_Acceptor.cpp b/modules/acore/deps/acelite/ace/Asynch_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/Asynch_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/Asynch_Acceptor.h b/modules/acore/deps/acelite/ace/Asynch_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Acceptor.h
rename to modules/acore/deps/acelite/ace/Asynch_Acceptor.h
diff --git a/modules/dep/acelite/ace/Asynch_Connector.cpp b/modules/acore/deps/acelite/ace/Asynch_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Connector.cpp
rename to modules/acore/deps/acelite/ace/Asynch_Connector.cpp
diff --git a/modules/dep/acelite/ace/Asynch_Connector.h b/modules/acore/deps/acelite/ace/Asynch_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Connector.h
rename to modules/acore/deps/acelite/ace/Asynch_Connector.h
diff --git a/modules/dep/acelite/ace/Asynch_IO.cpp b/modules/acore/deps/acelite/ace/Asynch_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO.cpp
rename to modules/acore/deps/acelite/ace/Asynch_IO.cpp
diff --git a/modules/dep/acelite/ace/Asynch_IO.h b/modules/acore/deps/acelite/ace/Asynch_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO.h
rename to modules/acore/deps/acelite/ace/Asynch_IO.h
diff --git a/modules/dep/acelite/ace/Asynch_IO_Impl.cpp b/modules/acore/deps/acelite/ace/Asynch_IO_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO_Impl.cpp
rename to modules/acore/deps/acelite/ace/Asynch_IO_Impl.cpp
diff --git a/modules/dep/acelite/ace/Asynch_IO_Impl.h b/modules/acore/deps/acelite/ace/Asynch_IO_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO_Impl.h
rename to modules/acore/deps/acelite/ace/Asynch_IO_Impl.h
diff --git a/modules/dep/acelite/ace/Asynch_IO_Impl.inl b/modules/acore/deps/acelite/ace/Asynch_IO_Impl.inl
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO_Impl.inl
rename to modules/acore/deps/acelite/ace/Asynch_IO_Impl.inl
diff --git a/modules/dep/acelite/ace/Asynch_Pseudo_Task.cpp b/modules/acore/deps/acelite/ace/Asynch_Pseudo_Task.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Pseudo_Task.cpp
rename to modules/acore/deps/acelite/ace/Asynch_Pseudo_Task.cpp
diff --git a/modules/dep/acelite/ace/Asynch_Pseudo_Task.h b/modules/acore/deps/acelite/ace/Asynch_Pseudo_Task.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Pseudo_Task.h
rename to modules/acore/deps/acelite/ace/Asynch_Pseudo_Task.h
diff --git a/modules/dep/acelite/ace/Atomic_Op.cpp b/modules/acore/deps/acelite/ace/Atomic_Op.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op.cpp
rename to modules/acore/deps/acelite/ace/Atomic_Op.cpp
diff --git a/modules/dep/acelite/ace/Atomic_Op.h b/modules/acore/deps/acelite/ace/Atomic_Op.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op.h
rename to modules/acore/deps/acelite/ace/Atomic_Op.h
diff --git a/modules/dep/acelite/ace/Atomic_Op.inl b/modules/acore/deps/acelite/ace/Atomic_Op.inl
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op.inl
rename to modules/acore/deps/acelite/ace/Atomic_Op.inl
diff --git a/modules/dep/acelite/ace/Atomic_Op_GCC_T.cpp b/modules/acore/deps/acelite/ace/Atomic_Op_GCC_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_GCC_T.cpp
rename to modules/acore/deps/acelite/ace/Atomic_Op_GCC_T.cpp
diff --git a/modules/dep/acelite/ace/Atomic_Op_GCC_T.h b/modules/acore/deps/acelite/ace/Atomic_Op_GCC_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_GCC_T.h
rename to modules/acore/deps/acelite/ace/Atomic_Op_GCC_T.h
diff --git a/modules/dep/acelite/ace/Atomic_Op_GCC_T.inl b/modules/acore/deps/acelite/ace/Atomic_Op_GCC_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_GCC_T.inl
rename to modules/acore/deps/acelite/ace/Atomic_Op_GCC_T.inl
diff --git a/modules/dep/acelite/ace/Atomic_Op_Sparc.c b/modules/acore/deps/acelite/ace/Atomic_Op_Sparc.c
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_Sparc.c
rename to modules/acore/deps/acelite/ace/Atomic_Op_Sparc.c
diff --git a/modules/dep/acelite/ace/Atomic_Op_Sparc.h b/modules/acore/deps/acelite/ace/Atomic_Op_Sparc.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_Sparc.h
rename to modules/acore/deps/acelite/ace/Atomic_Op_Sparc.h
diff --git a/modules/dep/acelite/ace/Atomic_Op_T.cpp b/modules/acore/deps/acelite/ace/Atomic_Op_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_T.cpp
rename to modules/acore/deps/acelite/ace/Atomic_Op_T.cpp
diff --git a/modules/dep/acelite/ace/Atomic_Op_T.h b/modules/acore/deps/acelite/ace/Atomic_Op_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_T.h
rename to modules/acore/deps/acelite/ace/Atomic_Op_T.h
diff --git a/modules/dep/acelite/ace/Atomic_Op_T.inl b/modules/acore/deps/acelite/ace/Atomic_Op_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_T.inl
rename to modules/acore/deps/acelite/ace/Atomic_Op_T.inl
diff --git a/modules/dep/acelite/ace/Auto_Event.cpp b/modules/acore/deps/acelite/ace/Auto_Event.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Event.cpp
rename to modules/acore/deps/acelite/ace/Auto_Event.cpp
diff --git a/modules/dep/acelite/ace/Auto_Event.h b/modules/acore/deps/acelite/ace/Auto_Event.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Event.h
rename to modules/acore/deps/acelite/ace/Auto_Event.h
diff --git a/modules/dep/acelite/ace/Auto_Event.inl b/modules/acore/deps/acelite/ace/Auto_Event.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Event.inl
rename to modules/acore/deps/acelite/ace/Auto_Event.inl
diff --git a/modules/dep/acelite/ace/Auto_Functor.cpp b/modules/acore/deps/acelite/ace/Auto_Functor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Functor.cpp
rename to modules/acore/deps/acelite/ace/Auto_Functor.cpp
diff --git a/modules/dep/acelite/ace/Auto_Functor.h b/modules/acore/deps/acelite/ace/Auto_Functor.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Functor.h
rename to modules/acore/deps/acelite/ace/Auto_Functor.h
diff --git a/modules/dep/acelite/ace/Auto_Functor.inl b/modules/acore/deps/acelite/ace/Auto_Functor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Functor.inl
rename to modules/acore/deps/acelite/ace/Auto_Functor.inl
diff --git a/modules/dep/acelite/ace/Auto_IncDec_T.cpp b/modules/acore/deps/acelite/ace/Auto_IncDec_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_IncDec_T.cpp
rename to modules/acore/deps/acelite/ace/Auto_IncDec_T.cpp
diff --git a/modules/dep/acelite/ace/Auto_IncDec_T.h b/modules/acore/deps/acelite/ace/Auto_IncDec_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_IncDec_T.h
rename to modules/acore/deps/acelite/ace/Auto_IncDec_T.h
diff --git a/modules/dep/acelite/ace/Auto_IncDec_T.inl b/modules/acore/deps/acelite/ace/Auto_IncDec_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_IncDec_T.inl
rename to modules/acore/deps/acelite/ace/Auto_IncDec_T.inl
diff --git a/modules/dep/acelite/ace/Auto_Ptr.cpp b/modules/acore/deps/acelite/ace/Auto_Ptr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Ptr.cpp
rename to modules/acore/deps/acelite/ace/Auto_Ptr.cpp
diff --git a/modules/dep/acelite/ace/Auto_Ptr.h b/modules/acore/deps/acelite/ace/Auto_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Ptr.h
rename to modules/acore/deps/acelite/ace/Auto_Ptr.h
diff --git a/modules/dep/acelite/ace/Auto_Ptr.inl b/modules/acore/deps/acelite/ace/Auto_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Ptr.inl
rename to modules/acore/deps/acelite/ace/Auto_Ptr.inl
diff --git a/modules/dep/acelite/ace/Barrier.cpp b/modules/acore/deps/acelite/ace/Barrier.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Barrier.cpp
rename to modules/acore/deps/acelite/ace/Barrier.cpp
diff --git a/modules/dep/acelite/ace/Barrier.h b/modules/acore/deps/acelite/ace/Barrier.h
similarity index 100%
rename from modules/dep/acelite/ace/Barrier.h
rename to modules/acore/deps/acelite/ace/Barrier.h
diff --git a/modules/dep/acelite/ace/Barrier.inl b/modules/acore/deps/acelite/ace/Barrier.inl
similarity index 100%
rename from modules/dep/acelite/ace/Barrier.inl
rename to modules/acore/deps/acelite/ace/Barrier.inl
diff --git a/modules/dep/acelite/ace/Base_Thread_Adapter.cpp b/modules/acore/deps/acelite/ace/Base_Thread_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Base_Thread_Adapter.cpp
rename to modules/acore/deps/acelite/ace/Base_Thread_Adapter.cpp
diff --git a/modules/dep/acelite/ace/Base_Thread_Adapter.h b/modules/acore/deps/acelite/ace/Base_Thread_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/Base_Thread_Adapter.h
rename to modules/acore/deps/acelite/ace/Base_Thread_Adapter.h
diff --git a/modules/dep/acelite/ace/Base_Thread_Adapter.inl b/modules/acore/deps/acelite/ace/Base_Thread_Adapter.inl
similarity index 100%
rename from modules/dep/acelite/ace/Base_Thread_Adapter.inl
rename to modules/acore/deps/acelite/ace/Base_Thread_Adapter.inl
diff --git a/modules/dep/acelite/ace/Based_Pointer_Repository.cpp b/modules/acore/deps/acelite/ace/Based_Pointer_Repository.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_Repository.cpp
rename to modules/acore/deps/acelite/ace/Based_Pointer_Repository.cpp
diff --git a/modules/dep/acelite/ace/Based_Pointer_Repository.h b/modules/acore/deps/acelite/ace/Based_Pointer_Repository.h
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_Repository.h
rename to modules/acore/deps/acelite/ace/Based_Pointer_Repository.h
diff --git a/modules/dep/acelite/ace/Based_Pointer_T.cpp b/modules/acore/deps/acelite/ace/Based_Pointer_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_T.cpp
rename to modules/acore/deps/acelite/ace/Based_Pointer_T.cpp
diff --git a/modules/dep/acelite/ace/Based_Pointer_T.h b/modules/acore/deps/acelite/ace/Based_Pointer_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_T.h
rename to modules/acore/deps/acelite/ace/Based_Pointer_T.h
diff --git a/modules/dep/acelite/ace/Based_Pointer_T.inl b/modules/acore/deps/acelite/ace/Based_Pointer_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_T.inl
rename to modules/acore/deps/acelite/ace/Based_Pointer_T.inl
diff --git a/modules/dep/acelite/ace/Basic_Stats.cpp b/modules/acore/deps/acelite/ace/Basic_Stats.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Stats.cpp
rename to modules/acore/deps/acelite/ace/Basic_Stats.cpp
diff --git a/modules/dep/acelite/ace/Basic_Stats.h b/modules/acore/deps/acelite/ace/Basic_Stats.h
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Stats.h
rename to modules/acore/deps/acelite/ace/Basic_Stats.h
diff --git a/modules/dep/acelite/ace/Basic_Stats.inl b/modules/acore/deps/acelite/ace/Basic_Stats.inl
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Stats.inl
rename to modules/acore/deps/acelite/ace/Basic_Stats.inl
diff --git a/modules/dep/acelite/ace/Basic_Types.cpp b/modules/acore/deps/acelite/ace/Basic_Types.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Types.cpp
rename to modules/acore/deps/acelite/ace/Basic_Types.cpp
diff --git a/modules/dep/acelite/ace/Basic_Types.h b/modules/acore/deps/acelite/ace/Basic_Types.h
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Types.h
rename to modules/acore/deps/acelite/ace/Basic_Types.h
diff --git a/modules/dep/acelite/ace/Bound_Ptr.h b/modules/acore/deps/acelite/ace/Bound_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Bound_Ptr.h
rename to modules/acore/deps/acelite/ace/Bound_Ptr.h
diff --git a/modules/dep/acelite/ace/Bound_Ptr.inl b/modules/acore/deps/acelite/ace/Bound_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Bound_Ptr.inl
rename to modules/acore/deps/acelite/ace/Bound_Ptr.inl
diff --git a/modules/dep/acelite/ace/CDR_Base.cpp b/modules/acore/deps/acelite/ace/CDR_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Base.cpp
rename to modules/acore/deps/acelite/ace/CDR_Base.cpp
diff --git a/modules/dep/acelite/ace/CDR_Base.h b/modules/acore/deps/acelite/ace/CDR_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Base.h
rename to modules/acore/deps/acelite/ace/CDR_Base.h
diff --git a/modules/dep/acelite/ace/CDR_Base.inl b/modules/acore/deps/acelite/ace/CDR_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Base.inl
rename to modules/acore/deps/acelite/ace/CDR_Base.inl
diff --git a/modules/dep/acelite/ace/CDR_Size.cpp b/modules/acore/deps/acelite/ace/CDR_Size.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Size.cpp
rename to modules/acore/deps/acelite/ace/CDR_Size.cpp
diff --git a/modules/dep/acelite/ace/CDR_Size.h b/modules/acore/deps/acelite/ace/CDR_Size.h
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Size.h
rename to modules/acore/deps/acelite/ace/CDR_Size.h
diff --git a/modules/dep/acelite/ace/CDR_Size.inl b/modules/acore/deps/acelite/ace/CDR_Size.inl
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Size.inl
rename to modules/acore/deps/acelite/ace/CDR_Size.inl
diff --git a/modules/dep/acelite/ace/CDR_Stream.cpp b/modules/acore/deps/acelite/ace/CDR_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Stream.cpp
rename to modules/acore/deps/acelite/ace/CDR_Stream.cpp
diff --git a/modules/dep/acelite/ace/CDR_Stream.h b/modules/acore/deps/acelite/ace/CDR_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Stream.h
rename to modules/acore/deps/acelite/ace/CDR_Stream.h
diff --git a/modules/dep/acelite/ace/CDR_Stream.inl b/modules/acore/deps/acelite/ace/CDR_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Stream.inl
rename to modules/acore/deps/acelite/ace/CDR_Stream.inl
diff --git a/modules/dep/acelite/ace/CE_Screen_Output.cpp b/modules/acore/deps/acelite/ace/CE_Screen_Output.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CE_Screen_Output.cpp
rename to modules/acore/deps/acelite/ace/CE_Screen_Output.cpp
diff --git a/modules/dep/acelite/ace/CE_Screen_Output.h b/modules/acore/deps/acelite/ace/CE_Screen_Output.h
similarity index 100%
rename from modules/dep/acelite/ace/CE_Screen_Output.h
rename to modules/acore/deps/acelite/ace/CE_Screen_Output.h
diff --git a/modules/dep/acelite/ace/CMakeLists.txt b/modules/acore/deps/acelite/ace/CMakeLists.txt
similarity index 100%
rename from modules/dep/acelite/ace/CMakeLists.txt
rename to modules/acore/deps/acelite/ace/CMakeLists.txt
diff --git a/modules/dep/acelite/ace/CORBA_macros.h b/modules/acore/deps/acelite/ace/CORBA_macros.h
similarity index 100%
rename from modules/dep/acelite/ace/CORBA_macros.h
rename to modules/acore/deps/acelite/ace/CORBA_macros.h
diff --git a/modules/dep/acelite/ace/Cache_Map_Manager_T.cpp b/modules/acore/deps/acelite/ace/Cache_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cache_Map_Manager_T.cpp
rename to modules/acore/deps/acelite/ace/Cache_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Cache_Map_Manager_T.h b/modules/acore/deps/acelite/ace/Cache_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Cache_Map_Manager_T.h
rename to modules/acore/deps/acelite/ace/Cache_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Cache_Map_Manager_T.inl b/modules/acore/deps/acelite/ace/Cache_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Cache_Map_Manager_T.inl
rename to modules/acore/deps/acelite/ace/Cache_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Cached_Connect_Strategy_T.cpp b/modules/acore/deps/acelite/ace/Cached_Connect_Strategy_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cached_Connect_Strategy_T.cpp
rename to modules/acore/deps/acelite/ace/Cached_Connect_Strategy_T.cpp
diff --git a/modules/dep/acelite/ace/Cached_Connect_Strategy_T.h b/modules/acore/deps/acelite/ace/Cached_Connect_Strategy_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Cached_Connect_Strategy_T.h
rename to modules/acore/deps/acelite/ace/Cached_Connect_Strategy_T.h
diff --git a/modules/dep/acelite/ace/Caching_Strategies_T.cpp b/modules/acore/deps/acelite/ace/Caching_Strategies_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Strategies_T.cpp
rename to modules/acore/deps/acelite/ace/Caching_Strategies_T.cpp
diff --git a/modules/dep/acelite/ace/Caching_Strategies_T.h b/modules/acore/deps/acelite/ace/Caching_Strategies_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Strategies_T.h
rename to modules/acore/deps/acelite/ace/Caching_Strategies_T.h
diff --git a/modules/dep/acelite/ace/Caching_Strategies_T.inl b/modules/acore/deps/acelite/ace/Caching_Strategies_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Strategies_T.inl
rename to modules/acore/deps/acelite/ace/Caching_Strategies_T.inl
diff --git a/modules/dep/acelite/ace/Caching_Utility_T.cpp b/modules/acore/deps/acelite/ace/Caching_Utility_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Utility_T.cpp
rename to modules/acore/deps/acelite/ace/Caching_Utility_T.cpp
diff --git a/modules/dep/acelite/ace/Caching_Utility_T.h b/modules/acore/deps/acelite/ace/Caching_Utility_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Utility_T.h
rename to modules/acore/deps/acelite/ace/Caching_Utility_T.h
diff --git a/modules/dep/acelite/ace/Capabilities.cpp b/modules/acore/deps/acelite/ace/Capabilities.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Capabilities.cpp
rename to modules/acore/deps/acelite/ace/Capabilities.cpp
diff --git a/modules/dep/acelite/ace/Capabilities.h b/modules/acore/deps/acelite/ace/Capabilities.h
similarity index 100%
rename from modules/dep/acelite/ace/Capabilities.h
rename to modules/acore/deps/acelite/ace/Capabilities.h
diff --git a/modules/dep/acelite/ace/Capabilities.inl b/modules/acore/deps/acelite/ace/Capabilities.inl
similarity index 100%
rename from modules/dep/acelite/ace/Capabilities.inl
rename to modules/acore/deps/acelite/ace/Capabilities.inl
diff --git a/modules/dep/acelite/ace/Cleanup.cpp b/modules/acore/deps/acelite/ace/Cleanup.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup.cpp
rename to modules/acore/deps/acelite/ace/Cleanup.cpp
diff --git a/modules/dep/acelite/ace/Cleanup.h b/modules/acore/deps/acelite/ace/Cleanup.h
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup.h
rename to modules/acore/deps/acelite/ace/Cleanup.h
diff --git a/modules/dep/acelite/ace/Cleanup.inl b/modules/acore/deps/acelite/ace/Cleanup.inl
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup.inl
rename to modules/acore/deps/acelite/ace/Cleanup.inl
diff --git a/modules/dep/acelite/ace/Cleanup_Strategies_T.cpp b/modules/acore/deps/acelite/ace/Cleanup_Strategies_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup_Strategies_T.cpp
rename to modules/acore/deps/acelite/ace/Cleanup_Strategies_T.cpp
diff --git a/modules/dep/acelite/ace/Cleanup_Strategies_T.h b/modules/acore/deps/acelite/ace/Cleanup_Strategies_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup_Strategies_T.h
rename to modules/acore/deps/acelite/ace/Cleanup_Strategies_T.h
diff --git a/modules/dep/acelite/ace/Codecs.cpp b/modules/acore/deps/acelite/ace/Codecs.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codecs.cpp
rename to modules/acore/deps/acelite/ace/Codecs.cpp
diff --git a/modules/dep/acelite/ace/Codecs.h b/modules/acore/deps/acelite/ace/Codecs.h
similarity index 100%
rename from modules/dep/acelite/ace/Codecs.h
rename to modules/acore/deps/acelite/ace/Codecs.h
diff --git a/modules/dep/acelite/ace/Codeset_IBM1047.cpp b/modules/acore/deps/acelite/ace/Codeset_IBM1047.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_IBM1047.cpp
rename to modules/acore/deps/acelite/ace/Codeset_IBM1047.cpp
diff --git a/modules/dep/acelite/ace/Codeset_IBM1047.h b/modules/acore/deps/acelite/ace/Codeset_IBM1047.h
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_IBM1047.h
rename to modules/acore/deps/acelite/ace/Codeset_IBM1047.h
diff --git a/modules/dep/acelite/ace/Codeset_Registry.cpp b/modules/acore/deps/acelite/ace/Codeset_Registry.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry.cpp
rename to modules/acore/deps/acelite/ace/Codeset_Registry.cpp
diff --git a/modules/dep/acelite/ace/Codeset_Registry.h b/modules/acore/deps/acelite/ace/Codeset_Registry.h
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry.h
rename to modules/acore/deps/acelite/ace/Codeset_Registry.h
diff --git a/modules/dep/acelite/ace/Codeset_Registry.inl b/modules/acore/deps/acelite/ace/Codeset_Registry.inl
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry.inl
rename to modules/acore/deps/acelite/ace/Codeset_Registry.inl
diff --git a/modules/dep/acelite/ace/Codeset_Registry_db.cpp b/modules/acore/deps/acelite/ace/Codeset_Registry_db.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry_db.cpp
rename to modules/acore/deps/acelite/ace/Codeset_Registry_db.cpp
diff --git a/modules/dep/acelite/ace/Codeset_Symbols.h b/modules/acore/deps/acelite/ace/Codeset_Symbols.h
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Symbols.h
rename to modules/acore/deps/acelite/ace/Codeset_Symbols.h
diff --git a/modules/dep/acelite/ace/Compression/ACE_Compression.mpc b/modules/acore/deps/acelite/ace/Compression/ACE_Compression.mpc
similarity index 100%
rename from modules/dep/acelite/ace/Compression/ACE_Compression.mpc
rename to modules/acore/deps/acelite/ace/Compression/ACE_Compression.mpc
diff --git a/modules/dep/acelite/ace/Compression/ACE_Compression_export.h b/modules/acore/deps/acelite/ace/Compression/ACE_Compression_export.h
similarity index 100%
rename from modules/dep/acelite/ace/Compression/ACE_Compression_export.h
rename to modules/acore/deps/acelite/ace/Compression/ACE_Compression_export.h
diff --git a/modules/dep/acelite/ace/Compression/Compressor.cpp b/modules/acore/deps/acelite/ace/Compression/Compressor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Compression/Compressor.cpp
rename to modules/acore/deps/acelite/ace/Compression/Compressor.cpp
diff --git a/modules/dep/acelite/ace/Compression/Compressor.h b/modules/acore/deps/acelite/ace/Compression/Compressor.h
similarity index 100%
rename from modules/dep/acelite/ace/Compression/Compressor.h
rename to modules/acore/deps/acelite/ace/Compression/Compressor.h
diff --git a/modules/dep/acelite/ace/Compression/Compressor.inl b/modules/acore/deps/acelite/ace/Compression/Compressor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Compression/Compressor.inl
rename to modules/acore/deps/acelite/ace/Compression/Compressor.inl
diff --git a/modules/dep/acelite/ace/Compression/rle/ACE_RLECompression.mpc b/modules/acore/deps/acelite/ace/Compression/rle/ACE_RLECompression.mpc
similarity index 100%
rename from modules/dep/acelite/ace/Compression/rle/ACE_RLECompression.mpc
rename to modules/acore/deps/acelite/ace/Compression/rle/ACE_RLECompression.mpc
diff --git a/modules/dep/acelite/ace/Compression/rle/ACE_RLECompression_export.h b/modules/acore/deps/acelite/ace/Compression/rle/ACE_RLECompression_export.h
similarity index 100%
rename from modules/dep/acelite/ace/Compression/rle/ACE_RLECompression_export.h
rename to modules/acore/deps/acelite/ace/Compression/rle/ACE_RLECompression_export.h
diff --git a/modules/dep/acelite/ace/Compression/rle/RLECompressor.cpp b/modules/acore/deps/acelite/ace/Compression/rle/RLECompressor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Compression/rle/RLECompressor.cpp
rename to modules/acore/deps/acelite/ace/Compression/rle/RLECompressor.cpp
diff --git a/modules/dep/acelite/ace/Compression/rle/RLECompressor.h b/modules/acore/deps/acelite/ace/Compression/rle/RLECompressor.h
similarity index 100%
rename from modules/dep/acelite/ace/Compression/rle/RLECompressor.h
rename to modules/acore/deps/acelite/ace/Compression/rle/RLECompressor.h
diff --git a/modules/dep/acelite/ace/Condition_Attributes.cpp b/modules/acore/deps/acelite/ace/Condition_Attributes.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Attributes.cpp
rename to modules/acore/deps/acelite/ace/Condition_Attributes.cpp
diff --git a/modules/dep/acelite/ace/Condition_Attributes.h b/modules/acore/deps/acelite/ace/Condition_Attributes.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Attributes.h
rename to modules/acore/deps/acelite/ace/Condition_Attributes.h
diff --git a/modules/dep/acelite/ace/Condition_Attributes.inl b/modules/acore/deps/acelite/ace/Condition_Attributes.inl
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Attributes.inl
rename to modules/acore/deps/acelite/ace/Condition_Attributes.inl
diff --git a/modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp b/modules/acore/deps/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
rename to modules/acore/deps/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.h b/modules/acore/deps/acelite/ace/Condition_Recursive_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.h
rename to modules/acore/deps/acelite/ace/Condition_Recursive_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Condition_T.cpp b/modules/acore/deps/acelite/ace/Condition_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_T.cpp
rename to modules/acore/deps/acelite/ace/Condition_T.cpp
diff --git a/modules/dep/acelite/ace/Condition_T.h b/modules/acore/deps/acelite/ace/Condition_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_T.h
rename to modules/acore/deps/acelite/ace/Condition_T.h
diff --git a/modules/dep/acelite/ace/Condition_T.inl b/modules/acore/deps/acelite/ace/Condition_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Condition_T.inl
rename to modules/acore/deps/acelite/ace/Condition_T.inl
diff --git a/modules/dep/acelite/ace/Condition_Thread_Mutex.cpp b/modules/acore/deps/acelite/ace/Condition_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Thread_Mutex.cpp
rename to modules/acore/deps/acelite/ace/Condition_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Condition_Thread_Mutex.h b/modules/acore/deps/acelite/ace/Condition_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Thread_Mutex.h
rename to modules/acore/deps/acelite/ace/Condition_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Condition_Thread_Mutex.inl b/modules/acore/deps/acelite/ace/Condition_Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Thread_Mutex.inl
rename to modules/acore/deps/acelite/ace/Condition_Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Configuration.cpp b/modules/acore/deps/acelite/ace/Configuration.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Configuration.cpp
rename to modules/acore/deps/acelite/ace/Configuration.cpp
diff --git a/modules/dep/acelite/ace/Configuration.h b/modules/acore/deps/acelite/ace/Configuration.h
similarity index 100%
rename from modules/dep/acelite/ace/Configuration.h
rename to modules/acore/deps/acelite/ace/Configuration.h
diff --git a/modules/dep/acelite/ace/Configuration.inl b/modules/acore/deps/acelite/ace/Configuration.inl
similarity index 100%
rename from modules/dep/acelite/ace/Configuration.inl
rename to modules/acore/deps/acelite/ace/Configuration.inl
diff --git a/modules/dep/acelite/ace/Configuration_Import_Export.cpp b/modules/acore/deps/acelite/ace/Configuration_Import_Export.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Configuration_Import_Export.cpp
rename to modules/acore/deps/acelite/ace/Configuration_Import_Export.cpp
diff --git a/modules/dep/acelite/ace/Configuration_Import_Export.h b/modules/acore/deps/acelite/ace/Configuration_Import_Export.h
similarity index 100%
rename from modules/dep/acelite/ace/Configuration_Import_Export.h
rename to modules/acore/deps/acelite/ace/Configuration_Import_Export.h
diff --git a/modules/dep/acelite/ace/Connection_Recycling_Strategy.cpp b/modules/acore/deps/acelite/ace/Connection_Recycling_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Connection_Recycling_Strategy.cpp
rename to modules/acore/deps/acelite/ace/Connection_Recycling_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Connection_Recycling_Strategy.h b/modules/acore/deps/acelite/ace/Connection_Recycling_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Connection_Recycling_Strategy.h
rename to modules/acore/deps/acelite/ace/Connection_Recycling_Strategy.h
diff --git a/modules/dep/acelite/ace/Connector.cpp b/modules/acore/deps/acelite/ace/Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Connector.cpp
rename to modules/acore/deps/acelite/ace/Connector.cpp
diff --git a/modules/dep/acelite/ace/Connector.h b/modules/acore/deps/acelite/ace/Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/Connector.h
rename to modules/acore/deps/acelite/ace/Connector.h
diff --git a/modules/dep/acelite/ace/Containers.cpp b/modules/acore/deps/acelite/ace/Containers.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Containers.cpp
rename to modules/acore/deps/acelite/ace/Containers.cpp
diff --git a/modules/dep/acelite/ace/Containers.h b/modules/acore/deps/acelite/ace/Containers.h
similarity index 100%
rename from modules/dep/acelite/ace/Containers.h
rename to modules/acore/deps/acelite/ace/Containers.h
diff --git a/modules/dep/acelite/ace/Containers.inl b/modules/acore/deps/acelite/ace/Containers.inl
similarity index 100%
rename from modules/dep/acelite/ace/Containers.inl
rename to modules/acore/deps/acelite/ace/Containers.inl
diff --git a/modules/dep/acelite/ace/Containers_T.cpp b/modules/acore/deps/acelite/ace/Containers_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Containers_T.cpp
rename to modules/acore/deps/acelite/ace/Containers_T.cpp
diff --git a/modules/dep/acelite/ace/Containers_T.h b/modules/acore/deps/acelite/ace/Containers_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Containers_T.h
rename to modules/acore/deps/acelite/ace/Containers_T.h
diff --git a/modules/dep/acelite/ace/Containers_T.inl b/modules/acore/deps/acelite/ace/Containers_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Containers_T.inl
rename to modules/acore/deps/acelite/ace/Containers_T.inl
diff --git a/modules/dep/acelite/ace/Copy_Disabled.cpp b/modules/acore/deps/acelite/ace/Copy_Disabled.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Copy_Disabled.cpp
rename to modules/acore/deps/acelite/ace/Copy_Disabled.cpp
diff --git a/modules/dep/acelite/ace/Copy_Disabled.h b/modules/acore/deps/acelite/ace/Copy_Disabled.h
similarity index 100%
rename from modules/dep/acelite/ace/Copy_Disabled.h
rename to modules/acore/deps/acelite/ace/Copy_Disabled.h
diff --git a/modules/dep/acelite/ace/Countdown_Time.h b/modules/acore/deps/acelite/ace/Countdown_Time.h
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time.h
rename to modules/acore/deps/acelite/ace/Countdown_Time.h
diff --git a/modules/dep/acelite/ace/Countdown_Time_T.cpp b/modules/acore/deps/acelite/ace/Countdown_Time_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time_T.cpp
rename to modules/acore/deps/acelite/ace/Countdown_Time_T.cpp
diff --git a/modules/dep/acelite/ace/Countdown_Time_T.h b/modules/acore/deps/acelite/ace/Countdown_Time_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time_T.h
rename to modules/acore/deps/acelite/ace/Countdown_Time_T.h
diff --git a/modules/dep/acelite/ace/Countdown_Time_T.inl b/modules/acore/deps/acelite/ace/Countdown_Time_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time_T.inl
rename to modules/acore/deps/acelite/ace/Countdown_Time_T.inl
diff --git a/modules/dep/acelite/ace/DEV.cpp b/modules/acore/deps/acelite/ace/DEV.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV.cpp
rename to modules/acore/deps/acelite/ace/DEV.cpp
diff --git a/modules/dep/acelite/ace/DEV.h b/modules/acore/deps/acelite/ace/DEV.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV.h
rename to modules/acore/deps/acelite/ace/DEV.h
diff --git a/modules/dep/acelite/ace/DEV.inl b/modules/acore/deps/acelite/ace/DEV.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV.inl
rename to modules/acore/deps/acelite/ace/DEV.inl
diff --git a/modules/dep/acelite/ace/DEV_Addr.cpp b/modules/acore/deps/acelite/ace/DEV_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Addr.cpp
rename to modules/acore/deps/acelite/ace/DEV_Addr.cpp
diff --git a/modules/dep/acelite/ace/DEV_Addr.h b/modules/acore/deps/acelite/ace/DEV_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Addr.h
rename to modules/acore/deps/acelite/ace/DEV_Addr.h
diff --git a/modules/dep/acelite/ace/DEV_Addr.inl b/modules/acore/deps/acelite/ace/DEV_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Addr.inl
rename to modules/acore/deps/acelite/ace/DEV_Addr.inl
diff --git a/modules/dep/acelite/ace/DEV_Connector.cpp b/modules/acore/deps/acelite/ace/DEV_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Connector.cpp
rename to modules/acore/deps/acelite/ace/DEV_Connector.cpp
diff --git a/modules/dep/acelite/ace/DEV_Connector.h b/modules/acore/deps/acelite/ace/DEV_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Connector.h
rename to modules/acore/deps/acelite/ace/DEV_Connector.h
diff --git a/modules/dep/acelite/ace/DEV_Connector.inl b/modules/acore/deps/acelite/ace/DEV_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Connector.inl
rename to modules/acore/deps/acelite/ace/DEV_Connector.inl
diff --git a/modules/dep/acelite/ace/DEV_IO.cpp b/modules/acore/deps/acelite/ace/DEV_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV_IO.cpp
rename to modules/acore/deps/acelite/ace/DEV_IO.cpp
diff --git a/modules/dep/acelite/ace/DEV_IO.h b/modules/acore/deps/acelite/ace/DEV_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV_IO.h
rename to modules/acore/deps/acelite/ace/DEV_IO.h
diff --git a/modules/dep/acelite/ace/DEV_IO.inl b/modules/acore/deps/acelite/ace/DEV_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV_IO.inl
rename to modules/acore/deps/acelite/ace/DEV_IO.inl
diff --git a/modules/dep/acelite/ace/DLL.cpp b/modules/acore/deps/acelite/ace/DLL.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DLL.cpp
rename to modules/acore/deps/acelite/ace/DLL.cpp
diff --git a/modules/dep/acelite/ace/DLL.h b/modules/acore/deps/acelite/ace/DLL.h
similarity index 100%
rename from modules/dep/acelite/ace/DLL.h
rename to modules/acore/deps/acelite/ace/DLL.h
diff --git a/modules/dep/acelite/ace/DLL_Manager.cpp b/modules/acore/deps/acelite/ace/DLL_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DLL_Manager.cpp
rename to modules/acore/deps/acelite/ace/DLL_Manager.cpp
diff --git a/modules/dep/acelite/ace/DLL_Manager.h b/modules/acore/deps/acelite/ace/DLL_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/DLL_Manager.h
rename to modules/acore/deps/acelite/ace/DLL_Manager.h
diff --git a/modules/dep/acelite/ace/Date_Time.cpp b/modules/acore/deps/acelite/ace/Date_Time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Date_Time.cpp
rename to modules/acore/deps/acelite/ace/Date_Time.cpp
diff --git a/modules/dep/acelite/ace/Date_Time.h b/modules/acore/deps/acelite/ace/Date_Time.h
similarity index 100%
rename from modules/dep/acelite/ace/Date_Time.h
rename to modules/acore/deps/acelite/ace/Date_Time.h
diff --git a/modules/dep/acelite/ace/Date_Time.inl b/modules/acore/deps/acelite/ace/Date_Time.inl
similarity index 100%
rename from modules/dep/acelite/ace/Date_Time.inl
rename to modules/acore/deps/acelite/ace/Date_Time.inl
diff --git a/modules/dep/acelite/ace/Default_Constants.h b/modules/acore/deps/acelite/ace/Default_Constants.h
similarity index 100%
rename from modules/dep/acelite/ace/Default_Constants.h
rename to modules/acore/deps/acelite/ace/Default_Constants.h
diff --git a/modules/dep/acelite/ace/Dev_Poll_Reactor.cpp b/modules/acore/deps/acelite/ace/Dev_Poll_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dev_Poll_Reactor.cpp
rename to modules/acore/deps/acelite/ace/Dev_Poll_Reactor.cpp
diff --git a/modules/dep/acelite/ace/Dev_Poll_Reactor.h b/modules/acore/deps/acelite/ace/Dev_Poll_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Dev_Poll_Reactor.h
rename to modules/acore/deps/acelite/ace/Dev_Poll_Reactor.h
diff --git a/modules/dep/acelite/ace/Dev_Poll_Reactor.inl b/modules/acore/deps/acelite/ace/Dev_Poll_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dev_Poll_Reactor.inl
rename to modules/acore/deps/acelite/ace/Dev_Poll_Reactor.inl
diff --git a/modules/dep/acelite/ace/Dirent.cpp b/modules/acore/deps/acelite/ace/Dirent.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dirent.cpp
rename to modules/acore/deps/acelite/ace/Dirent.cpp
diff --git a/modules/dep/acelite/ace/Dirent.h b/modules/acore/deps/acelite/ace/Dirent.h
similarity index 100%
rename from modules/dep/acelite/ace/Dirent.h
rename to modules/acore/deps/acelite/ace/Dirent.h
diff --git a/modules/dep/acelite/ace/Dirent.inl b/modules/acore/deps/acelite/ace/Dirent.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dirent.inl
rename to modules/acore/deps/acelite/ace/Dirent.inl
diff --git a/modules/dep/acelite/ace/Dirent_Selector.cpp b/modules/acore/deps/acelite/ace/Dirent_Selector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dirent_Selector.cpp
rename to modules/acore/deps/acelite/ace/Dirent_Selector.cpp
diff --git a/modules/dep/acelite/ace/Dirent_Selector.h b/modules/acore/deps/acelite/ace/Dirent_Selector.h
similarity index 100%
rename from modules/dep/acelite/ace/Dirent_Selector.h
rename to modules/acore/deps/acelite/ace/Dirent_Selector.h
diff --git a/modules/dep/acelite/ace/Dirent_Selector.inl b/modules/acore/deps/acelite/ace/Dirent_Selector.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dirent_Selector.inl
rename to modules/acore/deps/acelite/ace/Dirent_Selector.inl
diff --git a/modules/dep/acelite/ace/Dump.cpp b/modules/acore/deps/acelite/ace/Dump.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dump.cpp
rename to modules/acore/deps/acelite/ace/Dump.cpp
diff --git a/modules/dep/acelite/ace/Dump.h b/modules/acore/deps/acelite/ace/Dump.h
similarity index 100%
rename from modules/dep/acelite/ace/Dump.h
rename to modules/acore/deps/acelite/ace/Dump.h
diff --git a/modules/dep/acelite/ace/Dump_T.cpp b/modules/acore/deps/acelite/ace/Dump_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dump_T.cpp
rename to modules/acore/deps/acelite/ace/Dump_T.cpp
diff --git a/modules/dep/acelite/ace/Dump_T.h b/modules/acore/deps/acelite/ace/Dump_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Dump_T.h
rename to modules/acore/deps/acelite/ace/Dump_T.h
diff --git a/modules/dep/acelite/ace/Dynamic.cpp b/modules/acore/deps/acelite/ace/Dynamic.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic.cpp
rename to modules/acore/deps/acelite/ace/Dynamic.cpp
diff --git a/modules/dep/acelite/ace/Dynamic.h b/modules/acore/deps/acelite/ace/Dynamic.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic.h
rename to modules/acore/deps/acelite/ace/Dynamic.h
diff --git a/modules/dep/acelite/ace/Dynamic.inl b/modules/acore/deps/acelite/ace/Dynamic.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic.inl
rename to modules/acore/deps/acelite/ace/Dynamic.inl
diff --git a/modules/dep/acelite/ace/Dynamic_Message_Strategy.cpp b/modules/acore/deps/acelite/ace/Dynamic_Message_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Message_Strategy.cpp
rename to modules/acore/deps/acelite/ace/Dynamic_Message_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Message_Strategy.h b/modules/acore/deps/acelite/ace/Dynamic_Message_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Message_Strategy.h
rename to modules/acore/deps/acelite/ace/Dynamic_Message_Strategy.h
diff --git a/modules/dep/acelite/ace/Dynamic_Message_Strategy.inl b/modules/acore/deps/acelite/ace/Dynamic_Message_Strategy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Message_Strategy.inl
rename to modules/acore/deps/acelite/ace/Dynamic_Message_Strategy.inl
diff --git a/modules/dep/acelite/ace/Dynamic_Service.cpp b/modules/acore/deps/acelite/ace/Dynamic_Service.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service.cpp
rename to modules/acore/deps/acelite/ace/Dynamic_Service.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Service.h b/modules/acore/deps/acelite/ace/Dynamic_Service.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service.h
rename to modules/acore/deps/acelite/ace/Dynamic_Service.h
diff --git a/modules/dep/acelite/ace/Dynamic_Service.inl b/modules/acore/deps/acelite/ace/Dynamic_Service.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service.inl
rename to modules/acore/deps/acelite/ace/Dynamic_Service.inl
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Base.cpp b/modules/acore/deps/acelite/ace/Dynamic_Service_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Base.cpp
rename to modules/acore/deps/acelite/ace/Dynamic_Service_Base.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Base.h b/modules/acore/deps/acelite/ace/Dynamic_Service_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Base.h
rename to modules/acore/deps/acelite/ace/Dynamic_Service_Base.h
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Dependency.cpp b/modules/acore/deps/acelite/ace/Dynamic_Service_Dependency.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Dependency.cpp
rename to modules/acore/deps/acelite/ace/Dynamic_Service_Dependency.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Dependency.h b/modules/acore/deps/acelite/ace/Dynamic_Service_Dependency.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Dependency.h
rename to modules/acore/deps/acelite/ace/Dynamic_Service_Dependency.h
diff --git a/modules/dep/acelite/ace/ETCL/ACE_ETCL.pc.in b/modules/acore/deps/acelite/ace/ETCL/ACE_ETCL.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ACE_ETCL.pc.in
rename to modules/acore/deps/acelite/ace/ETCL/ACE_ETCL.pc.in
diff --git a/modules/dep/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in b/modules/acore/deps/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
rename to modules/acore/deps/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
diff --git a/modules/dep/acelite/ace/ETCL/ETCL.ll b/modules/acore/deps/acelite/ace/ETCL/ETCL.ll
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL.ll
rename to modules/acore/deps/acelite/ace/ETCL/ETCL.ll
diff --git a/modules/dep/acelite/ace/ETCL/ETCL.mpc b/modules/acore/deps/acelite/ace/ETCL/ETCL.mpc
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL.mpc
rename to modules/acore/deps/acelite/ace/ETCL/ETCL.mpc
diff --git a/modules/dep/acelite/ace/ETCL/ETCL.yy b/modules/acore/deps/acelite/ace/ETCL/ETCL.yy
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL.yy
rename to modules/acore/deps/acelite/ace/ETCL/ETCL.yy
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint.cpp b/modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint.cpp
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint.h b/modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint.h
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint.h
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint.inl b/modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint.inl
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint.inl
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint.inl
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp b/modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h b/modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp b/modules/acore/deps/acelite/ace/ETCL/ETCL_Interpreter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_Interpreter.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Interpreter.h b/modules/acore/deps/acelite/ace/ETCL/ETCL_Interpreter.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Interpreter.h
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_Interpreter.h
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_l.cpp b/modules/acore/deps/acelite/ace/ETCL/ETCL_l.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_l.cpp
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_l.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_y.cpp b/modules/acore/deps/acelite/ace/ETCL/ETCL_y.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_y.cpp
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_y.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_y.h b/modules/acore/deps/acelite/ace/ETCL/ETCL_y.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_y.h
rename to modules/acore/deps/acelite/ace/ETCL/ETCL_y.h
diff --git a/modules/dep/acelite/ace/ETCL/ace_etcl_export.h b/modules/acore/deps/acelite/ace/ETCL/ace_etcl_export.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ace_etcl_export.h
rename to modules/acore/deps/acelite/ace/ETCL/ace_etcl_export.h
diff --git a/modules/dep/acelite/ace/ETCL/etcl_parser_export.h b/modules/acore/deps/acelite/ace/ETCL/etcl_parser_export.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/etcl_parser_export.h
rename to modules/acore/deps/acelite/ace/ETCL/etcl_parser_export.h
diff --git a/modules/dep/acelite/ace/Encoding_Converter.cpp b/modules/acore/deps/acelite/ace/Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter.cpp
rename to modules/acore/deps/acelite/ace/Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/Encoding_Converter.h b/modules/acore/deps/acelite/ace/Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter.h
rename to modules/acore/deps/acelite/ace/Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/Encoding_Converter_Factory.cpp b/modules/acore/deps/acelite/ace/Encoding_Converter_Factory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter_Factory.cpp
rename to modules/acore/deps/acelite/ace/Encoding_Converter_Factory.cpp
diff --git a/modules/dep/acelite/ace/Encoding_Converter_Factory.h b/modules/acore/deps/acelite/ace/Encoding_Converter_Factory.h
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter_Factory.h
rename to modules/acore/deps/acelite/ace/Encoding_Converter_Factory.h
diff --git a/modules/dep/acelite/ace/Env_Value_T.cpp b/modules/acore/deps/acelite/ace/Env_Value_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Env_Value_T.cpp
rename to modules/acore/deps/acelite/ace/Env_Value_T.cpp
diff --git a/modules/dep/acelite/ace/Env_Value_T.h b/modules/acore/deps/acelite/ace/Env_Value_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Env_Value_T.h
rename to modules/acore/deps/acelite/ace/Env_Value_T.h
diff --git a/modules/dep/acelite/ace/Env_Value_T.inl b/modules/acore/deps/acelite/ace/Env_Value_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Env_Value_T.inl
rename to modules/acore/deps/acelite/ace/Env_Value_T.inl
diff --git a/modules/dep/acelite/ace/Event.cpp b/modules/acore/deps/acelite/ace/Event.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event.cpp
rename to modules/acore/deps/acelite/ace/Event.cpp
diff --git a/modules/dep/acelite/ace/Event.h b/modules/acore/deps/acelite/ace/Event.h
similarity index 100%
rename from modules/dep/acelite/ace/Event.h
rename to modules/acore/deps/acelite/ace/Event.h
diff --git a/modules/dep/acelite/ace/Event.inl b/modules/acore/deps/acelite/ace/Event.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event.inl
rename to modules/acore/deps/acelite/ace/Event.inl
diff --git a/modules/dep/acelite/ace/Event_Base.cpp b/modules/acore/deps/acelite/ace/Event_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event_Base.cpp
rename to modules/acore/deps/acelite/ace/Event_Base.cpp
diff --git a/modules/dep/acelite/ace/Event_Base.h b/modules/acore/deps/acelite/ace/Event_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Event_Base.h
rename to modules/acore/deps/acelite/ace/Event_Base.h
diff --git a/modules/dep/acelite/ace/Event_Base.inl b/modules/acore/deps/acelite/ace/Event_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event_Base.inl
rename to modules/acore/deps/acelite/ace/Event_Base.inl
diff --git a/modules/dep/acelite/ace/Event_Handler.cpp b/modules/acore/deps/acelite/ace/Event_Handler.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler.cpp
rename to modules/acore/deps/acelite/ace/Event_Handler.cpp
diff --git a/modules/dep/acelite/ace/Event_Handler.h b/modules/acore/deps/acelite/ace/Event_Handler.h
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler.h
rename to modules/acore/deps/acelite/ace/Event_Handler.h
diff --git a/modules/dep/acelite/ace/Event_Handler.inl b/modules/acore/deps/acelite/ace/Event_Handler.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler.inl
rename to modules/acore/deps/acelite/ace/Event_Handler.inl
diff --git a/modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp b/modules/acore/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
rename to modules/acore/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
diff --git a/modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h b/modules/acore/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
rename to modules/acore/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
diff --git a/modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl b/modules/acore/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
rename to modules/acore/deps/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
diff --git a/modules/dep/acelite/ace/Event_Handler_T.cpp b/modules/acore/deps/acelite/ace/Event_Handler_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_T.cpp
rename to modules/acore/deps/acelite/ace/Event_Handler_T.cpp
diff --git a/modules/dep/acelite/ace/Event_Handler_T.h b/modules/acore/deps/acelite/ace/Event_Handler_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_T.h
rename to modules/acore/deps/acelite/ace/Event_Handler_T.h
diff --git a/modules/dep/acelite/ace/Event_Handler_T.inl b/modules/acore/deps/acelite/ace/Event_Handler_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_T.inl
rename to modules/acore/deps/acelite/ace/Event_Handler_T.inl
diff --git a/modules/dep/acelite/ace/FIFO.cpp b/modules/acore/deps/acelite/ace/FIFO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO.cpp
rename to modules/acore/deps/acelite/ace/FIFO.cpp
diff --git a/modules/dep/acelite/ace/FIFO.h b/modules/acore/deps/acelite/ace/FIFO.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO.h
rename to modules/acore/deps/acelite/ace/FIFO.h
diff --git a/modules/dep/acelite/ace/FIFO.inl b/modules/acore/deps/acelite/ace/FIFO.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO.inl
rename to modules/acore/deps/acelite/ace/FIFO.inl
diff --git a/modules/dep/acelite/ace/FIFO_Recv.cpp b/modules/acore/deps/acelite/ace/FIFO_Recv.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv.cpp
rename to modules/acore/deps/acelite/ace/FIFO_Recv.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Recv.h b/modules/acore/deps/acelite/ace/FIFO_Recv.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv.h
rename to modules/acore/deps/acelite/ace/FIFO_Recv.h
diff --git a/modules/dep/acelite/ace/FIFO_Recv.inl b/modules/acore/deps/acelite/ace/FIFO_Recv.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv.inl
rename to modules/acore/deps/acelite/ace/FIFO_Recv.inl
diff --git a/modules/dep/acelite/ace/FIFO_Recv_Msg.cpp b/modules/acore/deps/acelite/ace/FIFO_Recv_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv_Msg.cpp
rename to modules/acore/deps/acelite/ace/FIFO_Recv_Msg.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Recv_Msg.h b/modules/acore/deps/acelite/ace/FIFO_Recv_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv_Msg.h
rename to modules/acore/deps/acelite/ace/FIFO_Recv_Msg.h
diff --git a/modules/dep/acelite/ace/FIFO_Recv_Msg.inl b/modules/acore/deps/acelite/ace/FIFO_Recv_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv_Msg.inl
rename to modules/acore/deps/acelite/ace/FIFO_Recv_Msg.inl
diff --git a/modules/dep/acelite/ace/FIFO_Send.cpp b/modules/acore/deps/acelite/ace/FIFO_Send.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send.cpp
rename to modules/acore/deps/acelite/ace/FIFO_Send.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Send.h b/modules/acore/deps/acelite/ace/FIFO_Send.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send.h
rename to modules/acore/deps/acelite/ace/FIFO_Send.h
diff --git a/modules/dep/acelite/ace/FIFO_Send.inl b/modules/acore/deps/acelite/ace/FIFO_Send.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send.inl
rename to modules/acore/deps/acelite/ace/FIFO_Send.inl
diff --git a/modules/dep/acelite/ace/FIFO_Send_Msg.cpp b/modules/acore/deps/acelite/ace/FIFO_Send_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send_Msg.cpp
rename to modules/acore/deps/acelite/ace/FIFO_Send_Msg.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Send_Msg.h b/modules/acore/deps/acelite/ace/FIFO_Send_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send_Msg.h
rename to modules/acore/deps/acelite/ace/FIFO_Send_Msg.h
diff --git a/modules/dep/acelite/ace/FIFO_Send_Msg.inl b/modules/acore/deps/acelite/ace/FIFO_Send_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send_Msg.inl
rename to modules/acore/deps/acelite/ace/FIFO_Send_Msg.inl
diff --git a/modules/dep/acelite/ace/FILE.cpp b/modules/acore/deps/acelite/ace/FILE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE.cpp
rename to modules/acore/deps/acelite/ace/FILE.cpp
diff --git a/modules/dep/acelite/ace/FILE.h b/modules/acore/deps/acelite/ace/FILE.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE.h
rename to modules/acore/deps/acelite/ace/FILE.h
diff --git a/modules/dep/acelite/ace/FILE.inl b/modules/acore/deps/acelite/ace/FILE.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE.inl
rename to modules/acore/deps/acelite/ace/FILE.inl
diff --git a/modules/dep/acelite/ace/FILE_Addr.cpp b/modules/acore/deps/acelite/ace/FILE_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Addr.cpp
rename to modules/acore/deps/acelite/ace/FILE_Addr.cpp
diff --git a/modules/dep/acelite/ace/FILE_Addr.h b/modules/acore/deps/acelite/ace/FILE_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Addr.h
rename to modules/acore/deps/acelite/ace/FILE_Addr.h
diff --git a/modules/dep/acelite/ace/FILE_Addr.inl b/modules/acore/deps/acelite/ace/FILE_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Addr.inl
rename to modules/acore/deps/acelite/ace/FILE_Addr.inl
diff --git a/modules/dep/acelite/ace/FILE_Connector.cpp b/modules/acore/deps/acelite/ace/FILE_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Connector.cpp
rename to modules/acore/deps/acelite/ace/FILE_Connector.cpp
diff --git a/modules/dep/acelite/ace/FILE_Connector.h b/modules/acore/deps/acelite/ace/FILE_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Connector.h
rename to modules/acore/deps/acelite/ace/FILE_Connector.h
diff --git a/modules/dep/acelite/ace/FILE_Connector.inl b/modules/acore/deps/acelite/ace/FILE_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Connector.inl
rename to modules/acore/deps/acelite/ace/FILE_Connector.inl
diff --git a/modules/dep/acelite/ace/FILE_IO.cpp b/modules/acore/deps/acelite/ace/FILE_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE_IO.cpp
rename to modules/acore/deps/acelite/ace/FILE_IO.cpp
diff --git a/modules/dep/acelite/ace/FILE_IO.h b/modules/acore/deps/acelite/ace/FILE_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE_IO.h
rename to modules/acore/deps/acelite/ace/FILE_IO.h
diff --git a/modules/dep/acelite/ace/FILE_IO.inl b/modules/acore/deps/acelite/ace/FILE_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE_IO.inl
rename to modules/acore/deps/acelite/ace/FILE_IO.inl
diff --git a/modules/dep/acelite/ace/File_Lock.cpp b/modules/acore/deps/acelite/ace/File_Lock.cpp
similarity index 100%
rename from modules/dep/acelite/ace/File_Lock.cpp
rename to modules/acore/deps/acelite/ace/File_Lock.cpp
diff --git a/modules/dep/acelite/ace/File_Lock.h b/modules/acore/deps/acelite/ace/File_Lock.h
similarity index 100%
rename from modules/dep/acelite/ace/File_Lock.h
rename to modules/acore/deps/acelite/ace/File_Lock.h
diff --git a/modules/dep/acelite/ace/File_Lock.inl b/modules/acore/deps/acelite/ace/File_Lock.inl
similarity index 100%
rename from modules/dep/acelite/ace/File_Lock.inl
rename to modules/acore/deps/acelite/ace/File_Lock.inl
diff --git a/modules/dep/acelite/ace/Filecache.cpp b/modules/acore/deps/acelite/ace/Filecache.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Filecache.cpp
rename to modules/acore/deps/acelite/ace/Filecache.cpp
diff --git a/modules/dep/acelite/ace/Filecache.h b/modules/acore/deps/acelite/ace/Filecache.h
similarity index 100%
rename from modules/dep/acelite/ace/Filecache.h
rename to modules/acore/deps/acelite/ace/Filecache.h
diff --git a/modules/dep/acelite/ace/FlReactor/ACE_FlReactor.pc.in b/modules/acore/deps/acelite/ace/FlReactor/ACE_FlReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/ACE_FlReactor.pc.in
rename to modules/acore/deps/acelite/ace/FlReactor/ACE_FlReactor.pc.in
diff --git a/modules/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h b/modules/acore/deps/acelite/ace/FlReactor/ACE_FlReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h
rename to modules/acore/deps/acelite/ace/FlReactor/ACE_FlReactor_export.h
diff --git a/modules/dep/acelite/ace/FlReactor/FlReactor.cpp b/modules/acore/deps/acelite/ace/FlReactor/FlReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/FlReactor.cpp
rename to modules/acore/deps/acelite/ace/FlReactor/FlReactor.cpp
diff --git a/modules/dep/acelite/ace/FlReactor/FlReactor.h b/modules/acore/deps/acelite/ace/FlReactor/FlReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/FlReactor.h
rename to modules/acore/deps/acelite/ace/FlReactor/FlReactor.h
diff --git a/modules/dep/acelite/ace/FlReactor/ace_flreactor.mpc b/modules/acore/deps/acelite/ace/FlReactor/ace_flreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/ace_flreactor.mpc
rename to modules/acore/deps/acelite/ace/FlReactor/ace_flreactor.mpc
diff --git a/modules/dep/acelite/ace/Flag_Manip.cpp b/modules/acore/deps/acelite/ace/Flag_Manip.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Flag_Manip.cpp
rename to modules/acore/deps/acelite/ace/Flag_Manip.cpp
diff --git a/modules/dep/acelite/ace/Flag_Manip.h b/modules/acore/deps/acelite/ace/Flag_Manip.h
similarity index 100%
rename from modules/dep/acelite/ace/Flag_Manip.h
rename to modules/acore/deps/acelite/ace/Flag_Manip.h
diff --git a/modules/dep/acelite/ace/Flag_Manip.inl b/modules/acore/deps/acelite/ace/Flag_Manip.inl
similarity index 100%
rename from modules/dep/acelite/ace/Flag_Manip.inl
rename to modules/acore/deps/acelite/ace/Flag_Manip.inl
diff --git a/modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in b/modules/acore/deps/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
rename to modules/acore/deps/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
diff --git a/modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h b/modules/acore/deps/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
rename to modules/acore/deps/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
diff --git a/modules/dep/acelite/ace/FoxReactor/FoxReactor.cpp b/modules/acore/deps/acelite/ace/FoxReactor/FoxReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/FoxReactor.cpp
rename to modules/acore/deps/acelite/ace/FoxReactor/FoxReactor.cpp
diff --git a/modules/dep/acelite/ace/FoxReactor/FoxReactor.h b/modules/acore/deps/acelite/ace/FoxReactor/FoxReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/FoxReactor.h
rename to modules/acore/deps/acelite/ace/FoxReactor/FoxReactor.h
diff --git a/modules/dep/acelite/ace/FoxReactor/ace_foxreactor.mpc b/modules/acore/deps/acelite/ace/FoxReactor/ace_foxreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/ace_foxreactor.mpc
rename to modules/acore/deps/acelite/ace/FoxReactor/ace_foxreactor.mpc
diff --git a/modules/dep/acelite/ace/Framework_Component.cpp b/modules/acore/deps/acelite/ace/Framework_Component.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component.cpp
rename to modules/acore/deps/acelite/ace/Framework_Component.cpp
diff --git a/modules/dep/acelite/ace/Framework_Component.h b/modules/acore/deps/acelite/ace/Framework_Component.h
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component.h
rename to modules/acore/deps/acelite/ace/Framework_Component.h
diff --git a/modules/dep/acelite/ace/Framework_Component.inl b/modules/acore/deps/acelite/ace/Framework_Component.inl
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component.inl
rename to modules/acore/deps/acelite/ace/Framework_Component.inl
diff --git a/modules/dep/acelite/ace/Framework_Component_T.cpp b/modules/acore/deps/acelite/ace/Framework_Component_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component_T.cpp
rename to modules/acore/deps/acelite/ace/Framework_Component_T.cpp
diff --git a/modules/dep/acelite/ace/Framework_Component_T.h b/modules/acore/deps/acelite/ace/Framework_Component_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component_T.h
rename to modules/acore/deps/acelite/ace/Framework_Component_T.h
diff --git a/modules/dep/acelite/ace/Free_List.cpp b/modules/acore/deps/acelite/ace/Free_List.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Free_List.cpp
rename to modules/acore/deps/acelite/ace/Free_List.cpp
diff --git a/modules/dep/acelite/ace/Free_List.h b/modules/acore/deps/acelite/ace/Free_List.h
similarity index 100%
rename from modules/dep/acelite/ace/Free_List.h
rename to modules/acore/deps/acelite/ace/Free_List.h
diff --git a/modules/dep/acelite/ace/Functor.cpp b/modules/acore/deps/acelite/ace/Functor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Functor.cpp
rename to modules/acore/deps/acelite/ace/Functor.cpp
diff --git a/modules/dep/acelite/ace/Functor.h b/modules/acore/deps/acelite/ace/Functor.h
similarity index 100%
rename from modules/dep/acelite/ace/Functor.h
rename to modules/acore/deps/acelite/ace/Functor.h
diff --git a/modules/dep/acelite/ace/Functor.inl b/modules/acore/deps/acelite/ace/Functor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Functor.inl
rename to modules/acore/deps/acelite/ace/Functor.inl
diff --git a/modules/dep/acelite/ace/Functor_String.cpp b/modules/acore/deps/acelite/ace/Functor_String.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Functor_String.cpp
rename to modules/acore/deps/acelite/ace/Functor_String.cpp
diff --git a/modules/dep/acelite/ace/Functor_String.h b/modules/acore/deps/acelite/ace/Functor_String.h
similarity index 100%
rename from modules/dep/acelite/ace/Functor_String.h
rename to modules/acore/deps/acelite/ace/Functor_String.h
diff --git a/modules/dep/acelite/ace/Functor_String.inl b/modules/acore/deps/acelite/ace/Functor_String.inl
similarity index 100%
rename from modules/dep/acelite/ace/Functor_String.inl
rename to modules/acore/deps/acelite/ace/Functor_String.inl
diff --git a/modules/dep/acelite/ace/Functor_T.cpp b/modules/acore/deps/acelite/ace/Functor_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Functor_T.cpp
rename to modules/acore/deps/acelite/ace/Functor_T.cpp
diff --git a/modules/dep/acelite/ace/Functor_T.h b/modules/acore/deps/acelite/ace/Functor_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Functor_T.h
rename to modules/acore/deps/acelite/ace/Functor_T.h
diff --git a/modules/dep/acelite/ace/Functor_T.inl b/modules/acore/deps/acelite/ace/Functor_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Functor_T.inl
rename to modules/acore/deps/acelite/ace/Functor_T.inl
diff --git a/modules/dep/acelite/ace/Future.cpp b/modules/acore/deps/acelite/ace/Future.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Future.cpp
rename to modules/acore/deps/acelite/ace/Future.cpp
diff --git a/modules/dep/acelite/ace/Future.h b/modules/acore/deps/acelite/ace/Future.h
similarity index 100%
rename from modules/dep/acelite/ace/Future.h
rename to modules/acore/deps/acelite/ace/Future.h
diff --git a/modules/dep/acelite/ace/Future_Set.cpp b/modules/acore/deps/acelite/ace/Future_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Future_Set.cpp
rename to modules/acore/deps/acelite/ace/Future_Set.cpp
diff --git a/modules/dep/acelite/ace/Future_Set.h b/modules/acore/deps/acelite/ace/Future_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Future_Set.h
rename to modules/acore/deps/acelite/ace/Future_Set.h
diff --git a/modules/dep/acelite/ace/Get_Opt.cpp b/modules/acore/deps/acelite/ace/Get_Opt.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Get_Opt.cpp
rename to modules/acore/deps/acelite/ace/Get_Opt.cpp
diff --git a/modules/dep/acelite/ace/Get_Opt.h b/modules/acore/deps/acelite/ace/Get_Opt.h
similarity index 100%
rename from modules/dep/acelite/ace/Get_Opt.h
rename to modules/acore/deps/acelite/ace/Get_Opt.h
diff --git a/modules/dep/acelite/ace/Get_Opt.inl b/modules/acore/deps/acelite/ace/Get_Opt.inl
similarity index 100%
rename from modules/dep/acelite/ace/Get_Opt.inl
rename to modules/acore/deps/acelite/ace/Get_Opt.inl
diff --git a/modules/dep/acelite/ace/Global_Macros.h b/modules/acore/deps/acelite/ace/Global_Macros.h
similarity index 100%
rename from modules/dep/acelite/ace/Global_Macros.h
rename to modules/acore/deps/acelite/ace/Global_Macros.h
diff --git a/modules/dep/acelite/ace/Guard_T.cpp b/modules/acore/deps/acelite/ace/Guard_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Guard_T.cpp
rename to modules/acore/deps/acelite/ace/Guard_T.cpp
diff --git a/modules/dep/acelite/ace/Guard_T.h b/modules/acore/deps/acelite/ace/Guard_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Guard_T.h
rename to modules/acore/deps/acelite/ace/Guard_T.h
diff --git a/modules/dep/acelite/ace/Guard_T.inl b/modules/acore/deps/acelite/ace/Guard_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Guard_T.inl
rename to modules/acore/deps/acelite/ace/Guard_T.inl
diff --git a/modules/dep/acelite/ace/Handle_Gobbler.h b/modules/acore/deps/acelite/ace/Handle_Gobbler.h
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Gobbler.h
rename to modules/acore/deps/acelite/ace/Handle_Gobbler.h
diff --git a/modules/dep/acelite/ace/Handle_Gobbler.inl b/modules/acore/deps/acelite/ace/Handle_Gobbler.inl
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Gobbler.inl
rename to modules/acore/deps/acelite/ace/Handle_Gobbler.inl
diff --git a/modules/dep/acelite/ace/Handle_Ops.cpp b/modules/acore/deps/acelite/ace/Handle_Ops.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Ops.cpp
rename to modules/acore/deps/acelite/ace/Handle_Ops.cpp
diff --git a/modules/dep/acelite/ace/Handle_Ops.h b/modules/acore/deps/acelite/ace/Handle_Ops.h
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Ops.h
rename to modules/acore/deps/acelite/ace/Handle_Ops.h
diff --git a/modules/dep/acelite/ace/Handle_Set.cpp b/modules/acore/deps/acelite/ace/Handle_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Set.cpp
rename to modules/acore/deps/acelite/ace/Handle_Set.cpp
diff --git a/modules/dep/acelite/ace/Handle_Set.h b/modules/acore/deps/acelite/ace/Handle_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Set.h
rename to modules/acore/deps/acelite/ace/Handle_Set.h
diff --git a/modules/dep/acelite/ace/Handle_Set.inl b/modules/acore/deps/acelite/ace/Handle_Set.inl
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Set.inl
rename to modules/acore/deps/acelite/ace/Handle_Set.inl
diff --git a/modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.cpp b/modules/acore/deps/acelite/ace/Hash_Cache_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.cpp
rename to modules/acore/deps/acelite/ace/Hash_Cache_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.h b/modules/acore/deps/acelite/ace/Hash_Cache_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.h
rename to modules/acore/deps/acelite/ace/Hash_Cache_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.inl b/modules/acore/deps/acelite/ace/Hash_Cache_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.inl
rename to modules/acore/deps/acelite/ace/Hash_Cache_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager.h b/modules/acore/deps/acelite/ace/Hash_Map_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager.h
rename to modules/acore/deps/acelite/ace/Hash_Map_Manager.h
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager_T.cpp b/modules/acore/deps/acelite/ace/Hash_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager_T.cpp
rename to modules/acore/deps/acelite/ace/Hash_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager_T.h b/modules/acore/deps/acelite/ace/Hash_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager_T.h
rename to modules/acore/deps/acelite/ace/Hash_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager_T.inl b/modules/acore/deps/acelite/ace/Hash_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager_T.inl
rename to modules/acore/deps/acelite/ace/Hash_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Hash_Map_With_Allocator_T.cpp b/modules/acore/deps/acelite/ace/Hash_Map_With_Allocator_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_With_Allocator_T.cpp
rename to modules/acore/deps/acelite/ace/Hash_Map_With_Allocator_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Map_With_Allocator_T.h b/modules/acore/deps/acelite/ace/Hash_Map_With_Allocator_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_With_Allocator_T.h
rename to modules/acore/deps/acelite/ace/Hash_Map_With_Allocator_T.h
diff --git a/modules/dep/acelite/ace/Hash_Map_With_Allocator_T.inl b/modules/acore/deps/acelite/ace/Hash_Map_With_Allocator_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_With_Allocator_T.inl
rename to modules/acore/deps/acelite/ace/Hash_Map_With_Allocator_T.inl
diff --git a/modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp b/modules/acore/deps/acelite/ace/Hash_Multi_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp
rename to modules/acore/deps/acelite/ace/Hash_Multi_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.h b/modules/acore/deps/acelite/ace/Hash_Multi_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.h
rename to modules/acore/deps/acelite/ace/Hash_Multi_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.inl b/modules/acore/deps/acelite/ace/Hash_Multi_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.inl
rename to modules/acore/deps/acelite/ace/Hash_Multi_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Hashable.cpp b/modules/acore/deps/acelite/ace/Hashable.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Hashable.cpp
rename to modules/acore/deps/acelite/ace/Hashable.cpp
diff --git a/modules/dep/acelite/ace/Hashable.h b/modules/acore/deps/acelite/ace/Hashable.h
similarity index 100%
rename from modules/dep/acelite/ace/Hashable.h
rename to modules/acore/deps/acelite/ace/Hashable.h
diff --git a/modules/dep/acelite/ace/Hashable.inl b/modules/acore/deps/acelite/ace/Hashable.inl
similarity index 100%
rename from modules/dep/acelite/ace/Hashable.inl
rename to modules/acore/deps/acelite/ace/Hashable.inl
diff --git a/modules/dep/acelite/ace/High_Res_Timer.cpp b/modules/acore/deps/acelite/ace/High_Res_Timer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/High_Res_Timer.cpp
rename to modules/acore/deps/acelite/ace/High_Res_Timer.cpp
diff --git a/modules/dep/acelite/ace/High_Res_Timer.h b/modules/acore/deps/acelite/ace/High_Res_Timer.h
similarity index 100%
rename from modules/dep/acelite/ace/High_Res_Timer.h
rename to modules/acore/deps/acelite/ace/High_Res_Timer.h
diff --git a/modules/dep/acelite/ace/High_Res_Timer.inl b/modules/acore/deps/acelite/ace/High_Res_Timer.inl
similarity index 100%
rename from modules/dep/acelite/ace/High_Res_Timer.inl
rename to modules/acore/deps/acelite/ace/High_Res_Timer.inl
diff --git a/modules/dep/acelite/ace/ICMP_Socket.cpp b/modules/acore/deps/acelite/ace/ICMP_Socket.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ICMP_Socket.cpp
rename to modules/acore/deps/acelite/ace/ICMP_Socket.cpp
diff --git a/modules/dep/acelite/ace/ICMP_Socket.h b/modules/acore/deps/acelite/ace/ICMP_Socket.h
similarity index 100%
rename from modules/dep/acelite/ace/ICMP_Socket.h
rename to modules/acore/deps/acelite/ace/ICMP_Socket.h
diff --git a/modules/dep/acelite/ace/INET_Addr.cpp b/modules/acore/deps/acelite/ace/INET_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/INET_Addr.cpp
rename to modules/acore/deps/acelite/ace/INET_Addr.cpp
diff --git a/modules/dep/acelite/ace/INET_Addr.h b/modules/acore/deps/acelite/ace/INET_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/INET_Addr.h
rename to modules/acore/deps/acelite/ace/INET_Addr.h
diff --git a/modules/dep/acelite/ace/INET_Addr.inl b/modules/acore/deps/acelite/ace/INET_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/INET_Addr.inl
rename to modules/acore/deps/acelite/ace/INET_Addr.inl
diff --git a/modules/dep/acelite/ace/IOStream.cpp b/modules/acore/deps/acelite/ace/IOStream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IOStream.cpp
rename to modules/acore/deps/acelite/ace/IOStream.cpp
diff --git a/modules/dep/acelite/ace/IOStream.h b/modules/acore/deps/acelite/ace/IOStream.h
similarity index 100%
rename from modules/dep/acelite/ace/IOStream.h
rename to modules/acore/deps/acelite/ace/IOStream.h
diff --git a/modules/dep/acelite/ace/IOStream_T.cpp b/modules/acore/deps/acelite/ace/IOStream_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IOStream_T.cpp
rename to modules/acore/deps/acelite/ace/IOStream_T.cpp
diff --git a/modules/dep/acelite/ace/IOStream_T.h b/modules/acore/deps/acelite/ace/IOStream_T.h
similarity index 100%
rename from modules/dep/acelite/ace/IOStream_T.h
rename to modules/acore/deps/acelite/ace/IOStream_T.h
diff --git a/modules/dep/acelite/ace/IOStream_T.inl b/modules/acore/deps/acelite/ace/IOStream_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/IOStream_T.inl
rename to modules/acore/deps/acelite/ace/IOStream_T.inl
diff --git a/modules/dep/acelite/ace/IO_Cntl_Msg.cpp b/modules/acore/deps/acelite/ace/IO_Cntl_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IO_Cntl_Msg.cpp
rename to modules/acore/deps/acelite/ace/IO_Cntl_Msg.cpp
diff --git a/modules/dep/acelite/ace/IO_Cntl_Msg.h b/modules/acore/deps/acelite/ace/IO_Cntl_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/IO_Cntl_Msg.h
rename to modules/acore/deps/acelite/ace/IO_Cntl_Msg.h
diff --git a/modules/dep/acelite/ace/IO_Cntl_Msg.inl b/modules/acore/deps/acelite/ace/IO_Cntl_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/IO_Cntl_Msg.inl
rename to modules/acore/deps/acelite/ace/IO_Cntl_Msg.inl
diff --git a/modules/dep/acelite/ace/IO_SAP.cpp b/modules/acore/deps/acelite/ace/IO_SAP.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IO_SAP.cpp
rename to modules/acore/deps/acelite/ace/IO_SAP.cpp
diff --git a/modules/dep/acelite/ace/IO_SAP.h b/modules/acore/deps/acelite/ace/IO_SAP.h
similarity index 100%
rename from modules/dep/acelite/ace/IO_SAP.h
rename to modules/acore/deps/acelite/ace/IO_SAP.h
diff --git a/modules/dep/acelite/ace/IO_SAP.inl b/modules/acore/deps/acelite/ace/IO_SAP.inl
similarity index 100%
rename from modules/dep/acelite/ace/IO_SAP.inl
rename to modules/acore/deps/acelite/ace/IO_SAP.inl
diff --git a/modules/dep/acelite/ace/IPC_SAP.cpp b/modules/acore/deps/acelite/ace/IPC_SAP.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IPC_SAP.cpp
rename to modules/acore/deps/acelite/ace/IPC_SAP.cpp
diff --git a/modules/dep/acelite/ace/IPC_SAP.h b/modules/acore/deps/acelite/ace/IPC_SAP.h
similarity index 100%
rename from modules/dep/acelite/ace/IPC_SAP.h
rename to modules/acore/deps/acelite/ace/IPC_SAP.h
diff --git a/modules/dep/acelite/ace/IPC_SAP.inl b/modules/acore/deps/acelite/ace/IPC_SAP.inl
similarity index 100%
rename from modules/dep/acelite/ace/IPC_SAP.inl
rename to modules/acore/deps/acelite/ace/IPC_SAP.inl
diff --git a/modules/dep/acelite/ace/If_Then_Else.h b/modules/acore/deps/acelite/ace/If_Then_Else.h
similarity index 100%
rename from modules/dep/acelite/ace/If_Then_Else.h
rename to modules/acore/deps/acelite/ace/If_Then_Else.h
diff --git a/modules/dep/acelite/ace/Init_ACE.cpp b/modules/acore/deps/acelite/ace/Init_ACE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Init_ACE.cpp
rename to modules/acore/deps/acelite/ace/Init_ACE.cpp
diff --git a/modules/dep/acelite/ace/Init_ACE.h b/modules/acore/deps/acelite/ace/Init_ACE.h
similarity index 100%
rename from modules/dep/acelite/ace/Init_ACE.h
rename to modules/acore/deps/acelite/ace/Init_ACE.h
diff --git a/modules/dep/acelite/ace/Intrusive_Auto_Ptr.cpp b/modules/acore/deps/acelite/ace/Intrusive_Auto_Ptr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_Auto_Ptr.cpp
rename to modules/acore/deps/acelite/ace/Intrusive_Auto_Ptr.cpp
diff --git a/modules/dep/acelite/ace/Intrusive_Auto_Ptr.h b/modules/acore/deps/acelite/ace/Intrusive_Auto_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_Auto_Ptr.h
rename to modules/acore/deps/acelite/ace/Intrusive_Auto_Ptr.h
diff --git a/modules/dep/acelite/ace/Intrusive_Auto_Ptr.inl b/modules/acore/deps/acelite/ace/Intrusive_Auto_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_Auto_Ptr.inl
rename to modules/acore/deps/acelite/ace/Intrusive_Auto_Ptr.inl
diff --git a/modules/dep/acelite/ace/Intrusive_List.cpp b/modules/acore/deps/acelite/ace/Intrusive_List.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List.cpp
rename to modules/acore/deps/acelite/ace/Intrusive_List.cpp
diff --git a/modules/dep/acelite/ace/Intrusive_List.h b/modules/acore/deps/acelite/ace/Intrusive_List.h
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List.h
rename to modules/acore/deps/acelite/ace/Intrusive_List.h
diff --git a/modules/dep/acelite/ace/Intrusive_List.inl b/modules/acore/deps/acelite/ace/Intrusive_List.inl
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List.inl
rename to modules/acore/deps/acelite/ace/Intrusive_List.inl
diff --git a/modules/dep/acelite/ace/Intrusive_List_Node.cpp b/modules/acore/deps/acelite/ace/Intrusive_List_Node.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List_Node.cpp
rename to modules/acore/deps/acelite/ace/Intrusive_List_Node.cpp
diff --git a/modules/dep/acelite/ace/Intrusive_List_Node.h b/modules/acore/deps/acelite/ace/Intrusive_List_Node.h
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List_Node.h
rename to modules/acore/deps/acelite/ace/Intrusive_List_Node.h
diff --git a/modules/dep/acelite/ace/Intrusive_List_Node.inl b/modules/acore/deps/acelite/ace/Intrusive_List_Node.inl
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List_Node.inl
rename to modules/acore/deps/acelite/ace/Intrusive_List_Node.inl
diff --git a/modules/dep/acelite/ace/LOCK_SOCK_Acceptor.cpp b/modules/acore/deps/acelite/ace/LOCK_SOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LOCK_SOCK_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/LOCK_SOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/LOCK_SOCK_Acceptor.h b/modules/acore/deps/acelite/ace/LOCK_SOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/LOCK_SOCK_Acceptor.h
rename to modules/acore/deps/acelite/ace/LOCK_SOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/LSOCK.cpp b/modules/acore/deps/acelite/ace/LSOCK.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK.cpp
rename to modules/acore/deps/acelite/ace/LSOCK.cpp
diff --git a/modules/dep/acelite/ace/LSOCK.h b/modules/acore/deps/acelite/ace/LSOCK.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK.h
rename to modules/acore/deps/acelite/ace/LSOCK.h
diff --git a/modules/dep/acelite/ace/LSOCK.inl b/modules/acore/deps/acelite/ace/LSOCK.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK.inl
rename to modules/acore/deps/acelite/ace/LSOCK.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Acceptor.cpp b/modules/acore/deps/acelite/ace/LSOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/LSOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Acceptor.h b/modules/acore/deps/acelite/ace/LSOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Acceptor.h
rename to modules/acore/deps/acelite/ace/LSOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/LSOCK_CODgram.cpp b/modules/acore/deps/acelite/ace/LSOCK_CODgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_CODgram.cpp
rename to modules/acore/deps/acelite/ace/LSOCK_CODgram.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_CODgram.h b/modules/acore/deps/acelite/ace/LSOCK_CODgram.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_CODgram.h
rename to modules/acore/deps/acelite/ace/LSOCK_CODgram.h
diff --git a/modules/dep/acelite/ace/LSOCK_CODgram.inl b/modules/acore/deps/acelite/ace/LSOCK_CODgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_CODgram.inl
rename to modules/acore/deps/acelite/ace/LSOCK_CODgram.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Connector.cpp b/modules/acore/deps/acelite/ace/LSOCK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Connector.cpp
rename to modules/acore/deps/acelite/ace/LSOCK_Connector.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Connector.h b/modules/acore/deps/acelite/ace/LSOCK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Connector.h
rename to modules/acore/deps/acelite/ace/LSOCK_Connector.h
diff --git a/modules/dep/acelite/ace/LSOCK_Connector.inl b/modules/acore/deps/acelite/ace/LSOCK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Connector.inl
rename to modules/acore/deps/acelite/ace/LSOCK_Connector.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Dgram.cpp b/modules/acore/deps/acelite/ace/LSOCK_Dgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Dgram.cpp
rename to modules/acore/deps/acelite/ace/LSOCK_Dgram.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Dgram.h b/modules/acore/deps/acelite/ace/LSOCK_Dgram.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Dgram.h
rename to modules/acore/deps/acelite/ace/LSOCK_Dgram.h
diff --git a/modules/dep/acelite/ace/LSOCK_Dgram.inl b/modules/acore/deps/acelite/ace/LSOCK_Dgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Dgram.inl
rename to modules/acore/deps/acelite/ace/LSOCK_Dgram.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Stream.cpp b/modules/acore/deps/acelite/ace/LSOCK_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Stream.cpp
rename to modules/acore/deps/acelite/ace/LSOCK_Stream.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Stream.h b/modules/acore/deps/acelite/ace/LSOCK_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Stream.h
rename to modules/acore/deps/acelite/ace/LSOCK_Stream.h
diff --git a/modules/dep/acelite/ace/LSOCK_Stream.inl b/modules/acore/deps/acelite/ace/LSOCK_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Stream.inl
rename to modules/acore/deps/acelite/ace/LSOCK_Stream.inl
diff --git a/modules/dep/acelite/ace/Lib_Find.cpp b/modules/acore/deps/acelite/ace/Lib_Find.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Lib_Find.cpp
rename to modules/acore/deps/acelite/ace/Lib_Find.cpp
diff --git a/modules/dep/acelite/ace/Lib_Find.h b/modules/acore/deps/acelite/ace/Lib_Find.h
similarity index 100%
rename from modules/dep/acelite/ace/Lib_Find.h
rename to modules/acore/deps/acelite/ace/Lib_Find.h
diff --git a/modules/dep/acelite/ace/Local_Memory_Pool.cpp b/modules/acore/deps/acelite/ace/Local_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Memory_Pool.cpp
rename to modules/acore/deps/acelite/ace/Local_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Local_Memory_Pool.h b/modules/acore/deps/acelite/ace/Local_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Memory_Pool.h
rename to modules/acore/deps/acelite/ace/Local_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Local_Name_Space.cpp b/modules/acore/deps/acelite/ace/Local_Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space.cpp
rename to modules/acore/deps/acelite/ace/Local_Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Local_Name_Space.h b/modules/acore/deps/acelite/ace/Local_Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space.h
rename to modules/acore/deps/acelite/ace/Local_Name_Space.h
diff --git a/modules/dep/acelite/ace/Local_Name_Space_T.cpp b/modules/acore/deps/acelite/ace/Local_Name_Space_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space_T.cpp
rename to modules/acore/deps/acelite/ace/Local_Name_Space_T.cpp
diff --git a/modules/dep/acelite/ace/Local_Name_Space_T.h b/modules/acore/deps/acelite/ace/Local_Name_Space_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space_T.h
rename to modules/acore/deps/acelite/ace/Local_Name_Space_T.h
diff --git a/modules/dep/acelite/ace/Local_Tokens.cpp b/modules/acore/deps/acelite/ace/Local_Tokens.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Tokens.cpp
rename to modules/acore/deps/acelite/ace/Local_Tokens.cpp
diff --git a/modules/dep/acelite/ace/Local_Tokens.h b/modules/acore/deps/acelite/ace/Local_Tokens.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Tokens.h
rename to modules/acore/deps/acelite/ace/Local_Tokens.h
diff --git a/modules/dep/acelite/ace/Local_Tokens.inl b/modules/acore/deps/acelite/ace/Local_Tokens.inl
similarity index 100%
rename from modules/dep/acelite/ace/Local_Tokens.inl
rename to modules/acore/deps/acelite/ace/Local_Tokens.inl
diff --git a/modules/dep/acelite/ace/Lock.cpp b/modules/acore/deps/acelite/ace/Lock.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Lock.cpp
rename to modules/acore/deps/acelite/ace/Lock.cpp
diff --git a/modules/dep/acelite/ace/Lock.h b/modules/acore/deps/acelite/ace/Lock.h
similarity index 100%
rename from modules/dep/acelite/ace/Lock.h
rename to modules/acore/deps/acelite/ace/Lock.h
diff --git a/modules/dep/acelite/ace/Lock.inl b/modules/acore/deps/acelite/ace/Lock.inl
similarity index 100%
rename from modules/dep/acelite/ace/Lock.inl
rename to modules/acore/deps/acelite/ace/Lock.inl
diff --git a/modules/dep/acelite/ace/Lock_Adapter_T.cpp b/modules/acore/deps/acelite/ace/Lock_Adapter_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Lock_Adapter_T.cpp
rename to modules/acore/deps/acelite/ace/Lock_Adapter_T.cpp
diff --git a/modules/dep/acelite/ace/Lock_Adapter_T.h b/modules/acore/deps/acelite/ace/Lock_Adapter_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Lock_Adapter_T.h
rename to modules/acore/deps/acelite/ace/Lock_Adapter_T.h
diff --git a/modules/dep/acelite/ace/Lock_Adapter_T.inl b/modules/acore/deps/acelite/ace/Lock_Adapter_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Lock_Adapter_T.inl
rename to modules/acore/deps/acelite/ace/Lock_Adapter_T.inl
diff --git a/modules/dep/acelite/ace/Log_Category.cpp b/modules/acore/deps/acelite/ace/Log_Category.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Category.cpp
rename to modules/acore/deps/acelite/ace/Log_Category.cpp
diff --git a/modules/dep/acelite/ace/Log_Category.h b/modules/acore/deps/acelite/ace/Log_Category.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Category.h
rename to modules/acore/deps/acelite/ace/Log_Category.h
diff --git a/modules/dep/acelite/ace/Log_Category.inl b/modules/acore/deps/acelite/ace/Log_Category.inl
similarity index 100%
rename from modules/dep/acelite/ace/Log_Category.inl
rename to modules/acore/deps/acelite/ace/Log_Category.inl
diff --git a/modules/dep/acelite/ace/Log_Msg.cpp b/modules/acore/deps/acelite/ace/Log_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg.cpp
rename to modules/acore/deps/acelite/ace/Log_Msg.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg.h b/modules/acore/deps/acelite/ace/Log_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg.h
rename to modules/acore/deps/acelite/ace/Log_Msg.h
diff --git a/modules/dep/acelite/ace/Log_Msg.inl b/modules/acore/deps/acelite/ace/Log_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg.inl
rename to modules/acore/deps/acelite/ace/Log_Msg.inl
diff --git a/modules/dep/acelite/ace/Log_Msg_Backend.cpp b/modules/acore/deps/acelite/ace/Log_Msg_Backend.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Backend.cpp
rename to modules/acore/deps/acelite/ace/Log_Msg_Backend.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_Backend.h b/modules/acore/deps/acelite/ace/Log_Msg_Backend.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Backend.h
rename to modules/acore/deps/acelite/ace/Log_Msg_Backend.h
diff --git a/modules/dep/acelite/ace/Log_Msg_Callback.cpp b/modules/acore/deps/acelite/ace/Log_Msg_Callback.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Callback.cpp
rename to modules/acore/deps/acelite/ace/Log_Msg_Callback.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_Callback.h b/modules/acore/deps/acelite/ace/Log_Msg_Callback.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Callback.h
rename to modules/acore/deps/acelite/ace/Log_Msg_Callback.h
diff --git a/modules/dep/acelite/ace/Log_Msg_IPC.cpp b/modules/acore/deps/acelite/ace/Log_Msg_IPC.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_IPC.cpp
rename to modules/acore/deps/acelite/ace/Log_Msg_IPC.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_IPC.h b/modules/acore/deps/acelite/ace/Log_Msg_IPC.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_IPC.h
rename to modules/acore/deps/acelite/ace/Log_Msg_IPC.h
diff --git a/modules/dep/acelite/ace/Log_Msg_NT_Event_Log.cpp b/modules/acore/deps/acelite/ace/Log_Msg_NT_Event_Log.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_NT_Event_Log.cpp
rename to modules/acore/deps/acelite/ace/Log_Msg_NT_Event_Log.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_NT_Event_Log.h b/modules/acore/deps/acelite/ace/Log_Msg_NT_Event_Log.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_NT_Event_Log.h
rename to modules/acore/deps/acelite/ace/Log_Msg_NT_Event_Log.h
diff --git a/modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp b/modules/acore/deps/acelite/ace/Log_Msg_UNIX_Syslog.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp
rename to modules/acore/deps/acelite/ace/Log_Msg_UNIX_Syslog.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.h b/modules/acore/deps/acelite/ace/Log_Msg_UNIX_Syslog.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.h
rename to modules/acore/deps/acelite/ace/Log_Msg_UNIX_Syslog.h
diff --git a/modules/dep/acelite/ace/Log_Priority.h b/modules/acore/deps/acelite/ace/Log_Priority.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Priority.h
rename to modules/acore/deps/acelite/ace/Log_Priority.h
diff --git a/modules/dep/acelite/ace/Log_Record.cpp b/modules/acore/deps/acelite/ace/Log_Record.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Record.cpp
rename to modules/acore/deps/acelite/ace/Log_Record.cpp
diff --git a/modules/dep/acelite/ace/Log_Record.h b/modules/acore/deps/acelite/ace/Log_Record.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Record.h
rename to modules/acore/deps/acelite/ace/Log_Record.h
diff --git a/modules/dep/acelite/ace/Log_Record.inl b/modules/acore/deps/acelite/ace/Log_Record.inl
similarity index 100%
rename from modules/dep/acelite/ace/Log_Record.inl
rename to modules/acore/deps/acelite/ace/Log_Record.inl
diff --git a/modules/dep/acelite/ace/Logging_Strategy.cpp b/modules/acore/deps/acelite/ace/Logging_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Logging_Strategy.cpp
rename to modules/acore/deps/acelite/ace/Logging_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Logging_Strategy.h b/modules/acore/deps/acelite/ace/Logging_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Logging_Strategy.h
rename to modules/acore/deps/acelite/ace/Logging_Strategy.h
diff --git a/modules/dep/acelite/ace/MEM_Acceptor.cpp b/modules/acore/deps/acelite/ace/MEM_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/MEM_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/MEM_Acceptor.h b/modules/acore/deps/acelite/ace/MEM_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Acceptor.h
rename to modules/acore/deps/acelite/ace/MEM_Acceptor.h
diff --git a/modules/dep/acelite/ace/MEM_Acceptor.inl b/modules/acore/deps/acelite/ace/MEM_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Acceptor.inl
rename to modules/acore/deps/acelite/ace/MEM_Acceptor.inl
diff --git a/modules/dep/acelite/ace/MEM_Addr.cpp b/modules/acore/deps/acelite/ace/MEM_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Addr.cpp
rename to modules/acore/deps/acelite/ace/MEM_Addr.cpp
diff --git a/modules/dep/acelite/ace/MEM_Addr.h b/modules/acore/deps/acelite/ace/MEM_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Addr.h
rename to modules/acore/deps/acelite/ace/MEM_Addr.h
diff --git a/modules/dep/acelite/ace/MEM_Addr.inl b/modules/acore/deps/acelite/ace/MEM_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Addr.inl
rename to modules/acore/deps/acelite/ace/MEM_Addr.inl
diff --git a/modules/dep/acelite/ace/MEM_Connector.cpp b/modules/acore/deps/acelite/ace/MEM_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Connector.cpp
rename to modules/acore/deps/acelite/ace/MEM_Connector.cpp
diff --git a/modules/dep/acelite/ace/MEM_Connector.h b/modules/acore/deps/acelite/ace/MEM_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Connector.h
rename to modules/acore/deps/acelite/ace/MEM_Connector.h
diff --git a/modules/dep/acelite/ace/MEM_Connector.inl b/modules/acore/deps/acelite/ace/MEM_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Connector.inl
rename to modules/acore/deps/acelite/ace/MEM_Connector.inl
diff --git a/modules/dep/acelite/ace/MEM_IO.cpp b/modules/acore/deps/acelite/ace/MEM_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_IO.cpp
rename to modules/acore/deps/acelite/ace/MEM_IO.cpp
diff --git a/modules/dep/acelite/ace/MEM_IO.h b/modules/acore/deps/acelite/ace/MEM_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_IO.h
rename to modules/acore/deps/acelite/ace/MEM_IO.h
diff --git a/modules/dep/acelite/ace/MEM_IO.inl b/modules/acore/deps/acelite/ace/MEM_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_IO.inl
rename to modules/acore/deps/acelite/ace/MEM_IO.inl
diff --git a/modules/dep/acelite/ace/MEM_SAP.cpp b/modules/acore/deps/acelite/ace/MEM_SAP.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_SAP.cpp
rename to modules/acore/deps/acelite/ace/MEM_SAP.cpp
diff --git a/modules/dep/acelite/ace/MEM_SAP.h b/modules/acore/deps/acelite/ace/MEM_SAP.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_SAP.h
rename to modules/acore/deps/acelite/ace/MEM_SAP.h
diff --git a/modules/dep/acelite/ace/MEM_SAP.inl b/modules/acore/deps/acelite/ace/MEM_SAP.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_SAP.inl
rename to modules/acore/deps/acelite/ace/MEM_SAP.inl
diff --git a/modules/dep/acelite/ace/MEM_Stream.cpp b/modules/acore/deps/acelite/ace/MEM_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Stream.cpp
rename to modules/acore/deps/acelite/ace/MEM_Stream.cpp
diff --git a/modules/dep/acelite/ace/MEM_Stream.h b/modules/acore/deps/acelite/ace/MEM_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Stream.h
rename to modules/acore/deps/acelite/ace/MEM_Stream.h
diff --git a/modules/dep/acelite/ace/MEM_Stream.inl b/modules/acore/deps/acelite/ace/MEM_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Stream.inl
rename to modules/acore/deps/acelite/ace/MEM_Stream.inl
diff --git a/modules/dep/acelite/ace/MMAP_Memory_Pool.cpp b/modules/acore/deps/acelite/ace/MMAP_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MMAP_Memory_Pool.cpp
rename to modules/acore/deps/acelite/ace/MMAP_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/MMAP_Memory_Pool.h b/modules/acore/deps/acelite/ace/MMAP_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/MMAP_Memory_Pool.h
rename to modules/acore/deps/acelite/ace/MMAP_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/MMAP_Memory_Pool.inl b/modules/acore/deps/acelite/ace/MMAP_Memory_Pool.inl
similarity index 100%
rename from modules/dep/acelite/ace/MMAP_Memory_Pool.inl
rename to modules/acore/deps/acelite/ace/MMAP_Memory_Pool.inl
diff --git a/modules/dep/acelite/ace/Malloc.cpp b/modules/acore/deps/acelite/ace/Malloc.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Malloc.cpp
rename to modules/acore/deps/acelite/ace/Malloc.cpp
diff --git a/modules/dep/acelite/ace/Malloc.h b/modules/acore/deps/acelite/ace/Malloc.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc.h
rename to modules/acore/deps/acelite/ace/Malloc.h
diff --git a/modules/dep/acelite/ace/Malloc.inl b/modules/acore/deps/acelite/ace/Malloc.inl
similarity index 100%
rename from modules/dep/acelite/ace/Malloc.inl
rename to modules/acore/deps/acelite/ace/Malloc.inl
diff --git a/modules/dep/acelite/ace/Malloc_Allocator.cpp b/modules/acore/deps/acelite/ace/Malloc_Allocator.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Allocator.cpp
rename to modules/acore/deps/acelite/ace/Malloc_Allocator.cpp
diff --git a/modules/dep/acelite/ace/Malloc_Allocator.h b/modules/acore/deps/acelite/ace/Malloc_Allocator.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Allocator.h
rename to modules/acore/deps/acelite/ace/Malloc_Allocator.h
diff --git a/modules/dep/acelite/ace/Malloc_Allocator.inl b/modules/acore/deps/acelite/ace/Malloc_Allocator.inl
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Allocator.inl
rename to modules/acore/deps/acelite/ace/Malloc_Allocator.inl
diff --git a/modules/dep/acelite/ace/Malloc_Base.h b/modules/acore/deps/acelite/ace/Malloc_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Base.h
rename to modules/acore/deps/acelite/ace/Malloc_Base.h
diff --git a/modules/dep/acelite/ace/Malloc_T.cpp b/modules/acore/deps/acelite/ace/Malloc_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_T.cpp
rename to modules/acore/deps/acelite/ace/Malloc_T.cpp
diff --git a/modules/dep/acelite/ace/Malloc_T.h b/modules/acore/deps/acelite/ace/Malloc_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_T.h
rename to modules/acore/deps/acelite/ace/Malloc_T.h
diff --git a/modules/dep/acelite/ace/Malloc_T.inl b/modules/acore/deps/acelite/ace/Malloc_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_T.inl
rename to modules/acore/deps/acelite/ace/Malloc_T.inl
diff --git a/modules/dep/acelite/ace/Managed_Object.cpp b/modules/acore/deps/acelite/ace/Managed_Object.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Managed_Object.cpp
rename to modules/acore/deps/acelite/ace/Managed_Object.cpp
diff --git a/modules/dep/acelite/ace/Managed_Object.h b/modules/acore/deps/acelite/ace/Managed_Object.h
similarity index 100%
rename from modules/dep/acelite/ace/Managed_Object.h
rename to modules/acore/deps/acelite/ace/Managed_Object.h
diff --git a/modules/dep/acelite/ace/Managed_Object.inl b/modules/acore/deps/acelite/ace/Managed_Object.inl
similarity index 100%
rename from modules/dep/acelite/ace/Managed_Object.inl
rename to modules/acore/deps/acelite/ace/Managed_Object.inl
diff --git a/modules/dep/acelite/ace/Manual_Event.cpp b/modules/acore/deps/acelite/ace/Manual_Event.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Manual_Event.cpp
rename to modules/acore/deps/acelite/ace/Manual_Event.cpp
diff --git a/modules/dep/acelite/ace/Manual_Event.h b/modules/acore/deps/acelite/ace/Manual_Event.h
similarity index 100%
rename from modules/dep/acelite/ace/Manual_Event.h
rename to modules/acore/deps/acelite/ace/Manual_Event.h
diff --git a/modules/dep/acelite/ace/Manual_Event.inl b/modules/acore/deps/acelite/ace/Manual_Event.inl
similarity index 100%
rename from modules/dep/acelite/ace/Manual_Event.inl
rename to modules/acore/deps/acelite/ace/Manual_Event.inl
diff --git a/modules/dep/acelite/ace/Map_Manager.cpp b/modules/acore/deps/acelite/ace/Map_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Map_Manager.cpp
rename to modules/acore/deps/acelite/ace/Map_Manager.cpp
diff --git a/modules/dep/acelite/ace/Map_Manager.h b/modules/acore/deps/acelite/ace/Map_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Map_Manager.h
rename to modules/acore/deps/acelite/ace/Map_Manager.h
diff --git a/modules/dep/acelite/ace/Map_Manager.inl b/modules/acore/deps/acelite/ace/Map_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Map_Manager.inl
rename to modules/acore/deps/acelite/ace/Map_Manager.inl
diff --git a/modules/dep/acelite/ace/Map_T.cpp b/modules/acore/deps/acelite/ace/Map_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Map_T.cpp
rename to modules/acore/deps/acelite/ace/Map_T.cpp
diff --git a/modules/dep/acelite/ace/Map_T.h b/modules/acore/deps/acelite/ace/Map_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Map_T.h
rename to modules/acore/deps/acelite/ace/Map_T.h
diff --git a/modules/dep/acelite/ace/Map_T.inl b/modules/acore/deps/acelite/ace/Map_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Map_T.inl
rename to modules/acore/deps/acelite/ace/Map_T.inl
diff --git a/modules/dep/acelite/ace/Mem_Map.cpp b/modules/acore/deps/acelite/ace/Mem_Map.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Mem_Map.cpp
rename to modules/acore/deps/acelite/ace/Mem_Map.cpp
diff --git a/modules/dep/acelite/ace/Mem_Map.h b/modules/acore/deps/acelite/ace/Mem_Map.h
similarity index 100%
rename from modules/dep/acelite/ace/Mem_Map.h
rename to modules/acore/deps/acelite/ace/Mem_Map.h
diff --git a/modules/dep/acelite/ace/Mem_Map.inl b/modules/acore/deps/acelite/ace/Mem_Map.inl
similarity index 100%
rename from modules/dep/acelite/ace/Mem_Map.inl
rename to modules/acore/deps/acelite/ace/Mem_Map.inl
diff --git a/modules/dep/acelite/ace/Memory_Pool.h b/modules/acore/deps/acelite/ace/Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Memory_Pool.h
rename to modules/acore/deps/acelite/ace/Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Message_Block.cpp b/modules/acore/deps/acelite/ace/Message_Block.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block.cpp
rename to modules/acore/deps/acelite/ace/Message_Block.cpp
diff --git a/modules/dep/acelite/ace/Message_Block.h b/modules/acore/deps/acelite/ace/Message_Block.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block.h
rename to modules/acore/deps/acelite/ace/Message_Block.h
diff --git a/modules/dep/acelite/ace/Message_Block.inl b/modules/acore/deps/acelite/ace/Message_Block.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block.inl
rename to modules/acore/deps/acelite/ace/Message_Block.inl
diff --git a/modules/dep/acelite/ace/Message_Block_T.cpp b/modules/acore/deps/acelite/ace/Message_Block_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block_T.cpp
rename to modules/acore/deps/acelite/ace/Message_Block_T.cpp
diff --git a/modules/dep/acelite/ace/Message_Block_T.h b/modules/acore/deps/acelite/ace/Message_Block_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block_T.h
rename to modules/acore/deps/acelite/ace/Message_Block_T.h
diff --git a/modules/dep/acelite/ace/Message_Block_T.inl b/modules/acore/deps/acelite/ace/Message_Block_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block_T.inl
rename to modules/acore/deps/acelite/ace/Message_Block_T.inl
diff --git a/modules/dep/acelite/ace/Message_Queue.cpp b/modules/acore/deps/acelite/ace/Message_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue.cpp
rename to modules/acore/deps/acelite/ace/Message_Queue.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue.h b/modules/acore/deps/acelite/ace/Message_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue.h
rename to modules/acore/deps/acelite/ace/Message_Queue.h
diff --git a/modules/dep/acelite/ace/Message_Queue.inl b/modules/acore/deps/acelite/ace/Message_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue.inl
rename to modules/acore/deps/acelite/ace/Message_Queue.inl
diff --git a/modules/dep/acelite/ace/Message_Queue_NT.cpp b/modules/acore/deps/acelite/ace/Message_Queue_NT.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_NT.cpp
rename to modules/acore/deps/acelite/ace/Message_Queue_NT.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue_NT.h b/modules/acore/deps/acelite/ace/Message_Queue_NT.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_NT.h
rename to modules/acore/deps/acelite/ace/Message_Queue_NT.h
diff --git a/modules/dep/acelite/ace/Message_Queue_NT.inl b/modules/acore/deps/acelite/ace/Message_Queue_NT.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_NT.inl
rename to modules/acore/deps/acelite/ace/Message_Queue_NT.inl
diff --git a/modules/dep/acelite/ace/Message_Queue_T.cpp b/modules/acore/deps/acelite/ace/Message_Queue_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_T.cpp
rename to modules/acore/deps/acelite/ace/Message_Queue_T.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue_T.h b/modules/acore/deps/acelite/ace/Message_Queue_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_T.h
rename to modules/acore/deps/acelite/ace/Message_Queue_T.h
diff --git a/modules/dep/acelite/ace/Message_Queue_Vx.cpp b/modules/acore/deps/acelite/ace/Message_Queue_Vx.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_Vx.cpp
rename to modules/acore/deps/acelite/ace/Message_Queue_Vx.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue_Vx.h b/modules/acore/deps/acelite/ace/Message_Queue_Vx.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_Vx.h
rename to modules/acore/deps/acelite/ace/Message_Queue_Vx.h
diff --git a/modules/dep/acelite/ace/Message_Queue_Vx.inl b/modules/acore/deps/acelite/ace/Message_Queue_Vx.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_Vx.inl
rename to modules/acore/deps/acelite/ace/Message_Queue_Vx.inl
diff --git a/modules/dep/acelite/ace/Method_Request.cpp b/modules/acore/deps/acelite/ace/Method_Request.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Method_Request.cpp
rename to modules/acore/deps/acelite/ace/Method_Request.cpp
diff --git a/modules/dep/acelite/ace/Method_Request.h b/modules/acore/deps/acelite/ace/Method_Request.h
similarity index 100%
rename from modules/dep/acelite/ace/Method_Request.h
rename to modules/acore/deps/acelite/ace/Method_Request.h
diff --git a/modules/dep/acelite/ace/Metrics_Cache.h b/modules/acore/deps/acelite/ace/Metrics_Cache.h
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache.h
rename to modules/acore/deps/acelite/ace/Metrics_Cache.h
diff --git a/modules/dep/acelite/ace/Metrics_Cache_T.cpp b/modules/acore/deps/acelite/ace/Metrics_Cache_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache_T.cpp
rename to modules/acore/deps/acelite/ace/Metrics_Cache_T.cpp
diff --git a/modules/dep/acelite/ace/Metrics_Cache_T.h b/modules/acore/deps/acelite/ace/Metrics_Cache_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache_T.h
rename to modules/acore/deps/acelite/ace/Metrics_Cache_T.h
diff --git a/modules/dep/acelite/ace/Metrics_Cache_T.inl b/modules/acore/deps/acelite/ace/Metrics_Cache_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache_T.inl
rename to modules/acore/deps/acelite/ace/Metrics_Cache_T.inl
diff --git a/modules/dep/acelite/ace/Min_Max.h b/modules/acore/deps/acelite/ace/Min_Max.h
similarity index 100%
rename from modules/dep/acelite/ace/Min_Max.h
rename to modules/acore/deps/acelite/ace/Min_Max.h
diff --git a/modules/dep/acelite/ace/Module.cpp b/modules/acore/deps/acelite/ace/Module.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Module.cpp
rename to modules/acore/deps/acelite/ace/Module.cpp
diff --git a/modules/dep/acelite/ace/Module.h b/modules/acore/deps/acelite/ace/Module.h
similarity index 100%
rename from modules/dep/acelite/ace/Module.h
rename to modules/acore/deps/acelite/ace/Module.h
diff --git a/modules/dep/acelite/ace/Module.inl b/modules/acore/deps/acelite/ace/Module.inl
similarity index 100%
rename from modules/dep/acelite/ace/Module.inl
rename to modules/acore/deps/acelite/ace/Module.inl
diff --git a/modules/dep/acelite/ace/Monitor_Admin.cpp b/modules/acore/deps/acelite/ace/Monitor_Admin.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Admin.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Admin.h b/modules/acore/deps/acelite/ace/Monitor_Admin.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin.h
rename to modules/acore/deps/acelite/ace/Monitor_Admin.h
diff --git a/modules/dep/acelite/ace/Monitor_Admin_Manager.cpp b/modules/acore/deps/acelite/ace/Monitor_Admin_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin_Manager.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Admin_Manager.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Admin_Manager.h b/modules/acore/deps/acelite/ace/Monitor_Admin_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin_Manager.h
rename to modules/acore/deps/acelite/ace/Monitor_Admin_Manager.h
diff --git a/modules/dep/acelite/ace/Monitor_Base.cpp b/modules/acore/deps/acelite/ace/Monitor_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Base.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Base.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Base.h b/modules/acore/deps/acelite/ace/Monitor_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Base.h
rename to modules/acore/deps/acelite/ace/Monitor_Base.h
diff --git a/modules/dep/acelite/ace/Monitor_Base.inl b/modules/acore/deps/acelite/ace/Monitor_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Base.inl
rename to modules/acore/deps/acelite/ace/Monitor_Base.inl
diff --git a/modules/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.h b/modules/acore/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Auto_Update_Starter.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h b/modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Interpreter.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Visitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Constraint_Visitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control.h b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control.mpc b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control.mpc
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control.mpc
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control.mpc
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control.vsd b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control.vsd
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control.vsd
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control.vsd
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control_export.h b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control_export.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control_export.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control_export.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control_utils.h b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control_utils.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control_utils.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Control_utils.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Group.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Group.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Group.h b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Group.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Group.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Group.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Query.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Query.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Query.h b/modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Query.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Query.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Monitor_Query.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Windows_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Windows_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Windows_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Windows_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/modules/acore/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h b/modules/acore/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
rename to modules/acore/deps/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control_Action.cpp b/modules/acore/deps/acelite/ace/Monitor_Control_Action.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Action.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control_Action.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control_Action.h b/modules/acore/deps/acelite/ace/Monitor_Control_Action.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Action.h
rename to modules/acore/deps/acelite/ace/Monitor_Control_Action.h
diff --git a/modules/dep/acelite/ace/Monitor_Control_Types.cpp b/modules/acore/deps/acelite/ace/Monitor_Control_Types.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Types.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Control_Types.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control_Types.h b/modules/acore/deps/acelite/ace/Monitor_Control_Types.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Types.h
rename to modules/acore/deps/acelite/ace/Monitor_Control_Types.h
diff --git a/modules/dep/acelite/ace/Monitor_Point_Registry.cpp b/modules/acore/deps/acelite/ace/Monitor_Point_Registry.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Point_Registry.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Point_Registry.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Point_Registry.h b/modules/acore/deps/acelite/ace/Monitor_Point_Registry.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Point_Registry.h
rename to modules/acore/deps/acelite/ace/Monitor_Point_Registry.h
diff --git a/modules/dep/acelite/ace/Monitor_Size.cpp b/modules/acore/deps/acelite/ace/Monitor_Size.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Size.cpp
rename to modules/acore/deps/acelite/ace/Monitor_Size.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Size.h b/modules/acore/deps/acelite/ace/Monitor_Size.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Size.h
rename to modules/acore/deps/acelite/ace/Monitor_Size.h
diff --git a/modules/dep/acelite/ace/Monotonic_Time_Policy.cpp b/modules/acore/deps/acelite/ace/Monotonic_Time_Policy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monotonic_Time_Policy.cpp
rename to modules/acore/deps/acelite/ace/Monotonic_Time_Policy.cpp
diff --git a/modules/dep/acelite/ace/Monotonic_Time_Policy.h b/modules/acore/deps/acelite/ace/Monotonic_Time_Policy.h
similarity index 100%
rename from modules/dep/acelite/ace/Monotonic_Time_Policy.h
rename to modules/acore/deps/acelite/ace/Monotonic_Time_Policy.h
diff --git a/modules/dep/acelite/ace/Monotonic_Time_Policy.inl b/modules/acore/deps/acelite/ace/Monotonic_Time_Policy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Monotonic_Time_Policy.inl
rename to modules/acore/deps/acelite/ace/Monotonic_Time_Policy.inl
diff --git a/modules/dep/acelite/ace/Msg_WFMO_Reactor.cpp b/modules/acore/deps/acelite/ace/Msg_WFMO_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Msg_WFMO_Reactor.cpp
rename to modules/acore/deps/acelite/ace/Msg_WFMO_Reactor.cpp
diff --git a/modules/dep/acelite/ace/Msg_WFMO_Reactor.h b/modules/acore/deps/acelite/ace/Msg_WFMO_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Msg_WFMO_Reactor.h
rename to modules/acore/deps/acelite/ace/Msg_WFMO_Reactor.h
diff --git a/modules/dep/acelite/ace/Msg_WFMO_Reactor.inl b/modules/acore/deps/acelite/ace/Msg_WFMO_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Msg_WFMO_Reactor.inl
rename to modules/acore/deps/acelite/ace/Msg_WFMO_Reactor.inl
diff --git a/modules/dep/acelite/ace/Multihomed_INET_Addr.cpp b/modules/acore/deps/acelite/ace/Multihomed_INET_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Multihomed_INET_Addr.cpp
rename to modules/acore/deps/acelite/ace/Multihomed_INET_Addr.cpp
diff --git a/modules/dep/acelite/ace/Multihomed_INET_Addr.h b/modules/acore/deps/acelite/ace/Multihomed_INET_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/Multihomed_INET_Addr.h
rename to modules/acore/deps/acelite/ace/Multihomed_INET_Addr.h
diff --git a/modules/dep/acelite/ace/Multihomed_INET_Addr.inl b/modules/acore/deps/acelite/ace/Multihomed_INET_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Multihomed_INET_Addr.inl
rename to modules/acore/deps/acelite/ace/Multihomed_INET_Addr.inl
diff --git a/modules/dep/acelite/ace/Mutex.cpp b/modules/acore/deps/acelite/ace/Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Mutex.cpp
rename to modules/acore/deps/acelite/ace/Mutex.cpp
diff --git a/modules/dep/acelite/ace/Mutex.h b/modules/acore/deps/acelite/ace/Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Mutex.h
rename to modules/acore/deps/acelite/ace/Mutex.h
diff --git a/modules/dep/acelite/ace/Mutex.inl b/modules/acore/deps/acelite/ace/Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Mutex.inl
rename to modules/acore/deps/acelite/ace/Mutex.inl
diff --git a/modules/dep/acelite/ace/NT_Service.cpp b/modules/acore/deps/acelite/ace/NT_Service.cpp
similarity index 100%
rename from modules/dep/acelite/ace/NT_Service.cpp
rename to modules/acore/deps/acelite/ace/NT_Service.cpp
diff --git a/modules/dep/acelite/ace/NT_Service.h b/modules/acore/deps/acelite/ace/NT_Service.h
similarity index 100%
rename from modules/dep/acelite/ace/NT_Service.h
rename to modules/acore/deps/acelite/ace/NT_Service.h
diff --git a/modules/dep/acelite/ace/NT_Service.inl b/modules/acore/deps/acelite/ace/NT_Service.inl
similarity index 100%
rename from modules/dep/acelite/ace/NT_Service.inl
rename to modules/acore/deps/acelite/ace/NT_Service.inl
diff --git a/modules/dep/acelite/ace/Name_Proxy.cpp b/modules/acore/deps/acelite/ace/Name_Proxy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Name_Proxy.cpp
rename to modules/acore/deps/acelite/ace/Name_Proxy.cpp
diff --git a/modules/dep/acelite/ace/Name_Proxy.h b/modules/acore/deps/acelite/ace/Name_Proxy.h
similarity index 100%
rename from modules/dep/acelite/ace/Name_Proxy.h
rename to modules/acore/deps/acelite/ace/Name_Proxy.h
diff --git a/modules/dep/acelite/ace/Name_Request_Reply.cpp b/modules/acore/deps/acelite/ace/Name_Request_Reply.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Name_Request_Reply.cpp
rename to modules/acore/deps/acelite/ace/Name_Request_Reply.cpp
diff --git a/modules/dep/acelite/ace/Name_Request_Reply.h b/modules/acore/deps/acelite/ace/Name_Request_Reply.h
similarity index 100%
rename from modules/dep/acelite/ace/Name_Request_Reply.h
rename to modules/acore/deps/acelite/ace/Name_Request_Reply.h
diff --git a/modules/dep/acelite/ace/Name_Space.cpp b/modules/acore/deps/acelite/ace/Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Name_Space.cpp
rename to modules/acore/deps/acelite/ace/Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Name_Space.h b/modules/acore/deps/acelite/ace/Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Name_Space.h
rename to modules/acore/deps/acelite/ace/Name_Space.h
diff --git a/modules/dep/acelite/ace/Naming_Context.cpp b/modules/acore/deps/acelite/ace/Naming_Context.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Naming_Context.cpp
rename to modules/acore/deps/acelite/ace/Naming_Context.cpp
diff --git a/modules/dep/acelite/ace/Naming_Context.h b/modules/acore/deps/acelite/ace/Naming_Context.h
similarity index 100%
rename from modules/dep/acelite/ace/Naming_Context.h
rename to modules/acore/deps/acelite/ace/Naming_Context.h
diff --git a/modules/dep/acelite/ace/Naming_Context.inl b/modules/acore/deps/acelite/ace/Naming_Context.inl
similarity index 100%
rename from modules/dep/acelite/ace/Naming_Context.inl
rename to modules/acore/deps/acelite/ace/Naming_Context.inl
diff --git a/modules/dep/acelite/ace/Netlink_Addr.cpp b/modules/acore/deps/acelite/ace/Netlink_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Netlink_Addr.cpp
rename to modules/acore/deps/acelite/ace/Netlink_Addr.cpp
diff --git a/modules/dep/acelite/ace/Netlink_Addr.h b/modules/acore/deps/acelite/ace/Netlink_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/Netlink_Addr.h
rename to modules/acore/deps/acelite/ace/Netlink_Addr.h
diff --git a/modules/dep/acelite/ace/Netlink_Addr.inl b/modules/acore/deps/acelite/ace/Netlink_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Netlink_Addr.inl
rename to modules/acore/deps/acelite/ace/Netlink_Addr.inl
diff --git a/modules/dep/acelite/ace/Node.cpp b/modules/acore/deps/acelite/ace/Node.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Node.cpp
rename to modules/acore/deps/acelite/ace/Node.cpp
diff --git a/modules/dep/acelite/ace/Node.h b/modules/acore/deps/acelite/ace/Node.h
similarity index 100%
rename from modules/dep/acelite/ace/Node.h
rename to modules/acore/deps/acelite/ace/Node.h
diff --git a/modules/dep/acelite/ace/Notification_Queue.cpp b/modules/acore/deps/acelite/ace/Notification_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Queue.cpp
rename to modules/acore/deps/acelite/ace/Notification_Queue.cpp
diff --git a/modules/dep/acelite/ace/Notification_Queue.h b/modules/acore/deps/acelite/ace/Notification_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Queue.h
rename to modules/acore/deps/acelite/ace/Notification_Queue.h
diff --git a/modules/dep/acelite/ace/Notification_Queue.inl b/modules/acore/deps/acelite/ace/Notification_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Queue.inl
rename to modules/acore/deps/acelite/ace/Notification_Queue.inl
diff --git a/modules/dep/acelite/ace/Notification_Strategy.cpp b/modules/acore/deps/acelite/ace/Notification_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Strategy.cpp
rename to modules/acore/deps/acelite/ace/Notification_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Notification_Strategy.h b/modules/acore/deps/acelite/ace/Notification_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Strategy.h
rename to modules/acore/deps/acelite/ace/Notification_Strategy.h
diff --git a/modules/dep/acelite/ace/Notification_Strategy.inl b/modules/acore/deps/acelite/ace/Notification_Strategy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Strategy.inl
rename to modules/acore/deps/acelite/ace/Notification_Strategy.inl
diff --git a/modules/dep/acelite/ace/Null_Barrier.h b/modules/acore/deps/acelite/ace/Null_Barrier.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Barrier.h
rename to modules/acore/deps/acelite/ace/Null_Barrier.h
diff --git a/modules/dep/acelite/ace/Null_Condition.h b/modules/acore/deps/acelite/ace/Null_Condition.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Condition.h
rename to modules/acore/deps/acelite/ace/Null_Condition.h
diff --git a/modules/dep/acelite/ace/Null_Mutex.h b/modules/acore/deps/acelite/ace/Null_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Mutex.h
rename to modules/acore/deps/acelite/ace/Null_Mutex.h
diff --git a/modules/dep/acelite/ace/Null_Semaphore.h b/modules/acore/deps/acelite/ace/Null_Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Semaphore.h
rename to modules/acore/deps/acelite/ace/Null_Semaphore.h
diff --git a/modules/dep/acelite/ace/Numeric_Limits.h b/modules/acore/deps/acelite/ace/Numeric_Limits.h
similarity index 100%
rename from modules/dep/acelite/ace/Numeric_Limits.h
rename to modules/acore/deps/acelite/ace/Numeric_Limits.h
diff --git a/modules/dep/acelite/ace/OS.h b/modules/acore/deps/acelite/ace/OS.h
similarity index 100%
rename from modules/dep/acelite/ace/OS.h
rename to modules/acore/deps/acelite/ace/OS.h
diff --git a/modules/dep/acelite/ace/OS_Errno.cpp b/modules/acore/deps/acelite/ace/OS_Errno.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_Errno.cpp
rename to modules/acore/deps/acelite/ace/OS_Errno.cpp
diff --git a/modules/dep/acelite/ace/OS_Errno.h b/modules/acore/deps/acelite/ace/OS_Errno.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Errno.h
rename to modules/acore/deps/acelite/ace/OS_Errno.h
diff --git a/modules/dep/acelite/ace/OS_Errno.inl b/modules/acore/deps/acelite/ace/OS_Errno.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_Errno.inl
rename to modules/acore/deps/acelite/ace/OS_Errno.inl
diff --git a/modules/dep/acelite/ace/OS_Log_Msg_Attributes.cpp b/modules/acore/deps/acelite/ace/OS_Log_Msg_Attributes.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_Log_Msg_Attributes.cpp
rename to modules/acore/deps/acelite/ace/OS_Log_Msg_Attributes.cpp
diff --git a/modules/dep/acelite/ace/OS_Log_Msg_Attributes.h b/modules/acore/deps/acelite/ace/OS_Log_Msg_Attributes.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Log_Msg_Attributes.h
rename to modules/acore/deps/acelite/ace/OS_Log_Msg_Attributes.h
diff --git a/modules/dep/acelite/ace/OS_Log_Msg_Attributes.inl b/modules/acore/deps/acelite/ace/OS_Log_Msg_Attributes.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_Log_Msg_Attributes.inl
rename to modules/acore/deps/acelite/ace/OS_Log_Msg_Attributes.inl
diff --git a/modules/dep/acelite/ace/OS_Memory.h b/modules/acore/deps/acelite/ace/OS_Memory.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Memory.h
rename to modules/acore/deps/acelite/ace/OS_Memory.h
diff --git a/modules/dep/acelite/ace/OS_NS_Thread.cpp b/modules/acore/deps/acelite/ace/OS_NS_Thread.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_Thread.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_Thread.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_Thread.h b/modules/acore/deps/acelite/ace/OS_NS_Thread.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_Thread.h
rename to modules/acore/deps/acelite/ace/OS_NS_Thread.h
diff --git a/modules/dep/acelite/ace/OS_NS_Thread.inl b/modules/acore/deps/acelite/ace/OS_NS_Thread.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_Thread.inl
rename to modules/acore/deps/acelite/ace/OS_NS_Thread.inl
diff --git a/modules/dep/acelite/ace/OS_NS_arpa_inet.cpp b/modules/acore/deps/acelite/ace/OS_NS_arpa_inet.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_arpa_inet.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_arpa_inet.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_arpa_inet.h b/modules/acore/deps/acelite/ace/OS_NS_arpa_inet.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_arpa_inet.h
rename to modules/acore/deps/acelite/ace/OS_NS_arpa_inet.h
diff --git a/modules/dep/acelite/ace/OS_NS_arpa_inet.inl b/modules/acore/deps/acelite/ace/OS_NS_arpa_inet.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_arpa_inet.inl
rename to modules/acore/deps/acelite/ace/OS_NS_arpa_inet.inl
diff --git a/modules/dep/acelite/ace/OS_NS_ctype.cpp b/modules/acore/deps/acelite/ace/OS_NS_ctype.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_ctype.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_ctype.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_ctype.h b/modules/acore/deps/acelite/ace/OS_NS_ctype.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_ctype.h
rename to modules/acore/deps/acelite/ace/OS_NS_ctype.h
diff --git a/modules/dep/acelite/ace/OS_NS_ctype.inl b/modules/acore/deps/acelite/ace/OS_NS_ctype.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_ctype.inl
rename to modules/acore/deps/acelite/ace/OS_NS_ctype.inl
diff --git a/modules/dep/acelite/ace/OS_NS_dirent.cpp b/modules/acore/deps/acelite/ace/OS_NS_dirent.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dirent.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_dirent.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_dirent.h b/modules/acore/deps/acelite/ace/OS_NS_dirent.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dirent.h
rename to modules/acore/deps/acelite/ace/OS_NS_dirent.h
diff --git a/modules/dep/acelite/ace/OS_NS_dirent.inl b/modules/acore/deps/acelite/ace/OS_NS_dirent.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dirent.inl
rename to modules/acore/deps/acelite/ace/OS_NS_dirent.inl
diff --git a/modules/dep/acelite/ace/OS_NS_dlfcn.cpp b/modules/acore/deps/acelite/ace/OS_NS_dlfcn.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dlfcn.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_dlfcn.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_dlfcn.h b/modules/acore/deps/acelite/ace/OS_NS_dlfcn.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dlfcn.h
rename to modules/acore/deps/acelite/ace/OS_NS_dlfcn.h
diff --git a/modules/dep/acelite/ace/OS_NS_dlfcn.inl b/modules/acore/deps/acelite/ace/OS_NS_dlfcn.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dlfcn.inl
rename to modules/acore/deps/acelite/ace/OS_NS_dlfcn.inl
diff --git a/modules/dep/acelite/ace/OS_NS_errno.cpp b/modules/acore/deps/acelite/ace/OS_NS_errno.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_errno.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_errno.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_errno.h b/modules/acore/deps/acelite/ace/OS_NS_errno.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_errno.h
rename to modules/acore/deps/acelite/ace/OS_NS_errno.h
diff --git a/modules/dep/acelite/ace/OS_NS_errno.inl b/modules/acore/deps/acelite/ace/OS_NS_errno.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_errno.inl
rename to modules/acore/deps/acelite/ace/OS_NS_errno.inl
diff --git a/modules/dep/acelite/ace/OS_NS_fcntl.cpp b/modules/acore/deps/acelite/ace/OS_NS_fcntl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_fcntl.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_fcntl.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_fcntl.h b/modules/acore/deps/acelite/ace/OS_NS_fcntl.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_fcntl.h
rename to modules/acore/deps/acelite/ace/OS_NS_fcntl.h
diff --git a/modules/dep/acelite/ace/OS_NS_fcntl.inl b/modules/acore/deps/acelite/ace/OS_NS_fcntl.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_fcntl.inl
rename to modules/acore/deps/acelite/ace/OS_NS_fcntl.inl
diff --git a/modules/dep/acelite/ace/OS_NS_macros.h b/modules/acore/deps/acelite/ace/OS_NS_macros.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_macros.h
rename to modules/acore/deps/acelite/ace/OS_NS_macros.h
diff --git a/modules/dep/acelite/ace/OS_NS_math.cpp b/modules/acore/deps/acelite/ace/OS_NS_math.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_math.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_math.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_math.h b/modules/acore/deps/acelite/ace/OS_NS_math.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_math.h
rename to modules/acore/deps/acelite/ace/OS_NS_math.h
diff --git a/modules/dep/acelite/ace/OS_NS_math.inl b/modules/acore/deps/acelite/ace/OS_NS_math.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_math.inl
rename to modules/acore/deps/acelite/ace/OS_NS_math.inl
diff --git a/modules/dep/acelite/ace/OS_NS_netdb.cpp b/modules/acore/deps/acelite/ace/OS_NS_netdb.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_netdb.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_netdb.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_netdb.h b/modules/acore/deps/acelite/ace/OS_NS_netdb.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_netdb.h
rename to modules/acore/deps/acelite/ace/OS_NS_netdb.h
diff --git a/modules/dep/acelite/ace/OS_NS_netdb.inl b/modules/acore/deps/acelite/ace/OS_NS_netdb.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_netdb.inl
rename to modules/acore/deps/acelite/ace/OS_NS_netdb.inl
diff --git a/modules/dep/acelite/ace/OS_NS_poll.cpp b/modules/acore/deps/acelite/ace/OS_NS_poll.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_poll.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_poll.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_poll.h b/modules/acore/deps/acelite/ace/OS_NS_poll.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_poll.h
rename to modules/acore/deps/acelite/ace/OS_NS_poll.h
diff --git a/modules/dep/acelite/ace/OS_NS_poll.inl b/modules/acore/deps/acelite/ace/OS_NS_poll.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_poll.inl
rename to modules/acore/deps/acelite/ace/OS_NS_poll.inl
diff --git a/modules/dep/acelite/ace/OS_NS_pwd.cpp b/modules/acore/deps/acelite/ace/OS_NS_pwd.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_pwd.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_pwd.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_pwd.h b/modules/acore/deps/acelite/ace/OS_NS_pwd.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_pwd.h
rename to modules/acore/deps/acelite/ace/OS_NS_pwd.h
diff --git a/modules/dep/acelite/ace/OS_NS_pwd.inl b/modules/acore/deps/acelite/ace/OS_NS_pwd.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_pwd.inl
rename to modules/acore/deps/acelite/ace/OS_NS_pwd.inl
diff --git a/modules/dep/acelite/ace/OS_NS_regex.cpp b/modules/acore/deps/acelite/ace/OS_NS_regex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_regex.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_regex.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_regex.h b/modules/acore/deps/acelite/ace/OS_NS_regex.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_regex.h
rename to modules/acore/deps/acelite/ace/OS_NS_regex.h
diff --git a/modules/dep/acelite/ace/OS_NS_regex.inl b/modules/acore/deps/acelite/ace/OS_NS_regex.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_regex.inl
rename to modules/acore/deps/acelite/ace/OS_NS_regex.inl
diff --git a/modules/dep/acelite/ace/OS_NS_signal.cpp b/modules/acore/deps/acelite/ace/OS_NS_signal.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_signal.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_signal.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_signal.h b/modules/acore/deps/acelite/ace/OS_NS_signal.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_signal.h
rename to modules/acore/deps/acelite/ace/OS_NS_signal.h
diff --git a/modules/dep/acelite/ace/OS_NS_signal.inl b/modules/acore/deps/acelite/ace/OS_NS_signal.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_signal.inl
rename to modules/acore/deps/acelite/ace/OS_NS_signal.inl
diff --git a/modules/dep/acelite/ace/OS_NS_stdio.cpp b/modules/acore/deps/acelite/ace/OS_NS_stdio.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdio.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_stdio.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_stdio.h b/modules/acore/deps/acelite/ace/OS_NS_stdio.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdio.h
rename to modules/acore/deps/acelite/ace/OS_NS_stdio.h
diff --git a/modules/dep/acelite/ace/OS_NS_stdio.inl b/modules/acore/deps/acelite/ace/OS_NS_stdio.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdio.inl
rename to modules/acore/deps/acelite/ace/OS_NS_stdio.inl
diff --git a/modules/dep/acelite/ace/OS_NS_stdlib.cpp b/modules/acore/deps/acelite/ace/OS_NS_stdlib.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdlib.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_stdlib.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_stdlib.h b/modules/acore/deps/acelite/ace/OS_NS_stdlib.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdlib.h
rename to modules/acore/deps/acelite/ace/OS_NS_stdlib.h
diff --git a/modules/dep/acelite/ace/OS_NS_stdlib.inl b/modules/acore/deps/acelite/ace/OS_NS_stdlib.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdlib.inl
rename to modules/acore/deps/acelite/ace/OS_NS_stdlib.inl
diff --git a/modules/dep/acelite/ace/OS_NS_string.cpp b/modules/acore/deps/acelite/ace/OS_NS_string.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_string.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_string.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_string.h b/modules/acore/deps/acelite/ace/OS_NS_string.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_string.h
rename to modules/acore/deps/acelite/ace/OS_NS_string.h
diff --git a/modules/dep/acelite/ace/OS_NS_string.inl b/modules/acore/deps/acelite/ace/OS_NS_string.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_string.inl
rename to modules/acore/deps/acelite/ace/OS_NS_string.inl
diff --git a/modules/dep/acelite/ace/OS_NS_strings.cpp b/modules/acore/deps/acelite/ace/OS_NS_strings.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_strings.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_strings.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_strings.h b/modules/acore/deps/acelite/ace/OS_NS_strings.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_strings.h
rename to modules/acore/deps/acelite/ace/OS_NS_strings.h
diff --git a/modules/dep/acelite/ace/OS_NS_strings.inl b/modules/acore/deps/acelite/ace/OS_NS_strings.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_strings.inl
rename to modules/acore/deps/acelite/ace/OS_NS_strings.inl
diff --git a/modules/dep/acelite/ace/OS_NS_stropts.cpp b/modules/acore/deps/acelite/ace/OS_NS_stropts.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stropts.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_stropts.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_stropts.h b/modules/acore/deps/acelite/ace/OS_NS_stropts.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stropts.h
rename to modules/acore/deps/acelite/ace/OS_NS_stropts.h
diff --git a/modules/dep/acelite/ace/OS_NS_stropts.inl b/modules/acore/deps/acelite/ace/OS_NS_stropts.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stropts.inl
rename to modules/acore/deps/acelite/ace/OS_NS_stropts.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_mman.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_mman.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_mman.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_mman.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_mman.h b/modules/acore/deps/acelite/ace/OS_NS_sys_mman.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_mman.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_mman.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_mman.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_mman.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_mman.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_mman.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_msg.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_msg.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_msg.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_msg.h b/modules/acore/deps/acelite/ace/OS_NS_sys_msg.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_msg.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_msg.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_msg.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_msg.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_msg.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_resource.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_resource.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_resource.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_resource.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_resource.h b/modules/acore/deps/acelite/ace/OS_NS_sys_resource.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_resource.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_resource.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_resource.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_resource.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_resource.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_resource.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_select.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_select.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_select.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_select.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_select.h b/modules/acore/deps/acelite/ace/OS_NS_sys_select.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_select.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_select.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_select.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_select.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_select.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_select.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_sendfile.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_sendfile.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_sendfile.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_sendfile.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_sendfile.h b/modules/acore/deps/acelite/ace/OS_NS_sys_sendfile.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_sendfile.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_sendfile.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_sendfile.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_sendfile.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_sendfile.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_sendfile.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_shm.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_shm.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_shm.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_shm.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_shm.h b/modules/acore/deps/acelite/ace/OS_NS_sys_shm.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_shm.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_shm.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_shm.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_shm.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_shm.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_shm.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_socket.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_socket.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_socket.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_socket.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_socket.h b/modules/acore/deps/acelite/ace/OS_NS_sys_socket.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_socket.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_socket.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_socket.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_socket.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_socket.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_socket.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_stat.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_stat.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_stat.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_stat.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_stat.h b/modules/acore/deps/acelite/ace/OS_NS_sys_stat.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_stat.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_stat.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_stat.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_stat.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_stat.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_stat.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_time.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_time.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_time.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_time.h b/modules/acore/deps/acelite/ace/OS_NS_sys_time.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_time.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_time.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_time.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_time.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_time.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_time.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_uio.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_uio.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_uio.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_uio.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_uio.h b/modules/acore/deps/acelite/ace/OS_NS_sys_uio.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_uio.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_uio.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_uio.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_uio.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_uio.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_uio.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_utsname.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_utsname.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_utsname.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_utsname.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_utsname.h b/modules/acore/deps/acelite/ace/OS_NS_sys_utsname.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_utsname.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_utsname.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_wait.cpp b/modules/acore/deps/acelite/ace/OS_NS_sys_wait.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_wait.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_sys_wait.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_wait.h b/modules/acore/deps/acelite/ace/OS_NS_sys_wait.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_wait.h
rename to modules/acore/deps/acelite/ace/OS_NS_sys_wait.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_wait.inl b/modules/acore/deps/acelite/ace/OS_NS_sys_wait.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_wait.inl
rename to modules/acore/deps/acelite/ace/OS_NS_sys_wait.inl
diff --git a/modules/dep/acelite/ace/OS_NS_time.cpp b/modules/acore/deps/acelite/ace/OS_NS_time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_time.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_time.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_time.h b/modules/acore/deps/acelite/ace/OS_NS_time.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_time.h
rename to modules/acore/deps/acelite/ace/OS_NS_time.h
diff --git a/modules/dep/acelite/ace/OS_NS_time.inl b/modules/acore/deps/acelite/ace/OS_NS_time.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_time.inl
rename to modules/acore/deps/acelite/ace/OS_NS_time.inl
diff --git a/modules/dep/acelite/ace/OS_NS_unistd.cpp b/modules/acore/deps/acelite/ace/OS_NS_unistd.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_unistd.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_unistd.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_unistd.h b/modules/acore/deps/acelite/ace/OS_NS_unistd.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_unistd.h
rename to modules/acore/deps/acelite/ace/OS_NS_unistd.h
diff --git a/modules/dep/acelite/ace/OS_NS_unistd.inl b/modules/acore/deps/acelite/ace/OS_NS_unistd.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_unistd.inl
rename to modules/acore/deps/acelite/ace/OS_NS_unistd.inl
diff --git a/modules/dep/acelite/ace/OS_NS_wchar.cpp b/modules/acore/deps/acelite/ace/OS_NS_wchar.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wchar.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_wchar.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_wchar.h b/modules/acore/deps/acelite/ace/OS_NS_wchar.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wchar.h
rename to modules/acore/deps/acelite/ace/OS_NS_wchar.h
diff --git a/modules/dep/acelite/ace/OS_NS_wchar.inl b/modules/acore/deps/acelite/ace/OS_NS_wchar.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wchar.inl
rename to modules/acore/deps/acelite/ace/OS_NS_wchar.inl
diff --git a/modules/dep/acelite/ace/OS_NS_wctype.cpp b/modules/acore/deps/acelite/ace/OS_NS_wctype.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wctype.cpp
rename to modules/acore/deps/acelite/ace/OS_NS_wctype.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_wctype.h b/modules/acore/deps/acelite/ace/OS_NS_wctype.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wctype.h
rename to modules/acore/deps/acelite/ace/OS_NS_wctype.h
diff --git a/modules/dep/acelite/ace/OS_NS_wctype.inl b/modules/acore/deps/acelite/ace/OS_NS_wctype.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wctype.inl
rename to modules/acore/deps/acelite/ace/OS_NS_wctype.inl
diff --git a/modules/dep/acelite/ace/OS_QoS.cpp b/modules/acore/deps/acelite/ace/OS_QoS.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_QoS.cpp
rename to modules/acore/deps/acelite/ace/OS_QoS.cpp
diff --git a/modules/dep/acelite/ace/OS_QoS.h b/modules/acore/deps/acelite/ace/OS_QoS.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_QoS.h
rename to modules/acore/deps/acelite/ace/OS_QoS.h
diff --git a/modules/dep/acelite/ace/OS_TLI.cpp b/modules/acore/deps/acelite/ace/OS_TLI.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_TLI.cpp
rename to modules/acore/deps/acelite/ace/OS_TLI.cpp
diff --git a/modules/dep/acelite/ace/OS_TLI.h b/modules/acore/deps/acelite/ace/OS_TLI.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_TLI.h
rename to modules/acore/deps/acelite/ace/OS_TLI.h
diff --git a/modules/dep/acelite/ace/OS_TLI.inl b/modules/acore/deps/acelite/ace/OS_TLI.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_TLI.inl
rename to modules/acore/deps/acelite/ace/OS_TLI.inl
diff --git a/modules/dep/acelite/ace/OS_Thread_Adapter.cpp b/modules/acore/deps/acelite/ace/OS_Thread_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_Thread_Adapter.cpp
rename to modules/acore/deps/acelite/ace/OS_Thread_Adapter.cpp
diff --git a/modules/dep/acelite/ace/OS_Thread_Adapter.h b/modules/acore/deps/acelite/ace/OS_Thread_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Thread_Adapter.h
rename to modules/acore/deps/acelite/ace/OS_Thread_Adapter.h
diff --git a/modules/dep/acelite/ace/OS_main.cpp b/modules/acore/deps/acelite/ace/OS_main.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_main.cpp
rename to modules/acore/deps/acelite/ace/OS_main.cpp
diff --git a/modules/dep/acelite/ace/OS_main.h b/modules/acore/deps/acelite/ace/OS_main.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_main.h
rename to modules/acore/deps/acelite/ace/OS_main.h
diff --git a/modules/dep/acelite/ace/Obchunk.cpp b/modules/acore/deps/acelite/ace/Obchunk.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Obchunk.cpp
rename to modules/acore/deps/acelite/ace/Obchunk.cpp
diff --git a/modules/dep/acelite/ace/Obchunk.h b/modules/acore/deps/acelite/ace/Obchunk.h
similarity index 100%
rename from modules/dep/acelite/ace/Obchunk.h
rename to modules/acore/deps/acelite/ace/Obchunk.h
diff --git a/modules/dep/acelite/ace/Obchunk.inl b/modules/acore/deps/acelite/ace/Obchunk.inl
similarity index 100%
rename from modules/dep/acelite/ace/Obchunk.inl
rename to modules/acore/deps/acelite/ace/Obchunk.inl
diff --git a/modules/dep/acelite/ace/Object_Manager.cpp b/modules/acore/deps/acelite/ace/Object_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager.cpp
rename to modules/acore/deps/acelite/ace/Object_Manager.cpp
diff --git a/modules/dep/acelite/ace/Object_Manager.h b/modules/acore/deps/acelite/ace/Object_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager.h
rename to modules/acore/deps/acelite/ace/Object_Manager.h
diff --git a/modules/dep/acelite/ace/Object_Manager.inl b/modules/acore/deps/acelite/ace/Object_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager.inl
rename to modules/acore/deps/acelite/ace/Object_Manager.inl
diff --git a/modules/dep/acelite/ace/Object_Manager_Base.cpp b/modules/acore/deps/acelite/ace/Object_Manager_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager_Base.cpp
rename to modules/acore/deps/acelite/ace/Object_Manager_Base.cpp
diff --git a/modules/dep/acelite/ace/Object_Manager_Base.h b/modules/acore/deps/acelite/ace/Object_Manager_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager_Base.h
rename to modules/acore/deps/acelite/ace/Object_Manager_Base.h
diff --git a/modules/dep/acelite/ace/Obstack.cpp b/modules/acore/deps/acelite/ace/Obstack.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Obstack.cpp
rename to modules/acore/deps/acelite/ace/Obstack.cpp
diff --git a/modules/dep/acelite/ace/Obstack.h b/modules/acore/deps/acelite/ace/Obstack.h
similarity index 100%
rename from modules/dep/acelite/ace/Obstack.h
rename to modules/acore/deps/acelite/ace/Obstack.h
diff --git a/modules/dep/acelite/ace/Obstack_T.cpp b/modules/acore/deps/acelite/ace/Obstack_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Obstack_T.cpp
rename to modules/acore/deps/acelite/ace/Obstack_T.cpp
diff --git a/modules/dep/acelite/ace/Obstack_T.h b/modules/acore/deps/acelite/ace/Obstack_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Obstack_T.h
rename to modules/acore/deps/acelite/ace/Obstack_T.h
diff --git a/modules/dep/acelite/ace/Obstack_T.inl b/modules/acore/deps/acelite/ace/Obstack_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Obstack_T.inl
rename to modules/acore/deps/acelite/ace/Obstack_T.inl
diff --git a/modules/dep/acelite/ace/PI_Malloc.cpp b/modules/acore/deps/acelite/ace/PI_Malloc.cpp
similarity index 100%
rename from modules/dep/acelite/ace/PI_Malloc.cpp
rename to modules/acore/deps/acelite/ace/PI_Malloc.cpp
diff --git a/modules/dep/acelite/ace/PI_Malloc.h b/modules/acore/deps/acelite/ace/PI_Malloc.h
similarity index 100%
rename from modules/dep/acelite/ace/PI_Malloc.h
rename to modules/acore/deps/acelite/ace/PI_Malloc.h
diff --git a/modules/dep/acelite/ace/PI_Malloc.inl b/modules/acore/deps/acelite/ace/PI_Malloc.inl
similarity index 100%
rename from modules/dep/acelite/ace/PI_Malloc.inl
rename to modules/acore/deps/acelite/ace/PI_Malloc.inl
diff --git a/modules/dep/acelite/ace/POSIX_Asynch_IO.cpp b/modules/acore/deps/acelite/ace/POSIX_Asynch_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Asynch_IO.cpp
rename to modules/acore/deps/acelite/ace/POSIX_Asynch_IO.cpp
diff --git a/modules/dep/acelite/ace/POSIX_Asynch_IO.h b/modules/acore/deps/acelite/ace/POSIX_Asynch_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Asynch_IO.h
rename to modules/acore/deps/acelite/ace/POSIX_Asynch_IO.h
diff --git a/modules/dep/acelite/ace/POSIX_CB_Proactor.cpp b/modules/acore/deps/acelite/ace/POSIX_CB_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_CB_Proactor.cpp
rename to modules/acore/deps/acelite/ace/POSIX_CB_Proactor.cpp
diff --git a/modules/dep/acelite/ace/POSIX_CB_Proactor.h b/modules/acore/deps/acelite/ace/POSIX_CB_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_CB_Proactor.h
rename to modules/acore/deps/acelite/ace/POSIX_CB_Proactor.h
diff --git a/modules/dep/acelite/ace/POSIX_Proactor.cpp b/modules/acore/deps/acelite/ace/POSIX_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Proactor.cpp
rename to modules/acore/deps/acelite/ace/POSIX_Proactor.cpp
diff --git a/modules/dep/acelite/ace/POSIX_Proactor.h b/modules/acore/deps/acelite/ace/POSIX_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Proactor.h
rename to modules/acore/deps/acelite/ace/POSIX_Proactor.h
diff --git a/modules/dep/acelite/ace/POSIX_Proactor.inl b/modules/acore/deps/acelite/ace/POSIX_Proactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Proactor.inl
rename to modules/acore/deps/acelite/ace/POSIX_Proactor.inl
diff --git a/modules/dep/acelite/ace/Pagefile_Memory_Pool.cpp b/modules/acore/deps/acelite/ace/Pagefile_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Pagefile_Memory_Pool.cpp
rename to modules/acore/deps/acelite/ace/Pagefile_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Pagefile_Memory_Pool.h b/modules/acore/deps/acelite/ace/Pagefile_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Pagefile_Memory_Pool.h
rename to modules/acore/deps/acelite/ace/Pagefile_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Pagefile_Memory_Pool.inl b/modules/acore/deps/acelite/ace/Pagefile_Memory_Pool.inl
similarity index 100%
rename from modules/dep/acelite/ace/Pagefile_Memory_Pool.inl
rename to modules/acore/deps/acelite/ace/Pagefile_Memory_Pool.inl
diff --git a/modules/dep/acelite/ace/Pair_T.cpp b/modules/acore/deps/acelite/ace/Pair_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Pair_T.cpp
rename to modules/acore/deps/acelite/ace/Pair_T.cpp
diff --git a/modules/dep/acelite/ace/Pair_T.h b/modules/acore/deps/acelite/ace/Pair_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Pair_T.h
rename to modules/acore/deps/acelite/ace/Pair_T.h
diff --git a/modules/dep/acelite/ace/Pair_T.inl b/modules/acore/deps/acelite/ace/Pair_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Pair_T.inl
rename to modules/acore/deps/acelite/ace/Pair_T.inl
diff --git a/modules/dep/acelite/ace/Parse_Node.cpp b/modules/acore/deps/acelite/ace/Parse_Node.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Parse_Node.cpp
rename to modules/acore/deps/acelite/ace/Parse_Node.cpp
diff --git a/modules/dep/acelite/ace/Parse_Node.h b/modules/acore/deps/acelite/ace/Parse_Node.h
similarity index 100%
rename from modules/dep/acelite/ace/Parse_Node.h
rename to modules/acore/deps/acelite/ace/Parse_Node.h
diff --git a/modules/dep/acelite/ace/Ping_Socket.cpp b/modules/acore/deps/acelite/ace/Ping_Socket.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Ping_Socket.cpp
rename to modules/acore/deps/acelite/ace/Ping_Socket.cpp
diff --git a/modules/dep/acelite/ace/Ping_Socket.h b/modules/acore/deps/acelite/ace/Ping_Socket.h
similarity index 100%
rename from modules/dep/acelite/ace/Ping_Socket.h
rename to modules/acore/deps/acelite/ace/Ping_Socket.h
diff --git a/modules/dep/acelite/ace/Ping_Socket.inl b/modules/acore/deps/acelite/ace/Ping_Socket.inl
similarity index 100%
rename from modules/dep/acelite/ace/Ping_Socket.inl
rename to modules/acore/deps/acelite/ace/Ping_Socket.inl
diff --git a/modules/dep/acelite/ace/Pipe.cpp b/modules/acore/deps/acelite/ace/Pipe.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Pipe.cpp
rename to modules/acore/deps/acelite/ace/Pipe.cpp
diff --git a/modules/dep/acelite/ace/Pipe.h b/modules/acore/deps/acelite/ace/Pipe.h
similarity index 100%
rename from modules/dep/acelite/ace/Pipe.h
rename to modules/acore/deps/acelite/ace/Pipe.h
diff --git a/modules/dep/acelite/ace/Pipe.inl b/modules/acore/deps/acelite/ace/Pipe.inl
similarity index 100%
rename from modules/dep/acelite/ace/Pipe.inl
rename to modules/acore/deps/acelite/ace/Pipe.inl
diff --git a/modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/modules/acore/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
similarity index 100%
rename from modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
rename to modules/acore/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
diff --git a/modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h b/modules/acore/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
similarity index 100%
rename from modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h
rename to modules/acore/deps/acelite/ace/PrecompiledHeaders/WinAcePCH.h
diff --git a/modules/dep/acelite/ace/Priority_Reactor.cpp b/modules/acore/deps/acelite/ace/Priority_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Priority_Reactor.cpp
rename to modules/acore/deps/acelite/ace/Priority_Reactor.cpp
diff --git a/modules/dep/acelite/ace/Priority_Reactor.h b/modules/acore/deps/acelite/ace/Priority_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Priority_Reactor.h
rename to modules/acore/deps/acelite/ace/Priority_Reactor.h
diff --git a/modules/dep/acelite/ace/Proactor.cpp b/modules/acore/deps/acelite/ace/Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Proactor.cpp
rename to modules/acore/deps/acelite/ace/Proactor.cpp
diff --git a/modules/dep/acelite/ace/Proactor.h b/modules/acore/deps/acelite/ace/Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Proactor.h
rename to modules/acore/deps/acelite/ace/Proactor.h
diff --git a/modules/dep/acelite/ace/Proactor.inl b/modules/acore/deps/acelite/ace/Proactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Proactor.inl
rename to modules/acore/deps/acelite/ace/Proactor.inl
diff --git a/modules/dep/acelite/ace/Proactor_Impl.cpp b/modules/acore/deps/acelite/ace/Proactor_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Proactor_Impl.cpp
rename to modules/acore/deps/acelite/ace/Proactor_Impl.cpp
diff --git a/modules/dep/acelite/ace/Proactor_Impl.h b/modules/acore/deps/acelite/ace/Proactor_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/Proactor_Impl.h
rename to modules/acore/deps/acelite/ace/Proactor_Impl.h
diff --git a/modules/dep/acelite/ace/Process.cpp b/modules/acore/deps/acelite/ace/Process.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process.cpp
rename to modules/acore/deps/acelite/ace/Process.cpp
diff --git a/modules/dep/acelite/ace/Process.h b/modules/acore/deps/acelite/ace/Process.h
similarity index 100%
rename from modules/dep/acelite/ace/Process.h
rename to modules/acore/deps/acelite/ace/Process.h
diff --git a/modules/dep/acelite/ace/Process.inl b/modules/acore/deps/acelite/ace/Process.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process.inl
rename to modules/acore/deps/acelite/ace/Process.inl
diff --git a/modules/dep/acelite/ace/Process_Manager.cpp b/modules/acore/deps/acelite/ace/Process_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process_Manager.cpp
rename to modules/acore/deps/acelite/ace/Process_Manager.cpp
diff --git a/modules/dep/acelite/ace/Process_Manager.h b/modules/acore/deps/acelite/ace/Process_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Process_Manager.h
rename to modules/acore/deps/acelite/ace/Process_Manager.h
diff --git a/modules/dep/acelite/ace/Process_Manager.inl b/modules/acore/deps/acelite/ace/Process_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process_Manager.inl
rename to modules/acore/deps/acelite/ace/Process_Manager.inl
diff --git a/modules/dep/acelite/ace/Process_Mutex.cpp b/modules/acore/deps/acelite/ace/Process_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process_Mutex.cpp
rename to modules/acore/deps/acelite/ace/Process_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Process_Mutex.h b/modules/acore/deps/acelite/ace/Process_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Process_Mutex.h
rename to modules/acore/deps/acelite/ace/Process_Mutex.h
diff --git a/modules/dep/acelite/ace/Process_Mutex.inl b/modules/acore/deps/acelite/ace/Process_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process_Mutex.inl
rename to modules/acore/deps/acelite/ace/Process_Mutex.inl
diff --git a/modules/dep/acelite/ace/Process_Semaphore.cpp b/modules/acore/deps/acelite/ace/Process_Semaphore.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process_Semaphore.cpp
rename to modules/acore/deps/acelite/ace/Process_Semaphore.cpp
diff --git a/modules/dep/acelite/ace/Process_Semaphore.h b/modules/acore/deps/acelite/ace/Process_Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Process_Semaphore.h
rename to modules/acore/deps/acelite/ace/Process_Semaphore.h
diff --git a/modules/dep/acelite/ace/Process_Semaphore.inl b/modules/acore/deps/acelite/ace/Process_Semaphore.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process_Semaphore.inl
rename to modules/acore/deps/acelite/ace/Process_Semaphore.inl
diff --git a/modules/dep/acelite/ace/Profile_Timer.cpp b/modules/acore/deps/acelite/ace/Profile_Timer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Profile_Timer.cpp
rename to modules/acore/deps/acelite/ace/Profile_Timer.cpp
diff --git a/modules/dep/acelite/ace/Profile_Timer.h b/modules/acore/deps/acelite/ace/Profile_Timer.h
similarity index 100%
rename from modules/dep/acelite/ace/Profile_Timer.h
rename to modules/acore/deps/acelite/ace/Profile_Timer.h
diff --git a/modules/dep/acelite/ace/Profile_Timer.inl b/modules/acore/deps/acelite/ace/Profile_Timer.inl
similarity index 100%
rename from modules/dep/acelite/ace/Profile_Timer.inl
rename to modules/acore/deps/acelite/ace/Profile_Timer.inl
diff --git a/modules/dep/acelite/ace/QoS/ACE_QoS.pc.in b/modules/acore/deps/acelite/ace/QoS/ACE_QoS.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/QoS/ACE_QoS.pc.in
rename to modules/acore/deps/acelite/ace/QoS/ACE_QoS.pc.in
diff --git a/modules/dep/acelite/ace/QoS/ACE_QoS_Export.h b/modules/acore/deps/acelite/ace/QoS/ACE_QoS_Export.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/ACE_QoS_Export.h
rename to modules/acore/deps/acelite/ace/QoS/ACE_QoS_Export.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Decorator.cpp b/modules/acore/deps/acelite/ace/QoS/QoS_Decorator.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Decorator.cpp
rename to modules/acore/deps/acelite/ace/QoS/QoS_Decorator.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Decorator.h b/modules/acore/deps/acelite/ace/QoS/QoS_Decorator.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Decorator.h
rename to modules/acore/deps/acelite/ace/QoS/QoS_Decorator.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Manager.cpp b/modules/acore/deps/acelite/ace/QoS/QoS_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Manager.cpp
rename to modules/acore/deps/acelite/ace/QoS/QoS_Manager.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Manager.h b/modules/acore/deps/acelite/ace/QoS/QoS_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Manager.h
rename to modules/acore/deps/acelite/ace/QoS/QoS_Manager.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session.h b/modules/acore/deps/acelite/ace/QoS/QoS_Session.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session.h
rename to modules/acore/deps/acelite/ace/QoS/QoS_Session.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Factory.cpp b/modules/acore/deps/acelite/ace/QoS/QoS_Session_Factory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Factory.cpp
rename to modules/acore/deps/acelite/ace/QoS/QoS_Session_Factory.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Factory.h b/modules/acore/deps/acelite/ace/QoS/QoS_Session_Factory.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Factory.h
rename to modules/acore/deps/acelite/ace/QoS/QoS_Session_Factory.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Impl.cpp b/modules/acore/deps/acelite/ace/QoS/QoS_Session_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Impl.cpp
rename to modules/acore/deps/acelite/ace/QoS/QoS_Session_Impl.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Impl.h b/modules/acore/deps/acelite/ace/QoS/QoS_Session_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Impl.h
rename to modules/acore/deps/acelite/ace/QoS/QoS_Session_Impl.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Impl.inl b/modules/acore/deps/acelite/ace/QoS/QoS_Session_Impl.inl
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Impl.inl
rename to modules/acore/deps/acelite/ace/QoS/QoS_Session_Impl.inl
diff --git a/modules/dep/acelite/ace/QoS/README b/modules/acore/deps/acelite/ace/QoS/README
similarity index 100%
rename from modules/dep/acelite/ace/QoS/README
rename to modules/acore/deps/acelite/ace/QoS/README
diff --git a/modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/modules/acore/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
rename to modules/acore/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
diff --git a/modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/modules/acore/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
rename to modules/acore/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
diff --git a/modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl b/modules/acore/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
similarity index 100%
rename from modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
rename to modules/acore/deps/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
diff --git a/modules/dep/acelite/ace/QoS/qos.mpc b/modules/acore/deps/acelite/ace/QoS/qos.mpc
similarity index 100%
rename from modules/dep/acelite/ace/QoS/qos.mpc
rename to modules/acore/deps/acelite/ace/QoS/qos.mpc
diff --git a/modules/dep/acelite/ace/QtReactor/.gitignore b/modules/acore/deps/acelite/ace/QtReactor/.gitignore
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/.gitignore
rename to modules/acore/deps/acelite/ace/QtReactor/.gitignore
diff --git a/modules/dep/acelite/ace/QtReactor/ACE_QtReactor.pc.in b/modules/acore/deps/acelite/ace/QtReactor/ACE_QtReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/ACE_QtReactor.pc.in
rename to modules/acore/deps/acelite/ace/QtReactor/ACE_QtReactor.pc.in
diff --git a/modules/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h b/modules/acore/deps/acelite/ace/QtReactor/ACE_QtReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h
rename to modules/acore/deps/acelite/ace/QtReactor/ACE_QtReactor_export.h
diff --git a/modules/dep/acelite/ace/QtReactor/QtReactor.cpp b/modules/acore/deps/acelite/ace/QtReactor/QtReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/QtReactor.cpp
rename to modules/acore/deps/acelite/ace/QtReactor/QtReactor.cpp
diff --git a/modules/dep/acelite/ace/QtReactor/QtReactor.h b/modules/acore/deps/acelite/ace/QtReactor/QtReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/QtReactor.h
rename to modules/acore/deps/acelite/ace/QtReactor/QtReactor.h
diff --git a/modules/dep/acelite/ace/QtReactor/ace_qt4reactor.mpc b/modules/acore/deps/acelite/ace/QtReactor/ace_qt4reactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/ace_qt4reactor.mpc
rename to modules/acore/deps/acelite/ace/QtReactor/ace_qt4reactor.mpc
diff --git a/modules/dep/acelite/ace/RB_Tree.cpp b/modules/acore/deps/acelite/ace/RB_Tree.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RB_Tree.cpp
rename to modules/acore/deps/acelite/ace/RB_Tree.cpp
diff --git a/modules/dep/acelite/ace/RB_Tree.h b/modules/acore/deps/acelite/ace/RB_Tree.h
similarity index 100%
rename from modules/dep/acelite/ace/RB_Tree.h
rename to modules/acore/deps/acelite/ace/RB_Tree.h
diff --git a/modules/dep/acelite/ace/RB_Tree.inl b/modules/acore/deps/acelite/ace/RB_Tree.inl
similarity index 100%
rename from modules/dep/acelite/ace/RB_Tree.inl
rename to modules/acore/deps/acelite/ace/RB_Tree.inl
diff --git a/modules/dep/acelite/ace/README b/modules/acore/deps/acelite/ace/README
similarity index 100%
rename from modules/dep/acelite/ace/README
rename to modules/acore/deps/acelite/ace/README
diff --git a/modules/dep/acelite/ace/RW_Mutex.cpp b/modules/acore/deps/acelite/ace/RW_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RW_Mutex.cpp
rename to modules/acore/deps/acelite/ace/RW_Mutex.cpp
diff --git a/modules/dep/acelite/ace/RW_Mutex.h b/modules/acore/deps/acelite/ace/RW_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/RW_Mutex.h
rename to modules/acore/deps/acelite/ace/RW_Mutex.h
diff --git a/modules/dep/acelite/ace/RW_Mutex.inl b/modules/acore/deps/acelite/ace/RW_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/RW_Mutex.inl
rename to modules/acore/deps/acelite/ace/RW_Mutex.inl
diff --git a/modules/dep/acelite/ace/RW_Process_Mutex.cpp b/modules/acore/deps/acelite/ace/RW_Process_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RW_Process_Mutex.cpp
rename to modules/acore/deps/acelite/ace/RW_Process_Mutex.cpp
diff --git a/modules/dep/acelite/ace/RW_Process_Mutex.h b/modules/acore/deps/acelite/ace/RW_Process_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/RW_Process_Mutex.h
rename to modules/acore/deps/acelite/ace/RW_Process_Mutex.h
diff --git a/modules/dep/acelite/ace/RW_Process_Mutex.inl b/modules/acore/deps/acelite/ace/RW_Process_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/RW_Process_Mutex.inl
rename to modules/acore/deps/acelite/ace/RW_Process_Mutex.inl
diff --git a/modules/dep/acelite/ace/RW_Thread_Mutex.cpp b/modules/acore/deps/acelite/ace/RW_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RW_Thread_Mutex.cpp
rename to modules/acore/deps/acelite/ace/RW_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/RW_Thread_Mutex.h b/modules/acore/deps/acelite/ace/RW_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/RW_Thread_Mutex.h
rename to modules/acore/deps/acelite/ace/RW_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/RW_Thread_Mutex.inl b/modules/acore/deps/acelite/ace/RW_Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/RW_Thread_Mutex.inl
rename to modules/acore/deps/acelite/ace/RW_Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Reactor.cpp b/modules/acore/deps/acelite/ace/Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor.cpp
rename to modules/acore/deps/acelite/ace/Reactor.cpp
diff --git a/modules/dep/acelite/ace/Reactor.h b/modules/acore/deps/acelite/ace/Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor.h
rename to modules/acore/deps/acelite/ace/Reactor.h
diff --git a/modules/dep/acelite/ace/Reactor.inl b/modules/acore/deps/acelite/ace/Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Reactor.inl
rename to modules/acore/deps/acelite/ace/Reactor.inl
diff --git a/modules/dep/acelite/ace/Reactor_Impl.cpp b/modules/acore/deps/acelite/ace/Reactor_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Impl.cpp
rename to modules/acore/deps/acelite/ace/Reactor_Impl.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Impl.h b/modules/acore/deps/acelite/ace/Reactor_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Impl.h
rename to modules/acore/deps/acelite/ace/Reactor_Impl.h
diff --git a/modules/dep/acelite/ace/Reactor_Notification_Strategy.cpp b/modules/acore/deps/acelite/ace/Reactor_Notification_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Notification_Strategy.cpp
rename to modules/acore/deps/acelite/ace/Reactor_Notification_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Notification_Strategy.h b/modules/acore/deps/acelite/ace/Reactor_Notification_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Notification_Strategy.h
rename to modules/acore/deps/acelite/ace/Reactor_Notification_Strategy.h
diff --git a/modules/dep/acelite/ace/Reactor_Notification_Strategy.inl b/modules/acore/deps/acelite/ace/Reactor_Notification_Strategy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Notification_Strategy.inl
rename to modules/acore/deps/acelite/ace/Reactor_Notification_Strategy.inl
diff --git a/modules/dep/acelite/ace/Reactor_Timer_Interface.cpp b/modules/acore/deps/acelite/ace/Reactor_Timer_Interface.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Timer_Interface.cpp
rename to modules/acore/deps/acelite/ace/Reactor_Timer_Interface.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Timer_Interface.h b/modules/acore/deps/acelite/ace/Reactor_Timer_Interface.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Timer_Interface.h
rename to modules/acore/deps/acelite/ace/Reactor_Timer_Interface.h
diff --git a/modules/dep/acelite/ace/Reactor_Token_T.cpp b/modules/acore/deps/acelite/ace/Reactor_Token_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Token_T.cpp
rename to modules/acore/deps/acelite/ace/Reactor_Token_T.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Token_T.h b/modules/acore/deps/acelite/ace/Reactor_Token_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Token_T.h
rename to modules/acore/deps/acelite/ace/Reactor_Token_T.h
diff --git a/modules/dep/acelite/ace/Read_Buffer.cpp b/modules/acore/deps/acelite/ace/Read_Buffer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Read_Buffer.cpp
rename to modules/acore/deps/acelite/ace/Read_Buffer.cpp
diff --git a/modules/dep/acelite/ace/Read_Buffer.h b/modules/acore/deps/acelite/ace/Read_Buffer.h
similarity index 100%
rename from modules/dep/acelite/ace/Read_Buffer.h
rename to modules/acore/deps/acelite/ace/Read_Buffer.h
diff --git a/modules/dep/acelite/ace/Read_Buffer.inl b/modules/acore/deps/acelite/ace/Read_Buffer.inl
similarity index 100%
rename from modules/dep/acelite/ace/Read_Buffer.inl
rename to modules/acore/deps/acelite/ace/Read_Buffer.inl
diff --git a/modules/dep/acelite/ace/Recursive_Thread_Mutex.cpp b/modules/acore/deps/acelite/ace/Recursive_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Recursive_Thread_Mutex.cpp
rename to modules/acore/deps/acelite/ace/Recursive_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Recursive_Thread_Mutex.h b/modules/acore/deps/acelite/ace/Recursive_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Recursive_Thread_Mutex.h
rename to modules/acore/deps/acelite/ace/Recursive_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Recursive_Thread_Mutex.inl b/modules/acore/deps/acelite/ace/Recursive_Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Recursive_Thread_Mutex.inl
rename to modules/acore/deps/acelite/ace/Recursive_Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Recyclable.cpp b/modules/acore/deps/acelite/ace/Recyclable.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Recyclable.cpp
rename to modules/acore/deps/acelite/ace/Recyclable.cpp
diff --git a/modules/dep/acelite/ace/Recyclable.h b/modules/acore/deps/acelite/ace/Recyclable.h
similarity index 100%
rename from modules/dep/acelite/ace/Recyclable.h
rename to modules/acore/deps/acelite/ace/Recyclable.h
diff --git a/modules/dep/acelite/ace/Recyclable.inl b/modules/acore/deps/acelite/ace/Recyclable.inl
similarity index 100%
rename from modules/dep/acelite/ace/Recyclable.inl
rename to modules/acore/deps/acelite/ace/Recyclable.inl
diff --git a/modules/dep/acelite/ace/Refcountable_T.cpp b/modules/acore/deps/acelite/ace/Refcountable_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Refcountable_T.cpp
rename to modules/acore/deps/acelite/ace/Refcountable_T.cpp
diff --git a/modules/dep/acelite/ace/Refcountable_T.h b/modules/acore/deps/acelite/ace/Refcountable_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Refcountable_T.h
rename to modules/acore/deps/acelite/ace/Refcountable_T.h
diff --git a/modules/dep/acelite/ace/Refcountable_T.inl b/modules/acore/deps/acelite/ace/Refcountable_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Refcountable_T.inl
rename to modules/acore/deps/acelite/ace/Refcountable_T.inl
diff --git a/modules/dep/acelite/ace/Refcounted_Auto_Ptr.cpp b/modules/acore/deps/acelite/ace/Refcounted_Auto_Ptr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Refcounted_Auto_Ptr.cpp
rename to modules/acore/deps/acelite/ace/Refcounted_Auto_Ptr.cpp
diff --git a/modules/dep/acelite/ace/Refcounted_Auto_Ptr.h b/modules/acore/deps/acelite/ace/Refcounted_Auto_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Refcounted_Auto_Ptr.h
rename to modules/acore/deps/acelite/ace/Refcounted_Auto_Ptr.h
diff --git a/modules/dep/acelite/ace/Refcounted_Auto_Ptr.inl b/modules/acore/deps/acelite/ace/Refcounted_Auto_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Refcounted_Auto_Ptr.inl
rename to modules/acore/deps/acelite/ace/Refcounted_Auto_Ptr.inl
diff --git a/modules/dep/acelite/ace/Registry.cpp b/modules/acore/deps/acelite/ace/Registry.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Registry.cpp
rename to modules/acore/deps/acelite/ace/Registry.cpp
diff --git a/modules/dep/acelite/ace/Registry.h b/modules/acore/deps/acelite/ace/Registry.h
similarity index 100%
rename from modules/dep/acelite/ace/Registry.h
rename to modules/acore/deps/acelite/ace/Registry.h
diff --git a/modules/dep/acelite/ace/Registry_Name_Space.cpp b/modules/acore/deps/acelite/ace/Registry_Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Registry_Name_Space.cpp
rename to modules/acore/deps/acelite/ace/Registry_Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Registry_Name_Space.h b/modules/acore/deps/acelite/ace/Registry_Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Registry_Name_Space.h
rename to modules/acore/deps/acelite/ace/Registry_Name_Space.h
diff --git a/modules/dep/acelite/ace/Remote_Name_Space.cpp b/modules/acore/deps/acelite/ace/Remote_Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Name_Space.cpp
rename to modules/acore/deps/acelite/ace/Remote_Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Remote_Name_Space.h b/modules/acore/deps/acelite/ace/Remote_Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Name_Space.h
rename to modules/acore/deps/acelite/ace/Remote_Name_Space.h
diff --git a/modules/dep/acelite/ace/Remote_Tokens.cpp b/modules/acore/deps/acelite/ace/Remote_Tokens.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Tokens.cpp
rename to modules/acore/deps/acelite/ace/Remote_Tokens.cpp
diff --git a/modules/dep/acelite/ace/Remote_Tokens.h b/modules/acore/deps/acelite/ace/Remote_Tokens.h
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Tokens.h
rename to modules/acore/deps/acelite/ace/Remote_Tokens.h
diff --git a/modules/dep/acelite/ace/Remote_Tokens.inl b/modules/acore/deps/acelite/ace/Remote_Tokens.inl
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Tokens.inl
rename to modules/acore/deps/acelite/ace/Remote_Tokens.inl
diff --git a/modules/dep/acelite/ace/Reverse_Lock_T.cpp b/modules/acore/deps/acelite/ace/Reverse_Lock_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reverse_Lock_T.cpp
rename to modules/acore/deps/acelite/ace/Reverse_Lock_T.cpp
diff --git a/modules/dep/acelite/ace/Reverse_Lock_T.h b/modules/acore/deps/acelite/ace/Reverse_Lock_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Reverse_Lock_T.h
rename to modules/acore/deps/acelite/ace/Reverse_Lock_T.h
diff --git a/modules/dep/acelite/ace/Reverse_Lock_T.inl b/modules/acore/deps/acelite/ace/Reverse_Lock_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Reverse_Lock_T.inl
rename to modules/acore/deps/acelite/ace/Reverse_Lock_T.inl
diff --git a/modules/dep/acelite/ace/Rtems_init.c b/modules/acore/deps/acelite/ace/Rtems_init.c
similarity index 100%
rename from modules/dep/acelite/ace/Rtems_init.c
rename to modules/acore/deps/acelite/ace/Rtems_init.c
diff --git a/modules/dep/acelite/ace/SOCK.cpp b/modules/acore/deps/acelite/ace/SOCK.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK.cpp
rename to modules/acore/deps/acelite/ace/SOCK.cpp
diff --git a/modules/dep/acelite/ace/SOCK.h b/modules/acore/deps/acelite/ace/SOCK.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK.h
rename to modules/acore/deps/acelite/ace/SOCK.h
diff --git a/modules/dep/acelite/ace/SOCK.inl b/modules/acore/deps/acelite/ace/SOCK.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK.inl
rename to modules/acore/deps/acelite/ace/SOCK.inl
diff --git a/modules/dep/acelite/ace/SOCK_Acceptor.cpp b/modules/acore/deps/acelite/ace/SOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/SOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Acceptor.h b/modules/acore/deps/acelite/ace/SOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Acceptor.h
rename to modules/acore/deps/acelite/ace/SOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/SOCK_Acceptor.inl b/modules/acore/deps/acelite/ace/SOCK_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Acceptor.inl
rename to modules/acore/deps/acelite/ace/SOCK_Acceptor.inl
diff --git a/modules/dep/acelite/ace/SOCK_CODgram.cpp b/modules/acore/deps/acelite/ace/SOCK_CODgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_CODgram.cpp
rename to modules/acore/deps/acelite/ace/SOCK_CODgram.cpp
diff --git a/modules/dep/acelite/ace/SOCK_CODgram.h b/modules/acore/deps/acelite/ace/SOCK_CODgram.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_CODgram.h
rename to modules/acore/deps/acelite/ace/SOCK_CODgram.h
diff --git a/modules/dep/acelite/ace/SOCK_CODgram.inl b/modules/acore/deps/acelite/ace/SOCK_CODgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_CODgram.inl
rename to modules/acore/deps/acelite/ace/SOCK_CODgram.inl
diff --git a/modules/dep/acelite/ace/SOCK_Connector.cpp b/modules/acore/deps/acelite/ace/SOCK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Connector.cpp
rename to modules/acore/deps/acelite/ace/SOCK_Connector.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Connector.h b/modules/acore/deps/acelite/ace/SOCK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Connector.h
rename to modules/acore/deps/acelite/ace/SOCK_Connector.h
diff --git a/modules/dep/acelite/ace/SOCK_Connector.inl b/modules/acore/deps/acelite/ace/SOCK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Connector.inl
rename to modules/acore/deps/acelite/ace/SOCK_Connector.inl
diff --git a/modules/dep/acelite/ace/SOCK_Dgram.cpp b/modules/acore/deps/acelite/ace/SOCK_Dgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram.cpp
rename to modules/acore/deps/acelite/ace/SOCK_Dgram.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Dgram.h b/modules/acore/deps/acelite/ace/SOCK_Dgram.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram.h
rename to modules/acore/deps/acelite/ace/SOCK_Dgram.h
diff --git a/modules/dep/acelite/ace/SOCK_Dgram.inl b/modules/acore/deps/acelite/ace/SOCK_Dgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram.inl
rename to modules/acore/deps/acelite/ace/SOCK_Dgram.inl
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Bcast.cpp b/modules/acore/deps/acelite/ace/SOCK_Dgram_Bcast.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Bcast.cpp
rename to modules/acore/deps/acelite/ace/SOCK_Dgram_Bcast.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Bcast.h b/modules/acore/deps/acelite/ace/SOCK_Dgram_Bcast.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Bcast.h
rename to modules/acore/deps/acelite/ace/SOCK_Dgram_Bcast.h
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Bcast.inl b/modules/acore/deps/acelite/ace/SOCK_Dgram_Bcast.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Bcast.inl
rename to modules/acore/deps/acelite/ace/SOCK_Dgram_Bcast.inl
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Mcast.cpp b/modules/acore/deps/acelite/ace/SOCK_Dgram_Mcast.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Mcast.cpp
rename to modules/acore/deps/acelite/ace/SOCK_Dgram_Mcast.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Mcast.h b/modules/acore/deps/acelite/ace/SOCK_Dgram_Mcast.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Mcast.h
rename to modules/acore/deps/acelite/ace/SOCK_Dgram_Mcast.h
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Mcast.inl b/modules/acore/deps/acelite/ace/SOCK_Dgram_Mcast.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Mcast.inl
rename to modules/acore/deps/acelite/ace/SOCK_Dgram_Mcast.inl
diff --git a/modules/dep/acelite/ace/SOCK_IO.cpp b/modules/acore/deps/acelite/ace/SOCK_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_IO.cpp
rename to modules/acore/deps/acelite/ace/SOCK_IO.cpp
diff --git a/modules/dep/acelite/ace/SOCK_IO.h b/modules/acore/deps/acelite/ace/SOCK_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_IO.h
rename to modules/acore/deps/acelite/ace/SOCK_IO.h
diff --git a/modules/dep/acelite/ace/SOCK_IO.inl b/modules/acore/deps/acelite/ace/SOCK_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_IO.inl
rename to modules/acore/deps/acelite/ace/SOCK_IO.inl
diff --git a/modules/dep/acelite/ace/SOCK_Netlink.cpp b/modules/acore/deps/acelite/ace/SOCK_Netlink.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Netlink.cpp
rename to modules/acore/deps/acelite/ace/SOCK_Netlink.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Netlink.h b/modules/acore/deps/acelite/ace/SOCK_Netlink.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Netlink.h
rename to modules/acore/deps/acelite/ace/SOCK_Netlink.h
diff --git a/modules/dep/acelite/ace/SOCK_Netlink.inl b/modules/acore/deps/acelite/ace/SOCK_Netlink.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Netlink.inl
rename to modules/acore/deps/acelite/ace/SOCK_Netlink.inl
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.h b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.h
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Acceptor.h
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.inl b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.inl
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Acceptor.inl
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Association.cpp b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Association.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Association.cpp
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Association.cpp
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Association.h b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Association.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Association.h
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Association.h
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Association.inl b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Association.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Association.inl
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Association.inl
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Connector.cpp
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Connector.h b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Connector.h
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Connector.h
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Connector.inl b/modules/acore/deps/acelite/ace/SOCK_SEQPACK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Connector.inl
rename to modules/acore/deps/acelite/ace/SOCK_SEQPACK_Connector.inl
diff --git a/modules/dep/acelite/ace/SOCK_Stream.cpp b/modules/acore/deps/acelite/ace/SOCK_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Stream.cpp
rename to modules/acore/deps/acelite/ace/SOCK_Stream.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Stream.h b/modules/acore/deps/acelite/ace/SOCK_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Stream.h
rename to modules/acore/deps/acelite/ace/SOCK_Stream.h
diff --git a/modules/dep/acelite/ace/SOCK_Stream.inl b/modules/acore/deps/acelite/ace/SOCK_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Stream.inl
rename to modules/acore/deps/acelite/ace/SOCK_Stream.inl
diff --git a/modules/dep/acelite/ace/SPIPE.cpp b/modules/acore/deps/acelite/ace/SPIPE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE.cpp
rename to modules/acore/deps/acelite/ace/SPIPE.cpp
diff --git a/modules/dep/acelite/ace/SPIPE.h b/modules/acore/deps/acelite/ace/SPIPE.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE.h
rename to modules/acore/deps/acelite/ace/SPIPE.h
diff --git a/modules/dep/acelite/ace/SPIPE.inl b/modules/acore/deps/acelite/ace/SPIPE.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE.inl
rename to modules/acore/deps/acelite/ace/SPIPE.inl
diff --git a/modules/dep/acelite/ace/SPIPE_Acceptor.cpp b/modules/acore/deps/acelite/ace/SPIPE_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/SPIPE_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Acceptor.h b/modules/acore/deps/acelite/ace/SPIPE_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Acceptor.h
rename to modules/acore/deps/acelite/ace/SPIPE_Acceptor.h
diff --git a/modules/dep/acelite/ace/SPIPE_Addr.cpp b/modules/acore/deps/acelite/ace/SPIPE_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Addr.cpp
rename to modules/acore/deps/acelite/ace/SPIPE_Addr.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Addr.h b/modules/acore/deps/acelite/ace/SPIPE_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Addr.h
rename to modules/acore/deps/acelite/ace/SPIPE_Addr.h
diff --git a/modules/dep/acelite/ace/SPIPE_Addr.inl b/modules/acore/deps/acelite/ace/SPIPE_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Addr.inl
rename to modules/acore/deps/acelite/ace/SPIPE_Addr.inl
diff --git a/modules/dep/acelite/ace/SPIPE_Connector.cpp b/modules/acore/deps/acelite/ace/SPIPE_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Connector.cpp
rename to modules/acore/deps/acelite/ace/SPIPE_Connector.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Connector.h b/modules/acore/deps/acelite/ace/SPIPE_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Connector.h
rename to modules/acore/deps/acelite/ace/SPIPE_Connector.h
diff --git a/modules/dep/acelite/ace/SPIPE_Connector.inl b/modules/acore/deps/acelite/ace/SPIPE_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Connector.inl
rename to modules/acore/deps/acelite/ace/SPIPE_Connector.inl
diff --git a/modules/dep/acelite/ace/SPIPE_Stream.cpp b/modules/acore/deps/acelite/ace/SPIPE_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Stream.cpp
rename to modules/acore/deps/acelite/ace/SPIPE_Stream.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Stream.h b/modules/acore/deps/acelite/ace/SPIPE_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Stream.h
rename to modules/acore/deps/acelite/ace/SPIPE_Stream.h
diff --git a/modules/dep/acelite/ace/SPIPE_Stream.inl b/modules/acore/deps/acelite/ace/SPIPE_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Stream.inl
rename to modules/acore/deps/acelite/ace/SPIPE_Stream.inl
diff --git a/modules/dep/acelite/ace/SSL/ACE_SSL.pc.in b/modules/acore/deps/acelite/ace/SSL/ACE_SSL.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/SSL/ACE_SSL.pc.in
rename to modules/acore/deps/acelite/ace/SSL/ACE_SSL.pc.in
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_Asynch_BIO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_Asynch_BIO.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.h b/modules/acore/deps/acelite/ace/SSL/SSL_Asynch_BIO.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_Asynch_BIO.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_Asynch_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_Asynch_Stream.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.h b/modules/acore/deps/acelite/ace/SSL/SSL_Asynch_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_Asynch_Stream.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl b/modules/acore/deps/acelite/ace/SSL/SSL_Asynch_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl
rename to modules/acore/deps/acelite/ace/SSL/SSL_Asynch_Stream.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_Context.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_Context.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Context.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_Context.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Context.h b/modules/acore/deps/acelite/ace/SSL/SSL_Context.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Context.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_Context.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Context.inl b/modules/acore/deps/acelite/ace/SSL/SSL_Context.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Context.inl
rename to modules/acore/deps/acelite/ace/SSL/SSL_Context.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_Export.h b/modules/acore/deps/acelite/ace/SSL/SSL_Export.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Export.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_Export.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Initializer.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_Initializer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Initializer.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_Initializer.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Initializer.h b/modules/acore/deps/acelite/ace/SSL/SSL_Initializer.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Initializer.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_Initializer.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK.h b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK.inl b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK.inl
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Connector.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.h b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Connector.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Connector.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Stream.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.h b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.h
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Stream.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl b/modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl
rename to modules/acore/deps/acelite/ace/SSL/SSL_SOCK_Stream.inl
diff --git a/modules/dep/acelite/ace/SSL/ssl.mpc b/modules/acore/deps/acelite/ace/SSL/ssl.mpc
similarity index 100%
rename from modules/dep/acelite/ace/SSL/ssl.mpc
rename to modules/acore/deps/acelite/ace/SSL/ssl.mpc
diff --git a/modules/dep/acelite/ace/SSL/ssl_for_tao.mpc b/modules/acore/deps/acelite/ace/SSL/ssl_for_tao.mpc
similarity index 100%
rename from modules/dep/acelite/ace/SSL/ssl_for_tao.mpc
rename to modules/acore/deps/acelite/ace/SSL/ssl_for_tao.mpc
diff --git a/modules/dep/acelite/ace/SSL/sslconf.h b/modules/acore/deps/acelite/ace/SSL/sslconf.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/sslconf.h
rename to modules/acore/deps/acelite/ace/SSL/sslconf.h
diff --git a/modules/dep/acelite/ace/SString.cpp b/modules/acore/deps/acelite/ace/SString.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SString.cpp
rename to modules/acore/deps/acelite/ace/SString.cpp
diff --git a/modules/dep/acelite/ace/SString.h b/modules/acore/deps/acelite/ace/SString.h
similarity index 100%
rename from modules/dep/acelite/ace/SString.h
rename to modules/acore/deps/acelite/ace/SString.h
diff --git a/modules/dep/acelite/ace/SString.inl b/modules/acore/deps/acelite/ace/SString.inl
similarity index 100%
rename from modules/dep/acelite/ace/SString.inl
rename to modules/acore/deps/acelite/ace/SString.inl
diff --git a/modules/dep/acelite/ace/SStringfwd.h b/modules/acore/deps/acelite/ace/SStringfwd.h
similarity index 100%
rename from modules/dep/acelite/ace/SStringfwd.h
rename to modules/acore/deps/acelite/ace/SStringfwd.h
diff --git a/modules/dep/acelite/ace/SUN_Proactor.cpp b/modules/acore/deps/acelite/ace/SUN_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SUN_Proactor.cpp
rename to modules/acore/deps/acelite/ace/SUN_Proactor.cpp
diff --git a/modules/dep/acelite/ace/SUN_Proactor.h b/modules/acore/deps/acelite/ace/SUN_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/SUN_Proactor.h
rename to modules/acore/deps/acelite/ace/SUN_Proactor.h
diff --git a/modules/dep/acelite/ace/SV_Message.cpp b/modules/acore/deps/acelite/ace/SV_Message.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message.cpp
rename to modules/acore/deps/acelite/ace/SV_Message.cpp
diff --git a/modules/dep/acelite/ace/SV_Message.h b/modules/acore/deps/acelite/ace/SV_Message.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message.h
rename to modules/acore/deps/acelite/ace/SV_Message.h
diff --git a/modules/dep/acelite/ace/SV_Message.inl b/modules/acore/deps/acelite/ace/SV_Message.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message.inl
rename to modules/acore/deps/acelite/ace/SV_Message.inl
diff --git a/modules/dep/acelite/ace/SV_Message_Queue.cpp b/modules/acore/deps/acelite/ace/SV_Message_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message_Queue.cpp
rename to modules/acore/deps/acelite/ace/SV_Message_Queue.cpp
diff --git a/modules/dep/acelite/ace/SV_Message_Queue.h b/modules/acore/deps/acelite/ace/SV_Message_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message_Queue.h
rename to modules/acore/deps/acelite/ace/SV_Message_Queue.h
diff --git a/modules/dep/acelite/ace/SV_Message_Queue.inl b/modules/acore/deps/acelite/ace/SV_Message_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message_Queue.inl
rename to modules/acore/deps/acelite/ace/SV_Message_Queue.inl
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Complex.cpp b/modules/acore/deps/acelite/ace/SV_Semaphore_Complex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Complex.cpp
rename to modules/acore/deps/acelite/ace/SV_Semaphore_Complex.cpp
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Complex.h b/modules/acore/deps/acelite/ace/SV_Semaphore_Complex.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Complex.h
rename to modules/acore/deps/acelite/ace/SV_Semaphore_Complex.h
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Complex.inl b/modules/acore/deps/acelite/ace/SV_Semaphore_Complex.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Complex.inl
rename to modules/acore/deps/acelite/ace/SV_Semaphore_Complex.inl
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Simple.cpp b/modules/acore/deps/acelite/ace/SV_Semaphore_Simple.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Simple.cpp
rename to modules/acore/deps/acelite/ace/SV_Semaphore_Simple.cpp
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Simple.h b/modules/acore/deps/acelite/ace/SV_Semaphore_Simple.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Simple.h
rename to modules/acore/deps/acelite/ace/SV_Semaphore_Simple.h
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Simple.inl b/modules/acore/deps/acelite/ace/SV_Semaphore_Simple.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Simple.inl
rename to modules/acore/deps/acelite/ace/SV_Semaphore_Simple.inl
diff --git a/modules/dep/acelite/ace/SV_Shared_Memory.cpp b/modules/acore/deps/acelite/ace/SV_Shared_Memory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Shared_Memory.cpp
rename to modules/acore/deps/acelite/ace/SV_Shared_Memory.cpp
diff --git a/modules/dep/acelite/ace/SV_Shared_Memory.h b/modules/acore/deps/acelite/ace/SV_Shared_Memory.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Shared_Memory.h
rename to modules/acore/deps/acelite/ace/SV_Shared_Memory.h
diff --git a/modules/dep/acelite/ace/SV_Shared_Memory.inl b/modules/acore/deps/acelite/ace/SV_Shared_Memory.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Shared_Memory.inl
rename to modules/acore/deps/acelite/ace/SV_Shared_Memory.inl
diff --git a/modules/dep/acelite/ace/Sample_History.cpp b/modules/acore/deps/acelite/ace/Sample_History.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sample_History.cpp
rename to modules/acore/deps/acelite/ace/Sample_History.cpp
diff --git a/modules/dep/acelite/ace/Sample_History.h b/modules/acore/deps/acelite/ace/Sample_History.h
similarity index 100%
rename from modules/dep/acelite/ace/Sample_History.h
rename to modules/acore/deps/acelite/ace/Sample_History.h
diff --git a/modules/dep/acelite/ace/Sample_History.inl b/modules/acore/deps/acelite/ace/Sample_History.inl
similarity index 100%
rename from modules/dep/acelite/ace/Sample_History.inl
rename to modules/acore/deps/acelite/ace/Sample_History.inl
diff --git a/modules/dep/acelite/ace/Sbrk_Memory_Pool.cpp b/modules/acore/deps/acelite/ace/Sbrk_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sbrk_Memory_Pool.cpp
rename to modules/acore/deps/acelite/ace/Sbrk_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Sbrk_Memory_Pool.h b/modules/acore/deps/acelite/ace/Sbrk_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Sbrk_Memory_Pool.h
rename to modules/acore/deps/acelite/ace/Sbrk_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Sched_Params.cpp b/modules/acore/deps/acelite/ace/Sched_Params.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sched_Params.cpp
rename to modules/acore/deps/acelite/ace/Sched_Params.cpp
diff --git a/modules/dep/acelite/ace/Sched_Params.h b/modules/acore/deps/acelite/ace/Sched_Params.h
similarity index 100%
rename from modules/dep/acelite/ace/Sched_Params.h
rename to modules/acore/deps/acelite/ace/Sched_Params.h
diff --git a/modules/dep/acelite/ace/Sched_Params.inl b/modules/acore/deps/acelite/ace/Sched_Params.inl
similarity index 100%
rename from modules/dep/acelite/ace/Sched_Params.inl
rename to modules/acore/deps/acelite/ace/Sched_Params.inl
diff --git a/modules/dep/acelite/ace/Select_Reactor.h b/modules/acore/deps/acelite/ace/Select_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor.h
rename to modules/acore/deps/acelite/ace/Select_Reactor.h
diff --git a/modules/dep/acelite/ace/Select_Reactor_Base.cpp b/modules/acore/deps/acelite/ace/Select_Reactor_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_Base.cpp
rename to modules/acore/deps/acelite/ace/Select_Reactor_Base.cpp
diff --git a/modules/dep/acelite/ace/Select_Reactor_Base.h b/modules/acore/deps/acelite/ace/Select_Reactor_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_Base.h
rename to modules/acore/deps/acelite/ace/Select_Reactor_Base.h
diff --git a/modules/dep/acelite/ace/Select_Reactor_Base.inl b/modules/acore/deps/acelite/ace/Select_Reactor_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_Base.inl
rename to modules/acore/deps/acelite/ace/Select_Reactor_Base.inl
diff --git a/modules/dep/acelite/ace/Select_Reactor_T.cpp b/modules/acore/deps/acelite/ace/Select_Reactor_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_T.cpp
rename to modules/acore/deps/acelite/ace/Select_Reactor_T.cpp
diff --git a/modules/dep/acelite/ace/Select_Reactor_T.h b/modules/acore/deps/acelite/ace/Select_Reactor_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_T.h
rename to modules/acore/deps/acelite/ace/Select_Reactor_T.h
diff --git a/modules/dep/acelite/ace/Select_Reactor_T.inl b/modules/acore/deps/acelite/ace/Select_Reactor_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_T.inl
rename to modules/acore/deps/acelite/ace/Select_Reactor_T.inl
diff --git a/modules/dep/acelite/ace/Semaphore.cpp b/modules/acore/deps/acelite/ace/Semaphore.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Semaphore.cpp
rename to modules/acore/deps/acelite/ace/Semaphore.cpp
diff --git a/modules/dep/acelite/ace/Semaphore.h b/modules/acore/deps/acelite/ace/Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Semaphore.h
rename to modules/acore/deps/acelite/ace/Semaphore.h
diff --git a/modules/dep/acelite/ace/Semaphore.inl b/modules/acore/deps/acelite/ace/Semaphore.inl
similarity index 100%
rename from modules/dep/acelite/ace/Semaphore.inl
rename to modules/acore/deps/acelite/ace/Semaphore.inl
diff --git a/modules/dep/acelite/ace/Service_Config.cpp b/modules/acore/deps/acelite/ace/Service_Config.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Config.cpp
rename to modules/acore/deps/acelite/ace/Service_Config.cpp
diff --git a/modules/dep/acelite/ace/Service_Config.h b/modules/acore/deps/acelite/ace/Service_Config.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Config.h
rename to modules/acore/deps/acelite/ace/Service_Config.h
diff --git a/modules/dep/acelite/ace/Service_Config.inl b/modules/acore/deps/acelite/ace/Service_Config.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Config.inl
rename to modules/acore/deps/acelite/ace/Service_Config.inl
diff --git a/modules/dep/acelite/ace/Service_Gestalt.cpp b/modules/acore/deps/acelite/ace/Service_Gestalt.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Gestalt.cpp
rename to modules/acore/deps/acelite/ace/Service_Gestalt.cpp
diff --git a/modules/dep/acelite/ace/Service_Gestalt.h b/modules/acore/deps/acelite/ace/Service_Gestalt.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Gestalt.h
rename to modules/acore/deps/acelite/ace/Service_Gestalt.h
diff --git a/modules/dep/acelite/ace/Service_Gestalt.inl b/modules/acore/deps/acelite/ace/Service_Gestalt.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Gestalt.inl
rename to modules/acore/deps/acelite/ace/Service_Gestalt.inl
diff --git a/modules/dep/acelite/ace/Service_Manager.cpp b/modules/acore/deps/acelite/ace/Service_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Manager.cpp
rename to modules/acore/deps/acelite/ace/Service_Manager.cpp
diff --git a/modules/dep/acelite/ace/Service_Manager.h b/modules/acore/deps/acelite/ace/Service_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Manager.h
rename to modules/acore/deps/acelite/ace/Service_Manager.h
diff --git a/modules/dep/acelite/ace/Service_Object.cpp b/modules/acore/deps/acelite/ace/Service_Object.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Object.cpp
rename to modules/acore/deps/acelite/ace/Service_Object.cpp
diff --git a/modules/dep/acelite/ace/Service_Object.h b/modules/acore/deps/acelite/ace/Service_Object.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Object.h
rename to modules/acore/deps/acelite/ace/Service_Object.h
diff --git a/modules/dep/acelite/ace/Service_Object.inl b/modules/acore/deps/acelite/ace/Service_Object.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Object.inl
rename to modules/acore/deps/acelite/ace/Service_Object.inl
diff --git a/modules/dep/acelite/ace/Service_Repository.cpp b/modules/acore/deps/acelite/ace/Service_Repository.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Repository.cpp
rename to modules/acore/deps/acelite/ace/Service_Repository.cpp
diff --git a/modules/dep/acelite/ace/Service_Repository.h b/modules/acore/deps/acelite/ace/Service_Repository.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Repository.h
rename to modules/acore/deps/acelite/ace/Service_Repository.h
diff --git a/modules/dep/acelite/ace/Service_Repository.inl b/modules/acore/deps/acelite/ace/Service_Repository.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Repository.inl
rename to modules/acore/deps/acelite/ace/Service_Repository.inl
diff --git a/modules/dep/acelite/ace/Service_Types.cpp b/modules/acore/deps/acelite/ace/Service_Types.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Types.cpp
rename to modules/acore/deps/acelite/ace/Service_Types.cpp
diff --git a/modules/dep/acelite/ace/Service_Types.h b/modules/acore/deps/acelite/ace/Service_Types.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Types.h
rename to modules/acore/deps/acelite/ace/Service_Types.h
diff --git a/modules/dep/acelite/ace/Service_Types.inl b/modules/acore/deps/acelite/ace/Service_Types.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Types.inl
rename to modules/acore/deps/acelite/ace/Service_Types.inl
diff --git a/modules/dep/acelite/ace/Shared_Memory.cpp b/modules/acore/deps/acelite/ace/Shared_Memory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory.cpp
rename to modules/acore/deps/acelite/ace/Shared_Memory.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory.h b/modules/acore/deps/acelite/ace/Shared_Memory.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory.h
rename to modules/acore/deps/acelite/ace/Shared_Memory.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_MM.cpp b/modules/acore/deps/acelite/ace/Shared_Memory_MM.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_MM.cpp
rename to modules/acore/deps/acelite/ace/Shared_Memory_MM.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory_MM.h b/modules/acore/deps/acelite/ace/Shared_Memory_MM.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_MM.h
rename to modules/acore/deps/acelite/ace/Shared_Memory_MM.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_MM.inl b/modules/acore/deps/acelite/ace/Shared_Memory_MM.inl
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_MM.inl
rename to modules/acore/deps/acelite/ace/Shared_Memory_MM.inl
diff --git a/modules/dep/acelite/ace/Shared_Memory_Pool.cpp b/modules/acore/deps/acelite/ace/Shared_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_Pool.cpp
rename to modules/acore/deps/acelite/ace/Shared_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory_Pool.h b/modules/acore/deps/acelite/ace/Shared_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_Pool.h
rename to modules/acore/deps/acelite/ace/Shared_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_SV.cpp b/modules/acore/deps/acelite/ace/Shared_Memory_SV.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_SV.cpp
rename to modules/acore/deps/acelite/ace/Shared_Memory_SV.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory_SV.h b/modules/acore/deps/acelite/ace/Shared_Memory_SV.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_SV.h
rename to modules/acore/deps/acelite/ace/Shared_Memory_SV.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_SV.inl b/modules/acore/deps/acelite/ace/Shared_Memory_SV.inl
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_SV.inl
rename to modules/acore/deps/acelite/ace/Shared_Memory_SV.inl
diff --git a/modules/dep/acelite/ace/Shared_Object.cpp b/modules/acore/deps/acelite/ace/Shared_Object.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Object.cpp
rename to modules/acore/deps/acelite/ace/Shared_Object.cpp
diff --git a/modules/dep/acelite/ace/Shared_Object.h b/modules/acore/deps/acelite/ace/Shared_Object.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Object.h
rename to modules/acore/deps/acelite/ace/Shared_Object.h
diff --git a/modules/dep/acelite/ace/Shared_Object.inl b/modules/acore/deps/acelite/ace/Shared_Object.inl
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Object.inl
rename to modules/acore/deps/acelite/ace/Shared_Object.inl
diff --git a/modules/dep/acelite/ace/Sig_Adapter.cpp b/modules/acore/deps/acelite/ace/Sig_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Adapter.cpp
rename to modules/acore/deps/acelite/ace/Sig_Adapter.cpp
diff --git a/modules/dep/acelite/ace/Sig_Adapter.h b/modules/acore/deps/acelite/ace/Sig_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Adapter.h
rename to modules/acore/deps/acelite/ace/Sig_Adapter.h
diff --git a/modules/dep/acelite/ace/Sig_Handler.cpp b/modules/acore/deps/acelite/ace/Sig_Handler.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Handler.cpp
rename to modules/acore/deps/acelite/ace/Sig_Handler.cpp
diff --git a/modules/dep/acelite/ace/Sig_Handler.h b/modules/acore/deps/acelite/ace/Sig_Handler.h
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Handler.h
rename to modules/acore/deps/acelite/ace/Sig_Handler.h
diff --git a/modules/dep/acelite/ace/Sig_Handler.inl b/modules/acore/deps/acelite/ace/Sig_Handler.inl
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Handler.inl
rename to modules/acore/deps/acelite/ace/Sig_Handler.inl
diff --git a/modules/dep/acelite/ace/Signal.cpp b/modules/acore/deps/acelite/ace/Signal.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Signal.cpp
rename to modules/acore/deps/acelite/ace/Signal.cpp
diff --git a/modules/dep/acelite/ace/Signal.h b/modules/acore/deps/acelite/ace/Signal.h
similarity index 100%
rename from modules/dep/acelite/ace/Signal.h
rename to modules/acore/deps/acelite/ace/Signal.h
diff --git a/modules/dep/acelite/ace/Signal.inl b/modules/acore/deps/acelite/ace/Signal.inl
similarity index 100%
rename from modules/dep/acelite/ace/Signal.inl
rename to modules/acore/deps/acelite/ace/Signal.inl
diff --git a/modules/dep/acelite/ace/Singleton.cpp b/modules/acore/deps/acelite/ace/Singleton.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Singleton.cpp
rename to modules/acore/deps/acelite/ace/Singleton.cpp
diff --git a/modules/dep/acelite/ace/Singleton.h b/modules/acore/deps/acelite/ace/Singleton.h
similarity index 100%
rename from modules/dep/acelite/ace/Singleton.h
rename to modules/acore/deps/acelite/ace/Singleton.h
diff --git a/modules/dep/acelite/ace/Singleton.inl b/modules/acore/deps/acelite/ace/Singleton.inl
similarity index 100%
rename from modules/dep/acelite/ace/Singleton.inl
rename to modules/acore/deps/acelite/ace/Singleton.inl
diff --git a/modules/dep/acelite/ace/Sock_Connect.cpp b/modules/acore/deps/acelite/ace/Sock_Connect.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sock_Connect.cpp
rename to modules/acore/deps/acelite/ace/Sock_Connect.cpp
diff --git a/modules/dep/acelite/ace/Sock_Connect.h b/modules/acore/deps/acelite/ace/Sock_Connect.h
similarity index 100%
rename from modules/dep/acelite/ace/Sock_Connect.h
rename to modules/acore/deps/acelite/ace/Sock_Connect.h
diff --git a/modules/dep/acelite/ace/Stack_Trace.cpp b/modules/acore/deps/acelite/ace/Stack_Trace.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stack_Trace.cpp
rename to modules/acore/deps/acelite/ace/Stack_Trace.cpp
diff --git a/modules/dep/acelite/ace/Stack_Trace.h b/modules/acore/deps/acelite/ace/Stack_Trace.h
similarity index 100%
rename from modules/dep/acelite/ace/Stack_Trace.h
rename to modules/acore/deps/acelite/ace/Stack_Trace.h
diff --git a/modules/dep/acelite/ace/Static_Object_Lock.h b/modules/acore/deps/acelite/ace/Static_Object_Lock.h
similarity index 100%
rename from modules/dep/acelite/ace/Static_Object_Lock.h
rename to modules/acore/deps/acelite/ace/Static_Object_Lock.h
diff --git a/modules/dep/acelite/ace/Stats.cpp b/modules/acore/deps/acelite/ace/Stats.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stats.cpp
rename to modules/acore/deps/acelite/ace/Stats.cpp
diff --git a/modules/dep/acelite/ace/Stats.h b/modules/acore/deps/acelite/ace/Stats.h
similarity index 100%
rename from modules/dep/acelite/ace/Stats.h
rename to modules/acore/deps/acelite/ace/Stats.h
diff --git a/modules/dep/acelite/ace/Stats.inl b/modules/acore/deps/acelite/ace/Stats.inl
similarity index 100%
rename from modules/dep/acelite/ace/Stats.inl
rename to modules/acore/deps/acelite/ace/Stats.inl
diff --git a/modules/dep/acelite/ace/Strategies_T.cpp b/modules/acore/deps/acelite/ace/Strategies_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Strategies_T.cpp
rename to modules/acore/deps/acelite/ace/Strategies_T.cpp
diff --git a/modules/dep/acelite/ace/Strategies_T.h b/modules/acore/deps/acelite/ace/Strategies_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Strategies_T.h
rename to modules/acore/deps/acelite/ace/Strategies_T.h
diff --git a/modules/dep/acelite/ace/Strategies_T.inl b/modules/acore/deps/acelite/ace/Strategies_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Strategies_T.inl
rename to modules/acore/deps/acelite/ace/Strategies_T.inl
diff --git a/modules/dep/acelite/ace/Stream.cpp b/modules/acore/deps/acelite/ace/Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stream.cpp
rename to modules/acore/deps/acelite/ace/Stream.cpp
diff --git a/modules/dep/acelite/ace/Stream.h b/modules/acore/deps/acelite/ace/Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/Stream.h
rename to modules/acore/deps/acelite/ace/Stream.h
diff --git a/modules/dep/acelite/ace/Stream.inl b/modules/acore/deps/acelite/ace/Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/Stream.inl
rename to modules/acore/deps/acelite/ace/Stream.inl
diff --git a/modules/dep/acelite/ace/Stream_Modules.cpp b/modules/acore/deps/acelite/ace/Stream_Modules.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stream_Modules.cpp
rename to modules/acore/deps/acelite/ace/Stream_Modules.cpp
diff --git a/modules/dep/acelite/ace/Stream_Modules.h b/modules/acore/deps/acelite/ace/Stream_Modules.h
similarity index 100%
rename from modules/dep/acelite/ace/Stream_Modules.h
rename to modules/acore/deps/acelite/ace/Stream_Modules.h
diff --git a/modules/dep/acelite/ace/String_Base.cpp b/modules/acore/deps/acelite/ace/String_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/String_Base.cpp
rename to modules/acore/deps/acelite/ace/String_Base.cpp
diff --git a/modules/dep/acelite/ace/String_Base.h b/modules/acore/deps/acelite/ace/String_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/String_Base.h
rename to modules/acore/deps/acelite/ace/String_Base.h
diff --git a/modules/dep/acelite/ace/String_Base.inl b/modules/acore/deps/acelite/ace/String_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/String_Base.inl
rename to modules/acore/deps/acelite/ace/String_Base.inl
diff --git a/modules/dep/acelite/ace/String_Base_Const.cpp b/modules/acore/deps/acelite/ace/String_Base_Const.cpp
similarity index 100%
rename from modules/dep/acelite/ace/String_Base_Const.cpp
rename to modules/acore/deps/acelite/ace/String_Base_Const.cpp
diff --git a/modules/dep/acelite/ace/String_Base_Const.h b/modules/acore/deps/acelite/ace/String_Base_Const.h
similarity index 100%
rename from modules/dep/acelite/ace/String_Base_Const.h
rename to modules/acore/deps/acelite/ace/String_Base_Const.h
diff --git a/modules/dep/acelite/ace/Svc_Conf.h b/modules/acore/deps/acelite/ace/Svc_Conf.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf.h
rename to modules/acore/deps/acelite/ace/Svc_Conf.h
diff --git a/modules/dep/acelite/ace/Svc_Conf.y b/modules/acore/deps/acelite/ace/Svc_Conf.y
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf.y
rename to modules/acore/deps/acelite/ace/Svc_Conf.y
diff --git a/modules/dep/acelite/ace/Svc_Conf_Lexer.cpp b/modules/acore/deps/acelite/ace/Svc_Conf_Lexer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Lexer.cpp
rename to modules/acore/deps/acelite/ace/Svc_Conf_Lexer.cpp
diff --git a/modules/dep/acelite/ace/Svc_Conf_Lexer.h b/modules/acore/deps/acelite/ace/Svc_Conf_Lexer.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Lexer.h
rename to modules/acore/deps/acelite/ace/Svc_Conf_Lexer.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_Param.h b/modules/acore/deps/acelite/ace/Svc_Conf_Param.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Param.h
rename to modules/acore/deps/acelite/ace/Svc_Conf_Param.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_Token_Table.h b/modules/acore/deps/acelite/ace/Svc_Conf_Token_Table.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Token_Table.h
rename to modules/acore/deps/acelite/ace/Svc_Conf_Token_Table.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_Tokens.h b/modules/acore/deps/acelite/ace/Svc_Conf_Tokens.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Tokens.h
rename to modules/acore/deps/acelite/ace/Svc_Conf_Tokens.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_y.cpp b/modules/acore/deps/acelite/ace/Svc_Conf_y.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_y.cpp
rename to modules/acore/deps/acelite/ace/Svc_Conf_y.cpp
diff --git a/modules/dep/acelite/ace/Svc_Handler.cpp b/modules/acore/deps/acelite/ace/Svc_Handler.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Handler.cpp
rename to modules/acore/deps/acelite/ace/Svc_Handler.cpp
diff --git a/modules/dep/acelite/ace/Svc_Handler.h b/modules/acore/deps/acelite/ace/Svc_Handler.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Handler.h
rename to modules/acore/deps/acelite/ace/Svc_Handler.h
diff --git a/modules/dep/acelite/ace/Synch.h b/modules/acore/deps/acelite/ace/Synch.h
similarity index 100%
rename from modules/dep/acelite/ace/Synch.h
rename to modules/acore/deps/acelite/ace/Synch.h
diff --git a/modules/dep/acelite/ace/Synch_Options.cpp b/modules/acore/deps/acelite/ace/Synch_Options.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Synch_Options.cpp
rename to modules/acore/deps/acelite/ace/Synch_Options.cpp
diff --git a/modules/dep/acelite/ace/Synch_Options.h b/modules/acore/deps/acelite/ace/Synch_Options.h
similarity index 100%
rename from modules/dep/acelite/ace/Synch_Options.h
rename to modules/acore/deps/acelite/ace/Synch_Options.h
diff --git a/modules/dep/acelite/ace/Synch_Traits.h b/modules/acore/deps/acelite/ace/Synch_Traits.h
similarity index 100%
rename from modules/dep/acelite/ace/Synch_Traits.h
rename to modules/acore/deps/acelite/ace/Synch_Traits.h
diff --git a/modules/dep/acelite/ace/System_Time.cpp b/modules/acore/deps/acelite/ace/System_Time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/System_Time.cpp
rename to modules/acore/deps/acelite/ace/System_Time.cpp
diff --git a/modules/dep/acelite/ace/System_Time.h b/modules/acore/deps/acelite/ace/System_Time.h
similarity index 100%
rename from modules/dep/acelite/ace/System_Time.h
rename to modules/acore/deps/acelite/ace/System_Time.h
diff --git a/modules/dep/acelite/ace/TLI.cpp b/modules/acore/deps/acelite/ace/TLI.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI.cpp
rename to modules/acore/deps/acelite/ace/TLI.cpp
diff --git a/modules/dep/acelite/ace/TLI.h b/modules/acore/deps/acelite/ace/TLI.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI.h
rename to modules/acore/deps/acelite/ace/TLI.h
diff --git a/modules/dep/acelite/ace/TLI.inl b/modules/acore/deps/acelite/ace/TLI.inl
similarity index 100%
rename from modules/dep/acelite/ace/TLI.inl
rename to modules/acore/deps/acelite/ace/TLI.inl
diff --git a/modules/dep/acelite/ace/TLI_Acceptor.cpp b/modules/acore/deps/acelite/ace/TLI_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/TLI_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/TLI_Acceptor.h b/modules/acore/deps/acelite/ace/TLI_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Acceptor.h
rename to modules/acore/deps/acelite/ace/TLI_Acceptor.h
diff --git a/modules/dep/acelite/ace/TLI_Connector.cpp b/modules/acore/deps/acelite/ace/TLI_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Connector.cpp
rename to modules/acore/deps/acelite/ace/TLI_Connector.cpp
diff --git a/modules/dep/acelite/ace/TLI_Connector.h b/modules/acore/deps/acelite/ace/TLI_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Connector.h
rename to modules/acore/deps/acelite/ace/TLI_Connector.h
diff --git a/modules/dep/acelite/ace/TLI_Connector.inl b/modules/acore/deps/acelite/ace/TLI_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Connector.inl
rename to modules/acore/deps/acelite/ace/TLI_Connector.inl
diff --git a/modules/dep/acelite/ace/TLI_Stream.cpp b/modules/acore/deps/acelite/ace/TLI_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Stream.cpp
rename to modules/acore/deps/acelite/ace/TLI_Stream.cpp
diff --git a/modules/dep/acelite/ace/TLI_Stream.h b/modules/acore/deps/acelite/ace/TLI_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Stream.h
rename to modules/acore/deps/acelite/ace/TLI_Stream.h
diff --git a/modules/dep/acelite/ace/TLI_Stream.inl b/modules/acore/deps/acelite/ace/TLI_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Stream.inl
rename to modules/acore/deps/acelite/ace/TLI_Stream.inl
diff --git a/modules/dep/acelite/ace/TP_Reactor.cpp b/modules/acore/deps/acelite/ace/TP_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TP_Reactor.cpp
rename to modules/acore/deps/acelite/ace/TP_Reactor.cpp
diff --git a/modules/dep/acelite/ace/TP_Reactor.h b/modules/acore/deps/acelite/ace/TP_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/TP_Reactor.h
rename to modules/acore/deps/acelite/ace/TP_Reactor.h
diff --git a/modules/dep/acelite/ace/TP_Reactor.inl b/modules/acore/deps/acelite/ace/TP_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/TP_Reactor.inl
rename to modules/acore/deps/acelite/ace/TP_Reactor.inl
diff --git a/modules/dep/acelite/ace/TSS_Adapter.cpp b/modules/acore/deps/acelite/ace/TSS_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TSS_Adapter.cpp
rename to modules/acore/deps/acelite/ace/TSS_Adapter.cpp
diff --git a/modules/dep/acelite/ace/TSS_Adapter.h b/modules/acore/deps/acelite/ace/TSS_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/TSS_Adapter.h
rename to modules/acore/deps/acelite/ace/TSS_Adapter.h
diff --git a/modules/dep/acelite/ace/TSS_T.cpp b/modules/acore/deps/acelite/ace/TSS_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TSS_T.cpp
rename to modules/acore/deps/acelite/ace/TSS_T.cpp
diff --git a/modules/dep/acelite/ace/TSS_T.h b/modules/acore/deps/acelite/ace/TSS_T.h
similarity index 100%
rename from modules/dep/acelite/ace/TSS_T.h
rename to modules/acore/deps/acelite/ace/TSS_T.h
diff --git a/modules/dep/acelite/ace/TSS_T.inl b/modules/acore/deps/acelite/ace/TSS_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/TSS_T.inl
rename to modules/acore/deps/acelite/ace/TSS_T.inl
diff --git a/modules/dep/acelite/ace/TTY_IO.cpp b/modules/acore/deps/acelite/ace/TTY_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TTY_IO.cpp
rename to modules/acore/deps/acelite/ace/TTY_IO.cpp
diff --git a/modules/dep/acelite/ace/TTY_IO.h b/modules/acore/deps/acelite/ace/TTY_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/TTY_IO.h
rename to modules/acore/deps/acelite/ace/TTY_IO.h
diff --git a/modules/dep/acelite/ace/Task.cpp b/modules/acore/deps/acelite/ace/Task.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Task.cpp
rename to modules/acore/deps/acelite/ace/Task.cpp
diff --git a/modules/dep/acelite/ace/Task.h b/modules/acore/deps/acelite/ace/Task.h
similarity index 100%
rename from modules/dep/acelite/ace/Task.h
rename to modules/acore/deps/acelite/ace/Task.h
diff --git a/modules/dep/acelite/ace/Task.inl b/modules/acore/deps/acelite/ace/Task.inl
similarity index 100%
rename from modules/dep/acelite/ace/Task.inl
rename to modules/acore/deps/acelite/ace/Task.inl
diff --git a/modules/dep/acelite/ace/Task_Ex_T.cpp b/modules/acore/deps/acelite/ace/Task_Ex_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Task_Ex_T.cpp
rename to modules/acore/deps/acelite/ace/Task_Ex_T.cpp
diff --git a/modules/dep/acelite/ace/Task_Ex_T.h b/modules/acore/deps/acelite/ace/Task_Ex_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Task_Ex_T.h
rename to modules/acore/deps/acelite/ace/Task_Ex_T.h
diff --git a/modules/dep/acelite/ace/Task_Ex_T.inl b/modules/acore/deps/acelite/ace/Task_Ex_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Task_Ex_T.inl
rename to modules/acore/deps/acelite/ace/Task_Ex_T.inl
diff --git a/modules/dep/acelite/ace/Task_T.cpp b/modules/acore/deps/acelite/ace/Task_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Task_T.cpp
rename to modules/acore/deps/acelite/ace/Task_T.cpp
diff --git a/modules/dep/acelite/ace/Task_T.h b/modules/acore/deps/acelite/ace/Task_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Task_T.h
rename to modules/acore/deps/acelite/ace/Task_T.h
diff --git a/modules/dep/acelite/ace/Task_T.inl b/modules/acore/deps/acelite/ace/Task_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Task_T.inl
rename to modules/acore/deps/acelite/ace/Task_T.inl
diff --git a/modules/dep/acelite/ace/Test_and_Set.cpp b/modules/acore/deps/acelite/ace/Test_and_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Test_and_Set.cpp
rename to modules/acore/deps/acelite/ace/Test_and_Set.cpp
diff --git a/modules/dep/acelite/ace/Test_and_Set.h b/modules/acore/deps/acelite/ace/Test_and_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Test_and_Set.h
rename to modules/acore/deps/acelite/ace/Test_and_Set.h
diff --git a/modules/dep/acelite/ace/Thread.cpp b/modules/acore/deps/acelite/ace/Thread.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread.cpp
rename to modules/acore/deps/acelite/ace/Thread.cpp
diff --git a/modules/dep/acelite/ace/Thread.h b/modules/acore/deps/acelite/ace/Thread.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread.h
rename to modules/acore/deps/acelite/ace/Thread.h
diff --git a/modules/dep/acelite/ace/Thread.inl b/modules/acore/deps/acelite/ace/Thread.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread.inl
rename to modules/acore/deps/acelite/ace/Thread.inl
diff --git a/modules/dep/acelite/ace/Thread_Adapter.cpp b/modules/acore/deps/acelite/ace/Thread_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Adapter.cpp
rename to modules/acore/deps/acelite/ace/Thread_Adapter.cpp
diff --git a/modules/dep/acelite/ace/Thread_Adapter.h b/modules/acore/deps/acelite/ace/Thread_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Adapter.h
rename to modules/acore/deps/acelite/ace/Thread_Adapter.h
diff --git a/modules/dep/acelite/ace/Thread_Adapter.inl b/modules/acore/deps/acelite/ace/Thread_Adapter.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Adapter.inl
rename to modules/acore/deps/acelite/ace/Thread_Adapter.inl
diff --git a/modules/dep/acelite/ace/Thread_Control.cpp b/modules/acore/deps/acelite/ace/Thread_Control.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Control.cpp
rename to modules/acore/deps/acelite/ace/Thread_Control.cpp
diff --git a/modules/dep/acelite/ace/Thread_Control.h b/modules/acore/deps/acelite/ace/Thread_Control.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Control.h
rename to modules/acore/deps/acelite/ace/Thread_Control.h
diff --git a/modules/dep/acelite/ace/Thread_Control.inl b/modules/acore/deps/acelite/ace/Thread_Control.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Control.inl
rename to modules/acore/deps/acelite/ace/Thread_Control.inl
diff --git a/modules/dep/acelite/ace/Thread_Exit.cpp b/modules/acore/deps/acelite/ace/Thread_Exit.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Exit.cpp
rename to modules/acore/deps/acelite/ace/Thread_Exit.cpp
diff --git a/modules/dep/acelite/ace/Thread_Exit.h b/modules/acore/deps/acelite/ace/Thread_Exit.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Exit.h
rename to modules/acore/deps/acelite/ace/Thread_Exit.h
diff --git a/modules/dep/acelite/ace/Thread_Hook.cpp b/modules/acore/deps/acelite/ace/Thread_Hook.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Hook.cpp
rename to modules/acore/deps/acelite/ace/Thread_Hook.cpp
diff --git a/modules/dep/acelite/ace/Thread_Hook.h b/modules/acore/deps/acelite/ace/Thread_Hook.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Hook.h
rename to modules/acore/deps/acelite/ace/Thread_Hook.h
diff --git a/modules/dep/acelite/ace/Thread_Manager.cpp b/modules/acore/deps/acelite/ace/Thread_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Manager.cpp
rename to modules/acore/deps/acelite/ace/Thread_Manager.cpp
diff --git a/modules/dep/acelite/ace/Thread_Manager.h b/modules/acore/deps/acelite/ace/Thread_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Manager.h
rename to modules/acore/deps/acelite/ace/Thread_Manager.h
diff --git a/modules/dep/acelite/ace/Thread_Manager.inl b/modules/acore/deps/acelite/ace/Thread_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Manager.inl
rename to modules/acore/deps/acelite/ace/Thread_Manager.inl
diff --git a/modules/dep/acelite/ace/Thread_Mutex.cpp b/modules/acore/deps/acelite/ace/Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Mutex.cpp
rename to modules/acore/deps/acelite/ace/Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Thread_Mutex.h b/modules/acore/deps/acelite/ace/Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Mutex.h
rename to modules/acore/deps/acelite/ace/Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Thread_Mutex.inl b/modules/acore/deps/acelite/ace/Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Mutex.inl
rename to modules/acore/deps/acelite/ace/Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Thread_Semaphore.cpp b/modules/acore/deps/acelite/ace/Thread_Semaphore.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Semaphore.cpp
rename to modules/acore/deps/acelite/ace/Thread_Semaphore.cpp
diff --git a/modules/dep/acelite/ace/Thread_Semaphore.h b/modules/acore/deps/acelite/ace/Thread_Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Semaphore.h
rename to modules/acore/deps/acelite/ace/Thread_Semaphore.h
diff --git a/modules/dep/acelite/ace/Thread_Semaphore.inl b/modules/acore/deps/acelite/ace/Thread_Semaphore.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Semaphore.inl
rename to modules/acore/deps/acelite/ace/Thread_Semaphore.inl
diff --git a/modules/dep/acelite/ace/Throughput_Stats.cpp b/modules/acore/deps/acelite/ace/Throughput_Stats.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Throughput_Stats.cpp
rename to modules/acore/deps/acelite/ace/Throughput_Stats.cpp
diff --git a/modules/dep/acelite/ace/Throughput_Stats.h b/modules/acore/deps/acelite/ace/Throughput_Stats.h
similarity index 100%
rename from modules/dep/acelite/ace/Throughput_Stats.h
rename to modules/acore/deps/acelite/ace/Throughput_Stats.h
diff --git a/modules/dep/acelite/ace/Time_Policy.cpp b/modules/acore/deps/acelite/ace/Time_Policy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy.cpp
rename to modules/acore/deps/acelite/ace/Time_Policy.cpp
diff --git a/modules/dep/acelite/ace/Time_Policy.h b/modules/acore/deps/acelite/ace/Time_Policy.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy.h
rename to modules/acore/deps/acelite/ace/Time_Policy.h
diff --git a/modules/dep/acelite/ace/Time_Policy.inl b/modules/acore/deps/acelite/ace/Time_Policy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy.inl
rename to modules/acore/deps/acelite/ace/Time_Policy.inl
diff --git a/modules/dep/acelite/ace/Time_Policy_T.cpp b/modules/acore/deps/acelite/ace/Time_Policy_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy_T.cpp
rename to modules/acore/deps/acelite/ace/Time_Policy_T.cpp
diff --git a/modules/dep/acelite/ace/Time_Policy_T.h b/modules/acore/deps/acelite/ace/Time_Policy_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy_T.h
rename to modules/acore/deps/acelite/ace/Time_Policy_T.h
diff --git a/modules/dep/acelite/ace/Time_Policy_T.inl b/modules/acore/deps/acelite/ace/Time_Policy_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy_T.inl
rename to modules/acore/deps/acelite/ace/Time_Policy_T.inl
diff --git a/modules/dep/acelite/ace/Time_Value.cpp b/modules/acore/deps/acelite/ace/Time_Value.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value.cpp
rename to modules/acore/deps/acelite/ace/Time_Value.cpp
diff --git a/modules/dep/acelite/ace/Time_Value.h b/modules/acore/deps/acelite/ace/Time_Value.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value.h
rename to modules/acore/deps/acelite/ace/Time_Value.h
diff --git a/modules/dep/acelite/ace/Time_Value.inl b/modules/acore/deps/acelite/ace/Time_Value.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value.inl
rename to modules/acore/deps/acelite/ace/Time_Value.inl
diff --git a/modules/dep/acelite/ace/Time_Value_T.cpp b/modules/acore/deps/acelite/ace/Time_Value_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value_T.cpp
rename to modules/acore/deps/acelite/ace/Time_Value_T.cpp
diff --git a/modules/dep/acelite/ace/Time_Value_T.h b/modules/acore/deps/acelite/ace/Time_Value_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value_T.h
rename to modules/acore/deps/acelite/ace/Time_Value_T.h
diff --git a/modules/dep/acelite/ace/Time_Value_T.inl b/modules/acore/deps/acelite/ace/Time_Value_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value_T.inl
rename to modules/acore/deps/acelite/ace/Time_Value_T.inl
diff --git a/modules/dep/acelite/ace/Timeprobe.cpp b/modules/acore/deps/acelite/ace/Timeprobe.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe.cpp
rename to modules/acore/deps/acelite/ace/Timeprobe.cpp
diff --git a/modules/dep/acelite/ace/Timeprobe.h b/modules/acore/deps/acelite/ace/Timeprobe.h
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe.h
rename to modules/acore/deps/acelite/ace/Timeprobe.h
diff --git a/modules/dep/acelite/ace/Timeprobe.inl b/modules/acore/deps/acelite/ace/Timeprobe.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe.inl
rename to modules/acore/deps/acelite/ace/Timeprobe.inl
diff --git a/modules/dep/acelite/ace/Timeprobe_T.cpp b/modules/acore/deps/acelite/ace/Timeprobe_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe_T.cpp
rename to modules/acore/deps/acelite/ace/Timeprobe_T.cpp
diff --git a/modules/dep/acelite/ace/Timeprobe_T.h b/modules/acore/deps/acelite/ace/Timeprobe_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe_T.h
rename to modules/acore/deps/acelite/ace/Timeprobe_T.h
diff --git a/modules/dep/acelite/ace/Timer_Hash.h b/modules/acore/deps/acelite/ace/Timer_Hash.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Hash.h
rename to modules/acore/deps/acelite/ace/Timer_Hash.h
diff --git a/modules/dep/acelite/ace/Timer_Hash_T.cpp b/modules/acore/deps/acelite/ace/Timer_Hash_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Hash_T.cpp
rename to modules/acore/deps/acelite/ace/Timer_Hash_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Hash_T.h b/modules/acore/deps/acelite/ace/Timer_Hash_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Hash_T.h
rename to modules/acore/deps/acelite/ace/Timer_Hash_T.h
diff --git a/modules/dep/acelite/ace/Timer_Heap.h b/modules/acore/deps/acelite/ace/Timer_Heap.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Heap.h
rename to modules/acore/deps/acelite/ace/Timer_Heap.h
diff --git a/modules/dep/acelite/ace/Timer_Heap_T.cpp b/modules/acore/deps/acelite/ace/Timer_Heap_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Heap_T.cpp
rename to modules/acore/deps/acelite/ace/Timer_Heap_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Heap_T.h b/modules/acore/deps/acelite/ace/Timer_Heap_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Heap_T.h
rename to modules/acore/deps/acelite/ace/Timer_Heap_T.h
diff --git a/modules/dep/acelite/ace/Timer_List.h b/modules/acore/deps/acelite/ace/Timer_List.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_List.h
rename to modules/acore/deps/acelite/ace/Timer_List.h
diff --git a/modules/dep/acelite/ace/Timer_List_T.cpp b/modules/acore/deps/acelite/ace/Timer_List_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_List_T.cpp
rename to modules/acore/deps/acelite/ace/Timer_List_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_List_T.h b/modules/acore/deps/acelite/ace/Timer_List_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_List_T.h
rename to modules/acore/deps/acelite/ace/Timer_List_T.h
diff --git a/modules/dep/acelite/ace/Timer_Queue.h b/modules/acore/deps/acelite/ace/Timer_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue.h
rename to modules/acore/deps/acelite/ace/Timer_Queue.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_Adapters.cpp b/modules/acore/deps/acelite/ace/Timer_Queue_Adapters.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Adapters.cpp
rename to modules/acore/deps/acelite/ace/Timer_Queue_Adapters.cpp
diff --git a/modules/dep/acelite/ace/Timer_Queue_Adapters.h b/modules/acore/deps/acelite/ace/Timer_Queue_Adapters.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Adapters.h
rename to modules/acore/deps/acelite/ace/Timer_Queue_Adapters.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_Adapters.inl b/modules/acore/deps/acelite/ace/Timer_Queue_Adapters.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Adapters.inl
rename to modules/acore/deps/acelite/ace/Timer_Queue_Adapters.inl
diff --git a/modules/dep/acelite/ace/Timer_Queue_Iterator.cpp b/modules/acore/deps/acelite/ace/Timer_Queue_Iterator.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Iterator.cpp
rename to modules/acore/deps/acelite/ace/Timer_Queue_Iterator.cpp
diff --git a/modules/dep/acelite/ace/Timer_Queue_Iterator.h b/modules/acore/deps/acelite/ace/Timer_Queue_Iterator.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Iterator.h
rename to modules/acore/deps/acelite/ace/Timer_Queue_Iterator.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_Iterator.inl b/modules/acore/deps/acelite/ace/Timer_Queue_Iterator.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Iterator.inl
rename to modules/acore/deps/acelite/ace/Timer_Queue_Iterator.inl
diff --git a/modules/dep/acelite/ace/Timer_Queue_T.cpp b/modules/acore/deps/acelite/ace/Timer_Queue_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_T.cpp
rename to modules/acore/deps/acelite/ace/Timer_Queue_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Queue_T.h b/modules/acore/deps/acelite/ace/Timer_Queue_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_T.h
rename to modules/acore/deps/acelite/ace/Timer_Queue_T.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_T.inl b/modules/acore/deps/acelite/ace/Timer_Queue_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_T.inl
rename to modules/acore/deps/acelite/ace/Timer_Queue_T.inl
diff --git a/modules/dep/acelite/ace/Timer_Queuefwd.h b/modules/acore/deps/acelite/ace/Timer_Queuefwd.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queuefwd.h
rename to modules/acore/deps/acelite/ace/Timer_Queuefwd.h
diff --git a/modules/dep/acelite/ace/Timer_Wheel.h b/modules/acore/deps/acelite/ace/Timer_Wheel.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Wheel.h
rename to modules/acore/deps/acelite/ace/Timer_Wheel.h
diff --git a/modules/dep/acelite/ace/Timer_Wheel_T.cpp b/modules/acore/deps/acelite/ace/Timer_Wheel_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Wheel_T.cpp
rename to modules/acore/deps/acelite/ace/Timer_Wheel_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Wheel_T.h b/modules/acore/deps/acelite/ace/Timer_Wheel_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Wheel_T.h
rename to modules/acore/deps/acelite/ace/Timer_Wheel_T.h
diff --git a/modules/dep/acelite/ace/TkReactor/ACE_TkReactor.pc.in b/modules/acore/deps/acelite/ace/TkReactor/ACE_TkReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/ACE_TkReactor.pc.in
rename to modules/acore/deps/acelite/ace/TkReactor/ACE_TkReactor.pc.in
diff --git a/modules/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h b/modules/acore/deps/acelite/ace/TkReactor/ACE_TkReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h
rename to modules/acore/deps/acelite/ace/TkReactor/ACE_TkReactor_export.h
diff --git a/modules/dep/acelite/ace/TkReactor/TkReactor.cpp b/modules/acore/deps/acelite/ace/TkReactor/TkReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/TkReactor.cpp
rename to modules/acore/deps/acelite/ace/TkReactor/TkReactor.cpp
diff --git a/modules/dep/acelite/ace/TkReactor/TkReactor.h b/modules/acore/deps/acelite/ace/TkReactor/TkReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/TkReactor.h
rename to modules/acore/deps/acelite/ace/TkReactor/TkReactor.h
diff --git a/modules/dep/acelite/ace/TkReactor/ace_tkreactor.mpc b/modules/acore/deps/acelite/ace/TkReactor/ace_tkreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/ace_tkreactor.mpc
rename to modules/acore/deps/acelite/ace/TkReactor/ace_tkreactor.mpc
diff --git a/modules/dep/acelite/ace/Token.cpp b/modules/acore/deps/acelite/ace/Token.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token.cpp
rename to modules/acore/deps/acelite/ace/Token.cpp
diff --git a/modules/dep/acelite/ace/Token.h b/modules/acore/deps/acelite/ace/Token.h
similarity index 100%
rename from modules/dep/acelite/ace/Token.h
rename to modules/acore/deps/acelite/ace/Token.h
diff --git a/modules/dep/acelite/ace/Token.inl b/modules/acore/deps/acelite/ace/Token.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token.inl
rename to modules/acore/deps/acelite/ace/Token.inl
diff --git a/modules/dep/acelite/ace/Token_Collection.cpp b/modules/acore/deps/acelite/ace/Token_Collection.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Collection.cpp
rename to modules/acore/deps/acelite/ace/Token_Collection.cpp
diff --git a/modules/dep/acelite/ace/Token_Collection.h b/modules/acore/deps/acelite/ace/Token_Collection.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Collection.h
rename to modules/acore/deps/acelite/ace/Token_Collection.h
diff --git a/modules/dep/acelite/ace/Token_Collection.inl b/modules/acore/deps/acelite/ace/Token_Collection.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token_Collection.inl
rename to modules/acore/deps/acelite/ace/Token_Collection.inl
diff --git a/modules/dep/acelite/ace/Token_Invariants.cpp b/modules/acore/deps/acelite/ace/Token_Invariants.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Invariants.cpp
rename to modules/acore/deps/acelite/ace/Token_Invariants.cpp
diff --git a/modules/dep/acelite/ace/Token_Invariants.h b/modules/acore/deps/acelite/ace/Token_Invariants.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Invariants.h
rename to modules/acore/deps/acelite/ace/Token_Invariants.h
diff --git a/modules/dep/acelite/ace/Token_Manager.cpp b/modules/acore/deps/acelite/ace/Token_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Manager.cpp
rename to modules/acore/deps/acelite/ace/Token_Manager.cpp
diff --git a/modules/dep/acelite/ace/Token_Manager.h b/modules/acore/deps/acelite/ace/Token_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Manager.h
rename to modules/acore/deps/acelite/ace/Token_Manager.h
diff --git a/modules/dep/acelite/ace/Token_Manager.inl b/modules/acore/deps/acelite/ace/Token_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token_Manager.inl
rename to modules/acore/deps/acelite/ace/Token_Manager.inl
diff --git a/modules/dep/acelite/ace/Token_Request_Reply.cpp b/modules/acore/deps/acelite/ace/Token_Request_Reply.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Request_Reply.cpp
rename to modules/acore/deps/acelite/ace/Token_Request_Reply.cpp
diff --git a/modules/dep/acelite/ace/Token_Request_Reply.h b/modules/acore/deps/acelite/ace/Token_Request_Reply.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Request_Reply.h
rename to modules/acore/deps/acelite/ace/Token_Request_Reply.h
diff --git a/modules/dep/acelite/ace/Token_Request_Reply.inl b/modules/acore/deps/acelite/ace/Token_Request_Reply.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token_Request_Reply.inl
rename to modules/acore/deps/acelite/ace/Token_Request_Reply.inl
diff --git a/modules/dep/acelite/ace/Tokenizer_T.cpp b/modules/acore/deps/acelite/ace/Tokenizer_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Tokenizer_T.cpp
rename to modules/acore/deps/acelite/ace/Tokenizer_T.cpp
diff --git a/modules/dep/acelite/ace/Tokenizer_T.h b/modules/acore/deps/acelite/ace/Tokenizer_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Tokenizer_T.h
rename to modules/acore/deps/acelite/ace/Tokenizer_T.h
diff --git a/modules/dep/acelite/ace/Trace.cpp b/modules/acore/deps/acelite/ace/Trace.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Trace.cpp
rename to modules/acore/deps/acelite/ace/Trace.cpp
diff --git a/modules/dep/acelite/ace/Trace.h b/modules/acore/deps/acelite/ace/Trace.h
similarity index 100%
rename from modules/dep/acelite/ace/Trace.h
rename to modules/acore/deps/acelite/ace/Trace.h
diff --git a/modules/dep/acelite/ace/Truncate.h b/modules/acore/deps/acelite/ace/Truncate.h
similarity index 100%
rename from modules/dep/acelite/ace/Truncate.h
rename to modules/acore/deps/acelite/ace/Truncate.h
diff --git a/modules/dep/acelite/ace/Typed_SV_Message.cpp b/modules/acore/deps/acelite/ace/Typed_SV_Message.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message.cpp
rename to modules/acore/deps/acelite/ace/Typed_SV_Message.cpp
diff --git a/modules/dep/acelite/ace/Typed_SV_Message.h b/modules/acore/deps/acelite/ace/Typed_SV_Message.h
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message.h
rename to modules/acore/deps/acelite/ace/Typed_SV_Message.h
diff --git a/modules/dep/acelite/ace/Typed_SV_Message.inl b/modules/acore/deps/acelite/ace/Typed_SV_Message.inl
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message.inl
rename to modules/acore/deps/acelite/ace/Typed_SV_Message.inl
diff --git a/modules/dep/acelite/ace/Typed_SV_Message_Queue.cpp b/modules/acore/deps/acelite/ace/Typed_SV_Message_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message_Queue.cpp
rename to modules/acore/deps/acelite/ace/Typed_SV_Message_Queue.cpp
diff --git a/modules/dep/acelite/ace/Typed_SV_Message_Queue.h b/modules/acore/deps/acelite/ace/Typed_SV_Message_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message_Queue.h
rename to modules/acore/deps/acelite/ace/Typed_SV_Message_Queue.h
diff --git a/modules/dep/acelite/ace/Typed_SV_Message_Queue.inl b/modules/acore/deps/acelite/ace/Typed_SV_Message_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message_Queue.inl
rename to modules/acore/deps/acelite/ace/Typed_SV_Message_Queue.inl
diff --git a/modules/dep/acelite/ace/UNIX_Addr.cpp b/modules/acore/deps/acelite/ace/UNIX_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UNIX_Addr.cpp
rename to modules/acore/deps/acelite/ace/UNIX_Addr.cpp
diff --git a/modules/dep/acelite/ace/UNIX_Addr.h b/modules/acore/deps/acelite/ace/UNIX_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/UNIX_Addr.h
rename to modules/acore/deps/acelite/ace/UNIX_Addr.h
diff --git a/modules/dep/acelite/ace/UNIX_Addr.inl b/modules/acore/deps/acelite/ace/UNIX_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/UNIX_Addr.inl
rename to modules/acore/deps/acelite/ace/UNIX_Addr.inl
diff --git a/modules/dep/acelite/ace/UPIPE_Acceptor.cpp b/modules/acore/deps/acelite/ace/UPIPE_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Acceptor.cpp
rename to modules/acore/deps/acelite/ace/UPIPE_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/UPIPE_Acceptor.h b/modules/acore/deps/acelite/ace/UPIPE_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Acceptor.h
rename to modules/acore/deps/acelite/ace/UPIPE_Acceptor.h
diff --git a/modules/dep/acelite/ace/UPIPE_Acceptor.inl b/modules/acore/deps/acelite/ace/UPIPE_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Acceptor.inl
rename to modules/acore/deps/acelite/ace/UPIPE_Acceptor.inl
diff --git a/modules/dep/acelite/ace/UPIPE_Addr.h b/modules/acore/deps/acelite/ace/UPIPE_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Addr.h
rename to modules/acore/deps/acelite/ace/UPIPE_Addr.h
diff --git a/modules/dep/acelite/ace/UPIPE_Connector.cpp b/modules/acore/deps/acelite/ace/UPIPE_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Connector.cpp
rename to modules/acore/deps/acelite/ace/UPIPE_Connector.cpp
diff --git a/modules/dep/acelite/ace/UPIPE_Connector.h b/modules/acore/deps/acelite/ace/UPIPE_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Connector.h
rename to modules/acore/deps/acelite/ace/UPIPE_Connector.h
diff --git a/modules/dep/acelite/ace/UPIPE_Connector.inl b/modules/acore/deps/acelite/ace/UPIPE_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Connector.inl
rename to modules/acore/deps/acelite/ace/UPIPE_Connector.inl
diff --git a/modules/dep/acelite/ace/UPIPE_Stream.cpp b/modules/acore/deps/acelite/ace/UPIPE_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Stream.cpp
rename to modules/acore/deps/acelite/ace/UPIPE_Stream.cpp
diff --git a/modules/dep/acelite/ace/UPIPE_Stream.h b/modules/acore/deps/acelite/ace/UPIPE_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Stream.h
rename to modules/acore/deps/acelite/ace/UPIPE_Stream.h
diff --git a/modules/dep/acelite/ace/UPIPE_Stream.inl b/modules/acore/deps/acelite/ace/UPIPE_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Stream.inl
rename to modules/acore/deps/acelite/ace/UPIPE_Stream.inl
diff --git a/modules/dep/acelite/ace/UTF16_Encoding_Converter.cpp b/modules/acore/deps/acelite/ace/UTF16_Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UTF16_Encoding_Converter.cpp
rename to modules/acore/deps/acelite/ace/UTF16_Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/UTF16_Encoding_Converter.h b/modules/acore/deps/acelite/ace/UTF16_Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/UTF16_Encoding_Converter.h
rename to modules/acore/deps/acelite/ace/UTF16_Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/UTF16_Encoding_Converter.inl b/modules/acore/deps/acelite/ace/UTF16_Encoding_Converter.inl
similarity index 100%
rename from modules/dep/acelite/ace/UTF16_Encoding_Converter.inl
rename to modules/acore/deps/acelite/ace/UTF16_Encoding_Converter.inl
diff --git a/modules/dep/acelite/ace/UTF32_Encoding_Converter.cpp b/modules/acore/deps/acelite/ace/UTF32_Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UTF32_Encoding_Converter.cpp
rename to modules/acore/deps/acelite/ace/UTF32_Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/UTF32_Encoding_Converter.h b/modules/acore/deps/acelite/ace/UTF32_Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/UTF32_Encoding_Converter.h
rename to modules/acore/deps/acelite/ace/UTF32_Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/UTF8_Encoding_Converter.cpp b/modules/acore/deps/acelite/ace/UTF8_Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UTF8_Encoding_Converter.cpp
rename to modules/acore/deps/acelite/ace/UTF8_Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/UTF8_Encoding_Converter.h b/modules/acore/deps/acelite/ace/UTF8_Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/UTF8_Encoding_Converter.h
rename to modules/acore/deps/acelite/ace/UTF8_Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/UUID.cpp b/modules/acore/deps/acelite/ace/UUID.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UUID.cpp
rename to modules/acore/deps/acelite/ace/UUID.cpp
diff --git a/modules/dep/acelite/ace/UUID.h b/modules/acore/deps/acelite/ace/UUID.h
similarity index 100%
rename from modules/dep/acelite/ace/UUID.h
rename to modules/acore/deps/acelite/ace/UUID.h
diff --git a/modules/dep/acelite/ace/UUID.inl b/modules/acore/deps/acelite/ace/UUID.inl
similarity index 100%
rename from modules/dep/acelite/ace/UUID.inl
rename to modules/acore/deps/acelite/ace/UUID.inl
diff --git a/modules/dep/acelite/ace/Unbounded_Queue.cpp b/modules/acore/deps/acelite/ace/Unbounded_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Queue.cpp
rename to modules/acore/deps/acelite/ace/Unbounded_Queue.cpp
diff --git a/modules/dep/acelite/ace/Unbounded_Queue.h b/modules/acore/deps/acelite/ace/Unbounded_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Queue.h
rename to modules/acore/deps/acelite/ace/Unbounded_Queue.h
diff --git a/modules/dep/acelite/ace/Unbounded_Queue.inl b/modules/acore/deps/acelite/ace/Unbounded_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Queue.inl
rename to modules/acore/deps/acelite/ace/Unbounded_Queue.inl
diff --git a/modules/dep/acelite/ace/Unbounded_Set.cpp b/modules/acore/deps/acelite/ace/Unbounded_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set.cpp
rename to modules/acore/deps/acelite/ace/Unbounded_Set.cpp
diff --git a/modules/dep/acelite/ace/Unbounded_Set.h b/modules/acore/deps/acelite/ace/Unbounded_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set.h
rename to modules/acore/deps/acelite/ace/Unbounded_Set.h
diff --git a/modules/dep/acelite/ace/Unbounded_Set.inl b/modules/acore/deps/acelite/ace/Unbounded_Set.inl
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set.inl
rename to modules/acore/deps/acelite/ace/Unbounded_Set.inl
diff --git a/modules/dep/acelite/ace/Unbounded_Set_Ex.cpp b/modules/acore/deps/acelite/ace/Unbounded_Set_Ex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set_Ex.cpp
rename to modules/acore/deps/acelite/ace/Unbounded_Set_Ex.cpp
diff --git a/modules/dep/acelite/ace/Unbounded_Set_Ex.h b/modules/acore/deps/acelite/ace/Unbounded_Set_Ex.h
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set_Ex.h
rename to modules/acore/deps/acelite/ace/Unbounded_Set_Ex.h
diff --git a/modules/dep/acelite/ace/Unbounded_Set_Ex.inl b/modules/acore/deps/acelite/ace/Unbounded_Set_Ex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set_Ex.inl
rename to modules/acore/deps/acelite/ace/Unbounded_Set_Ex.inl
diff --git a/modules/dep/acelite/ace/Value_Ptr.h b/modules/acore/deps/acelite/ace/Value_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Value_Ptr.h
rename to modules/acore/deps/acelite/ace/Value_Ptr.h
diff --git a/modules/dep/acelite/ace/Vector_T.cpp b/modules/acore/deps/acelite/ace/Vector_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Vector_T.cpp
rename to modules/acore/deps/acelite/ace/Vector_T.cpp
diff --git a/modules/dep/acelite/ace/Vector_T.h b/modules/acore/deps/acelite/ace/Vector_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Vector_T.h
rename to modules/acore/deps/acelite/ace/Vector_T.h
diff --git a/modules/dep/acelite/ace/Vector_T.inl b/modules/acore/deps/acelite/ace/Vector_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Vector_T.inl
rename to modules/acore/deps/acelite/ace/Vector_T.inl
diff --git a/modules/dep/acelite/ace/Version.h b/modules/acore/deps/acelite/ace/Version.h
similarity index 100%
rename from modules/dep/acelite/ace/Version.h
rename to modules/acore/deps/acelite/ace/Version.h
diff --git a/modules/dep/acelite/ace/Versioned_Namespace.h b/modules/acore/deps/acelite/ace/Versioned_Namespace.h
similarity index 100%
rename from modules/dep/acelite/ace/Versioned_Namespace.h
rename to modules/acore/deps/acelite/ace/Versioned_Namespace.h
diff --git a/modules/dep/acelite/ace/WFMO_Reactor.cpp b/modules/acore/deps/acelite/ace/WFMO_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/WFMO_Reactor.cpp
rename to modules/acore/deps/acelite/ace/WFMO_Reactor.cpp
diff --git a/modules/dep/acelite/ace/WFMO_Reactor.h b/modules/acore/deps/acelite/ace/WFMO_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/WFMO_Reactor.h
rename to modules/acore/deps/acelite/ace/WFMO_Reactor.h
diff --git a/modules/dep/acelite/ace/WFMO_Reactor.inl b/modules/acore/deps/acelite/ace/WFMO_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/WFMO_Reactor.inl
rename to modules/acore/deps/acelite/ace/WFMO_Reactor.inl
diff --git a/modules/dep/acelite/ace/WIN32_Asynch_IO.cpp b/modules/acore/deps/acelite/ace/WIN32_Asynch_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Asynch_IO.cpp
rename to modules/acore/deps/acelite/ace/WIN32_Asynch_IO.cpp
diff --git a/modules/dep/acelite/ace/WIN32_Asynch_IO.h b/modules/acore/deps/acelite/ace/WIN32_Asynch_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Asynch_IO.h
rename to modules/acore/deps/acelite/ace/WIN32_Asynch_IO.h
diff --git a/modules/dep/acelite/ace/WIN32_Proactor.cpp b/modules/acore/deps/acelite/ace/WIN32_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Proactor.cpp
rename to modules/acore/deps/acelite/ace/WIN32_Proactor.cpp
diff --git a/modules/dep/acelite/ace/WIN32_Proactor.h b/modules/acore/deps/acelite/ace/WIN32_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Proactor.h
rename to modules/acore/deps/acelite/ace/WIN32_Proactor.h
diff --git a/modules/dep/acelite/ace/XML_Svc_Conf.cpp b/modules/acore/deps/acelite/ace/XML_Svc_Conf.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Svc_Conf.cpp
rename to modules/acore/deps/acelite/ace/XML_Svc_Conf.cpp
diff --git a/modules/dep/acelite/ace/XML_Svc_Conf.h b/modules/acore/deps/acelite/ace/XML_Svc_Conf.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Svc_Conf.h
rename to modules/acore/deps/acelite/ace/XML_Svc_Conf.h
diff --git a/modules/dep/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in b/modules/acore/deps/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
rename to modules/acore/deps/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
diff --git a/modules/dep/acelite/ace/XML_Utils/XML.mpc b/modules/acore/deps/acelite/ace/XML_Utils/XML.mpc
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML.mpc
rename to modules/acore/deps/acelite/ace/XML_Utils/XML.mpc
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Types.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Types.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Types.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Types.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/id_map.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Error_Handler.cpp b/modules/acore/deps/acelite/ace/XML_Utils/XML_Error_Handler.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Error_Handler.cpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Error_Handler.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Error_Handler.h b/modules/acore/deps/acelite/ace/XML_Utils/XML_Error_Handler.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Error_Handler.h
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Error_Handler.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Helper.h b/modules/acore/deps/acelite/ace/XML_Utils/XML_Helper.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Helper.h
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Helper.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Helper.tpp b/modules/acore/deps/acelite/ace/XML_Utils/XML_Helper.tpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Helper.tpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Helper.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp b/modules/acore/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.h b/modules/acore/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.h
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp b/modules/acore/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp b/modules/acore/deps/acelite/ace/XML_Utils/XML_Typedefs.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Typedefs.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Typedefs.h b/modules/acore/deps/acelite/ace/XML_Utils/XML_Typedefs.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Typedefs.h
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Typedefs.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Utils_Export.h b/modules/acore/deps/acelite/ace/XML_Utils/XML_Utils_Export.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Utils_Export.h
rename to modules/acore/deps/acelite/ace/XML_Utils/XML_Utils_Export.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Elements.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Elements.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Parser.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Parser.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Writer.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/Writer.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/XML.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/XML.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp b/modules/acore/deps/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XercesString.cpp b/modules/acore/deps/acelite/ace/XML_Utils/XercesString.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XercesString.cpp
rename to modules/acore/deps/acelite/ace/XML_Utils/XercesString.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XercesString.h b/modules/acore/deps/acelite/ace/XML_Utils/XercesString.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XercesString.h
rename to modules/acore/deps/acelite/ace/XML_Utils/XercesString.h
diff --git a/modules/dep/acelite/ace/XTI_ATM_Mcast.cpp b/modules/acore/deps/acelite/ace/XTI_ATM_Mcast.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XTI_ATM_Mcast.cpp
rename to modules/acore/deps/acelite/ace/XTI_ATM_Mcast.cpp
diff --git a/modules/dep/acelite/ace/XTI_ATM_Mcast.h b/modules/acore/deps/acelite/ace/XTI_ATM_Mcast.h
similarity index 100%
rename from modules/dep/acelite/ace/XTI_ATM_Mcast.h
rename to modules/acore/deps/acelite/ace/XTI_ATM_Mcast.h
diff --git a/modules/dep/acelite/ace/XTI_ATM_Mcast.inl b/modules/acore/deps/acelite/ace/XTI_ATM_Mcast.inl
similarity index 100%
rename from modules/dep/acelite/ace/XTI_ATM_Mcast.inl
rename to modules/acore/deps/acelite/ace/XTI_ATM_Mcast.inl
diff --git a/modules/dep/acelite/ace/XtReactor/ACE_XtReactor.pc.in b/modules/acore/deps/acelite/ace/XtReactor/ACE_XtReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/ACE_XtReactor.pc.in
rename to modules/acore/deps/acelite/ace/XtReactor/ACE_XtReactor.pc.in
diff --git a/modules/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h b/modules/acore/deps/acelite/ace/XtReactor/ACE_XtReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h
rename to modules/acore/deps/acelite/ace/XtReactor/ACE_XtReactor_export.h
diff --git a/modules/dep/acelite/ace/XtReactor/XtReactor.cpp b/modules/acore/deps/acelite/ace/XtReactor/XtReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/XtReactor.cpp
rename to modules/acore/deps/acelite/ace/XtReactor/XtReactor.cpp
diff --git a/modules/dep/acelite/ace/XtReactor/XtReactor.h b/modules/acore/deps/acelite/ace/XtReactor/XtReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/XtReactor.h
rename to modules/acore/deps/acelite/ace/XtReactor/XtReactor.h
diff --git a/modules/dep/acelite/ace/XtReactor/ace_xtreactor.mpc b/modules/acore/deps/acelite/ace/XtReactor/ace_xtreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/ace_xtreactor.mpc
rename to modules/acore/deps/acelite/ace/XtReactor/ace_xtreactor.mpc
diff --git a/modules/dep/acelite/ace/ace.mpc b/modules/acore/deps/acelite/ace/ace.mpc
similarity index 100%
rename from modules/dep/acelite/ace/ace.mpc
rename to modules/acore/deps/acelite/ace/ace.mpc
diff --git a/modules/dep/acelite/ace/ace.mwc b/modules/acore/deps/acelite/ace/ace.mwc
similarity index 100%
rename from modules/dep/acelite/ace/ace.mwc
rename to modules/acore/deps/acelite/ace/ace.mwc
diff --git a/modules/dep/acelite/ace/ace.rc b/modules/acore/deps/acelite/ace/ace.rc
similarity index 100%
rename from modules/dep/acelite/ace/ace.rc
rename to modules/acore/deps/acelite/ace/ace.rc
diff --git a/modules/dep/acelite/ace/ace_for_tao.mpc b/modules/acore/deps/acelite/ace/ace_for_tao.mpc
similarity index 100%
rename from modules/dep/acelite/ace/ace_for_tao.mpc
rename to modules/acore/deps/acelite/ace/ace_for_tao.mpc
diff --git a/modules/dep/acelite/ace/ace_message_table.bin b/modules/acore/deps/acelite/ace/ace_message_table.bin
similarity index 100%
rename from modules/dep/acelite/ace/ace_message_table.bin
rename to modules/acore/deps/acelite/ace/ace_message_table.bin
diff --git a/modules/dep/acelite/ace/ace_wchar.cpp b/modules/acore/deps/acelite/ace/ace_wchar.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ace_wchar.cpp
rename to modules/acore/deps/acelite/ace/ace_wchar.cpp
diff --git a/modules/dep/acelite/ace/ace_wchar.h b/modules/acore/deps/acelite/ace/ace_wchar.h
similarity index 100%
rename from modules/dep/acelite/ace/ace_wchar.h
rename to modules/acore/deps/acelite/ace/ace_wchar.h
diff --git a/modules/dep/acelite/ace/ace_wchar.inl b/modules/acore/deps/acelite/ace/ace_wchar.inl
similarity index 100%
rename from modules/dep/acelite/ace/ace_wchar.inl
rename to modules/acore/deps/acelite/ace/ace_wchar.inl
diff --git a/modules/dep/acelite/ace/checked_iterator.h b/modules/acore/deps/acelite/ace/checked_iterator.h
similarity index 100%
rename from modules/dep/acelite/ace/checked_iterator.h
rename to modules/acore/deps/acelite/ace/checked_iterator.h
diff --git a/modules/dep/acelite/ace/codecs.mpb b/modules/acore/deps/acelite/ace/codecs.mpb
similarity index 100%
rename from modules/dep/acelite/ace/codecs.mpb
rename to modules/acore/deps/acelite/ace/codecs.mpb
diff --git a/modules/dep/acelite/ace/config-WinCE.h b/modules/acore/deps/acelite/ace/config-WinCE.h
similarity index 100%
rename from modules/dep/acelite/ace/config-WinCE.h
rename to modules/acore/deps/acelite/ace/config-WinCE.h
diff --git a/modules/dep/acelite/ace/config-aix-5.x.h b/modules/acore/deps/acelite/ace/config-aix-5.x.h
similarity index 100%
rename from modules/dep/acelite/ace/config-aix-5.x.h
rename to modules/acore/deps/acelite/ace/config-aix-5.x.h
diff --git a/modules/dep/acelite/ace/config-aix-7.h b/modules/acore/deps/acelite/ace/config-aix-7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-aix-7.h
rename to modules/acore/deps/acelite/ace/config-aix-7.h
diff --git a/modules/dep/acelite/ace/config-all.h b/modules/acore/deps/acelite/ace/config-all.h
similarity index 100%
rename from modules/dep/acelite/ace/config-all.h
rename to modules/acore/deps/acelite/ace/config-all.h
diff --git a/modules/dep/acelite/ace/config-android.h b/modules/acore/deps/acelite/ace/config-android.h
similarity index 100%
rename from modules/dep/acelite/ace/config-android.h
rename to modules/acore/deps/acelite/ace/config-android.h
diff --git a/modules/dep/acelite/ace/config-cygwin32.h b/modules/acore/deps/acelite/ace/config-cygwin32.h
similarity index 100%
rename from modules/dep/acelite/ace/config-cygwin32.h
rename to modules/acore/deps/acelite/ace/config-cygwin32.h
diff --git a/modules/dep/acelite/ace/config-freebsd.h b/modules/acore/deps/acelite/ace/config-freebsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-freebsd.h
rename to modules/acore/deps/acelite/ace/config-freebsd.h
diff --git a/modules/dep/acelite/ace/config-g++-common.h b/modules/acore/deps/acelite/ace/config-g++-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-g++-common.h
rename to modules/acore/deps/acelite/ace/config-g++-common.h
diff --git a/modules/dep/acelite/ace/config-hpux-11.00.h b/modules/acore/deps/acelite/ace/config-hpux-11.00.h
similarity index 100%
rename from modules/dep/acelite/ace/config-hpux-11.00.h
rename to modules/acore/deps/acelite/ace/config-hpux-11.00.h
diff --git a/modules/dep/acelite/ace/config-icc-common.h b/modules/acore/deps/acelite/ace/config-icc-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-icc-common.h
rename to modules/acore/deps/acelite/ace/config-icc-common.h
diff --git a/modules/dep/acelite/ace/config-integritySCA.h b/modules/acore/deps/acelite/ace/config-integritySCA.h
similarity index 100%
rename from modules/dep/acelite/ace/config-integritySCA.h
rename to modules/acore/deps/acelite/ace/config-integritySCA.h
diff --git a/modules/dep/acelite/ace/config-kfreebsd.h b/modules/acore/deps/acelite/ace/config-kfreebsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-kfreebsd.h
rename to modules/acore/deps/acelite/ace/config-kfreebsd.h
diff --git a/modules/dep/acelite/ace/config-linux.h b/modules/acore/deps/acelite/ace/config-linux.h
similarity index 100%
rename from modules/dep/acelite/ace/config-linux.h
rename to modules/acore/deps/acelite/ace/config-linux.h
diff --git a/modules/dep/acelite/ace/config-lite.h b/modules/acore/deps/acelite/ace/config-lite.h
similarity index 100%
rename from modules/dep/acelite/ace/config-lite.h
rename to modules/acore/deps/acelite/ace/config-lite.h
diff --git a/modules/dep/acelite/ace/config-lynxos.h b/modules/acore/deps/acelite/ace/config-lynxos.h
similarity index 100%
rename from modules/dep/acelite/ace/config-lynxos.h
rename to modules/acore/deps/acelite/ace/config-lynxos.h
diff --git a/modules/dep/acelite/ace/config-macosx-iOS-hardware.h b/modules/acore/deps/acelite/ace/config-macosx-iOS-hardware.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-iOS-hardware.h
rename to modules/acore/deps/acelite/ace/config-macosx-iOS-hardware.h
diff --git a/modules/dep/acelite/ace/config-macosx-iOS-simulator.h b/modules/acore/deps/acelite/ace/config-macosx-iOS-simulator.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-iOS-simulator.h
rename to modules/acore/deps/acelite/ace/config-macosx-iOS-simulator.h
diff --git a/modules/dep/acelite/ace/config-macosx-leopard.h b/modules/acore/deps/acelite/ace/config-macosx-leopard.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-leopard.h
rename to modules/acore/deps/acelite/ace/config-macosx-leopard.h
diff --git a/modules/dep/acelite/ace/config-macosx-lion.h b/modules/acore/deps/acelite/ace/config-macosx-lion.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-lion.h
rename to modules/acore/deps/acelite/ace/config-macosx-lion.h
diff --git a/modules/dep/acelite/ace/config-macosx-mavericks.h b/modules/acore/deps/acelite/ace/config-macosx-mavericks.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-mavericks.h
rename to modules/acore/deps/acelite/ace/config-macosx-mavericks.h
diff --git a/modules/dep/acelite/ace/config-macosx-mountainlion.h b/modules/acore/deps/acelite/ace/config-macosx-mountainlion.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-mountainlion.h
rename to modules/acore/deps/acelite/ace/config-macosx-mountainlion.h
diff --git a/modules/dep/acelite/ace/config-macosx-panther.h b/modules/acore/deps/acelite/ace/config-macosx-panther.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-panther.h
rename to modules/acore/deps/acelite/ace/config-macosx-panther.h
diff --git a/modules/dep/acelite/ace/config-macosx-snowleopard.h b/modules/acore/deps/acelite/ace/config-macosx-snowleopard.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-snowleopard.h
rename to modules/acore/deps/acelite/ace/config-macosx-snowleopard.h
diff --git a/modules/dep/acelite/ace/config-macosx-tiger.h b/modules/acore/deps/acelite/ace/config-macosx-tiger.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-tiger.h
rename to modules/acore/deps/acelite/ace/config-macosx-tiger.h
diff --git a/modules/dep/acelite/ace/config-macosx-yosemite.h b/modules/acore/deps/acelite/ace/config-macosx-yosemite.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-yosemite.h
rename to modules/acore/deps/acelite/ace/config-macosx-yosemite.h
diff --git a/modules/dep/acelite/ace/config-macosx.h b/modules/acore/deps/acelite/ace/config-macosx.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx.h
rename to modules/acore/deps/acelite/ace/config-macosx.h
diff --git a/modules/dep/acelite/ace/config-macros.h b/modules/acore/deps/acelite/ace/config-macros.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macros.h
rename to modules/acore/deps/acelite/ace/config-macros.h
diff --git a/modules/dep/acelite/ace/config-netbsd.h b/modules/acore/deps/acelite/ace/config-netbsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-netbsd.h
rename to modules/acore/deps/acelite/ace/config-netbsd.h
diff --git a/modules/dep/acelite/ace/config-openbsd.h b/modules/acore/deps/acelite/ace/config-openbsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-openbsd.h
rename to modules/acore/deps/acelite/ace/config-openbsd.h
diff --git a/modules/dep/acelite/ace/config-openvms.h b/modules/acore/deps/acelite/ace/config-openvms.h
similarity index 100%
rename from modules/dep/acelite/ace/config-openvms.h
rename to modules/acore/deps/acelite/ace/config-openvms.h
diff --git a/modules/dep/acelite/ace/config-pharlap.h b/modules/acore/deps/acelite/ace/config-pharlap.h
similarity index 100%
rename from modules/dep/acelite/ace/config-pharlap.h
rename to modules/acore/deps/acelite/ace/config-pharlap.h
diff --git a/modules/dep/acelite/ace/config-posix-nonetworking.h b/modules/acore/deps/acelite/ace/config-posix-nonetworking.h
similarity index 100%
rename from modules/dep/acelite/ace/config-posix-nonetworking.h
rename to modules/acore/deps/acelite/ace/config-posix-nonetworking.h
diff --git a/modules/dep/acelite/ace/config-posix.h b/modules/acore/deps/acelite/ace/config-posix.h
similarity index 100%
rename from modules/dep/acelite/ace/config-posix.h
rename to modules/acore/deps/acelite/ace/config-posix.h
diff --git a/modules/dep/acelite/ace/config-qnx.h b/modules/acore/deps/acelite/ace/config-qnx.h
similarity index 100%
rename from modules/dep/acelite/ace/config-qnx.h
rename to modules/acore/deps/acelite/ace/config-qnx.h
diff --git a/modules/dep/acelite/ace/config-rtems.h b/modules/acore/deps/acelite/ace/config-rtems.h
similarity index 100%
rename from modules/dep/acelite/ace/config-rtems.h
rename to modules/acore/deps/acelite/ace/config-rtems.h
diff --git a/modules/dep/acelite/ace/config-suncc-common.h b/modules/acore/deps/acelite/ace/config-suncc-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-suncc-common.h
rename to modules/acore/deps/acelite/ace/config-suncc-common.h
diff --git a/modules/dep/acelite/ace/config-sunos5.10.h b/modules/acore/deps/acelite/ace/config-sunos5.10.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.10.h
rename to modules/acore/deps/acelite/ace/config-sunos5.10.h
diff --git a/modules/dep/acelite/ace/config-sunos5.11.h b/modules/acore/deps/acelite/ace/config-sunos5.11.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.11.h
rename to modules/acore/deps/acelite/ace/config-sunos5.11.h
diff --git a/modules/dep/acelite/ace/config-sunos5.4-g++.h b/modules/acore/deps/acelite/ace/config-sunos5.4-g++.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.4-g++.h
rename to modules/acore/deps/acelite/ace/config-sunos5.4-g++.h
diff --git a/modules/dep/acelite/ace/config-sunos5.4-sunc++-4.x.h b/modules/acore/deps/acelite/ace/config-sunos5.4-sunc++-4.x.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.4-sunc++-4.x.h
rename to modules/acore/deps/acelite/ace/config-sunos5.4-sunc++-4.x.h
diff --git a/modules/dep/acelite/ace/config-sunos5.5.h b/modules/acore/deps/acelite/ace/config-sunos5.5.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.5.h
rename to modules/acore/deps/acelite/ace/config-sunos5.5.h
diff --git a/modules/dep/acelite/ace/config-sunos5.6.h b/modules/acore/deps/acelite/ace/config-sunos5.6.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.6.h
rename to modules/acore/deps/acelite/ace/config-sunos5.6.h
diff --git a/modules/dep/acelite/ace/config-sunos5.7.h b/modules/acore/deps/acelite/ace/config-sunos5.7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.7.h
rename to modules/acore/deps/acelite/ace/config-sunos5.7.h
diff --git a/modules/dep/acelite/ace/config-sunos5.8.h b/modules/acore/deps/acelite/ace/config-sunos5.8.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.8.h
rename to modules/acore/deps/acelite/ace/config-sunos5.8.h
diff --git a/modules/dep/acelite/ace/config-sunos5.9.h b/modules/acore/deps/acelite/ace/config-sunos5.9.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.9.h
rename to modules/acore/deps/acelite/ace/config-sunos5.9.h
diff --git a/modules/dep/acelite/ace/config-vxworks.h b/modules/acore/deps/acelite/ace/config-vxworks.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks.h
rename to modules/acore/deps/acelite/ace/config-vxworks.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.4.h b/modules/acore/deps/acelite/ace/config-vxworks6.4.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.4.h
rename to modules/acore/deps/acelite/ace/config-vxworks6.4.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.5.h b/modules/acore/deps/acelite/ace/config-vxworks6.5.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.5.h
rename to modules/acore/deps/acelite/ace/config-vxworks6.5.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.6.h b/modules/acore/deps/acelite/ace/config-vxworks6.6.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.6.h
rename to modules/acore/deps/acelite/ace/config-vxworks6.6.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.7.h b/modules/acore/deps/acelite/ace/config-vxworks6.7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.7.h
rename to modules/acore/deps/acelite/ace/config-vxworks6.7.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.8.h b/modules/acore/deps/acelite/ace/config-vxworks6.8.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.8.h
rename to modules/acore/deps/acelite/ace/config-vxworks6.8.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.9.h b/modules/acore/deps/acelite/ace/config-vxworks6.9.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.9.h
rename to modules/acore/deps/acelite/ace/config-vxworks6.9.h
diff --git a/modules/dep/acelite/ace/config-win32-borland.h b/modules/acore/deps/acelite/ace/config-win32-borland.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-borland.h
rename to modules/acore/deps/acelite/ace/config-win32-borland.h
diff --git a/modules/dep/acelite/ace/config-win32-cegcc.h b/modules/acore/deps/acelite/ace/config-win32-cegcc.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-cegcc.h
rename to modules/acore/deps/acelite/ace/config-win32-cegcc.h
diff --git a/modules/dep/acelite/ace/config-win32-common.h b/modules/acore/deps/acelite/ace/config-win32-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-common.h
rename to modules/acore/deps/acelite/ace/config-win32-common.h
diff --git a/modules/dep/acelite/ace/config-win32-dmc.h b/modules/acore/deps/acelite/ace/config-win32-dmc.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-dmc.h
rename to modules/acore/deps/acelite/ace/config-win32-dmc.h
diff --git a/modules/dep/acelite/ace/config-win32-interix.h b/modules/acore/deps/acelite/ace/config-win32-interix.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-interix.h
rename to modules/acore/deps/acelite/ace/config-win32-interix.h
diff --git a/modules/dep/acelite/ace/config-win32-mingw.h b/modules/acore/deps/acelite/ace/config-win32-mingw.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-mingw.h
rename to modules/acore/deps/acelite/ace/config-win32-mingw.h
diff --git a/modules/dep/acelite/ace/config-win32-mingw64.h b/modules/acore/deps/acelite/ace/config-win32-mingw64.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-mingw64.h
rename to modules/acore/deps/acelite/ace/config-win32-mingw64.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-10.h b/modules/acore/deps/acelite/ace/config-win32-msvc-10.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-10.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc-10.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-11.h b/modules/acore/deps/acelite/ace/config-win32-msvc-11.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-11.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc-11.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-12.h b/modules/acore/deps/acelite/ace/config-win32-msvc-12.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-12.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc-12.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-14.h b/modules/acore/deps/acelite/ace/config-win32-msvc-14.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-14.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc-14.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-7.h b/modules/acore/deps/acelite/ace/config-win32-msvc-7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-7.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc-7.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-8.h b/modules/acore/deps/acelite/ace/config-win32-msvc-8.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-8.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc-8.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-9.h b/modules/acore/deps/acelite/ace/config-win32-msvc-9.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-9.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc-9.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc.h b/modules/acore/deps/acelite/ace/config-win32-msvc.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc.h
rename to modules/acore/deps/acelite/ace/config-win32-msvc.h
diff --git a/modules/dep/acelite/ace/config-win32.h b/modules/acore/deps/acelite/ace/config-win32.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32.h
rename to modules/acore/deps/acelite/ace/config-win32.h
diff --git a/modules/dep/acelite/ace/config-windows.h b/modules/acore/deps/acelite/ace/config-windows.h
similarity index 100%
rename from modules/dep/acelite/ace/config-windows.h
rename to modules/acore/deps/acelite/ace/config-windows.h
diff --git a/modules/dep/acelite/ace/filecache.mpb b/modules/acore/deps/acelite/ace/filecache.mpb
similarity index 100%
rename from modules/dep/acelite/ace/filecache.mpb
rename to modules/acore/deps/acelite/ace/filecache.mpb
diff --git a/modules/dep/acelite/ace/iosfwd.h b/modules/acore/deps/acelite/ace/iosfwd.h
similarity index 100%
rename from modules/dep/acelite/ace/iosfwd.h
rename to modules/acore/deps/acelite/ace/iosfwd.h
diff --git a/modules/dep/acelite/ace/os_include/arpa/os_inet.h b/modules/acore/deps/acelite/ace/os_include/arpa/os_inet.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/arpa/os_inet.h
rename to modules/acore/deps/acelite/ace/os_include/arpa/os_inet.h
diff --git a/modules/dep/acelite/ace/os_include/net/os_if.h b/modules/acore/deps/acelite/ace/os_include/net/os_if.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/net/os_if.h
rename to modules/acore/deps/acelite/ace/os_include/net/os_if.h
diff --git a/modules/dep/acelite/ace/os_include/netinet/os_in.h b/modules/acore/deps/acelite/ace/os_include/netinet/os_in.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/netinet/os_in.h
rename to modules/acore/deps/acelite/ace/os_include/netinet/os_in.h
diff --git a/modules/dep/acelite/ace/os_include/netinet/os_tcp.h b/modules/acore/deps/acelite/ace/os_include/netinet/os_tcp.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/netinet/os_tcp.h
rename to modules/acore/deps/acelite/ace/os_include/netinet/os_tcp.h
diff --git a/modules/dep/acelite/ace/os_include/os_aio.h b/modules/acore/deps/acelite/ace/os_include/os_aio.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_aio.h
rename to modules/acore/deps/acelite/ace/os_include/os_aio.h
diff --git a/modules/dep/acelite/ace/os_include/os_assert.h b/modules/acore/deps/acelite/ace/os_include/os_assert.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_assert.h
rename to modules/acore/deps/acelite/ace/os_include/os_assert.h
diff --git a/modules/dep/acelite/ace/os_include/os_byteswap.h b/modules/acore/deps/acelite/ace/os_include/os_byteswap.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_byteswap.h
rename to modules/acore/deps/acelite/ace/os_include/os_byteswap.h
diff --git a/modules/dep/acelite/ace/os_include/os_complex.h b/modules/acore/deps/acelite/ace/os_include/os_complex.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_complex.h
rename to modules/acore/deps/acelite/ace/os_include/os_complex.h
diff --git a/modules/dep/acelite/ace/os_include/os_cpio.h b/modules/acore/deps/acelite/ace/os_include/os_cpio.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_cpio.h
rename to modules/acore/deps/acelite/ace/os_include/os_cpio.h
diff --git a/modules/dep/acelite/ace/os_include/os_ctype.h b/modules/acore/deps/acelite/ace/os_include/os_ctype.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ctype.h
rename to modules/acore/deps/acelite/ace/os_include/os_ctype.h
diff --git a/modules/dep/acelite/ace/os_include/os_dirent.h b/modules/acore/deps/acelite/ace/os_include/os_dirent.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_dirent.h
rename to modules/acore/deps/acelite/ace/os_include/os_dirent.h
diff --git a/modules/dep/acelite/ace/os_include/os_dlfcn.h b/modules/acore/deps/acelite/ace/os_include/os_dlfcn.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_dlfcn.h
rename to modules/acore/deps/acelite/ace/os_include/os_dlfcn.h
diff --git a/modules/dep/acelite/ace/os_include/os_errno.h b/modules/acore/deps/acelite/ace/os_include/os_errno.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_errno.h
rename to modules/acore/deps/acelite/ace/os_include/os_errno.h
diff --git a/modules/dep/acelite/ace/os_include/os_fcntl.h b/modules/acore/deps/acelite/ace/os_include/os_fcntl.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fcntl.h
rename to modules/acore/deps/acelite/ace/os_include/os_fcntl.h
diff --git a/modules/dep/acelite/ace/os_include/os_fenv.h b/modules/acore/deps/acelite/ace/os_include/os_fenv.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fenv.h
rename to modules/acore/deps/acelite/ace/os_include/os_fenv.h
diff --git a/modules/dep/acelite/ace/os_include/os_float.h b/modules/acore/deps/acelite/ace/os_include/os_float.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_float.h
rename to modules/acore/deps/acelite/ace/os_include/os_float.h
diff --git a/modules/dep/acelite/ace/os_include/os_fmtmsg.h b/modules/acore/deps/acelite/ace/os_include/os_fmtmsg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fmtmsg.h
rename to modules/acore/deps/acelite/ace/os_include/os_fmtmsg.h
diff --git a/modules/dep/acelite/ace/os_include/os_fnmatch.h b/modules/acore/deps/acelite/ace/os_include/os_fnmatch.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fnmatch.h
rename to modules/acore/deps/acelite/ace/os_include/os_fnmatch.h
diff --git a/modules/dep/acelite/ace/os_include/os_ftw.h b/modules/acore/deps/acelite/ace/os_include/os_ftw.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ftw.h
rename to modules/acore/deps/acelite/ace/os_include/os_ftw.h
diff --git a/modules/dep/acelite/ace/os_include/os_glob.h b/modules/acore/deps/acelite/ace/os_include/os_glob.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_glob.h
rename to modules/acore/deps/acelite/ace/os_include/os_glob.h
diff --git a/modules/dep/acelite/ace/os_include/os_grp.h b/modules/acore/deps/acelite/ace/os_include/os_grp.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_grp.h
rename to modules/acore/deps/acelite/ace/os_include/os_grp.h
diff --git a/modules/dep/acelite/ace/os_include/os_iconv.h b/modules/acore/deps/acelite/ace/os_include/os_iconv.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_iconv.h
rename to modules/acore/deps/acelite/ace/os_include/os_iconv.h
diff --git a/modules/dep/acelite/ace/os_include/os_ifaddrs.h b/modules/acore/deps/acelite/ace/os_include/os_ifaddrs.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ifaddrs.h
rename to modules/acore/deps/acelite/ace/os_include/os_ifaddrs.h
diff --git a/modules/dep/acelite/ace/os_include/os_intrin.h b/modules/acore/deps/acelite/ace/os_include/os_intrin.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_intrin.h
rename to modules/acore/deps/acelite/ace/os_include/os_intrin.h
diff --git a/modules/dep/acelite/ace/os_include/os_inttypes.h b/modules/acore/deps/acelite/ace/os_include/os_inttypes.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_inttypes.h
rename to modules/acore/deps/acelite/ace/os_include/os_inttypes.h
diff --git a/modules/dep/acelite/ace/os_include/os_iso646.h b/modules/acore/deps/acelite/ace/os_include/os_iso646.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_iso646.h
rename to modules/acore/deps/acelite/ace/os_include/os_iso646.h
diff --git a/modules/dep/acelite/ace/os_include/os_kstat.h b/modules/acore/deps/acelite/ace/os_include/os_kstat.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_kstat.h
rename to modules/acore/deps/acelite/ace/os_include/os_kstat.h
diff --git a/modules/dep/acelite/ace/os_include/os_langinfo.h b/modules/acore/deps/acelite/ace/os_include/os_langinfo.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_langinfo.h
rename to modules/acore/deps/acelite/ace/os_include/os_langinfo.h
diff --git a/modules/dep/acelite/ace/os_include/os_libgen.h b/modules/acore/deps/acelite/ace/os_include/os_libgen.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_libgen.h
rename to modules/acore/deps/acelite/ace/os_include/os_libgen.h
diff --git a/modules/dep/acelite/ace/os_include/os_limits.h b/modules/acore/deps/acelite/ace/os_include/os_limits.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_limits.h
rename to modules/acore/deps/acelite/ace/os_include/os_limits.h
diff --git a/modules/dep/acelite/ace/os_include/os_local.h b/modules/acore/deps/acelite/ace/os_include/os_local.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_local.h
rename to modules/acore/deps/acelite/ace/os_include/os_local.h
diff --git a/modules/dep/acelite/ace/os_include/os_math.h b/modules/acore/deps/acelite/ace/os_include/os_math.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_math.h
rename to modules/acore/deps/acelite/ace/os_include/os_math.h
diff --git a/modules/dep/acelite/ace/os_include/os_monetary.h b/modules/acore/deps/acelite/ace/os_include/os_monetary.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_monetary.h
rename to modules/acore/deps/acelite/ace/os_include/os_monetary.h
diff --git a/modules/dep/acelite/ace/os_include/os_mqueue.h b/modules/acore/deps/acelite/ace/os_include/os_mqueue.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_mqueue.h
rename to modules/acore/deps/acelite/ace/os_include/os_mqueue.h
diff --git a/modules/dep/acelite/ace/os_include/os_ndbm.h b/modules/acore/deps/acelite/ace/os_include/os_ndbm.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ndbm.h
rename to modules/acore/deps/acelite/ace/os_include/os_ndbm.h
diff --git a/modules/dep/acelite/ace/os_include/os_netdb.h b/modules/acore/deps/acelite/ace/os_include/os_netdb.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_netdb.h
rename to modules/acore/deps/acelite/ace/os_include/os_netdb.h
diff --git a/modules/dep/acelite/ace/os_include/os_nl_types.h b/modules/acore/deps/acelite/ace/os_include/os_nl_types.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_nl_types.h
rename to modules/acore/deps/acelite/ace/os_include/os_nl_types.h
diff --git a/modules/dep/acelite/ace/os_include/os_pdh.h b/modules/acore/deps/acelite/ace/os_include/os_pdh.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pdh.h
rename to modules/acore/deps/acelite/ace/os_include/os_pdh.h
diff --git a/modules/dep/acelite/ace/os_include/os_pdhmsg.h b/modules/acore/deps/acelite/ace/os_include/os_pdhmsg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pdhmsg.h
rename to modules/acore/deps/acelite/ace/os_include/os_pdhmsg.h
diff --git a/modules/dep/acelite/ace/os_include/os_poll.h b/modules/acore/deps/acelite/ace/os_include/os_poll.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_poll.h
rename to modules/acore/deps/acelite/ace/os_include/os_poll.h
diff --git a/modules/dep/acelite/ace/os_include/os_pthread.h b/modules/acore/deps/acelite/ace/os_include/os_pthread.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pthread.h
rename to modules/acore/deps/acelite/ace/os_include/os_pthread.h
diff --git a/modules/dep/acelite/ace/os_include/os_pwd.h b/modules/acore/deps/acelite/ace/os_include/os_pwd.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pwd.h
rename to modules/acore/deps/acelite/ace/os_include/os_pwd.h
diff --git a/modules/dep/acelite/ace/os_include/os_regex.h b/modules/acore/deps/acelite/ace/os_include/os_regex.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_regex.h
rename to modules/acore/deps/acelite/ace/os_include/os_regex.h
diff --git a/modules/dep/acelite/ace/os_include/os_sched.h b/modules/acore/deps/acelite/ace/os_include/os_sched.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_sched.h
rename to modules/acore/deps/acelite/ace/os_include/os_sched.h
diff --git a/modules/dep/acelite/ace/os_include/os_search.h b/modules/acore/deps/acelite/ace/os_include/os_search.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_search.h
rename to modules/acore/deps/acelite/ace/os_include/os_search.h
diff --git a/modules/dep/acelite/ace/os_include/os_semaphore.h b/modules/acore/deps/acelite/ace/os_include/os_semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_semaphore.h
rename to modules/acore/deps/acelite/ace/os_include/os_semaphore.h
diff --git a/modules/dep/acelite/ace/os_include/os_setjmp.h b/modules/acore/deps/acelite/ace/os_include/os_setjmp.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_setjmp.h
rename to modules/acore/deps/acelite/ace/os_include/os_setjmp.h
diff --git a/modules/dep/acelite/ace/os_include/os_signal.h b/modules/acore/deps/acelite/ace/os_include/os_signal.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_signal.h
rename to modules/acore/deps/acelite/ace/os_include/os_signal.h
diff --git a/modules/dep/acelite/ace/os_include/os_spawn.h b/modules/acore/deps/acelite/ace/os_include/os_spawn.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_spawn.h
rename to modules/acore/deps/acelite/ace/os_include/os_spawn.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdarg.h b/modules/acore/deps/acelite/ace/os_include/os_stdarg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdarg.h
rename to modules/acore/deps/acelite/ace/os_include/os_stdarg.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdbool.h b/modules/acore/deps/acelite/ace/os_include/os_stdbool.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdbool.h
rename to modules/acore/deps/acelite/ace/os_include/os_stdbool.h
diff --git a/modules/dep/acelite/ace/os_include/os_stddef.h b/modules/acore/deps/acelite/ace/os_include/os_stddef.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stddef.h
rename to modules/acore/deps/acelite/ace/os_include/os_stddef.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdint.h b/modules/acore/deps/acelite/ace/os_include/os_stdint.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdint.h
rename to modules/acore/deps/acelite/ace/os_include/os_stdint.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdio.h b/modules/acore/deps/acelite/ace/os_include/os_stdio.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdio.h
rename to modules/acore/deps/acelite/ace/os_include/os_stdio.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdlib.h b/modules/acore/deps/acelite/ace/os_include/os_stdlib.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdlib.h
rename to modules/acore/deps/acelite/ace/os_include/os_stdlib.h
diff --git a/modules/dep/acelite/ace/os_include/os_string.h b/modules/acore/deps/acelite/ace/os_include/os_string.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_string.h
rename to modules/acore/deps/acelite/ace/os_include/os_string.h
diff --git a/modules/dep/acelite/ace/os_include/os_strings.h b/modules/acore/deps/acelite/ace/os_include/os_strings.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_strings.h
rename to modules/acore/deps/acelite/ace/os_include/os_strings.h
diff --git a/modules/dep/acelite/ace/os_include/os_stropts.h b/modules/acore/deps/acelite/ace/os_include/os_stropts.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stropts.h
rename to modules/acore/deps/acelite/ace/os_include/os_stropts.h
diff --git a/modules/dep/acelite/ace/os_include/os_syslog.h b/modules/acore/deps/acelite/ace/os_include/os_syslog.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_syslog.h
rename to modules/acore/deps/acelite/ace/os_include/os_syslog.h
diff --git a/modules/dep/acelite/ace/os_include/os_tar.h b/modules/acore/deps/acelite/ace/os_include/os_tar.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_tar.h
rename to modules/acore/deps/acelite/ace/os_include/os_tar.h
diff --git a/modules/dep/acelite/ace/os_include/os_termios.h b/modules/acore/deps/acelite/ace/os_include/os_termios.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_termios.h
rename to modules/acore/deps/acelite/ace/os_include/os_termios.h
diff --git a/modules/dep/acelite/ace/os_include/os_tgmath.h b/modules/acore/deps/acelite/ace/os_include/os_tgmath.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_tgmath.h
rename to modules/acore/deps/acelite/ace/os_include/os_tgmath.h
diff --git a/modules/dep/acelite/ace/os_include/os_time.h b/modules/acore/deps/acelite/ace/os_include/os_time.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_time.h
rename to modules/acore/deps/acelite/ace/os_include/os_time.h
diff --git a/modules/dep/acelite/ace/os_include/os_trace.h b/modules/acore/deps/acelite/ace/os_include/os_trace.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_trace.h
rename to modules/acore/deps/acelite/ace/os_include/os_trace.h
diff --git a/modules/dep/acelite/ace/os_include/os_typeinfo.h b/modules/acore/deps/acelite/ace/os_include/os_typeinfo.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_typeinfo.h
rename to modules/acore/deps/acelite/ace/os_include/os_typeinfo.h
diff --git a/modules/dep/acelite/ace/os_include/os_ucontext.h b/modules/acore/deps/acelite/ace/os_include/os_ucontext.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ucontext.h
rename to modules/acore/deps/acelite/ace/os_include/os_ucontext.h
diff --git a/modules/dep/acelite/ace/os_include/os_ulimit.h b/modules/acore/deps/acelite/ace/os_include/os_ulimit.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ulimit.h
rename to modules/acore/deps/acelite/ace/os_include/os_ulimit.h
diff --git a/modules/dep/acelite/ace/os_include/os_unistd.h b/modules/acore/deps/acelite/ace/os_include/os_unistd.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_unistd.h
rename to modules/acore/deps/acelite/ace/os_include/os_unistd.h
diff --git a/modules/dep/acelite/ace/os_include/os_utime.h b/modules/acore/deps/acelite/ace/os_include/os_utime.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_utime.h
rename to modules/acore/deps/acelite/ace/os_include/os_utime.h
diff --git a/modules/dep/acelite/ace/os_include/os_utmpx.h b/modules/acore/deps/acelite/ace/os_include/os_utmpx.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_utmpx.h
rename to modules/acore/deps/acelite/ace/os_include/os_utmpx.h
diff --git a/modules/dep/acelite/ace/os_include/os_wchar.h b/modules/acore/deps/acelite/ace/os_include/os_wchar.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_wchar.h
rename to modules/acore/deps/acelite/ace/os_include/os_wchar.h
diff --git a/modules/dep/acelite/ace/os_include/os_wctype.h b/modules/acore/deps/acelite/ace/os_include/os_wctype.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_wctype.h
rename to modules/acore/deps/acelite/ace/os_include/os_wctype.h
diff --git a/modules/dep/acelite/ace/os_include/os_wordexp.h b/modules/acore/deps/acelite/ace/os_include/os_wordexp.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_wordexp.h
rename to modules/acore/deps/acelite/ace/os_include/os_wordexp.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_ipc.h b/modules/acore/deps/acelite/ace/os_include/sys/os_ipc.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_ipc.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_ipc.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_loadavg.h b/modules/acore/deps/acelite/ace/os_include/sys/os_loadavg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_loadavg.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_loadavg.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_mman.h b/modules/acore/deps/acelite/ace/os_include/sys/os_mman.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_mman.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_mman.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_msg.h b/modules/acore/deps/acelite/ace/os_include/sys/os_msg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_msg.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_msg.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_pstat.h b/modules/acore/deps/acelite/ace/os_include/sys/os_pstat.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_pstat.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_pstat.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_resource.h b/modules/acore/deps/acelite/ace/os_include/sys/os_resource.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_resource.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_resource.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_select.h b/modules/acore/deps/acelite/ace/os_include/sys/os_select.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_select.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_select.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_sem.h b/modules/acore/deps/acelite/ace/os_include/sys/os_sem.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_sem.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_sem.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_shm.h b/modules/acore/deps/acelite/ace/os_include/sys/os_shm.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_shm.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_shm.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_socket.h b/modules/acore/deps/acelite/ace/os_include/sys/os_socket.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_socket.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_socket.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_stat.h b/modules/acore/deps/acelite/ace/os_include/sys/os_stat.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_stat.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_stat.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_statvfs.h b/modules/acore/deps/acelite/ace/os_include/sys/os_statvfs.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_statvfs.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_statvfs.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_sysctl.h b/modules/acore/deps/acelite/ace/os_include/sys/os_sysctl.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_sysctl.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_sysctl.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_sysinfo.h b/modules/acore/deps/acelite/ace/os_include/sys/os_sysinfo.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_sysinfo.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_sysinfo.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_time.h b/modules/acore/deps/acelite/ace/os_include/sys/os_time.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_time.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_time.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_timeb.h b/modules/acore/deps/acelite/ace/os_include/sys/os_timeb.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_timeb.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_timeb.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_times.h b/modules/acore/deps/acelite/ace/os_include/sys/os_times.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_times.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_times.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_types.h b/modules/acore/deps/acelite/ace/os_include/sys/os_types.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_types.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_types.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_uio.h b/modules/acore/deps/acelite/ace/os_include/sys/os_uio.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_uio.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_uio.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_un.h b/modules/acore/deps/acelite/ace/os_include/sys/os_un.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_un.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_un.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_utsname.h b/modules/acore/deps/acelite/ace/os_include/sys/os_utsname.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_utsname.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_utsname.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_wait.h b/modules/acore/deps/acelite/ace/os_include/sys/os_wait.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/sys/os_wait.h
rename to modules/acore/deps/acelite/ace/os_include/sys/os_wait.h
diff --git a/modules/dep/acelite/ace/other.mpb b/modules/acore/deps/acelite/ace/other.mpb
similarity index 100%
rename from modules/dep/acelite/ace/other.mpb
rename to modules/acore/deps/acelite/ace/other.mpb
diff --git a/modules/dep/acelite/ace/post.h b/modules/acore/deps/acelite/ace/post.h
similarity index 100%
rename from modules/dep/acelite/ace/post.h
rename to modules/acore/deps/acelite/ace/post.h
diff --git a/modules/dep/acelite/ace/pre.h b/modules/acore/deps/acelite/ace/pre.h
similarity index 100%
rename from modules/dep/acelite/ace/pre.h
rename to modules/acore/deps/acelite/ace/pre.h
diff --git a/modules/dep/acelite/ace/streams.h b/modules/acore/deps/acelite/ace/streams.h
similarity index 100%
rename from modules/dep/acelite/ace/streams.h
rename to modules/acore/deps/acelite/ace/streams.h
diff --git a/modules/dep/acelite/ace/svc_export.h b/modules/acore/deps/acelite/ace/svc_export.h
similarity index 100%
rename from modules/dep/acelite/ace/svc_export.h
rename to modules/acore/deps/acelite/ace/svc_export.h
diff --git a/modules/dep/acelite/ace/svcconf.mpb b/modules/acore/deps/acelite/ace/svcconf.mpb
similarity index 100%
rename from modules/dep/acelite/ace/svcconf.mpb
rename to modules/acore/deps/acelite/ace/svcconf.mpb
diff --git a/modules/dep/acelite/ace/svcconfgen.mpc b/modules/acore/deps/acelite/ace/svcconfgen.mpc
similarity index 100%
rename from modules/dep/acelite/ace/svcconfgen.mpc
rename to modules/acore/deps/acelite/ace/svcconfgen.mpc
diff --git a/modules/dep/acelite/ace/token.mpb b/modules/acore/deps/acelite/ace/token.mpb
similarity index 100%
rename from modules/dep/acelite/ace/token.mpb
rename to modules/acore/deps/acelite/ace/token.mpb
diff --git a/modules/dep/acelite/ace/uuid.mpb b/modules/acore/deps/acelite/ace/uuid.mpb
similarity index 100%
rename from modules/dep/acelite/ace/uuid.mpb
rename to modules/acore/deps/acelite/ace/uuid.mpb
diff --git a/modules/dep/bzip2/CMakeLists.txt b/modules/acore/deps/bzip2/CMakeLists.txt
similarity index 100%
rename from modules/dep/bzip2/CMakeLists.txt
rename to modules/acore/deps/bzip2/CMakeLists.txt
diff --git a/modules/dep/bzip2/LICENSE b/modules/acore/deps/bzip2/LICENSE
similarity index 100%
rename from modules/dep/bzip2/LICENSE
rename to modules/acore/deps/bzip2/LICENSE
diff --git a/modules/dep/bzip2/README b/modules/acore/deps/bzip2/README
similarity index 100%
rename from modules/dep/bzip2/README
rename to modules/acore/deps/bzip2/README
diff --git a/modules/dep/bzip2/blocksort.c b/modules/acore/deps/bzip2/blocksort.c
similarity index 100%
rename from modules/dep/bzip2/blocksort.c
rename to modules/acore/deps/bzip2/blocksort.c
diff --git a/modules/dep/bzip2/bzlib.c b/modules/acore/deps/bzip2/bzlib.c
similarity index 100%
rename from modules/dep/bzip2/bzlib.c
rename to modules/acore/deps/bzip2/bzlib.c
diff --git a/modules/dep/bzip2/bzlib.h b/modules/acore/deps/bzip2/bzlib.h
similarity index 100%
rename from modules/dep/bzip2/bzlib.h
rename to modules/acore/deps/bzip2/bzlib.h
diff --git a/modules/dep/bzip2/bzlib_private.h b/modules/acore/deps/bzip2/bzlib_private.h
similarity index 100%
rename from modules/dep/bzip2/bzlib_private.h
rename to modules/acore/deps/bzip2/bzlib_private.h
diff --git a/modules/dep/bzip2/compress.c b/modules/acore/deps/bzip2/compress.c
similarity index 100%
rename from modules/dep/bzip2/compress.c
rename to modules/acore/deps/bzip2/compress.c
diff --git a/modules/dep/bzip2/crctable.c b/modules/acore/deps/bzip2/crctable.c
similarity index 100%
rename from modules/dep/bzip2/crctable.c
rename to modules/acore/deps/bzip2/crctable.c
diff --git a/modules/dep/bzip2/decompress.c b/modules/acore/deps/bzip2/decompress.c
similarity index 100%
rename from modules/dep/bzip2/decompress.c
rename to modules/acore/deps/bzip2/decompress.c
diff --git a/modules/dep/bzip2/huffman.c b/modules/acore/deps/bzip2/huffman.c
similarity index 100%
rename from modules/dep/bzip2/huffman.c
rename to modules/acore/deps/bzip2/huffman.c
diff --git a/modules/dep/bzip2/randtable.c b/modules/acore/deps/bzip2/randtable.c
similarity index 100%
rename from modules/dep/bzip2/randtable.c
rename to modules/acore/deps/bzip2/randtable.c
diff --git a/modules/dep/g3dlite/CMakeLists.txt b/modules/acore/deps/g3dlite/CMakeLists.txt
similarity index 100%
rename from modules/dep/g3dlite/CMakeLists.txt
rename to modules/acore/deps/g3dlite/CMakeLists.txt
diff --git a/modules/dep/g3dlite/Readme.txt b/modules/acore/deps/g3dlite/Readme.txt
similarity index 100%
rename from modules/dep/g3dlite/Readme.txt
rename to modules/acore/deps/g3dlite/Readme.txt
diff --git a/modules/dep/g3dlite/include/G3D/AABox.h b/modules/acore/deps/g3dlite/include/G3D/AABox.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AABox.h
rename to modules/acore/deps/g3dlite/include/G3D/AABox.h
diff --git a/modules/dep/g3dlite/include/G3D/Any.h b/modules/acore/deps/g3dlite/include/G3D/Any.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Any.h
rename to modules/acore/deps/g3dlite/include/G3D/Any.h
diff --git a/modules/dep/g3dlite/include/G3D/AnyVal.h b/modules/acore/deps/g3dlite/include/G3D/AnyVal.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AnyVal.h
rename to modules/acore/deps/g3dlite/include/G3D/AnyVal.h
diff --git a/modules/dep/g3dlite/include/G3D/AreaMemoryManager.h b/modules/acore/deps/g3dlite/include/G3D/AreaMemoryManager.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AreaMemoryManager.h
rename to modules/acore/deps/g3dlite/include/G3D/AreaMemoryManager.h
diff --git a/modules/dep/g3dlite/include/G3D/Array.h b/modules/acore/deps/g3dlite/include/G3D/Array.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Array.h
rename to modules/acore/deps/g3dlite/include/G3D/Array.h
diff --git a/modules/dep/g3dlite/include/G3D/AtomicInt32.h b/modules/acore/deps/g3dlite/include/G3D/AtomicInt32.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AtomicInt32.h
rename to modules/acore/deps/g3dlite/include/G3D/AtomicInt32.h
diff --git a/modules/dep/g3dlite/include/G3D/BinaryFormat.h b/modules/acore/deps/g3dlite/include/G3D/BinaryFormat.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BinaryFormat.h
rename to modules/acore/deps/g3dlite/include/G3D/BinaryFormat.h
diff --git a/modules/dep/g3dlite/include/G3D/BinaryInput.h b/modules/acore/deps/g3dlite/include/G3D/BinaryInput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BinaryInput.h
rename to modules/acore/deps/g3dlite/include/G3D/BinaryInput.h
diff --git a/modules/dep/g3dlite/include/G3D/BinaryOutput.h b/modules/acore/deps/g3dlite/include/G3D/BinaryOutput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BinaryOutput.h
rename to modules/acore/deps/g3dlite/include/G3D/BinaryOutput.h
diff --git a/modules/dep/g3dlite/include/G3D/BoundsTrait.h b/modules/acore/deps/g3dlite/include/G3D/BoundsTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BoundsTrait.h
rename to modules/acore/deps/g3dlite/include/G3D/BoundsTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/Box.h b/modules/acore/deps/g3dlite/include/G3D/Box.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Box.h
rename to modules/acore/deps/g3dlite/include/G3D/Box.h
diff --git a/modules/dep/g3dlite/include/G3D/Box2D.h b/modules/acore/deps/g3dlite/include/G3D/Box2D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Box2D.h
rename to modules/acore/deps/g3dlite/include/G3D/Box2D.h
diff --git a/modules/dep/g3dlite/include/G3D/BumpMapPreprocess.h b/modules/acore/deps/g3dlite/include/G3D/BumpMapPreprocess.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BumpMapPreprocess.h
rename to modules/acore/deps/g3dlite/include/G3D/BumpMapPreprocess.h
diff --git a/modules/dep/g3dlite/include/G3D/Capsule.h b/modules/acore/deps/g3dlite/include/G3D/Capsule.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Capsule.h
rename to modules/acore/deps/g3dlite/include/G3D/Capsule.h
diff --git a/modules/dep/g3dlite/include/G3D/CollisionDetection.h b/modules/acore/deps/g3dlite/include/G3D/CollisionDetection.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/CollisionDetection.h
rename to modules/acore/deps/g3dlite/include/G3D/CollisionDetection.h
diff --git a/modules/dep/g3dlite/include/G3D/Color1.h b/modules/acore/deps/g3dlite/include/G3D/Color1.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color1.h
rename to modules/acore/deps/g3dlite/include/G3D/Color1.h
diff --git a/modules/dep/g3dlite/include/G3D/Color1uint8.h b/modules/acore/deps/g3dlite/include/G3D/Color1uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color1uint8.h
rename to modules/acore/deps/g3dlite/include/G3D/Color1uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Color3.h b/modules/acore/deps/g3dlite/include/G3D/Color3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color3.h
rename to modules/acore/deps/g3dlite/include/G3D/Color3.h
diff --git a/modules/dep/g3dlite/include/G3D/Color3uint8.h b/modules/acore/deps/g3dlite/include/G3D/Color3uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color3uint8.h
rename to modules/acore/deps/g3dlite/include/G3D/Color3uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Color4.h b/modules/acore/deps/g3dlite/include/G3D/Color4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color4.h
rename to modules/acore/deps/g3dlite/include/G3D/Color4.h
diff --git a/modules/dep/g3dlite/include/G3D/Color4uint8.h b/modules/acore/deps/g3dlite/include/G3D/Color4uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color4uint8.h
rename to modules/acore/deps/g3dlite/include/G3D/Color4uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Cone.h b/modules/acore/deps/g3dlite/include/G3D/Cone.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Cone.h
rename to modules/acore/deps/g3dlite/include/G3D/Cone.h
diff --git a/modules/dep/g3dlite/include/G3D/ConvexPolyhedron.h b/modules/acore/deps/g3dlite/include/G3D/ConvexPolyhedron.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ConvexPolyhedron.h
rename to modules/acore/deps/g3dlite/include/G3D/ConvexPolyhedron.h
diff --git a/modules/dep/g3dlite/include/G3D/CoordinateFrame.h b/modules/acore/deps/g3dlite/include/G3D/CoordinateFrame.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/CoordinateFrame.h
rename to modules/acore/deps/g3dlite/include/G3D/CoordinateFrame.h
diff --git a/modules/dep/g3dlite/include/G3D/Crypto.h b/modules/acore/deps/g3dlite/include/G3D/Crypto.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Crypto.h
rename to modules/acore/deps/g3dlite/include/G3D/Crypto.h
diff --git a/modules/dep/g3dlite/include/G3D/Cylinder.h b/modules/acore/deps/g3dlite/include/G3D/Cylinder.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Cylinder.h
rename to modules/acore/deps/g3dlite/include/G3D/Cylinder.h
diff --git a/modules/dep/g3dlite/include/G3D/EqualsTrait.h b/modules/acore/deps/g3dlite/include/G3D/EqualsTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/EqualsTrait.h
rename to modules/acore/deps/g3dlite/include/G3D/EqualsTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/FileSystem.h b/modules/acore/deps/g3dlite/include/G3D/FileSystem.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/FileSystem.h
rename to modules/acore/deps/g3dlite/include/G3D/FileSystem.h
diff --git a/modules/dep/g3dlite/include/G3D/G3D.h b/modules/acore/deps/g3dlite/include/G3D/G3D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/G3D.h
rename to modules/acore/deps/g3dlite/include/G3D/G3D.h
diff --git a/modules/dep/g3dlite/include/G3D/G3DAll.h b/modules/acore/deps/g3dlite/include/G3D/G3DAll.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/G3DAll.h
rename to modules/acore/deps/g3dlite/include/G3D/G3DAll.h
diff --git a/modules/dep/g3dlite/include/G3D/G3DGameUnits.h b/modules/acore/deps/g3dlite/include/G3D/G3DGameUnits.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/G3DGameUnits.h
rename to modules/acore/deps/g3dlite/include/G3D/G3DGameUnits.h
diff --git a/modules/dep/g3dlite/include/G3D/GCamera.h b/modules/acore/deps/g3dlite/include/G3D/GCamera.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GCamera.h
rename to modules/acore/deps/g3dlite/include/G3D/GCamera.h
diff --git a/modules/dep/g3dlite/include/G3D/GImage.h b/modules/acore/deps/g3dlite/include/G3D/GImage.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GImage.h
rename to modules/acore/deps/g3dlite/include/G3D/GImage.h
diff --git a/modules/dep/g3dlite/include/G3D/GLight.h b/modules/acore/deps/g3dlite/include/G3D/GLight.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GLight.h
rename to modules/acore/deps/g3dlite/include/G3D/GLight.h
diff --git a/modules/dep/g3dlite/include/G3D/GMutex.h b/modules/acore/deps/g3dlite/include/G3D/GMutex.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GMutex.h
rename to modules/acore/deps/g3dlite/include/G3D/GMutex.h
diff --git a/modules/dep/g3dlite/include/G3D/GThread.h b/modules/acore/deps/g3dlite/include/G3D/GThread.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GThread.h
rename to modules/acore/deps/g3dlite/include/G3D/GThread.h
diff --git a/modules/dep/g3dlite/include/G3D/GUniqueID.h b/modules/acore/deps/g3dlite/include/G3D/GUniqueID.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GUniqueID.h
rename to modules/acore/deps/g3dlite/include/G3D/GUniqueID.h
diff --git a/modules/dep/g3dlite/include/G3D/HashTrait.h b/modules/acore/deps/g3dlite/include/G3D/HashTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/HashTrait.h
rename to modules/acore/deps/g3dlite/include/G3D/HashTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/Image1.h b/modules/acore/deps/g3dlite/include/G3D/Image1.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image1.h
rename to modules/acore/deps/g3dlite/include/G3D/Image1.h
diff --git a/modules/dep/g3dlite/include/G3D/Image1uint8.h b/modules/acore/deps/g3dlite/include/G3D/Image1uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image1uint8.h
rename to modules/acore/deps/g3dlite/include/G3D/Image1uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Image3.h b/modules/acore/deps/g3dlite/include/G3D/Image3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image3.h
rename to modules/acore/deps/g3dlite/include/G3D/Image3.h
diff --git a/modules/dep/g3dlite/include/G3D/Image3uint8.h b/modules/acore/deps/g3dlite/include/G3D/Image3uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image3uint8.h
rename to modules/acore/deps/g3dlite/include/G3D/Image3uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Image4.h b/modules/acore/deps/g3dlite/include/G3D/Image4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image4.h
rename to modules/acore/deps/g3dlite/include/G3D/Image4.h
diff --git a/modules/dep/g3dlite/include/G3D/Image4uint8.h b/modules/acore/deps/g3dlite/include/G3D/Image4uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image4uint8.h
rename to modules/acore/deps/g3dlite/include/G3D/Image4uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/ImageFormat.h b/modules/acore/deps/g3dlite/include/G3D/ImageFormat.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ImageFormat.h
rename to modules/acore/deps/g3dlite/include/G3D/ImageFormat.h
diff --git a/modules/dep/g3dlite/include/G3D/Intersect.h b/modules/acore/deps/g3dlite/include/G3D/Intersect.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Intersect.h
rename to modules/acore/deps/g3dlite/include/G3D/Intersect.h
diff --git a/modules/dep/g3dlite/include/G3D/KDTree.h b/modules/acore/deps/g3dlite/include/G3D/KDTree.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/KDTree.h
rename to modules/acore/deps/g3dlite/include/G3D/KDTree.h
diff --git a/modules/dep/g3dlite/include/G3D/Line.h b/modules/acore/deps/g3dlite/include/G3D/Line.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Line.h
rename to modules/acore/deps/g3dlite/include/G3D/Line.h
diff --git a/modules/dep/g3dlite/include/G3D/LineSegment.h b/modules/acore/deps/g3dlite/include/G3D/LineSegment.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/LineSegment.h
rename to modules/acore/deps/g3dlite/include/G3D/LineSegment.h
diff --git a/modules/dep/g3dlite/include/G3D/Log.h b/modules/acore/deps/g3dlite/include/G3D/Log.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Log.h
rename to modules/acore/deps/g3dlite/include/G3D/Log.h
diff --git a/modules/dep/g3dlite/include/G3D/Map2D.h b/modules/acore/deps/g3dlite/include/G3D/Map2D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Map2D.h
rename to modules/acore/deps/g3dlite/include/G3D/Map2D.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix.h b/modules/acore/deps/g3dlite/include/G3D/Matrix.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix.h
rename to modules/acore/deps/g3dlite/include/G3D/Matrix.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix2.h b/modules/acore/deps/g3dlite/include/G3D/Matrix2.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix2.h
rename to modules/acore/deps/g3dlite/include/G3D/Matrix2.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix3.h b/modules/acore/deps/g3dlite/include/G3D/Matrix3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix3.h
rename to modules/acore/deps/g3dlite/include/G3D/Matrix3.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix4.h b/modules/acore/deps/g3dlite/include/G3D/Matrix4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix4.h
rename to modules/acore/deps/g3dlite/include/G3D/Matrix4.h
diff --git a/modules/dep/g3dlite/include/G3D/MemoryManager.h b/modules/acore/deps/g3dlite/include/G3D/MemoryManager.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/MemoryManager.h
rename to modules/acore/deps/g3dlite/include/G3D/MemoryManager.h
diff --git a/modules/dep/g3dlite/include/G3D/MeshAlg.h b/modules/acore/deps/g3dlite/include/G3D/MeshAlg.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/MeshAlg.h
rename to modules/acore/deps/g3dlite/include/G3D/MeshAlg.h
diff --git a/modules/dep/g3dlite/include/G3D/MeshBuilder.h b/modules/acore/deps/g3dlite/include/G3D/MeshBuilder.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/MeshBuilder.h
rename to modules/acore/deps/g3dlite/include/G3D/MeshBuilder.h
diff --git a/modules/dep/g3dlite/include/G3D/NetAddress.h b/modules/acore/deps/g3dlite/include/G3D/NetAddress.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/NetAddress.h
rename to modules/acore/deps/g3dlite/include/G3D/NetAddress.h
diff --git a/modules/dep/g3dlite/include/G3D/NetworkDevice.h b/modules/acore/deps/g3dlite/include/G3D/NetworkDevice.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/NetworkDevice.h
rename to modules/acore/deps/g3dlite/include/G3D/NetworkDevice.h
diff --git a/modules/dep/g3dlite/include/G3D/ParseError.h b/modules/acore/deps/g3dlite/include/G3D/ParseError.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ParseError.h
rename to modules/acore/deps/g3dlite/include/G3D/ParseError.h
diff --git a/modules/dep/g3dlite/include/G3D/PhysicsFrame.h b/modules/acore/deps/g3dlite/include/G3D/PhysicsFrame.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PhysicsFrame.h
rename to modules/acore/deps/g3dlite/include/G3D/PhysicsFrame.h
diff --git a/modules/dep/g3dlite/include/G3D/PhysicsFrameSpline.h b/modules/acore/deps/g3dlite/include/G3D/PhysicsFrameSpline.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PhysicsFrameSpline.h
rename to modules/acore/deps/g3dlite/include/G3D/PhysicsFrameSpline.h
diff --git a/modules/dep/g3dlite/include/G3D/Plane.h b/modules/acore/deps/g3dlite/include/G3D/Plane.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Plane.h
rename to modules/acore/deps/g3dlite/include/G3D/Plane.h
diff --git a/modules/dep/g3dlite/include/G3D/PointHashGrid.h b/modules/acore/deps/g3dlite/include/G3D/PointHashGrid.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PointHashGrid.h
rename to modules/acore/deps/g3dlite/include/G3D/PointHashGrid.h
diff --git a/modules/dep/g3dlite/include/G3D/PointKDTree.h b/modules/acore/deps/g3dlite/include/G3D/PointKDTree.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PointKDTree.h
rename to modules/acore/deps/g3dlite/include/G3D/PointKDTree.h
diff --git a/modules/dep/g3dlite/include/G3D/Pointer.h b/modules/acore/deps/g3dlite/include/G3D/Pointer.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Pointer.h
rename to modules/acore/deps/g3dlite/include/G3D/Pointer.h
diff --git a/modules/dep/g3dlite/include/G3D/PositionTrait.h b/modules/acore/deps/g3dlite/include/G3D/PositionTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PositionTrait.h
rename to modules/acore/deps/g3dlite/include/G3D/PositionTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/PrecomputedRandom.h b/modules/acore/deps/g3dlite/include/G3D/PrecomputedRandom.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PrecomputedRandom.h
rename to modules/acore/deps/g3dlite/include/G3D/PrecomputedRandom.h
diff --git a/modules/dep/g3dlite/include/G3D/Quat.h b/modules/acore/deps/g3dlite/include/G3D/Quat.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Quat.h
rename to modules/acore/deps/g3dlite/include/G3D/Quat.h
diff --git a/modules/dep/g3dlite/include/G3D/Queue.h b/modules/acore/deps/g3dlite/include/G3D/Queue.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Queue.h
rename to modules/acore/deps/g3dlite/include/G3D/Queue.h
diff --git a/modules/dep/g3dlite/include/G3D/Random.h b/modules/acore/deps/g3dlite/include/G3D/Random.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Random.h
rename to modules/acore/deps/g3dlite/include/G3D/Random.h
diff --git a/modules/dep/g3dlite/include/G3D/Ray.h b/modules/acore/deps/g3dlite/include/G3D/Ray.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Ray.h
rename to modules/acore/deps/g3dlite/include/G3D/Ray.h
diff --git a/modules/dep/g3dlite/include/G3D/Rect2D.h b/modules/acore/deps/g3dlite/include/G3D/Rect2D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Rect2D.h
rename to modules/acore/deps/g3dlite/include/G3D/Rect2D.h
diff --git a/modules/dep/g3dlite/include/G3D/ReferenceCount.h b/modules/acore/deps/g3dlite/include/G3D/ReferenceCount.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ReferenceCount.h
rename to modules/acore/deps/g3dlite/include/G3D/ReferenceCount.h
diff --git a/modules/dep/g3dlite/include/G3D/RegistryUtil.h b/modules/acore/deps/g3dlite/include/G3D/RegistryUtil.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/RegistryUtil.h
rename to modules/acore/deps/g3dlite/include/G3D/RegistryUtil.h
diff --git a/modules/dep/g3dlite/include/G3D/Set.h b/modules/acore/deps/g3dlite/include/G3D/Set.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Set.h
rename to modules/acore/deps/g3dlite/include/G3D/Set.h
diff --git a/modules/dep/g3dlite/include/G3D/SmallArray.h b/modules/acore/deps/g3dlite/include/G3D/SmallArray.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/SmallArray.h
rename to modules/acore/deps/g3dlite/include/G3D/SmallArray.h
diff --git a/modules/dep/g3dlite/include/G3D/Sphere.h b/modules/acore/deps/g3dlite/include/G3D/Sphere.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Sphere.h
rename to modules/acore/deps/g3dlite/include/G3D/Sphere.h
diff --git a/modules/dep/g3dlite/include/G3D/Spline.h b/modules/acore/deps/g3dlite/include/G3D/Spline.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Spline.h
rename to modules/acore/deps/g3dlite/include/G3D/Spline.h
diff --git a/modules/dep/g3dlite/include/G3D/Stopwatch.h b/modules/acore/deps/g3dlite/include/G3D/Stopwatch.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Stopwatch.h
rename to modules/acore/deps/g3dlite/include/G3D/Stopwatch.h
diff --git a/modules/dep/g3dlite/include/G3D/System.h b/modules/acore/deps/g3dlite/include/G3D/System.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/System.h
rename to modules/acore/deps/g3dlite/include/G3D/System.h
diff --git a/modules/dep/g3dlite/include/G3D/Table.h b/modules/acore/deps/g3dlite/include/G3D/Table.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Table.h
rename to modules/acore/deps/g3dlite/include/G3D/Table.h
diff --git a/modules/dep/g3dlite/include/G3D/TextInput.h b/modules/acore/deps/g3dlite/include/G3D/TextInput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/TextInput.h
rename to modules/acore/deps/g3dlite/include/G3D/TextInput.h
diff --git a/modules/dep/g3dlite/include/G3D/TextOutput.h b/modules/acore/deps/g3dlite/include/G3D/TextOutput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/TextOutput.h
rename to modules/acore/deps/g3dlite/include/G3D/TextOutput.h
diff --git a/modules/dep/g3dlite/include/G3D/ThreadSet.h b/modules/acore/deps/g3dlite/include/G3D/ThreadSet.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ThreadSet.h
rename to modules/acore/deps/g3dlite/include/G3D/ThreadSet.h
diff --git a/modules/dep/g3dlite/include/G3D/Triangle.h b/modules/acore/deps/g3dlite/include/G3D/Triangle.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Triangle.h
rename to modules/acore/deps/g3dlite/include/G3D/Triangle.h
diff --git a/modules/dep/g3dlite/include/G3D/UprightFrame.h b/modules/acore/deps/g3dlite/include/G3D/UprightFrame.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/UprightFrame.h
rename to modules/acore/deps/g3dlite/include/G3D/UprightFrame.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector2.h b/modules/acore/deps/g3dlite/include/G3D/Vector2.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector2.h
rename to modules/acore/deps/g3dlite/include/G3D/Vector2.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector2int16.h b/modules/acore/deps/g3dlite/include/G3D/Vector2int16.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector2int16.h
rename to modules/acore/deps/g3dlite/include/G3D/Vector2int16.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector3.h b/modules/acore/deps/g3dlite/include/G3D/Vector3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector3.h
rename to modules/acore/deps/g3dlite/include/G3D/Vector3.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector3int16.h b/modules/acore/deps/g3dlite/include/G3D/Vector3int16.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector3int16.h
rename to modules/acore/deps/g3dlite/include/G3D/Vector3int16.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector3int32.h b/modules/acore/deps/g3dlite/include/G3D/Vector3int32.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector3int32.h
rename to modules/acore/deps/g3dlite/include/G3D/Vector3int32.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector4.h b/modules/acore/deps/g3dlite/include/G3D/Vector4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector4.h
rename to modules/acore/deps/g3dlite/include/G3D/Vector4.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector4int8.h b/modules/acore/deps/g3dlite/include/G3D/Vector4int8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector4int8.h
rename to modules/acore/deps/g3dlite/include/G3D/Vector4int8.h
diff --git a/modules/dep/g3dlite/include/G3D/WeakCache.h b/modules/acore/deps/g3dlite/include/G3D/WeakCache.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/WeakCache.h
rename to modules/acore/deps/g3dlite/include/G3D/WeakCache.h
diff --git a/modules/dep/g3dlite/include/G3D/Welder.h b/modules/acore/deps/g3dlite/include/G3D/Welder.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Welder.h
rename to modules/acore/deps/g3dlite/include/G3D/Welder.h
diff --git a/modules/dep/g3dlite/include/G3D/WrapMode.h b/modules/acore/deps/g3dlite/include/G3D/WrapMode.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/WrapMode.h
rename to modules/acore/deps/g3dlite/include/G3D/WrapMode.h
diff --git a/modules/dep/g3dlite/include/G3D/XML.h b/modules/acore/deps/g3dlite/include/G3D/XML.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/XML.h
rename to modules/acore/deps/g3dlite/include/G3D/XML.h
diff --git a/modules/dep/g3dlite/include/G3D/constants.h b/modules/acore/deps/g3dlite/include/G3D/constants.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/constants.h
rename to modules/acore/deps/g3dlite/include/G3D/constants.h
diff --git a/modules/dep/g3dlite/include/G3D/debug.h b/modules/acore/deps/g3dlite/include/G3D/debug.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/debug.h
rename to modules/acore/deps/g3dlite/include/G3D/debug.h
diff --git a/modules/dep/g3dlite/include/G3D/debugAssert.h b/modules/acore/deps/g3dlite/include/G3D/debugAssert.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/debugAssert.h
rename to modules/acore/deps/g3dlite/include/G3D/debugAssert.h
diff --git a/modules/dep/g3dlite/include/G3D/debugPrintf.h b/modules/acore/deps/g3dlite/include/G3D/debugPrintf.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/debugPrintf.h
rename to modules/acore/deps/g3dlite/include/G3D/debugPrintf.h
diff --git a/modules/dep/g3dlite/include/G3D/enumclass.h b/modules/acore/deps/g3dlite/include/G3D/enumclass.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/enumclass.h
rename to modules/acore/deps/g3dlite/include/G3D/enumclass.h
diff --git a/modules/dep/g3dlite/include/G3D/fileutils.h b/modules/acore/deps/g3dlite/include/G3D/fileutils.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/fileutils.h
rename to modules/acore/deps/g3dlite/include/G3D/fileutils.h
diff --git a/modules/dep/g3dlite/include/G3D/filter.h b/modules/acore/deps/g3dlite/include/G3D/filter.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/filter.h
rename to modules/acore/deps/g3dlite/include/G3D/filter.h
diff --git a/modules/dep/g3dlite/include/G3D/format.h b/modules/acore/deps/g3dlite/include/G3D/format.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/format.h
rename to modules/acore/deps/g3dlite/include/G3D/format.h
diff --git a/modules/dep/g3dlite/include/G3D/g3dfnmatch.h b/modules/acore/deps/g3dlite/include/G3D/g3dfnmatch.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/g3dfnmatch.h
rename to modules/acore/deps/g3dlite/include/G3D/g3dfnmatch.h
diff --git a/modules/dep/g3dlite/include/G3D/g3dmath.h b/modules/acore/deps/g3dlite/include/G3D/g3dmath.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/g3dmath.h
rename to modules/acore/deps/g3dlite/include/G3D/g3dmath.h
diff --git a/modules/dep/g3dlite/include/G3D/netheaders.h b/modules/acore/deps/g3dlite/include/G3D/netheaders.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/netheaders.h
rename to modules/acore/deps/g3dlite/include/G3D/netheaders.h
diff --git a/modules/dep/g3dlite/include/G3D/networkHelpers.h b/modules/acore/deps/g3dlite/include/G3D/networkHelpers.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/networkHelpers.h
rename to modules/acore/deps/g3dlite/include/G3D/networkHelpers.h
diff --git a/modules/dep/g3dlite/include/G3D/platform.h b/modules/acore/deps/g3dlite/include/G3D/platform.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/platform.h
rename to modules/acore/deps/g3dlite/include/G3D/platform.h
diff --git a/modules/dep/g3dlite/include/G3D/prompt.h b/modules/acore/deps/g3dlite/include/G3D/prompt.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/prompt.h
rename to modules/acore/deps/g3dlite/include/G3D/prompt.h
diff --git a/modules/dep/g3dlite/include/G3D/serialize.h b/modules/acore/deps/g3dlite/include/G3D/serialize.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/serialize.h
rename to modules/acore/deps/g3dlite/include/G3D/serialize.h
diff --git a/modules/dep/g3dlite/include/G3D/splinefunc.h b/modules/acore/deps/g3dlite/include/G3D/splinefunc.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/splinefunc.h
rename to modules/acore/deps/g3dlite/include/G3D/splinefunc.h
diff --git a/modules/dep/g3dlite/include/G3D/stringutils.h b/modules/acore/deps/g3dlite/include/G3D/stringutils.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/stringutils.h
rename to modules/acore/deps/g3dlite/include/G3D/stringutils.h
diff --git a/modules/dep/g3dlite/include/G3D/uint128.h b/modules/acore/deps/g3dlite/include/G3D/uint128.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/uint128.h
rename to modules/acore/deps/g3dlite/include/G3D/uint128.h
diff --git a/modules/dep/g3dlite/include/G3D/units.h b/modules/acore/deps/g3dlite/include/G3D/units.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/units.h
rename to modules/acore/deps/g3dlite/include/G3D/units.h
diff --git a/modules/dep/g3dlite/include/G3D/vectorMath.h b/modules/acore/deps/g3dlite/include/G3D/vectorMath.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/vectorMath.h
rename to modules/acore/deps/g3dlite/include/G3D/vectorMath.h
diff --git a/modules/dep/g3dlite/source/AABox.cpp b/modules/acore/deps/g3dlite/source/AABox.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/AABox.cpp
rename to modules/acore/deps/g3dlite/source/AABox.cpp
diff --git a/modules/dep/g3dlite/source/Any.cpp b/modules/acore/deps/g3dlite/source/Any.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Any.cpp
rename to modules/acore/deps/g3dlite/source/Any.cpp
diff --git a/modules/dep/g3dlite/source/AnyVal.cpp b/modules/acore/deps/g3dlite/source/AnyVal.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/AnyVal.cpp
rename to modules/acore/deps/g3dlite/source/AnyVal.cpp
diff --git a/modules/dep/g3dlite/source/AreaMemoryManager.cpp b/modules/acore/deps/g3dlite/source/AreaMemoryManager.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/AreaMemoryManager.cpp
rename to modules/acore/deps/g3dlite/source/AreaMemoryManager.cpp
diff --git a/modules/dep/g3dlite/source/BinaryFormat.cpp b/modules/acore/deps/g3dlite/source/BinaryFormat.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BinaryFormat.cpp
rename to modules/acore/deps/g3dlite/source/BinaryFormat.cpp
diff --git a/modules/dep/g3dlite/source/BinaryInput.cpp b/modules/acore/deps/g3dlite/source/BinaryInput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BinaryInput.cpp
rename to modules/acore/deps/g3dlite/source/BinaryInput.cpp
diff --git a/modules/dep/g3dlite/source/BinaryOutput.cpp b/modules/acore/deps/g3dlite/source/BinaryOutput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BinaryOutput.cpp
rename to modules/acore/deps/g3dlite/source/BinaryOutput.cpp
diff --git a/modules/dep/g3dlite/source/Box.cpp b/modules/acore/deps/g3dlite/source/Box.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Box.cpp
rename to modules/acore/deps/g3dlite/source/Box.cpp
diff --git a/modules/dep/g3dlite/source/Box2D.cpp b/modules/acore/deps/g3dlite/source/Box2D.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Box2D.cpp
rename to modules/acore/deps/g3dlite/source/Box2D.cpp
diff --git a/modules/dep/g3dlite/source/BumpMapPreprocess.cpp b/modules/acore/deps/g3dlite/source/BumpMapPreprocess.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BumpMapPreprocess.cpp
rename to modules/acore/deps/g3dlite/source/BumpMapPreprocess.cpp
diff --git a/modules/dep/g3dlite/source/Capsule.cpp b/modules/acore/deps/g3dlite/source/Capsule.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Capsule.cpp
rename to modules/acore/deps/g3dlite/source/Capsule.cpp
diff --git a/modules/dep/g3dlite/source/CollisionDetection.cpp b/modules/acore/deps/g3dlite/source/CollisionDetection.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/CollisionDetection.cpp
rename to modules/acore/deps/g3dlite/source/CollisionDetection.cpp
diff --git a/modules/dep/g3dlite/source/Color1.cpp b/modules/acore/deps/g3dlite/source/Color1.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color1.cpp
rename to modules/acore/deps/g3dlite/source/Color1.cpp
diff --git a/modules/dep/g3dlite/source/Color1uint8.cpp b/modules/acore/deps/g3dlite/source/Color1uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color1uint8.cpp
rename to modules/acore/deps/g3dlite/source/Color1uint8.cpp
diff --git a/modules/dep/g3dlite/source/Color3.cpp b/modules/acore/deps/g3dlite/source/Color3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color3.cpp
rename to modules/acore/deps/g3dlite/source/Color3.cpp
diff --git a/modules/dep/g3dlite/source/Color3uint8.cpp b/modules/acore/deps/g3dlite/source/Color3uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color3uint8.cpp
rename to modules/acore/deps/g3dlite/source/Color3uint8.cpp
diff --git a/modules/dep/g3dlite/source/Color4.cpp b/modules/acore/deps/g3dlite/source/Color4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color4.cpp
rename to modules/acore/deps/g3dlite/source/Color4.cpp
diff --git a/modules/dep/g3dlite/source/Color4uint8.cpp b/modules/acore/deps/g3dlite/source/Color4uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color4uint8.cpp
rename to modules/acore/deps/g3dlite/source/Color4uint8.cpp
diff --git a/modules/dep/g3dlite/source/Cone.cpp b/modules/acore/deps/g3dlite/source/Cone.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Cone.cpp
rename to modules/acore/deps/g3dlite/source/Cone.cpp
diff --git a/modules/dep/g3dlite/source/ConvexPolyhedron.cpp b/modules/acore/deps/g3dlite/source/ConvexPolyhedron.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ConvexPolyhedron.cpp
rename to modules/acore/deps/g3dlite/source/ConvexPolyhedron.cpp
diff --git a/modules/dep/g3dlite/source/CoordinateFrame.cpp b/modules/acore/deps/g3dlite/source/CoordinateFrame.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/CoordinateFrame.cpp
rename to modules/acore/deps/g3dlite/source/CoordinateFrame.cpp
diff --git a/modules/dep/g3dlite/source/Crypto.cpp b/modules/acore/deps/g3dlite/source/Crypto.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Crypto.cpp
rename to modules/acore/deps/g3dlite/source/Crypto.cpp
diff --git a/modules/dep/g3dlite/source/Crypto_md5.cpp b/modules/acore/deps/g3dlite/source/Crypto_md5.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Crypto_md5.cpp
rename to modules/acore/deps/g3dlite/source/Crypto_md5.cpp
diff --git a/modules/dep/g3dlite/source/Cylinder.cpp b/modules/acore/deps/g3dlite/source/Cylinder.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Cylinder.cpp
rename to modules/acore/deps/g3dlite/source/Cylinder.cpp
diff --git a/modules/dep/g3dlite/source/FileSystem.cpp b/modules/acore/deps/g3dlite/source/FileSystem.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/FileSystem.cpp
rename to modules/acore/deps/g3dlite/source/FileSystem.cpp
diff --git a/modules/dep/g3dlite/source/GCamera.cpp b/modules/acore/deps/g3dlite/source/GCamera.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GCamera.cpp
rename to modules/acore/deps/g3dlite/source/GCamera.cpp
diff --git a/modules/dep/g3dlite/source/GImage.cpp b/modules/acore/deps/g3dlite/source/GImage.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage.cpp
rename to modules/acore/deps/g3dlite/source/GImage.cpp
diff --git a/modules/dep/g3dlite/source/GImage_bayer.cpp b/modules/acore/deps/g3dlite/source/GImage_bayer.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_bayer.cpp
rename to modules/acore/deps/g3dlite/source/GImage_bayer.cpp
diff --git a/modules/dep/g3dlite/source/GImage_bmp.cpp b/modules/acore/deps/g3dlite/source/GImage_bmp.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_bmp.cpp
rename to modules/acore/deps/g3dlite/source/GImage_bmp.cpp
diff --git a/modules/dep/g3dlite/source/GImage_jpeg.cpp b/modules/acore/deps/g3dlite/source/GImage_jpeg.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_jpeg.cpp
rename to modules/acore/deps/g3dlite/source/GImage_jpeg.cpp
diff --git a/modules/dep/g3dlite/source/GImage_png.cpp b/modules/acore/deps/g3dlite/source/GImage_png.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_png.cpp
rename to modules/acore/deps/g3dlite/source/GImage_png.cpp
diff --git a/modules/dep/g3dlite/source/GImage_ppm.cpp b/modules/acore/deps/g3dlite/source/GImage_ppm.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_ppm.cpp
rename to modules/acore/deps/g3dlite/source/GImage_ppm.cpp
diff --git a/modules/dep/g3dlite/source/GImage_tga.cpp b/modules/acore/deps/g3dlite/source/GImage_tga.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_tga.cpp
rename to modules/acore/deps/g3dlite/source/GImage_tga.cpp
diff --git a/modules/dep/g3dlite/source/GLight.cpp b/modules/acore/deps/g3dlite/source/GLight.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GLight.cpp
rename to modules/acore/deps/g3dlite/source/GLight.cpp
diff --git a/modules/dep/g3dlite/source/GThread.cpp b/modules/acore/deps/g3dlite/source/GThread.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GThread.cpp
rename to modules/acore/deps/g3dlite/source/GThread.cpp
diff --git a/modules/dep/g3dlite/source/GUniqueID.cpp b/modules/acore/deps/g3dlite/source/GUniqueID.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GUniqueID.cpp
rename to modules/acore/deps/g3dlite/source/GUniqueID.cpp
diff --git a/modules/dep/g3dlite/source/Image1.cpp b/modules/acore/deps/g3dlite/source/Image1.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image1.cpp
rename to modules/acore/deps/g3dlite/source/Image1.cpp
diff --git a/modules/dep/g3dlite/source/Image1uint8.cpp b/modules/acore/deps/g3dlite/source/Image1uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image1uint8.cpp
rename to modules/acore/deps/g3dlite/source/Image1uint8.cpp
diff --git a/modules/dep/g3dlite/source/Image3.cpp b/modules/acore/deps/g3dlite/source/Image3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image3.cpp
rename to modules/acore/deps/g3dlite/source/Image3.cpp
diff --git a/modules/dep/g3dlite/source/Image3uint8.cpp b/modules/acore/deps/g3dlite/source/Image3uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image3uint8.cpp
rename to modules/acore/deps/g3dlite/source/Image3uint8.cpp
diff --git a/modules/dep/g3dlite/source/Image4.cpp b/modules/acore/deps/g3dlite/source/Image4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image4.cpp
rename to modules/acore/deps/g3dlite/source/Image4.cpp
diff --git a/modules/dep/g3dlite/source/Image4uint8.cpp b/modules/acore/deps/g3dlite/source/Image4uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image4uint8.cpp
rename to modules/acore/deps/g3dlite/source/Image4uint8.cpp
diff --git a/modules/dep/g3dlite/source/ImageFormat.cpp b/modules/acore/deps/g3dlite/source/ImageFormat.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ImageFormat.cpp
rename to modules/acore/deps/g3dlite/source/ImageFormat.cpp
diff --git a/modules/dep/g3dlite/source/ImageFormat_convert.cpp b/modules/acore/deps/g3dlite/source/ImageFormat_convert.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ImageFormat_convert.cpp
rename to modules/acore/deps/g3dlite/source/ImageFormat_convert.cpp
diff --git a/modules/dep/g3dlite/source/Intersect.cpp b/modules/acore/deps/g3dlite/source/Intersect.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Intersect.cpp
rename to modules/acore/deps/g3dlite/source/Intersect.cpp
diff --git a/modules/dep/g3dlite/source/Line.cpp b/modules/acore/deps/g3dlite/source/Line.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Line.cpp
rename to modules/acore/deps/g3dlite/source/Line.cpp
diff --git a/modules/dep/g3dlite/source/LineSegment.cpp b/modules/acore/deps/g3dlite/source/LineSegment.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/LineSegment.cpp
rename to modules/acore/deps/g3dlite/source/LineSegment.cpp
diff --git a/modules/dep/g3dlite/source/Log.cpp b/modules/acore/deps/g3dlite/source/Log.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Log.cpp
rename to modules/acore/deps/g3dlite/source/Log.cpp
diff --git a/modules/dep/g3dlite/source/Matrix.cpp b/modules/acore/deps/g3dlite/source/Matrix.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Matrix.cpp
rename to modules/acore/deps/g3dlite/source/Matrix.cpp
diff --git a/modules/dep/g3dlite/source/Matrix3.cpp b/modules/acore/deps/g3dlite/source/Matrix3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Matrix3.cpp
rename to modules/acore/deps/g3dlite/source/Matrix3.cpp
diff --git a/modules/dep/g3dlite/source/Matrix4.cpp b/modules/acore/deps/g3dlite/source/Matrix4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Matrix4.cpp
rename to modules/acore/deps/g3dlite/source/Matrix4.cpp
diff --git a/modules/dep/g3dlite/source/MemoryManager.cpp b/modules/acore/deps/g3dlite/source/MemoryManager.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MemoryManager.cpp
rename to modules/acore/deps/g3dlite/source/MemoryManager.cpp
diff --git a/modules/dep/g3dlite/source/MeshAlg.cpp b/modules/acore/deps/g3dlite/source/MeshAlg.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshAlg.cpp
rename to modules/acore/deps/g3dlite/source/MeshAlg.cpp
diff --git a/modules/dep/g3dlite/source/MeshAlgAdjacency.cpp b/modules/acore/deps/g3dlite/source/MeshAlgAdjacency.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshAlgAdjacency.cpp
rename to modules/acore/deps/g3dlite/source/MeshAlgAdjacency.cpp
diff --git a/modules/dep/g3dlite/source/MeshAlgWeld.cpp b/modules/acore/deps/g3dlite/source/MeshAlgWeld.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshAlgWeld.cpp
rename to modules/acore/deps/g3dlite/source/MeshAlgWeld.cpp
diff --git a/modules/dep/g3dlite/source/MeshBuilder.cpp b/modules/acore/deps/g3dlite/source/MeshBuilder.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshBuilder.cpp
rename to modules/acore/deps/g3dlite/source/MeshBuilder.cpp
diff --git a/modules/dep/g3dlite/source/NetAddress.cpp b/modules/acore/deps/g3dlite/source/NetAddress.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/NetAddress.cpp
rename to modules/acore/deps/g3dlite/source/NetAddress.cpp
diff --git a/modules/dep/g3dlite/source/NetworkDevice.cpp b/modules/acore/deps/g3dlite/source/NetworkDevice.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/NetworkDevice.cpp
rename to modules/acore/deps/g3dlite/source/NetworkDevice.cpp
diff --git a/modules/dep/g3dlite/source/PhysicsFrame.cpp b/modules/acore/deps/g3dlite/source/PhysicsFrame.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/PhysicsFrame.cpp
rename to modules/acore/deps/g3dlite/source/PhysicsFrame.cpp
diff --git a/modules/dep/g3dlite/source/PhysicsFrameSpline.cpp b/modules/acore/deps/g3dlite/source/PhysicsFrameSpline.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/PhysicsFrameSpline.cpp
rename to modules/acore/deps/g3dlite/source/PhysicsFrameSpline.cpp
diff --git a/modules/dep/g3dlite/source/Plane.cpp b/modules/acore/deps/g3dlite/source/Plane.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Plane.cpp
rename to modules/acore/deps/g3dlite/source/Plane.cpp
diff --git a/modules/dep/g3dlite/source/PrecomputedRandom.cpp b/modules/acore/deps/g3dlite/source/PrecomputedRandom.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/PrecomputedRandom.cpp
rename to modules/acore/deps/g3dlite/source/PrecomputedRandom.cpp
diff --git a/modules/dep/g3dlite/source/Quat.cpp b/modules/acore/deps/g3dlite/source/Quat.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Quat.cpp
rename to modules/acore/deps/g3dlite/source/Quat.cpp
diff --git a/modules/dep/g3dlite/source/Random.cpp b/modules/acore/deps/g3dlite/source/Random.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Random.cpp
rename to modules/acore/deps/g3dlite/source/Random.cpp
diff --git a/modules/dep/g3dlite/source/Ray.cpp b/modules/acore/deps/g3dlite/source/Ray.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Ray.cpp
rename to modules/acore/deps/g3dlite/source/Ray.cpp
diff --git a/modules/dep/g3dlite/source/Rect2D.cpp b/modules/acore/deps/g3dlite/source/Rect2D.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Rect2D.cpp
rename to modules/acore/deps/g3dlite/source/Rect2D.cpp
diff --git a/modules/dep/g3dlite/source/ReferenceCount.cpp b/modules/acore/deps/g3dlite/source/ReferenceCount.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ReferenceCount.cpp
rename to modules/acore/deps/g3dlite/source/ReferenceCount.cpp
diff --git a/modules/dep/g3dlite/source/RegistryUtil.cpp b/modules/acore/deps/g3dlite/source/RegistryUtil.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/RegistryUtil.cpp
rename to modules/acore/deps/g3dlite/source/RegistryUtil.cpp
diff --git a/modules/dep/g3dlite/source/Sphere.cpp b/modules/acore/deps/g3dlite/source/Sphere.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Sphere.cpp
rename to modules/acore/deps/g3dlite/source/Sphere.cpp
diff --git a/modules/dep/g3dlite/source/SplineBase.cpp b/modules/acore/deps/g3dlite/source/SplineBase.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/SplineBase.cpp
rename to modules/acore/deps/g3dlite/source/SplineBase.cpp
diff --git a/modules/dep/g3dlite/source/Stopwatch.cpp b/modules/acore/deps/g3dlite/source/Stopwatch.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Stopwatch.cpp
rename to modules/acore/deps/g3dlite/source/Stopwatch.cpp
diff --git a/modules/dep/g3dlite/source/System.cpp b/modules/acore/deps/g3dlite/source/System.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/System.cpp
rename to modules/acore/deps/g3dlite/source/System.cpp
diff --git a/modules/dep/g3dlite/source/TextInput.cpp b/modules/acore/deps/g3dlite/source/TextInput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/TextInput.cpp
rename to modules/acore/deps/g3dlite/source/TextInput.cpp
diff --git a/modules/dep/g3dlite/source/TextOutput.cpp b/modules/acore/deps/g3dlite/source/TextOutput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/TextOutput.cpp
rename to modules/acore/deps/g3dlite/source/TextOutput.cpp
diff --git a/modules/dep/g3dlite/source/ThreadSet.cpp b/modules/acore/deps/g3dlite/source/ThreadSet.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ThreadSet.cpp
rename to modules/acore/deps/g3dlite/source/ThreadSet.cpp
diff --git a/modules/dep/g3dlite/source/Triangle.cpp b/modules/acore/deps/g3dlite/source/Triangle.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Triangle.cpp
rename to modules/acore/deps/g3dlite/source/Triangle.cpp
diff --git a/modules/dep/g3dlite/source/UprightFrame.cpp b/modules/acore/deps/g3dlite/source/UprightFrame.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/UprightFrame.cpp
rename to modules/acore/deps/g3dlite/source/UprightFrame.cpp
diff --git a/modules/dep/g3dlite/source/Vector2.cpp b/modules/acore/deps/g3dlite/source/Vector2.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector2.cpp
rename to modules/acore/deps/g3dlite/source/Vector2.cpp
diff --git a/modules/dep/g3dlite/source/Vector2int16.cpp b/modules/acore/deps/g3dlite/source/Vector2int16.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector2int16.cpp
rename to modules/acore/deps/g3dlite/source/Vector2int16.cpp
diff --git a/modules/dep/g3dlite/source/Vector3.cpp b/modules/acore/deps/g3dlite/source/Vector3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector3.cpp
rename to modules/acore/deps/g3dlite/source/Vector3.cpp
diff --git a/modules/dep/g3dlite/source/Vector3int16.cpp b/modules/acore/deps/g3dlite/source/Vector3int16.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector3int16.cpp
rename to modules/acore/deps/g3dlite/source/Vector3int16.cpp
diff --git a/modules/dep/g3dlite/source/Vector3int32.cpp b/modules/acore/deps/g3dlite/source/Vector3int32.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector3int32.cpp
rename to modules/acore/deps/g3dlite/source/Vector3int32.cpp
diff --git a/modules/dep/g3dlite/source/Vector4.cpp b/modules/acore/deps/g3dlite/source/Vector4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector4.cpp
rename to modules/acore/deps/g3dlite/source/Vector4.cpp
diff --git a/modules/dep/g3dlite/source/Vector4int8.cpp b/modules/acore/deps/g3dlite/source/Vector4int8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector4int8.cpp
rename to modules/acore/deps/g3dlite/source/Vector4int8.cpp
diff --git a/modules/dep/g3dlite/source/Welder.cpp b/modules/acore/deps/g3dlite/source/Welder.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Welder.cpp
rename to modules/acore/deps/g3dlite/source/Welder.cpp
diff --git a/modules/dep/g3dlite/source/WinMain.cpp b/modules/acore/deps/g3dlite/source/WinMain.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/WinMain.cpp
rename to modules/acore/deps/g3dlite/source/WinMain.cpp
diff --git a/modules/dep/g3dlite/source/XML.cpp b/modules/acore/deps/g3dlite/source/XML.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/XML.cpp
rename to modules/acore/deps/g3dlite/source/XML.cpp
diff --git a/modules/dep/g3dlite/source/constants.cpp b/modules/acore/deps/g3dlite/source/constants.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/constants.cpp
rename to modules/acore/deps/g3dlite/source/constants.cpp
diff --git a/modules/dep/g3dlite/source/debugAssert.cpp b/modules/acore/deps/g3dlite/source/debugAssert.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/debugAssert.cpp
rename to modules/acore/deps/g3dlite/source/debugAssert.cpp
diff --git a/modules/dep/g3dlite/source/fileutils.cpp b/modules/acore/deps/g3dlite/source/fileutils.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/fileutils.cpp
rename to modules/acore/deps/g3dlite/source/fileutils.cpp
diff --git a/modules/dep/g3dlite/source/filter.cpp b/modules/acore/deps/g3dlite/source/filter.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/filter.cpp
rename to modules/acore/deps/g3dlite/source/filter.cpp
diff --git a/modules/dep/g3dlite/source/format.cpp b/modules/acore/deps/g3dlite/source/format.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/format.cpp
rename to modules/acore/deps/g3dlite/source/format.cpp
diff --git a/modules/dep/g3dlite/source/g3dfnmatch.cpp b/modules/acore/deps/g3dlite/source/g3dfnmatch.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/g3dfnmatch.cpp
rename to modules/acore/deps/g3dlite/source/g3dfnmatch.cpp
diff --git a/modules/dep/g3dlite/source/g3dmath.cpp b/modules/acore/deps/g3dlite/source/g3dmath.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/g3dmath.cpp
rename to modules/acore/deps/g3dlite/source/g3dmath.cpp
diff --git a/modules/dep/g3dlite/source/license.cpp b/modules/acore/deps/g3dlite/source/license.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/license.cpp
rename to modules/acore/deps/g3dlite/source/license.cpp
diff --git a/modules/dep/g3dlite/source/prompt.cpp b/modules/acore/deps/g3dlite/source/prompt.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/prompt.cpp
rename to modules/acore/deps/g3dlite/source/prompt.cpp
diff --git a/modules/dep/g3dlite/source/stringutils.cpp b/modules/acore/deps/g3dlite/source/stringutils.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/stringutils.cpp
rename to modules/acore/deps/g3dlite/source/stringutils.cpp
diff --git a/modules/dep/g3dlite/source/uint128.cpp b/modules/acore/deps/g3dlite/source/uint128.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/uint128.cpp
rename to modules/acore/deps/g3dlite/source/uint128.cpp
diff --git a/modules/dep/gsoap/CMakeLists.txt b/modules/acore/deps/gsoap/CMakeLists.txt
similarity index 100%
rename from modules/dep/gsoap/CMakeLists.txt
rename to modules/acore/deps/gsoap/CMakeLists.txt
diff --git a/modules/dep/gsoap/gsoap.stub b/modules/acore/deps/gsoap/gsoap.stub
similarity index 100%
rename from modules/dep/gsoap/gsoap.stub
rename to modules/acore/deps/gsoap/gsoap.stub
diff --git a/modules/dep/gsoap/soapC.cpp b/modules/acore/deps/gsoap/soapC.cpp
similarity index 100%
rename from modules/dep/gsoap/soapC.cpp
rename to modules/acore/deps/gsoap/soapC.cpp
diff --git a/modules/dep/gsoap/soapH.h b/modules/acore/deps/gsoap/soapH.h
similarity index 100%
rename from modules/dep/gsoap/soapH.h
rename to modules/acore/deps/gsoap/soapH.h
diff --git a/modules/dep/gsoap/soapServer.cpp b/modules/acore/deps/gsoap/soapServer.cpp
similarity index 100%
rename from modules/dep/gsoap/soapServer.cpp
rename to modules/acore/deps/gsoap/soapServer.cpp
diff --git a/modules/dep/gsoap/soapStub.h b/modules/acore/deps/gsoap/soapStub.h
similarity index 100%
rename from modules/dep/gsoap/soapStub.h
rename to modules/acore/deps/gsoap/soapStub.h
diff --git a/modules/dep/gsoap/stdsoap2.cpp b/modules/acore/deps/gsoap/stdsoap2.cpp
similarity index 100%
rename from modules/dep/gsoap/stdsoap2.cpp
rename to modules/acore/deps/gsoap/stdsoap2.cpp
diff --git a/modules/dep/gsoap/stdsoap2.h b/modules/acore/deps/gsoap/stdsoap2.h
similarity index 100%
rename from modules/dep/gsoap/stdsoap2.h
rename to modules/acore/deps/gsoap/stdsoap2.h
diff --git a/modules/dep/gsoap/tc_upgrades.txt b/modules/acore/deps/gsoap/tc_upgrades.txt
similarity index 100%
rename from modules/dep/gsoap/tc_upgrades.txt
rename to modules/acore/deps/gsoap/tc_upgrades.txt
diff --git a/modules/dep/jemalloc/CMakeLists.txt b/modules/acore/deps/jemalloc/CMakeLists.txt
similarity index 100%
rename from modules/dep/jemalloc/CMakeLists.txt
rename to modules/acore/deps/jemalloc/CMakeLists.txt
diff --git a/modules/dep/jemalloc/COPYING b/modules/acore/deps/jemalloc/COPYING
similarity index 100%
rename from modules/dep/jemalloc/COPYING
rename to modules/acore/deps/jemalloc/COPYING
diff --git a/modules/dep/jemalloc/ChangeLog b/modules/acore/deps/jemalloc/ChangeLog
similarity index 100%
rename from modules/dep/jemalloc/ChangeLog
rename to modules/acore/deps/jemalloc/ChangeLog
diff --git a/modules/dep/jemalloc/README b/modules/acore/deps/jemalloc/README
similarity index 100%
rename from modules/dep/jemalloc/README
rename to modules/acore/deps/jemalloc/README
diff --git a/modules/dep/jemalloc/TC_NOTE.txt b/modules/acore/deps/jemalloc/TC_NOTE.txt
similarity index 100%
rename from modules/dep/jemalloc/TC_NOTE.txt
rename to modules/acore/deps/jemalloc/TC_NOTE.txt
diff --git a/modules/dep/jemalloc/VERSION b/modules/acore/deps/jemalloc/VERSION
similarity index 100%
rename from modules/dep/jemalloc/VERSION
rename to modules/acore/deps/jemalloc/VERSION
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/arena.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/arena.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/arena.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/arena.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/atomic.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/atomic.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/atomic.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/atomic.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/base.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/base.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/base.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/base.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/bitmap.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/bitmap.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/bitmap.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/bitmap.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/chunk.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/chunk.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/chunk.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/chunk.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/chunk_dss.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/chunk_dss.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/chunk_dss.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/chunk_dss.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/chunk_mmap.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/chunk_mmap.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/chunk_mmap.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/chunk_mmap.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/ckh.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/ckh.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/ckh.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/ckh.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/ctl.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/ctl.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/ctl.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/ctl.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/extent.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/extent.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/extent.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/extent.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/hash.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/hash.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/hash.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/hash.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/huge.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/huge.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/huge.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/huge.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/jemalloc_internal.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/jemalloc_internal.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/jemalloc_internal.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/mb.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/mb.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/mb.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/mb.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/mutex.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/mutex.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/mutex.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/mutex.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/private_namespace.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/private_namespace.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/private_namespace.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/private_namespace.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/prng.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/prng.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/prng.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/prng.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/prof.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/prof.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/prof.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/prof.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/ql.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/ql.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/ql.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/ql.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/qr.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/qr.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/qr.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/qr.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/quarantine.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/quarantine.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/quarantine.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/quarantine.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/rb.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/rb.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/rb.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/rb.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/rtree.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/rtree.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/rtree.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/rtree.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/size_classes.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/size_classes.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/size_classes.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/size_classes.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/stats.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/stats.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/stats.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/stats.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/tcache.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/tcache.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/tcache.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/tcache.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/tsd.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/tsd.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/tsd.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/tsd.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/util.h b/modules/acore/deps/jemalloc/include/jemalloc/internal/util.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/util.h
rename to modules/acore/deps/jemalloc/include/jemalloc/internal/util.h
diff --git a/modules/dep/jemalloc/include/jemalloc/jemalloc.h b/modules/acore/deps/jemalloc/include/jemalloc/jemalloc.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/jemalloc.h
rename to modules/acore/deps/jemalloc/include/jemalloc/jemalloc.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/inttypes.h b/modules/acore/deps/jemalloc/include/msvc_compat/inttypes.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/inttypes.h
rename to modules/acore/deps/jemalloc/include/msvc_compat/inttypes.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/stdbool.h b/modules/acore/deps/jemalloc/include/msvc_compat/stdbool.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/stdbool.h
rename to modules/acore/deps/jemalloc/include/msvc_compat/stdbool.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/stdint.h b/modules/acore/deps/jemalloc/include/msvc_compat/stdint.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/stdint.h
rename to modules/acore/deps/jemalloc/include/msvc_compat/stdint.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/strings.h b/modules/acore/deps/jemalloc/include/msvc_compat/strings.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/strings.h
rename to modules/acore/deps/jemalloc/include/msvc_compat/strings.h
diff --git a/modules/dep/jemalloc/jemalloc_defs.h.in.cmake b/modules/acore/deps/jemalloc/jemalloc_defs.h.in.cmake
similarity index 100%
rename from modules/dep/jemalloc/jemalloc_defs.h.in.cmake
rename to modules/acore/deps/jemalloc/jemalloc_defs.h.in.cmake
diff --git a/modules/dep/jemalloc/src/arena.c b/modules/acore/deps/jemalloc/src/arena.c
similarity index 100%
rename from modules/dep/jemalloc/src/arena.c
rename to modules/acore/deps/jemalloc/src/arena.c
diff --git a/modules/dep/jemalloc/src/atomic.c b/modules/acore/deps/jemalloc/src/atomic.c
similarity index 100%
rename from modules/dep/jemalloc/src/atomic.c
rename to modules/acore/deps/jemalloc/src/atomic.c
diff --git a/modules/dep/jemalloc/src/base.c b/modules/acore/deps/jemalloc/src/base.c
similarity index 100%
rename from modules/dep/jemalloc/src/base.c
rename to modules/acore/deps/jemalloc/src/base.c
diff --git a/modules/dep/jemalloc/src/bitmap.c b/modules/acore/deps/jemalloc/src/bitmap.c
similarity index 100%
rename from modules/dep/jemalloc/src/bitmap.c
rename to modules/acore/deps/jemalloc/src/bitmap.c
diff --git a/modules/dep/jemalloc/src/chunk.c b/modules/acore/deps/jemalloc/src/chunk.c
similarity index 100%
rename from modules/dep/jemalloc/src/chunk.c
rename to modules/acore/deps/jemalloc/src/chunk.c
diff --git a/modules/dep/jemalloc/src/chunk_dss.c b/modules/acore/deps/jemalloc/src/chunk_dss.c
similarity index 100%
rename from modules/dep/jemalloc/src/chunk_dss.c
rename to modules/acore/deps/jemalloc/src/chunk_dss.c
diff --git a/modules/dep/jemalloc/src/chunk_mmap.c b/modules/acore/deps/jemalloc/src/chunk_mmap.c
similarity index 100%
rename from modules/dep/jemalloc/src/chunk_mmap.c
rename to modules/acore/deps/jemalloc/src/chunk_mmap.c
diff --git a/modules/dep/jemalloc/src/ckh.c b/modules/acore/deps/jemalloc/src/ckh.c
similarity index 100%
rename from modules/dep/jemalloc/src/ckh.c
rename to modules/acore/deps/jemalloc/src/ckh.c
diff --git a/modules/dep/jemalloc/src/ctl.c b/modules/acore/deps/jemalloc/src/ctl.c
similarity index 100%
rename from modules/dep/jemalloc/src/ctl.c
rename to modules/acore/deps/jemalloc/src/ctl.c
diff --git a/modules/dep/jemalloc/src/extent.c b/modules/acore/deps/jemalloc/src/extent.c
similarity index 100%
rename from modules/dep/jemalloc/src/extent.c
rename to modules/acore/deps/jemalloc/src/extent.c
diff --git a/modules/dep/jemalloc/src/hash.c b/modules/acore/deps/jemalloc/src/hash.c
similarity index 100%
rename from modules/dep/jemalloc/src/hash.c
rename to modules/acore/deps/jemalloc/src/hash.c
diff --git a/modules/dep/jemalloc/src/huge.c b/modules/acore/deps/jemalloc/src/huge.c
similarity index 100%
rename from modules/dep/jemalloc/src/huge.c
rename to modules/acore/deps/jemalloc/src/huge.c
diff --git a/modules/dep/jemalloc/src/jemalloc.c b/modules/acore/deps/jemalloc/src/jemalloc.c
similarity index 100%
rename from modules/dep/jemalloc/src/jemalloc.c
rename to modules/acore/deps/jemalloc/src/jemalloc.c
diff --git a/modules/dep/jemalloc/src/mb.c b/modules/acore/deps/jemalloc/src/mb.c
similarity index 100%
rename from modules/dep/jemalloc/src/mb.c
rename to modules/acore/deps/jemalloc/src/mb.c
diff --git a/modules/dep/jemalloc/src/mutex.c b/modules/acore/deps/jemalloc/src/mutex.c
similarity index 100%
rename from modules/dep/jemalloc/src/mutex.c
rename to modules/acore/deps/jemalloc/src/mutex.c
diff --git a/modules/dep/jemalloc/src/prof.c b/modules/acore/deps/jemalloc/src/prof.c
similarity index 100%
rename from modules/dep/jemalloc/src/prof.c
rename to modules/acore/deps/jemalloc/src/prof.c
diff --git a/modules/dep/jemalloc/src/quarantine.c b/modules/acore/deps/jemalloc/src/quarantine.c
similarity index 100%
rename from modules/dep/jemalloc/src/quarantine.c
rename to modules/acore/deps/jemalloc/src/quarantine.c
diff --git a/modules/dep/jemalloc/src/rtree.c b/modules/acore/deps/jemalloc/src/rtree.c
similarity index 100%
rename from modules/dep/jemalloc/src/rtree.c
rename to modules/acore/deps/jemalloc/src/rtree.c
diff --git a/modules/dep/jemalloc/src/stats.c b/modules/acore/deps/jemalloc/src/stats.c
similarity index 100%
rename from modules/dep/jemalloc/src/stats.c
rename to modules/acore/deps/jemalloc/src/stats.c
diff --git a/modules/dep/jemalloc/src/tcache.c b/modules/acore/deps/jemalloc/src/tcache.c
similarity index 100%
rename from modules/dep/jemalloc/src/tcache.c
rename to modules/acore/deps/jemalloc/src/tcache.c
diff --git a/modules/dep/jemalloc/src/tsd.c b/modules/acore/deps/jemalloc/src/tsd.c
similarity index 100%
rename from modules/dep/jemalloc/src/tsd.c
rename to modules/acore/deps/jemalloc/src/tsd.c
diff --git a/modules/dep/jemalloc/src/util.c b/modules/acore/deps/jemalloc/src/util.c
similarity index 100%
rename from modules/dep/jemalloc/src/util.c
rename to modules/acore/deps/jemalloc/src/util.c
diff --git a/modules/dep/jemalloc/src/zone.c b/modules/acore/deps/jemalloc/src/zone.c
similarity index 100%
rename from modules/dep/jemalloc/src/zone.c
rename to modules/acore/deps/jemalloc/src/zone.c
diff --git a/modules/dep/libmpq/AUTHORS b/modules/acore/deps/libmpq/AUTHORS
similarity index 100%
rename from modules/dep/libmpq/AUTHORS
rename to modules/acore/deps/libmpq/AUTHORS
diff --git a/modules/dep/libmpq/CMakeLists.txt b/modules/acore/deps/libmpq/CMakeLists.txt
similarity index 100%
rename from modules/dep/libmpq/CMakeLists.txt
rename to modules/acore/deps/libmpq/CMakeLists.txt
diff --git a/modules/dep/libmpq/COPYING b/modules/acore/deps/libmpq/COPYING
similarity index 100%
rename from modules/dep/libmpq/COPYING
rename to modules/acore/deps/libmpq/COPYING
diff --git a/modules/dep/libmpq/FAQ b/modules/acore/deps/libmpq/FAQ
similarity index 100%
rename from modules/dep/libmpq/FAQ
rename to modules/acore/deps/libmpq/FAQ
diff --git a/modules/dep/libmpq/INSTALL b/modules/acore/deps/libmpq/INSTALL
similarity index 100%
rename from modules/dep/libmpq/INSTALL
rename to modules/acore/deps/libmpq/INSTALL
diff --git a/modules/dep/libmpq/Makefile.am b/modules/acore/deps/libmpq/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/Makefile.am
rename to modules/acore/deps/libmpq/Makefile.am
diff --git a/modules/dep/libmpq/NEWS b/modules/acore/deps/libmpq/NEWS
similarity index 100%
rename from modules/dep/libmpq/NEWS
rename to modules/acore/deps/libmpq/NEWS
diff --git a/modules/dep/libmpq/README b/modules/acore/deps/libmpq/README
similarity index 100%
rename from modules/dep/libmpq/README
rename to modules/acore/deps/libmpq/README
diff --git a/modules/dep/libmpq/THANKS b/modules/acore/deps/libmpq/THANKS
similarity index 100%
rename from modules/dep/libmpq/THANKS
rename to modules/acore/deps/libmpq/THANKS
diff --git a/modules/dep/libmpq/TODO b/modules/acore/deps/libmpq/TODO
similarity index 100%
rename from modules/dep/libmpq/TODO
rename to modules/acore/deps/libmpq/TODO
diff --git a/modules/dep/libmpq/autogen.sh b/modules/acore/deps/libmpq/autogen.sh
similarity index 100%
rename from modules/dep/libmpq/autogen.sh
rename to modules/acore/deps/libmpq/autogen.sh
diff --git a/modules/dep/libmpq/bindings/Makefile.am b/modules/acore/deps/libmpq/bindings/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/bindings/Makefile.am
rename to modules/acore/deps/libmpq/bindings/Makefile.am
diff --git a/modules/dep/libmpq/bindings/d/Makefile.am b/modules/acore/deps/libmpq/bindings/d/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/bindings/d/Makefile.am
rename to modules/acore/deps/libmpq/bindings/d/Makefile.am
diff --git a/modules/dep/libmpq/bindings/d/dsss.conf b/modules/acore/deps/libmpq/bindings/d/dsss.conf
similarity index 100%
rename from modules/dep/libmpq/bindings/d/dsss.conf
rename to modules/acore/deps/libmpq/bindings/d/dsss.conf
diff --git a/modules/dep/libmpq/bindings/d/mpq.d b/modules/acore/deps/libmpq/bindings/d/mpq.d
similarity index 100%
rename from modules/dep/libmpq/bindings/d/mpq.d
rename to modules/acore/deps/libmpq/bindings/d/mpq.d
diff --git a/modules/dep/libmpq/bindings/python/Makefile.am b/modules/acore/deps/libmpq/bindings/python/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/bindings/python/Makefile.am
rename to modules/acore/deps/libmpq/bindings/python/Makefile.am
diff --git a/modules/dep/libmpq/bindings/python/mpq-info b/modules/acore/deps/libmpq/bindings/python/mpq-info
similarity index 100%
rename from modules/dep/libmpq/bindings/python/mpq-info
rename to modules/acore/deps/libmpq/bindings/python/mpq-info
diff --git a/modules/dep/libmpq/bindings/python/mpq.py b/modules/acore/deps/libmpq/bindings/python/mpq.py
similarity index 100%
rename from modules/dep/libmpq/bindings/python/mpq.py
rename to modules/acore/deps/libmpq/bindings/python/mpq.py
diff --git a/modules/dep/libmpq/config.h b/modules/acore/deps/libmpq/config.h
similarity index 100%
rename from modules/dep/libmpq/config.h
rename to modules/acore/deps/libmpq/config.h
diff --git a/modules/dep/libmpq/configure.ac b/modules/acore/deps/libmpq/configure.ac
similarity index 100%
rename from modules/dep/libmpq/configure.ac
rename to modules/acore/deps/libmpq/configure.ac
diff --git a/modules/dep/libmpq/debian/changelog b/modules/acore/deps/libmpq/debian/changelog
similarity index 100%
rename from modules/dep/libmpq/debian/changelog
rename to modules/acore/deps/libmpq/debian/changelog
diff --git a/modules/dep/libmpq/debian/compat b/modules/acore/deps/libmpq/debian/compat
similarity index 100%
rename from modules/dep/libmpq/debian/compat
rename to modules/acore/deps/libmpq/debian/compat
diff --git a/modules/dep/libmpq/debian/control b/modules/acore/deps/libmpq/debian/control
similarity index 100%
rename from modules/dep/libmpq/debian/control
rename to modules/acore/deps/libmpq/debian/control
diff --git a/modules/dep/libmpq/debian/copyright b/modules/acore/deps/libmpq/debian/copyright
similarity index 100%
rename from modules/dep/libmpq/debian/copyright
rename to modules/acore/deps/libmpq/debian/copyright
diff --git a/modules/dep/libmpq/debian/libmpq-dev.dirs b/modules/acore/deps/libmpq/debian/libmpq-dev.dirs
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq-dev.dirs
rename to modules/acore/deps/libmpq/debian/libmpq-dev.dirs
diff --git a/modules/dep/libmpq/debian/libmpq-dev.install b/modules/acore/deps/libmpq/debian/libmpq-dev.install
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq-dev.install
rename to modules/acore/deps/libmpq/debian/libmpq-dev.install
diff --git a/modules/dep/libmpq/debian/libmpq0.dirs b/modules/acore/deps/libmpq/debian/libmpq0.dirs
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq0.dirs
rename to modules/acore/deps/libmpq/debian/libmpq0.dirs
diff --git a/modules/dep/libmpq/debian/libmpq0.docs b/modules/acore/deps/libmpq/debian/libmpq0.docs
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq0.docs
rename to modules/acore/deps/libmpq/debian/libmpq0.docs
diff --git a/modules/dep/libmpq/debian/libmpq0.install b/modules/acore/deps/libmpq/debian/libmpq0.install
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq0.install
rename to modules/acore/deps/libmpq/debian/libmpq0.install
diff --git a/modules/dep/libmpq/debian/python-mpq.install b/modules/acore/deps/libmpq/debian/python-mpq.install
similarity index 100%
rename from modules/dep/libmpq/debian/python-mpq.install
rename to modules/acore/deps/libmpq/debian/python-mpq.install
diff --git a/modules/dep/libmpq/debian/rules b/modules/acore/deps/libmpq/debian/rules
similarity index 100%
rename from modules/dep/libmpq/debian/rules
rename to modules/acore/deps/libmpq/debian/rules
diff --git a/modules/dep/libmpq/doc/Makefile.am b/modules/acore/deps/libmpq/doc/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/doc/Makefile.am
rename to modules/acore/deps/libmpq/doc/Makefile.am
diff --git a/modules/dep/libmpq/doc/man1/Makefile.am b/modules/acore/deps/libmpq/doc/man1/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/doc/man1/Makefile.am
rename to modules/acore/deps/libmpq/doc/man1/Makefile.am
diff --git a/modules/dep/libmpq/doc/man1/libmpq-config.1 b/modules/acore/deps/libmpq/doc/man1/libmpq-config.1
similarity index 100%
rename from modules/dep/libmpq/doc/man1/libmpq-config.1
rename to modules/acore/deps/libmpq/doc/man1/libmpq-config.1
diff --git a/modules/dep/libmpq/doc/man3/Makefile.am b/modules/acore/deps/libmpq/doc/man3/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/doc/man3/Makefile.am
rename to modules/acore/deps/libmpq/doc/man3/Makefile.am
diff --git a/modules/dep/libmpq/doc/man3/libmpq.3 b/modules/acore/deps/libmpq/doc/man3/libmpq.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_close.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__archive_close.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_close.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__archive_close.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_files.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__archive_files.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_files.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__archive_files.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_offset.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__archive_offset.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_offset.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__archive_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_open.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__archive_open.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_open.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__archive_open.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_packed_size.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__archive_packed_size.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_packed_size.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__archive_packed_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__archive_unpacked_size.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__archive_unpacked_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_version.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__archive_version.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_version.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__archive_version.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_close_offset.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__block_close_offset.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__block_close_offset.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__block_close_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_open_offset.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__block_open_offset.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__block_open_offset.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__block_open_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_read.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__block_read.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__block_read.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__block_read.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_unpacked_size.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__block_unpacked_size.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__block_unpacked_size.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__block_unpacked_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_blocks.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_blocks.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_blocks.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_blocks.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_compressed.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_compressed.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_compressed.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_compressed.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_encrypted.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_encrypted.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_encrypted.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_encrypted.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_imploded.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_imploded.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_imploded.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_imploded.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_number.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_number.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_number.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_number.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_offset.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_offset.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_offset.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_packed_size.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_packed_size.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_packed_size.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_packed_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_read.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_read.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_read.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_read.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_unpacked_size.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__file_unpacked_size.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_unpacked_size.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__file_unpacked_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__strerror.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__strerror.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__strerror.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__strerror.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__version.3 b/modules/acore/deps/libmpq/doc/man3/libmpq__version.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__version.3
rename to modules/acore/deps/libmpq/doc/man3/libmpq__version.3
diff --git a/modules/dep/libmpq/libmpq-config.in b/modules/acore/deps/libmpq/libmpq-config.in
similarity index 100%
rename from modules/dep/libmpq/libmpq-config.in
rename to modules/acore/deps/libmpq/libmpq-config.in
diff --git a/modules/dep/libmpq/libmpq.pc.in b/modules/acore/deps/libmpq/libmpq.pc.in
similarity index 100%
rename from modules/dep/libmpq/libmpq.pc.in
rename to modules/acore/deps/libmpq/libmpq.pc.in
diff --git a/modules/dep/libmpq/libmpq/Makefile.am b/modules/acore/deps/libmpq/libmpq/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/libmpq/Makefile.am
rename to modules/acore/deps/libmpq/libmpq/Makefile.am
diff --git a/modules/dep/libmpq/libmpq/common.c b/modules/acore/deps/libmpq/libmpq/common.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/common.c
rename to modules/acore/deps/libmpq/libmpq/common.c
diff --git a/modules/dep/libmpq/libmpq/common.h b/modules/acore/deps/libmpq/libmpq/common.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/common.h
rename to modules/acore/deps/libmpq/libmpq/common.h
diff --git a/modules/dep/libmpq/libmpq/crypt_buf.h b/modules/acore/deps/libmpq/libmpq/crypt_buf.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/crypt_buf.h
rename to modules/acore/deps/libmpq/libmpq/crypt_buf.h
diff --git a/modules/dep/libmpq/libmpq/explode.c b/modules/acore/deps/libmpq/libmpq/explode.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/explode.c
rename to modules/acore/deps/libmpq/libmpq/explode.c
diff --git a/modules/dep/libmpq/libmpq/explode.h b/modules/acore/deps/libmpq/libmpq/explode.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/explode.h
rename to modules/acore/deps/libmpq/libmpq/explode.h
diff --git a/modules/dep/libmpq/libmpq/extract.c b/modules/acore/deps/libmpq/libmpq/extract.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/extract.c
rename to modules/acore/deps/libmpq/libmpq/extract.c
diff --git a/modules/dep/libmpq/libmpq/extract.h b/modules/acore/deps/libmpq/libmpq/extract.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/extract.h
rename to modules/acore/deps/libmpq/libmpq/extract.h
diff --git a/modules/dep/libmpq/libmpq/huffman.c b/modules/acore/deps/libmpq/libmpq/huffman.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/huffman.c
rename to modules/acore/deps/libmpq/libmpq/huffman.c
diff --git a/modules/dep/libmpq/libmpq/huffman.h b/modules/acore/deps/libmpq/libmpq/huffman.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/huffman.h
rename to modules/acore/deps/libmpq/libmpq/huffman.h
diff --git a/modules/dep/libmpq/libmpq/mpq-internal.h b/modules/acore/deps/libmpq/libmpq/mpq-internal.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/mpq-internal.h
rename to modules/acore/deps/libmpq/libmpq/mpq-internal.h
diff --git a/modules/dep/libmpq/libmpq/mpq.c b/modules/acore/deps/libmpq/libmpq/mpq.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/mpq.c
rename to modules/acore/deps/libmpq/libmpq/mpq.c
diff --git a/modules/dep/libmpq/libmpq/mpq.h b/modules/acore/deps/libmpq/libmpq/mpq.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/mpq.h
rename to modules/acore/deps/libmpq/libmpq/mpq.h
diff --git a/modules/dep/libmpq/libmpq/pack_begin.h b/modules/acore/deps/libmpq/libmpq/pack_begin.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/pack_begin.h
rename to modules/acore/deps/libmpq/libmpq/pack_begin.h
diff --git a/modules/dep/libmpq/libmpq/pack_end.h b/modules/acore/deps/libmpq/libmpq/pack_end.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/pack_end.h
rename to modules/acore/deps/libmpq/libmpq/pack_end.h
diff --git a/modules/dep/libmpq/libmpq/platform.h b/modules/acore/deps/libmpq/libmpq/platform.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/platform.h
rename to modules/acore/deps/libmpq/libmpq/platform.h
diff --git a/modules/dep/libmpq/libmpq/wave.c b/modules/acore/deps/libmpq/libmpq/wave.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/wave.c
rename to modules/acore/deps/libmpq/libmpq/wave.c
diff --git a/modules/dep/libmpq/libmpq/wave.h b/modules/acore/deps/libmpq/libmpq/wave.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/wave.h
rename to modules/acore/deps/libmpq/libmpq/wave.h
diff --git a/modules/dep/libmpq/tools/Makefile.am b/modules/acore/deps/libmpq/tools/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/tools/Makefile.am
rename to modules/acore/deps/libmpq/tools/Makefile.am
diff --git a/modules/dep/libmpq/tools/crypt_buf_gen.c b/modules/acore/deps/libmpq/tools/crypt_buf_gen.c
similarity index 100%
rename from modules/dep/libmpq/tools/crypt_buf_gen.c
rename to modules/acore/deps/libmpq/tools/crypt_buf_gen.c
diff --git a/modules/dep/libmpq/win/config.h b/modules/acore/deps/libmpq/win/config.h
similarity index 100%
rename from modules/dep/libmpq/win/config.h
rename to modules/acore/deps/libmpq/win/config.h
diff --git a/modules/dep/libmpq/win/dirent.h b/modules/acore/deps/libmpq/win/dirent.h
similarity index 100%
rename from modules/dep/libmpq/win/dirent.h
rename to modules/acore/deps/libmpq/win/dirent.h
diff --git a/modules/dep/libmpq/win/stdint.h b/modules/acore/deps/libmpq/win/stdint.h
similarity index 100%
rename from modules/dep/libmpq/win/stdint.h
rename to modules/acore/deps/libmpq/win/stdint.h
diff --git a/modules/dep/mysqllite/CMakeLists.txt b/modules/acore/deps/mysqllite/CMakeLists.txt
similarity index 100%
rename from modules/dep/mysqllite/CMakeLists.txt
rename to modules/acore/deps/mysqllite/CMakeLists.txt
diff --git a/modules/dep/mysqllite/COPYING b/modules/acore/deps/mysqllite/COPYING
similarity index 100%
rename from modules/dep/mysqllite/COPYING
rename to modules/acore/deps/mysqllite/COPYING
diff --git a/modules/dep/mysqllite/README b/modules/acore/deps/mysqllite/README
similarity index 100%
rename from modules/dep/mysqllite/README
rename to modules/acore/deps/mysqllite/README
diff --git a/modules/dep/mysqllite/VERSION b/modules/acore/deps/mysqllite/VERSION
similarity index 100%
rename from modules/dep/mysqllite/VERSION
rename to modules/acore/deps/mysqllite/VERSION
diff --git a/modules/dep/mysqllite/cmake/character_sets.cmake b/modules/acore/deps/mysqllite/cmake/character_sets.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/character_sets.cmake
rename to modules/acore/deps/mysqllite/cmake/character_sets.cmake
diff --git a/modules/dep/mysqllite/cmake/mysql_version.cmake b/modules/acore/deps/mysqllite/cmake/mysql_version.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/mysql_version.cmake
rename to modules/acore/deps/mysqllite/cmake/mysql_version.cmake
diff --git a/modules/dep/mysqllite/cmake/os/Windows.cmake b/modules/acore/deps/mysqllite/cmake/os/Windows.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/os/Windows.cmake
rename to modules/acore/deps/mysqllite/cmake/os/Windows.cmake
diff --git a/modules/dep/mysqllite/cmake/os/WindowsCache.cmake b/modules/acore/deps/mysqllite/cmake/os/WindowsCache.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/os/WindowsCache.cmake
rename to modules/acore/deps/mysqllite/cmake/os/WindowsCache.cmake
diff --git a/modules/dep/mysqllite/cmake/stack_direction.c b/modules/acore/deps/mysqllite/cmake/stack_direction.c
similarity index 100%
rename from modules/dep/mysqllite/cmake/stack_direction.c
rename to modules/acore/deps/mysqllite/cmake/stack_direction.c
diff --git a/modules/dep/mysqllite/cmake/versioninfo.rc.in b/modules/acore/deps/mysqllite/cmake/versioninfo.rc.in
similarity index 100%
rename from modules/dep/mysqllite/cmake/versioninfo.rc.in
rename to modules/acore/deps/mysqllite/cmake/versioninfo.rc.in
diff --git a/modules/dep/mysqllite/config.h.cmake b/modules/acore/deps/mysqllite/config.h.cmake
similarity index 100%
rename from modules/dep/mysqllite/config.h.cmake
rename to modules/acore/deps/mysqllite/config.h.cmake
diff --git a/modules/dep/mysqllite/configure.cmake b/modules/acore/deps/mysqllite/configure.cmake
similarity index 100%
rename from modules/dep/mysqllite/configure.cmake
rename to modules/acore/deps/mysqllite/configure.cmake
diff --git a/modules/dep/mysqllite/dbug/dbug.c b/modules/acore/deps/mysqllite/dbug/dbug.c
similarity index 100%
rename from modules/dep/mysqllite/dbug/dbug.c
rename to modules/acore/deps/mysqllite/dbug/dbug.c
diff --git a/modules/dep/mysqllite/dbug/dbug_long.h b/modules/acore/deps/mysqllite/dbug/dbug_long.h
similarity index 100%
rename from modules/dep/mysqllite/dbug/dbug_long.h
rename to modules/acore/deps/mysqllite/dbug/dbug_long.h
diff --git a/modules/dep/mysqllite/dbug/monty.doc b/modules/acore/deps/mysqllite/dbug/monty.doc
similarity index 100%
rename from modules/dep/mysqllite/dbug/monty.doc
rename to modules/acore/deps/mysqllite/dbug/monty.doc
diff --git a/modules/dep/mysqllite/dbug/user.r b/modules/acore/deps/mysqllite/dbug/user.r
similarity index 100%
rename from modules/dep/mysqllite/dbug/user.r
rename to modules/acore/deps/mysqllite/dbug/user.r
diff --git a/modules/dep/mysqllite/include/decimal.h b/modules/acore/deps/mysqllite/include/decimal.h
similarity index 100%
rename from modules/dep/mysqllite/include/decimal.h
rename to modules/acore/deps/mysqllite/include/decimal.h
diff --git a/modules/dep/mysqllite/include/errmsg.h b/modules/acore/deps/mysqllite/include/errmsg.h
similarity index 100%
rename from modules/dep/mysqllite/include/errmsg.h
rename to modules/acore/deps/mysqllite/include/errmsg.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/gcc_builtins.h b/modules/acore/deps/mysqllite/include/internal/atomic/gcc_builtins.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/gcc_builtins.h
rename to modules/acore/deps/mysqllite/include/internal/atomic/gcc_builtins.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/generic-msvc.h b/modules/acore/deps/mysqllite/include/internal/atomic/generic-msvc.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/generic-msvc.h
rename to modules/acore/deps/mysqllite/include/internal/atomic/generic-msvc.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/nolock.h b/modules/acore/deps/mysqllite/include/internal/atomic/nolock.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/nolock.h
rename to modules/acore/deps/mysqllite/include/internal/atomic/nolock.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/rwlock.h b/modules/acore/deps/mysqllite/include/internal/atomic/rwlock.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/rwlock.h
rename to modules/acore/deps/mysqllite/include/internal/atomic/rwlock.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/solaris.h b/modules/acore/deps/mysqllite/include/internal/atomic/solaris.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/solaris.h
rename to modules/acore/deps/mysqllite/include/internal/atomic/solaris.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/x86-gcc.h b/modules/acore/deps/mysqllite/include/internal/atomic/x86-gcc.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/x86-gcc.h
rename to modules/acore/deps/mysqllite/include/internal/atomic/x86-gcc.h
diff --git a/modules/dep/mysqllite/include/internal/base64.h b/modules/acore/deps/mysqllite/include/internal/base64.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/base64.h
rename to modules/acore/deps/mysqllite/include/internal/base64.h
diff --git a/modules/dep/mysqllite/include/internal/hash.h b/modules/acore/deps/mysqllite/include/internal/hash.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/hash.h
rename to modules/acore/deps/mysqllite/include/internal/hash.h
diff --git a/modules/dep/mysqllite/include/internal/lf.h b/modules/acore/deps/mysqllite/include/internal/lf.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/lf.h
rename to modules/acore/deps/mysqllite/include/internal/lf.h
diff --git a/modules/dep/mysqllite/include/internal/my_aes.h b/modules/acore/deps/mysqllite/include/internal/my_aes.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_aes.h
rename to modules/acore/deps/mysqllite/include/internal/my_aes.h
diff --git a/modules/dep/mysqllite/include/internal/my_alarm.h b/modules/acore/deps/mysqllite/include/internal/my_alarm.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_alarm.h
rename to modules/acore/deps/mysqllite/include/internal/my_alarm.h
diff --git a/modules/dep/mysqllite/include/internal/my_atomic.h b/modules/acore/deps/mysqllite/include/internal/my_atomic.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_atomic.h
rename to modules/acore/deps/mysqllite/include/internal/my_atomic.h
diff --git a/modules/dep/mysqllite/include/internal/my_base.h b/modules/acore/deps/mysqllite/include/internal/my_base.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_base.h
rename to modules/acore/deps/mysqllite/include/internal/my_base.h
diff --git a/modules/dep/mysqllite/include/internal/my_bit.h b/modules/acore/deps/mysqllite/include/internal/my_bit.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_bit.h
rename to modules/acore/deps/mysqllite/include/internal/my_bit.h
diff --git a/modules/dep/mysqllite/include/internal/my_bitmap.h b/modules/acore/deps/mysqllite/include/internal/my_bitmap.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_bitmap.h
rename to modules/acore/deps/mysqllite/include/internal/my_bitmap.h
diff --git a/modules/dep/mysqllite/include/internal/my_handler.h b/modules/acore/deps/mysqllite/include/internal/my_handler.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_handler.h
rename to modules/acore/deps/mysqllite/include/internal/my_handler.h
diff --git a/modules/dep/mysqllite/include/internal/my_libwrap.h b/modules/acore/deps/mysqllite/include/internal/my_libwrap.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_libwrap.h
rename to modules/acore/deps/mysqllite/include/internal/my_libwrap.h
diff --git a/modules/dep/mysqllite/include/internal/my_md5.h b/modules/acore/deps/mysqllite/include/internal/my_md5.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_md5.h
rename to modules/acore/deps/mysqllite/include/internal/my_md5.h
diff --git a/modules/dep/mysqllite/include/internal/my_nosys.h b/modules/acore/deps/mysqllite/include/internal/my_nosys.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_nosys.h
rename to modules/acore/deps/mysqllite/include/internal/my_nosys.h
diff --git a/modules/dep/mysqllite/include/internal/my_rdtsc.h b/modules/acore/deps/mysqllite/include/internal/my_rdtsc.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_rdtsc.h
rename to modules/acore/deps/mysqllite/include/internal/my_rdtsc.h
diff --git a/modules/dep/mysqllite/include/internal/my_stacktrace.h b/modules/acore/deps/mysqllite/include/internal/my_stacktrace.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_stacktrace.h
rename to modules/acore/deps/mysqllite/include/internal/my_stacktrace.h
diff --git a/modules/dep/mysqllite/include/internal/my_time.h b/modules/acore/deps/mysqllite/include/internal/my_time.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_time.h
rename to modules/acore/deps/mysqllite/include/internal/my_time.h
diff --git a/modules/dep/mysqllite/include/internal/my_tree.h b/modules/acore/deps/mysqllite/include/internal/my_tree.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_tree.h
rename to modules/acore/deps/mysqllite/include/internal/my_tree.h
diff --git a/modules/dep/mysqllite/include/internal/my_uctype.h b/modules/acore/deps/mysqllite/include/internal/my_uctype.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_uctype.h
rename to modules/acore/deps/mysqllite/include/internal/my_uctype.h
diff --git a/modules/dep/mysqllite/include/internal/myisampack.h b/modules/acore/deps/mysqllite/include/internal/myisampack.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/myisampack.h
rename to modules/acore/deps/mysqllite/include/internal/myisampack.h
diff --git a/modules/dep/mysqllite/include/internal/mysql_version.h.in b/modules/acore/deps/mysqllite/include/internal/mysql_version.h.in
similarity index 100%
rename from modules/dep/mysqllite/include/internal/mysql_version.h.in
rename to modules/acore/deps/mysqllite/include/internal/mysql_version.h.in
diff --git a/modules/dep/mysqllite/include/internal/mysys_err.h b/modules/acore/deps/mysqllite/include/internal/mysys_err.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/mysys_err.h
rename to modules/acore/deps/mysqllite/include/internal/mysys_err.h
diff --git a/modules/dep/mysqllite/include/internal/password.h b/modules/acore/deps/mysqllite/include/internal/password.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/password.h
rename to modules/acore/deps/mysqllite/include/internal/password.h
diff --git a/modules/dep/mysqllite/include/internal/probes_mysql.h b/modules/acore/deps/mysqllite/include/internal/probes_mysql.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/probes_mysql.h
rename to modules/acore/deps/mysqllite/include/internal/probes_mysql.h
diff --git a/modules/dep/mysqllite/include/internal/probes_mysql_nodtrace.h b/modules/acore/deps/mysqllite/include/internal/probes_mysql_nodtrace.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/probes_mysql_nodtrace.h
rename to modules/acore/deps/mysqllite/include/internal/probes_mysql_nodtrace.h
diff --git a/modules/dep/mysqllite/include/internal/queues.h b/modules/acore/deps/mysqllite/include/internal/queues.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/queues.h
rename to modules/acore/deps/mysqllite/include/internal/queues.h
diff --git a/modules/dep/mysqllite/include/internal/rijndael.h b/modules/acore/deps/mysqllite/include/internal/rijndael.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/rijndael.h
rename to modules/acore/deps/mysqllite/include/internal/rijndael.h
diff --git a/modules/dep/mysqllite/include/internal/sha1.h b/modules/acore/deps/mysqllite/include/internal/sha1.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/sha1.h
rename to modules/acore/deps/mysqllite/include/internal/sha1.h
diff --git a/modules/dep/mysqllite/include/internal/t_ctype.h b/modules/acore/deps/mysqllite/include/internal/t_ctype.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/t_ctype.h
rename to modules/acore/deps/mysqllite/include/internal/t_ctype.h
diff --git a/modules/dep/mysqllite/include/internal/thr_alarm.h b/modules/acore/deps/mysqllite/include/internal/thr_alarm.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/thr_alarm.h
rename to modules/acore/deps/mysqllite/include/internal/thr_alarm.h
diff --git a/modules/dep/mysqllite/include/internal/thr_lock.h b/modules/acore/deps/mysqllite/include/internal/thr_lock.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/thr_lock.h
rename to modules/acore/deps/mysqllite/include/internal/thr_lock.h
diff --git a/modules/dep/mysqllite/include/internal/violite.h b/modules/acore/deps/mysqllite/include/internal/violite.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/violite.h
rename to modules/acore/deps/mysqllite/include/internal/violite.h
diff --git a/modules/dep/mysqllite/include/keycache.h b/modules/acore/deps/mysqllite/include/keycache.h
similarity index 100%
rename from modules/dep/mysqllite/include/keycache.h
rename to modules/acore/deps/mysqllite/include/keycache.h
diff --git a/modules/dep/mysqllite/include/m_ctype.h b/modules/acore/deps/mysqllite/include/m_ctype.h
similarity index 100%
rename from modules/dep/mysqllite/include/m_ctype.h
rename to modules/acore/deps/mysqllite/include/m_ctype.h
diff --git a/modules/dep/mysqllite/include/m_string.h b/modules/acore/deps/mysqllite/include/m_string.h
similarity index 100%
rename from modules/dep/mysqllite/include/m_string.h
rename to modules/acore/deps/mysqllite/include/m_string.h
diff --git a/modules/dep/mysqllite/include/my_alloc.h b/modules/acore/deps/mysqllite/include/my_alloc.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_alloc.h
rename to modules/acore/deps/mysqllite/include/my_alloc.h
diff --git a/modules/dep/mysqllite/include/my_attribute.h b/modules/acore/deps/mysqllite/include/my_attribute.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_attribute.h
rename to modules/acore/deps/mysqllite/include/my_attribute.h
diff --git a/modules/dep/mysqllite/include/my_compiler.h b/modules/acore/deps/mysqllite/include/my_compiler.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_compiler.h
rename to modules/acore/deps/mysqllite/include/my_compiler.h
diff --git a/modules/dep/mysqllite/include/my_dbug.h b/modules/acore/deps/mysqllite/include/my_dbug.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_dbug.h
rename to modules/acore/deps/mysqllite/include/my_dbug.h
diff --git a/modules/dep/mysqllite/include/my_dir.h b/modules/acore/deps/mysqllite/include/my_dir.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_dir.h
rename to modules/acore/deps/mysqllite/include/my_dir.h
diff --git a/modules/dep/mysqllite/include/my_getopt.h b/modules/acore/deps/mysqllite/include/my_getopt.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_getopt.h
rename to modules/acore/deps/mysqllite/include/my_getopt.h
diff --git a/modules/dep/mysqllite/include/my_global.h b/modules/acore/deps/mysqllite/include/my_global.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_global.h
rename to modules/acore/deps/mysqllite/include/my_global.h
diff --git a/modules/dep/mysqllite/include/my_list.h b/modules/acore/deps/mysqllite/include/my_list.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_list.h
rename to modules/acore/deps/mysqllite/include/my_list.h
diff --git a/modules/dep/mysqllite/include/my_net.h b/modules/acore/deps/mysqllite/include/my_net.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_net.h
rename to modules/acore/deps/mysqllite/include/my_net.h
diff --git a/modules/dep/mysqllite/include/my_pthread.h b/modules/acore/deps/mysqllite/include/my_pthread.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_pthread.h
rename to modules/acore/deps/mysqllite/include/my_pthread.h
diff --git a/modules/dep/mysqllite/include/my_sys.h b/modules/acore/deps/mysqllite/include/my_sys.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_sys.h
rename to modules/acore/deps/mysqllite/include/my_sys.h
diff --git a/modules/dep/mysqllite/include/my_xml.h b/modules/acore/deps/mysqllite/include/my_xml.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_xml.h
rename to modules/acore/deps/mysqllite/include/my_xml.h
diff --git a/modules/dep/mysqllite/include/mysql.h b/modules/acore/deps/mysqllite/include/mysql.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql.h
rename to modules/acore/deps/mysqllite/include/mysql.h
diff --git a/modules/dep/mysqllite/include/mysql/client_plugin.h b/modules/acore/deps/mysqllite/include/mysql/client_plugin.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/client_plugin.h
rename to modules/acore/deps/mysqllite/include/mysql/client_plugin.h
diff --git a/modules/dep/mysqllite/include/mysql/innodb_priv.h b/modules/acore/deps/mysqllite/include/mysql/innodb_priv.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/innodb_priv.h
rename to modules/acore/deps/mysqllite/include/mysql/innodb_priv.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin.h b/modules/acore/deps/mysqllite/include/mysql/plugin.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin.h
rename to modules/acore/deps/mysqllite/include/mysql/plugin.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_audit.h b/modules/acore/deps/mysqllite/include/mysql/plugin_audit.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_audit.h
rename to modules/acore/deps/mysqllite/include/mysql/plugin_audit.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_auth.h b/modules/acore/deps/mysqllite/include/mysql/plugin_auth.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_auth.h
rename to modules/acore/deps/mysqllite/include/mysql/plugin_auth.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_auth_common.h b/modules/acore/deps/mysqllite/include/mysql/plugin_auth_common.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_auth_common.h
rename to modules/acore/deps/mysqllite/include/mysql/plugin_auth_common.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_ftparser.h b/modules/acore/deps/mysqllite/include/mysql/plugin_ftparser.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_ftparser.h
rename to modules/acore/deps/mysqllite/include/mysql/plugin_ftparser.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/mysql_file.h b/modules/acore/deps/mysqllite/include/mysql/psi/mysql_file.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/mysql_file.h
rename to modules/acore/deps/mysqllite/include/mysql/psi/mysql_file.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/mysql_thread.h b/modules/acore/deps/mysqllite/include/mysql/psi/mysql_thread.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/mysql_thread.h
rename to modules/acore/deps/mysqllite/include/mysql/psi/mysql_thread.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/psi.h b/modules/acore/deps/mysqllite/include/mysql/psi/psi.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/psi.h
rename to modules/acore/deps/mysqllite/include/mysql/psi/psi.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/psi_abi_v1.h b/modules/acore/deps/mysqllite/include/mysql/psi/psi_abi_v1.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/psi_abi_v1.h
rename to modules/acore/deps/mysqllite/include/mysql/psi/psi_abi_v1.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/psi_abi_v2.h b/modules/acore/deps/mysqllite/include/mysql/psi/psi_abi_v2.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/psi_abi_v2.h
rename to modules/acore/deps/mysqllite/include/mysql/psi/psi_abi_v2.h
diff --git a/modules/dep/mysqllite/include/mysql/service_my_snprintf.h b/modules/acore/deps/mysqllite/include/mysql/service_my_snprintf.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_my_snprintf.h
rename to modules/acore/deps/mysqllite/include/mysql/service_my_snprintf.h
diff --git a/modules/dep/mysqllite/include/mysql/service_thd_alloc.h b/modules/acore/deps/mysqllite/include/mysql/service_thd_alloc.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_thd_alloc.h
rename to modules/acore/deps/mysqllite/include/mysql/service_thd_alloc.h
diff --git a/modules/dep/mysqllite/include/mysql/service_thd_wait.h b/modules/acore/deps/mysqllite/include/mysql/service_thd_wait.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_thd_wait.h
rename to modules/acore/deps/mysqllite/include/mysql/service_thd_wait.h
diff --git a/modules/dep/mysqllite/include/mysql/service_thread_scheduler.h b/modules/acore/deps/mysqllite/include/mysql/service_thread_scheduler.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_thread_scheduler.h
rename to modules/acore/deps/mysqllite/include/mysql/service_thread_scheduler.h
diff --git a/modules/dep/mysqllite/include/mysql/services.h b/modules/acore/deps/mysqllite/include/mysql/services.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/services.h
rename to modules/acore/deps/mysqllite/include/mysql/services.h
diff --git a/modules/dep/mysqllite/include/mysql_com.h b/modules/acore/deps/mysqllite/include/mysql_com.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql_com.h
rename to modules/acore/deps/mysqllite/include/mysql_com.h
diff --git a/modules/dep/mysqllite/include/mysql_embed.h b/modules/acore/deps/mysqllite/include/mysql_embed.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql_embed.h
rename to modules/acore/deps/mysqllite/include/mysql_embed.h
diff --git a/modules/dep/mysqllite/include/mysql_time.h b/modules/acore/deps/mysqllite/include/mysql_time.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql_time.h
rename to modules/acore/deps/mysqllite/include/mysql_time.h
diff --git a/modules/dep/mysqllite/include/mysqld_ername.h b/modules/acore/deps/mysqllite/include/mysqld_ername.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysqld_ername.h
rename to modules/acore/deps/mysqllite/include/mysqld_ername.h
diff --git a/modules/dep/mysqllite/include/mysqld_error.h b/modules/acore/deps/mysqllite/include/mysqld_error.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysqld_error.h
rename to modules/acore/deps/mysqllite/include/mysqld_error.h
diff --git a/modules/dep/mysqllite/include/plugin.h b/modules/acore/deps/mysqllite/include/plugin.h
similarity index 100%
rename from modules/dep/mysqllite/include/plugin.h
rename to modules/acore/deps/mysqllite/include/plugin.h
diff --git a/modules/dep/mysqllite/include/plugin_audit.h b/modules/acore/deps/mysqllite/include/plugin_audit.h
similarity index 100%
rename from modules/dep/mysqllite/include/plugin_audit.h
rename to modules/acore/deps/mysqllite/include/plugin_audit.h
diff --git a/modules/dep/mysqllite/include/plugin_ftparser.h b/modules/acore/deps/mysqllite/include/plugin_ftparser.h
similarity index 100%
rename from modules/dep/mysqllite/include/plugin_ftparser.h
rename to modules/acore/deps/mysqllite/include/plugin_ftparser.h
diff --git a/modules/dep/mysqllite/include/sql_common.h b/modules/acore/deps/mysqllite/include/sql_common.h
similarity index 100%
rename from modules/dep/mysqllite/include/sql_common.h
rename to modules/acore/deps/mysqllite/include/sql_common.h
diff --git a/modules/dep/mysqllite/include/sql_state.h b/modules/acore/deps/mysqllite/include/sql_state.h
similarity index 100%
rename from modules/dep/mysqllite/include/sql_state.h
rename to modules/acore/deps/mysqllite/include/sql_state.h
diff --git a/modules/dep/mysqllite/include/sslopt-case.h b/modules/acore/deps/mysqllite/include/sslopt-case.h
similarity index 100%
rename from modules/dep/mysqllite/include/sslopt-case.h
rename to modules/acore/deps/mysqllite/include/sslopt-case.h
diff --git a/modules/dep/mysqllite/include/sslopt-longopts.h b/modules/acore/deps/mysqllite/include/sslopt-longopts.h
similarity index 100%
rename from modules/dep/mysqllite/include/sslopt-longopts.h
rename to modules/acore/deps/mysqllite/include/sslopt-longopts.h
diff --git a/modules/dep/mysqllite/include/sslopt-vars.h b/modules/acore/deps/mysqllite/include/sslopt-vars.h
similarity index 100%
rename from modules/dep/mysqllite/include/sslopt-vars.h
rename to modules/acore/deps/mysqllite/include/sslopt-vars.h
diff --git a/modules/dep/mysqllite/include/typelib.h b/modules/acore/deps/mysqllite/include/typelib.h
similarity index 100%
rename from modules/dep/mysqllite/include/typelib.h
rename to modules/acore/deps/mysqllite/include/typelib.h
diff --git a/modules/dep/mysqllite/libmysql/client_settings.h b/modules/acore/deps/mysqllite/libmysql/client_settings.h
similarity index 100%
rename from modules/dep/mysqllite/libmysql/client_settings.h
rename to modules/acore/deps/mysqllite/libmysql/client_settings.h
diff --git a/modules/dep/mysqllite/libmysql/errmsg.c b/modules/acore/deps/mysqllite/libmysql/errmsg.c
similarity index 100%
rename from modules/dep/mysqllite/libmysql/errmsg.c
rename to modules/acore/deps/mysqllite/libmysql/errmsg.c
diff --git a/modules/dep/mysqllite/libmysql/get_password.c b/modules/acore/deps/mysqllite/libmysql/get_password.c
similarity index 100%
rename from modules/dep/mysqllite/libmysql/get_password.c
rename to modules/acore/deps/mysqllite/libmysql/get_password.c
diff --git a/modules/dep/mysqllite/libmysql/libmysql.c b/modules/acore/deps/mysqllite/libmysql/libmysql.c
similarity index 100%
rename from modules/dep/mysqllite/libmysql/libmysql.c
rename to modules/acore/deps/mysqllite/libmysql/libmysql.c
diff --git a/modules/dep/mysqllite/libmysql/libmysql_exports.def b/modules/acore/deps/mysqllite/libmysql/libmysql_exports.def
similarity index 100%
rename from modules/dep/mysqllite/libmysql/libmysql_exports.def
rename to modules/acore/deps/mysqllite/libmysql/libmysql_exports.def
diff --git a/modules/dep/mysqllite/mysys/ChangeLog b/modules/acore/deps/mysqllite/mysys/ChangeLog
similarity index 100%
rename from modules/dep/mysqllite/mysys/ChangeLog
rename to modules/acore/deps/mysqllite/mysys/ChangeLog
diff --git a/modules/dep/mysqllite/mysys/array.c b/modules/acore/deps/mysqllite/mysys/array.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/array.c
rename to modules/acore/deps/mysqllite/mysys/array.c
diff --git a/modules/dep/mysqllite/mysys/base64.c b/modules/acore/deps/mysqllite/mysys/base64.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/base64.c
rename to modules/acore/deps/mysqllite/mysys/base64.c
diff --git a/modules/dep/mysqllite/mysys/charset-def.c b/modules/acore/deps/mysqllite/mysys/charset-def.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/charset-def.c
rename to modules/acore/deps/mysqllite/mysys/charset-def.c
diff --git a/modules/dep/mysqllite/mysys/charset.c b/modules/acore/deps/mysqllite/mysys/charset.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/charset.c
rename to modules/acore/deps/mysqllite/mysys/charset.c
diff --git a/modules/dep/mysqllite/mysys/checksum.c b/modules/acore/deps/mysqllite/mysys/checksum.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/checksum.c
rename to modules/acore/deps/mysqllite/mysys/checksum.c
diff --git a/modules/dep/mysqllite/mysys/default.c b/modules/acore/deps/mysqllite/mysys/default.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/default.c
rename to modules/acore/deps/mysqllite/mysys/default.c
diff --git a/modules/dep/mysqllite/mysys/errors.c b/modules/acore/deps/mysqllite/mysys/errors.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/errors.c
rename to modules/acore/deps/mysqllite/mysys/errors.c
diff --git a/modules/dep/mysqllite/mysys/hash.c b/modules/acore/deps/mysqllite/mysys/hash.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/hash.c
rename to modules/acore/deps/mysqllite/mysys/hash.c
diff --git a/modules/dep/mysqllite/mysys/lf_alloc-pin.c b/modules/acore/deps/mysqllite/mysys/lf_alloc-pin.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/lf_alloc-pin.c
rename to modules/acore/deps/mysqllite/mysys/lf_alloc-pin.c
diff --git a/modules/dep/mysqllite/mysys/lf_dynarray.c b/modules/acore/deps/mysqllite/mysys/lf_dynarray.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/lf_dynarray.c
rename to modules/acore/deps/mysqllite/mysys/lf_dynarray.c
diff --git a/modules/dep/mysqllite/mysys/lf_hash.c b/modules/acore/deps/mysqllite/mysys/lf_hash.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/lf_hash.c
rename to modules/acore/deps/mysqllite/mysys/lf_hash.c
diff --git a/modules/dep/mysqllite/mysys/list.c b/modules/acore/deps/mysqllite/mysys/list.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/list.c
rename to modules/acore/deps/mysqllite/mysys/list.c
diff --git a/modules/dep/mysqllite/mysys/md5.c b/modules/acore/deps/mysqllite/mysys/md5.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/md5.c
rename to modules/acore/deps/mysqllite/mysys/md5.c
diff --git a/modules/dep/mysqllite/mysys/mf_arr_appstr.c b/modules/acore/deps/mysqllite/mysys/mf_arr_appstr.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_arr_appstr.c
rename to modules/acore/deps/mysqllite/mysys/mf_arr_appstr.c
diff --git a/modules/dep/mysqllite/mysys/mf_cache.c b/modules/acore/deps/mysqllite/mysys/mf_cache.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_cache.c
rename to modules/acore/deps/mysqllite/mysys/mf_cache.c
diff --git a/modules/dep/mysqllite/mysys/mf_dirname.c b/modules/acore/deps/mysqllite/mysys/mf_dirname.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_dirname.c
rename to modules/acore/deps/mysqllite/mysys/mf_dirname.c
diff --git a/modules/dep/mysqllite/mysys/mf_fn_ext.c b/modules/acore/deps/mysqllite/mysys/mf_fn_ext.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_fn_ext.c
rename to modules/acore/deps/mysqllite/mysys/mf_fn_ext.c
diff --git a/modules/dep/mysqllite/mysys/mf_format.c b/modules/acore/deps/mysqllite/mysys/mf_format.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_format.c
rename to modules/acore/deps/mysqllite/mysys/mf_format.c
diff --git a/modules/dep/mysqllite/mysys/mf_getdate.c b/modules/acore/deps/mysqllite/mysys/mf_getdate.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_getdate.c
rename to modules/acore/deps/mysqllite/mysys/mf_getdate.c
diff --git a/modules/dep/mysqllite/mysys/mf_iocache.c b/modules/acore/deps/mysqllite/mysys/mf_iocache.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_iocache.c
rename to modules/acore/deps/mysqllite/mysys/mf_iocache.c
diff --git a/modules/dep/mysqllite/mysys/mf_iocache2.c b/modules/acore/deps/mysqllite/mysys/mf_iocache2.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_iocache2.c
rename to modules/acore/deps/mysqllite/mysys/mf_iocache2.c
diff --git a/modules/dep/mysqllite/mysys/mf_keycache.c b/modules/acore/deps/mysqllite/mysys/mf_keycache.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_keycache.c
rename to modules/acore/deps/mysqllite/mysys/mf_keycache.c
diff --git a/modules/dep/mysqllite/mysys/mf_keycaches.c b/modules/acore/deps/mysqllite/mysys/mf_keycaches.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_keycaches.c
rename to modules/acore/deps/mysqllite/mysys/mf_keycaches.c
diff --git a/modules/dep/mysqllite/mysys/mf_loadpath.c b/modules/acore/deps/mysqllite/mysys/mf_loadpath.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_loadpath.c
rename to modules/acore/deps/mysqllite/mysys/mf_loadpath.c
diff --git a/modules/dep/mysqllite/mysys/mf_pack.c b/modules/acore/deps/mysqllite/mysys/mf_pack.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_pack.c
rename to modules/acore/deps/mysqllite/mysys/mf_pack.c
diff --git a/modules/dep/mysqllite/mysys/mf_path.c b/modules/acore/deps/mysqllite/mysys/mf_path.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_path.c
rename to modules/acore/deps/mysqllite/mysys/mf_path.c
diff --git a/modules/dep/mysqllite/mysys/mf_qsort.c b/modules/acore/deps/mysqllite/mysys/mf_qsort.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_qsort.c
rename to modules/acore/deps/mysqllite/mysys/mf_qsort.c
diff --git a/modules/dep/mysqllite/mysys/mf_qsort2.c b/modules/acore/deps/mysqllite/mysys/mf_qsort2.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_qsort2.c
rename to modules/acore/deps/mysqllite/mysys/mf_qsort2.c
diff --git a/modules/dep/mysqllite/mysys/mf_radix.c b/modules/acore/deps/mysqllite/mysys/mf_radix.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_radix.c
rename to modules/acore/deps/mysqllite/mysys/mf_radix.c
diff --git a/modules/dep/mysqllite/mysys/mf_same.c b/modules/acore/deps/mysqllite/mysys/mf_same.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_same.c
rename to modules/acore/deps/mysqllite/mysys/mf_same.c
diff --git a/modules/dep/mysqllite/mysys/mf_sort.c b/modules/acore/deps/mysqllite/mysys/mf_sort.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_sort.c
rename to modules/acore/deps/mysqllite/mysys/mf_sort.c
diff --git a/modules/dep/mysqllite/mysys/mf_soundex.c b/modules/acore/deps/mysqllite/mysys/mf_soundex.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_soundex.c
rename to modules/acore/deps/mysqllite/mysys/mf_soundex.c
diff --git a/modules/dep/mysqllite/mysys/mf_tempdir.c b/modules/acore/deps/mysqllite/mysys/mf_tempdir.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_tempdir.c
rename to modules/acore/deps/mysqllite/mysys/mf_tempdir.c
diff --git a/modules/dep/mysqllite/mysys/mf_tempfile.c b/modules/acore/deps/mysqllite/mysys/mf_tempfile.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_tempfile.c
rename to modules/acore/deps/mysqllite/mysys/mf_tempfile.c
diff --git a/modules/dep/mysqllite/mysys/mf_unixpath.c b/modules/acore/deps/mysqllite/mysys/mf_unixpath.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_unixpath.c
rename to modules/acore/deps/mysqllite/mysys/mf_unixpath.c
diff --git a/modules/dep/mysqllite/mysys/mf_wcomp.c b/modules/acore/deps/mysqllite/mysys/mf_wcomp.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_wcomp.c
rename to modules/acore/deps/mysqllite/mysys/mf_wcomp.c
diff --git a/modules/dep/mysqllite/mysys/mulalloc.c b/modules/acore/deps/mysqllite/mysys/mulalloc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mulalloc.c
rename to modules/acore/deps/mysqllite/mysys/mulalloc.c
diff --git a/modules/dep/mysqllite/mysys/my_access.c b/modules/acore/deps/mysqllite/mysys/my_access.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_access.c
rename to modules/acore/deps/mysqllite/mysys/my_access.c
diff --git a/modules/dep/mysqllite/mysys/my_aes.c b/modules/acore/deps/mysqllite/mysys/my_aes.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_aes.c
rename to modules/acore/deps/mysqllite/mysys/my_aes.c
diff --git a/modules/dep/mysqllite/mysys/my_alarm.c b/modules/acore/deps/mysqllite/mysys/my_alarm.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_alarm.c
rename to modules/acore/deps/mysqllite/mysys/my_alarm.c
diff --git a/modules/dep/mysqllite/mysys/my_alloc.c b/modules/acore/deps/mysqllite/mysys/my_alloc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_alloc.c
rename to modules/acore/deps/mysqllite/mysys/my_alloc.c
diff --git a/modules/dep/mysqllite/mysys/my_atomic.c b/modules/acore/deps/mysqllite/mysys/my_atomic.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_atomic.c
rename to modules/acore/deps/mysqllite/mysys/my_atomic.c
diff --git a/modules/dep/mysqllite/mysys/my_bit.c b/modules/acore/deps/mysqllite/mysys/my_bit.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_bit.c
rename to modules/acore/deps/mysqllite/mysys/my_bit.c
diff --git a/modules/dep/mysqllite/mysys/my_bitmap.c b/modules/acore/deps/mysqllite/mysys/my_bitmap.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_bitmap.c
rename to modules/acore/deps/mysqllite/mysys/my_bitmap.c
diff --git a/modules/dep/mysqllite/mysys/my_chsize.c b/modules/acore/deps/mysqllite/mysys/my_chsize.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_chsize.c
rename to modules/acore/deps/mysqllite/mysys/my_chsize.c
diff --git a/modules/dep/mysqllite/mysys/my_compress.c b/modules/acore/deps/mysqllite/mysys/my_compress.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_compress.c
rename to modules/acore/deps/mysqllite/mysys/my_compress.c
diff --git a/modules/dep/mysqllite/mysys/my_conio.c b/modules/acore/deps/mysqllite/mysys/my_conio.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_conio.c
rename to modules/acore/deps/mysqllite/mysys/my_conio.c
diff --git a/modules/dep/mysqllite/mysys/my_copy.c b/modules/acore/deps/mysqllite/mysys/my_copy.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_copy.c
rename to modules/acore/deps/mysqllite/mysys/my_copy.c
diff --git a/modules/dep/mysqllite/mysys/my_create.c b/modules/acore/deps/mysqllite/mysys/my_create.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_create.c
rename to modules/acore/deps/mysqllite/mysys/my_create.c
diff --git a/modules/dep/mysqllite/mysys/my_delete.c b/modules/acore/deps/mysqllite/mysys/my_delete.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_delete.c
rename to modules/acore/deps/mysqllite/mysys/my_delete.c
diff --git a/modules/dep/mysqllite/mysys/my_div.c b/modules/acore/deps/mysqllite/mysys/my_div.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_div.c
rename to modules/acore/deps/mysqllite/mysys/my_div.c
diff --git a/modules/dep/mysqllite/mysys/my_error.c b/modules/acore/deps/mysqllite/mysys/my_error.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_error.c
rename to modules/acore/deps/mysqllite/mysys/my_error.c
diff --git a/modules/dep/mysqllite/mysys/my_file.c b/modules/acore/deps/mysqllite/mysys/my_file.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_file.c
rename to modules/acore/deps/mysqllite/mysys/my_file.c
diff --git a/modules/dep/mysqllite/mysys/my_fopen.c b/modules/acore/deps/mysqllite/mysys/my_fopen.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_fopen.c
rename to modules/acore/deps/mysqllite/mysys/my_fopen.c
diff --git a/modules/dep/mysqllite/mysys/my_fstream.c b/modules/acore/deps/mysqllite/mysys/my_fstream.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_fstream.c
rename to modules/acore/deps/mysqllite/mysys/my_fstream.c
diff --git a/modules/dep/mysqllite/mysys/my_gethostbyname.c b/modules/acore/deps/mysqllite/mysys/my_gethostbyname.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_gethostbyname.c
rename to modules/acore/deps/mysqllite/mysys/my_gethostbyname.c
diff --git a/modules/dep/mysqllite/mysys/my_gethwaddr.c b/modules/acore/deps/mysqllite/mysys/my_gethwaddr.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_gethwaddr.c
rename to modules/acore/deps/mysqllite/mysys/my_gethwaddr.c
diff --git a/modules/dep/mysqllite/mysys/my_getncpus.c b/modules/acore/deps/mysqllite/mysys/my_getncpus.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getncpus.c
rename to modules/acore/deps/mysqllite/mysys/my_getncpus.c
diff --git a/modules/dep/mysqllite/mysys/my_getopt.c b/modules/acore/deps/mysqllite/mysys/my_getopt.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getopt.c
rename to modules/acore/deps/mysqllite/mysys/my_getopt.c
diff --git a/modules/dep/mysqllite/mysys/my_getpagesize.c b/modules/acore/deps/mysqllite/mysys/my_getpagesize.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getpagesize.c
rename to modules/acore/deps/mysqllite/mysys/my_getpagesize.c
diff --git a/modules/dep/mysqllite/mysys/my_getsystime.c b/modules/acore/deps/mysqllite/mysys/my_getsystime.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getsystime.c
rename to modules/acore/deps/mysqllite/mysys/my_getsystime.c
diff --git a/modules/dep/mysqllite/mysys/my_getwd.c b/modules/acore/deps/mysqllite/mysys/my_getwd.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getwd.c
rename to modules/acore/deps/mysqllite/mysys/my_getwd.c
diff --git a/modules/dep/mysqllite/mysys/my_handler.c b/modules/acore/deps/mysqllite/mysys/my_handler.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_handler.c
rename to modules/acore/deps/mysqllite/mysys/my_handler.c
diff --git a/modules/dep/mysqllite/mysys/my_handler_errors.h b/modules/acore/deps/mysqllite/mysys/my_handler_errors.h
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_handler_errors.h
rename to modules/acore/deps/mysqllite/mysys/my_handler_errors.h
diff --git a/modules/dep/mysqllite/mysys/my_init.c b/modules/acore/deps/mysqllite/mysys/my_init.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_init.c
rename to modules/acore/deps/mysqllite/mysys/my_init.c
diff --git a/modules/dep/mysqllite/mysys/my_largepage.c b/modules/acore/deps/mysqllite/mysys/my_largepage.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_largepage.c
rename to modules/acore/deps/mysqllite/mysys/my_largepage.c
diff --git a/modules/dep/mysqllite/mysys/my_lib.c b/modules/acore/deps/mysqllite/mysys/my_lib.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_lib.c
rename to modules/acore/deps/mysqllite/mysys/my_lib.c
diff --git a/modules/dep/mysqllite/mysys/my_libwrap.c b/modules/acore/deps/mysqllite/mysys/my_libwrap.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_libwrap.c
rename to modules/acore/deps/mysqllite/mysys/my_libwrap.c
diff --git a/modules/dep/mysqllite/mysys/my_lock.c b/modules/acore/deps/mysqllite/mysys/my_lock.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_lock.c
rename to modules/acore/deps/mysqllite/mysys/my_lock.c
diff --git a/modules/dep/mysqllite/mysys/my_lockmem.c b/modules/acore/deps/mysqllite/mysys/my_lockmem.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_lockmem.c
rename to modules/acore/deps/mysqllite/mysys/my_lockmem.c
diff --git a/modules/dep/mysqllite/mysys/my_malloc.c b/modules/acore/deps/mysqllite/mysys/my_malloc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_malloc.c
rename to modules/acore/deps/mysqllite/mysys/my_malloc.c
diff --git a/modules/dep/mysqllite/mysys/my_memmem.c b/modules/acore/deps/mysqllite/mysys/my_memmem.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_memmem.c
rename to modules/acore/deps/mysqllite/mysys/my_memmem.c
diff --git a/modules/dep/mysqllite/mysys/my_mess.c b/modules/acore/deps/mysqllite/mysys/my_mess.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_mess.c
rename to modules/acore/deps/mysqllite/mysys/my_mess.c
diff --git a/modules/dep/mysqllite/mysys/my_mkdir.c b/modules/acore/deps/mysqllite/mysys/my_mkdir.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_mkdir.c
rename to modules/acore/deps/mysqllite/mysys/my_mkdir.c
diff --git a/modules/dep/mysqllite/mysys/my_mmap.c b/modules/acore/deps/mysqllite/mysys/my_mmap.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_mmap.c
rename to modules/acore/deps/mysqllite/mysys/my_mmap.c
diff --git a/modules/dep/mysqllite/mysys/my_new.cc b/modules/acore/deps/mysqllite/mysys/my_new.cc
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_new.cc
rename to modules/acore/deps/mysqllite/mysys/my_new.cc
diff --git a/modules/dep/mysqllite/mysys/my_once.c b/modules/acore/deps/mysqllite/mysys/my_once.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_once.c
rename to modules/acore/deps/mysqllite/mysys/my_once.c
diff --git a/modules/dep/mysqllite/mysys/my_open.c b/modules/acore/deps/mysqllite/mysys/my_open.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_open.c
rename to modules/acore/deps/mysqllite/mysys/my_open.c
diff --git a/modules/dep/mysqllite/mysys/my_port.c b/modules/acore/deps/mysqllite/mysys/my_port.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_port.c
rename to modules/acore/deps/mysqllite/mysys/my_port.c
diff --git a/modules/dep/mysqllite/mysys/my_pread.c b/modules/acore/deps/mysqllite/mysys/my_pread.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_pread.c
rename to modules/acore/deps/mysqllite/mysys/my_pread.c
diff --git a/modules/dep/mysqllite/mysys/my_pthread.c b/modules/acore/deps/mysqllite/mysys/my_pthread.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_pthread.c
rename to modules/acore/deps/mysqllite/mysys/my_pthread.c
diff --git a/modules/dep/mysqllite/mysys/my_quick.c b/modules/acore/deps/mysqllite/mysys/my_quick.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_quick.c
rename to modules/acore/deps/mysqllite/mysys/my_quick.c
diff --git a/modules/dep/mysqllite/mysys/my_rdtsc.c b/modules/acore/deps/mysqllite/mysys/my_rdtsc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_rdtsc.c
rename to modules/acore/deps/mysqllite/mysys/my_rdtsc.c
diff --git a/modules/dep/mysqllite/mysys/my_read.c b/modules/acore/deps/mysqllite/mysys/my_read.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_read.c
rename to modules/acore/deps/mysqllite/mysys/my_read.c
diff --git a/modules/dep/mysqllite/mysys/my_redel.c b/modules/acore/deps/mysqllite/mysys/my_redel.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_redel.c
rename to modules/acore/deps/mysqllite/mysys/my_redel.c
diff --git a/modules/dep/mysqllite/mysys/my_rename.c b/modules/acore/deps/mysqllite/mysys/my_rename.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_rename.c
rename to modules/acore/deps/mysqllite/mysys/my_rename.c
diff --git a/modules/dep/mysqllite/mysys/my_seek.c b/modules/acore/deps/mysqllite/mysys/my_seek.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_seek.c
rename to modules/acore/deps/mysqllite/mysys/my_seek.c
diff --git a/modules/dep/mysqllite/mysys/my_sleep.c b/modules/acore/deps/mysqllite/mysys/my_sleep.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_sleep.c
rename to modules/acore/deps/mysqllite/mysys/my_sleep.c
diff --git a/modules/dep/mysqllite/mysys/my_static.c b/modules/acore/deps/mysqllite/mysys/my_static.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_static.c
rename to modules/acore/deps/mysqllite/mysys/my_static.c
diff --git a/modules/dep/mysqllite/mysys/my_static.h b/modules/acore/deps/mysqllite/mysys/my_static.h
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_static.h
rename to modules/acore/deps/mysqllite/mysys/my_static.h
diff --git a/modules/dep/mysqllite/mysys/my_symlink.c b/modules/acore/deps/mysqllite/mysys/my_symlink.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_symlink.c
rename to modules/acore/deps/mysqllite/mysys/my_symlink.c
diff --git a/modules/dep/mysqllite/mysys/my_symlink2.c b/modules/acore/deps/mysqllite/mysys/my_symlink2.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_symlink2.c
rename to modules/acore/deps/mysqllite/mysys/my_symlink2.c
diff --git a/modules/dep/mysqllite/mysys/my_sync.c b/modules/acore/deps/mysqllite/mysys/my_sync.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_sync.c
rename to modules/acore/deps/mysqllite/mysys/my_sync.c
diff --git a/modules/dep/mysqllite/mysys/my_thr_init.c b/modules/acore/deps/mysqllite/mysys/my_thr_init.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_thr_init.c
rename to modules/acore/deps/mysqllite/mysys/my_thr_init.c
diff --git a/modules/dep/mysqllite/mysys/my_wincond.c b/modules/acore/deps/mysqllite/mysys/my_wincond.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_wincond.c
rename to modules/acore/deps/mysqllite/mysys/my_wincond.c
diff --git a/modules/dep/mysqllite/mysys/my_windac.c b/modules/acore/deps/mysqllite/mysys/my_windac.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_windac.c
rename to modules/acore/deps/mysqllite/mysys/my_windac.c
diff --git a/modules/dep/mysqllite/mysys/my_winerr.c b/modules/acore/deps/mysqllite/mysys/my_winerr.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_winerr.c
rename to modules/acore/deps/mysqllite/mysys/my_winerr.c
diff --git a/modules/dep/mysqllite/mysys/my_winfile.c b/modules/acore/deps/mysqllite/mysys/my_winfile.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_winfile.c
rename to modules/acore/deps/mysqllite/mysys/my_winfile.c
diff --git a/modules/dep/mysqllite/mysys/my_winthread.c b/modules/acore/deps/mysqllite/mysys/my_winthread.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_winthread.c
rename to modules/acore/deps/mysqllite/mysys/my_winthread.c
diff --git a/modules/dep/mysqllite/mysys/my_write.c b/modules/acore/deps/mysqllite/mysys/my_write.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_write.c
rename to modules/acore/deps/mysqllite/mysys/my_write.c
diff --git a/modules/dep/mysqllite/mysys/mysys_priv.h b/modules/acore/deps/mysqllite/mysys/mysys_priv.h
similarity index 100%
rename from modules/dep/mysqllite/mysys/mysys_priv.h
rename to modules/acore/deps/mysqllite/mysys/mysys_priv.h
diff --git a/modules/dep/mysqllite/mysys/ptr_cmp.c b/modules/acore/deps/mysqllite/mysys/ptr_cmp.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/ptr_cmp.c
rename to modules/acore/deps/mysqllite/mysys/ptr_cmp.c
diff --git a/modules/dep/mysqllite/mysys/queues.c b/modules/acore/deps/mysqllite/mysys/queues.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/queues.c
rename to modules/acore/deps/mysqllite/mysys/queues.c
diff --git a/modules/dep/mysqllite/mysys/rijndael.c b/modules/acore/deps/mysqllite/mysys/rijndael.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/rijndael.c
rename to modules/acore/deps/mysqllite/mysys/rijndael.c
diff --git a/modules/dep/mysqllite/mysys/sha1.c b/modules/acore/deps/mysqllite/mysys/sha1.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/sha1.c
rename to modules/acore/deps/mysqllite/mysys/sha1.c
diff --git a/modules/dep/mysqllite/mysys/stacktrace.c b/modules/acore/deps/mysqllite/mysys/stacktrace.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/stacktrace.c
rename to modules/acore/deps/mysqllite/mysys/stacktrace.c
diff --git a/modules/dep/mysqllite/mysys/string.c b/modules/acore/deps/mysqllite/mysys/string.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/string.c
rename to modules/acore/deps/mysqllite/mysys/string.c
diff --git a/modules/dep/mysqllite/mysys/thr_alarm.c b/modules/acore/deps/mysqllite/mysys/thr_alarm.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_alarm.c
rename to modules/acore/deps/mysqllite/mysys/thr_alarm.c
diff --git a/modules/dep/mysqllite/mysys/thr_lock.c b/modules/acore/deps/mysqllite/mysys/thr_lock.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_lock.c
rename to modules/acore/deps/mysqllite/mysys/thr_lock.c
diff --git a/modules/dep/mysqllite/mysys/thr_mutex.c b/modules/acore/deps/mysqllite/mysys/thr_mutex.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_mutex.c
rename to modules/acore/deps/mysqllite/mysys/thr_mutex.c
diff --git a/modules/dep/mysqllite/mysys/thr_rwlock.c b/modules/acore/deps/mysqllite/mysys/thr_rwlock.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_rwlock.c
rename to modules/acore/deps/mysqllite/mysys/thr_rwlock.c
diff --git a/modules/dep/mysqllite/mysys/tree.c b/modules/acore/deps/mysqllite/mysys/tree.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/tree.c
rename to modules/acore/deps/mysqllite/mysys/tree.c
diff --git a/modules/dep/mysqllite/mysys/typelib.c b/modules/acore/deps/mysqllite/mysys/typelib.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/typelib.c
rename to modules/acore/deps/mysqllite/mysys/typelib.c
diff --git a/modules/dep/mysqllite/sql-common/client.c b/modules/acore/deps/mysqllite/sql-common/client.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/client.c
rename to modules/acore/deps/mysqllite/sql-common/client.c
diff --git a/modules/dep/mysqllite/sql-common/client_plugin.c b/modules/acore/deps/mysqllite/sql-common/client_plugin.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/client_plugin.c
rename to modules/acore/deps/mysqllite/sql-common/client_plugin.c
diff --git a/modules/dep/mysqllite/sql-common/my_time.c b/modules/acore/deps/mysqllite/sql-common/my_time.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/my_time.c
rename to modules/acore/deps/mysqllite/sql-common/my_time.c
diff --git a/modules/dep/mysqllite/sql-common/pack.c b/modules/acore/deps/mysqllite/sql-common/pack.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/pack.c
rename to modules/acore/deps/mysqllite/sql-common/pack.c
diff --git a/modules/dep/mysqllite/sql/net_serv.cc b/modules/acore/deps/mysqllite/sql/net_serv.cc
similarity index 100%
rename from modules/dep/mysqllite/sql/net_serv.cc
rename to modules/acore/deps/mysqllite/sql/net_serv.cc
diff --git a/modules/dep/mysqllite/sql/password.c b/modules/acore/deps/mysqllite/sql/password.c
similarity index 100%
rename from modules/dep/mysqllite/sql/password.c
rename to modules/acore/deps/mysqllite/sql/password.c
diff --git a/modules/dep/mysqllite/strings/CHARSET_INFO.txt b/modules/acore/deps/mysqllite/strings/CHARSET_INFO.txt
similarity index 100%
rename from modules/dep/mysqllite/strings/CHARSET_INFO.txt
rename to modules/acore/deps/mysqllite/strings/CHARSET_INFO.txt
diff --git a/modules/dep/mysqllite/strings/README b/modules/acore/deps/mysqllite/strings/README
similarity index 100%
rename from modules/dep/mysqllite/strings/README
rename to modules/acore/deps/mysqllite/strings/README
diff --git a/modules/dep/mysqllite/strings/bchange.c b/modules/acore/deps/mysqllite/strings/bchange.c
similarity index 100%
rename from modules/dep/mysqllite/strings/bchange.c
rename to modules/acore/deps/mysqllite/strings/bchange.c
diff --git a/modules/dep/mysqllite/strings/bmove_upp.c b/modules/acore/deps/mysqllite/strings/bmove_upp.c
similarity index 100%
rename from modules/dep/mysqllite/strings/bmove_upp.c
rename to modules/acore/deps/mysqllite/strings/bmove_upp.c
diff --git a/modules/dep/mysqllite/strings/ctype-big5.c b/modules/acore/deps/mysqllite/strings/ctype-big5.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-big5.c
rename to modules/acore/deps/mysqllite/strings/ctype-big5.c
diff --git a/modules/dep/mysqllite/strings/ctype-bin.c b/modules/acore/deps/mysqllite/strings/ctype-bin.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-bin.c
rename to modules/acore/deps/mysqllite/strings/ctype-bin.c
diff --git a/modules/dep/mysqllite/strings/ctype-cp932.c b/modules/acore/deps/mysqllite/strings/ctype-cp932.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-cp932.c
rename to modules/acore/deps/mysqllite/strings/ctype-cp932.c
diff --git a/modules/dep/mysqllite/strings/ctype-czech.c b/modules/acore/deps/mysqllite/strings/ctype-czech.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-czech.c
rename to modules/acore/deps/mysqllite/strings/ctype-czech.c
diff --git a/modules/dep/mysqllite/strings/ctype-euc_kr.c b/modules/acore/deps/mysqllite/strings/ctype-euc_kr.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-euc_kr.c
rename to modules/acore/deps/mysqllite/strings/ctype-euc_kr.c
diff --git a/modules/dep/mysqllite/strings/ctype-extra.c b/modules/acore/deps/mysqllite/strings/ctype-extra.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-extra.c
rename to modules/acore/deps/mysqllite/strings/ctype-extra.c
diff --git a/modules/dep/mysqllite/strings/ctype-gb2312.c b/modules/acore/deps/mysqllite/strings/ctype-gb2312.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-gb2312.c
rename to modules/acore/deps/mysqllite/strings/ctype-gb2312.c
diff --git a/modules/dep/mysqllite/strings/ctype-gbk.c b/modules/acore/deps/mysqllite/strings/ctype-gbk.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-gbk.c
rename to modules/acore/deps/mysqllite/strings/ctype-gbk.c
diff --git a/modules/dep/mysqllite/strings/ctype-latin1.c b/modules/acore/deps/mysqllite/strings/ctype-latin1.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-latin1.c
rename to modules/acore/deps/mysqllite/strings/ctype-latin1.c
diff --git a/modules/dep/mysqllite/strings/ctype-mb.c b/modules/acore/deps/mysqllite/strings/ctype-mb.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-mb.c
rename to modules/acore/deps/mysqllite/strings/ctype-mb.c
diff --git a/modules/dep/mysqllite/strings/ctype-simple.c b/modules/acore/deps/mysqllite/strings/ctype-simple.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-simple.c
rename to modules/acore/deps/mysqllite/strings/ctype-simple.c
diff --git a/modules/dep/mysqllite/strings/ctype-tis620.c b/modules/acore/deps/mysqllite/strings/ctype-tis620.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-tis620.c
rename to modules/acore/deps/mysqllite/strings/ctype-tis620.c
diff --git a/modules/dep/mysqllite/strings/ctype-uca.c b/modules/acore/deps/mysqllite/strings/ctype-uca.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-uca.c
rename to modules/acore/deps/mysqllite/strings/ctype-uca.c
diff --git a/modules/dep/mysqllite/strings/ctype-ucs2.c b/modules/acore/deps/mysqllite/strings/ctype-ucs2.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-ucs2.c
rename to modules/acore/deps/mysqllite/strings/ctype-ucs2.c
diff --git a/modules/dep/mysqllite/strings/ctype-utf8.c b/modules/acore/deps/mysqllite/strings/ctype-utf8.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-utf8.c
rename to modules/acore/deps/mysqllite/strings/ctype-utf8.c
diff --git a/modules/dep/mysqllite/strings/ctype-win1250ch.c b/modules/acore/deps/mysqllite/strings/ctype-win1250ch.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-win1250ch.c
rename to modules/acore/deps/mysqllite/strings/ctype-win1250ch.c
diff --git a/modules/dep/mysqllite/strings/ctype.c b/modules/acore/deps/mysqllite/strings/ctype.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype.c
rename to modules/acore/deps/mysqllite/strings/ctype.c
diff --git a/modules/dep/mysqllite/strings/decimal.c b/modules/acore/deps/mysqllite/strings/decimal.c
similarity index 100%
rename from modules/dep/mysqllite/strings/decimal.c
rename to modules/acore/deps/mysqllite/strings/decimal.c
diff --git a/modules/dep/mysqllite/strings/dtoa.c b/modules/acore/deps/mysqllite/strings/dtoa.c
similarity index 100%
rename from modules/dep/mysqllite/strings/dtoa.c
rename to modules/acore/deps/mysqllite/strings/dtoa.c
diff --git a/modules/dep/mysqllite/strings/int2str.c b/modules/acore/deps/mysqllite/strings/int2str.c
similarity index 100%
rename from modules/dep/mysqllite/strings/int2str.c
rename to modules/acore/deps/mysqllite/strings/int2str.c
diff --git a/modules/dep/mysqllite/strings/is_prefix.c b/modules/acore/deps/mysqllite/strings/is_prefix.c
similarity index 100%
rename from modules/dep/mysqllite/strings/is_prefix.c
rename to modules/acore/deps/mysqllite/strings/is_prefix.c
diff --git a/modules/dep/mysqllite/strings/latin2.def b/modules/acore/deps/mysqllite/strings/latin2.def
similarity index 100%
rename from modules/dep/mysqllite/strings/latin2.def
rename to modules/acore/deps/mysqllite/strings/latin2.def
diff --git a/modules/dep/mysqllite/strings/llstr.c b/modules/acore/deps/mysqllite/strings/llstr.c
similarity index 100%
rename from modules/dep/mysqllite/strings/llstr.c
rename to modules/acore/deps/mysqllite/strings/llstr.c
diff --git a/modules/dep/mysqllite/strings/longlong2str.c b/modules/acore/deps/mysqllite/strings/longlong2str.c
similarity index 100%
rename from modules/dep/mysqllite/strings/longlong2str.c
rename to modules/acore/deps/mysqllite/strings/longlong2str.c
diff --git a/modules/dep/mysqllite/strings/my_strchr.c b/modules/acore/deps/mysqllite/strings/my_strchr.c
similarity index 100%
rename from modules/dep/mysqllite/strings/my_strchr.c
rename to modules/acore/deps/mysqllite/strings/my_strchr.c
diff --git a/modules/dep/mysqllite/strings/my_strtoll10.c b/modules/acore/deps/mysqllite/strings/my_strtoll10.c
similarity index 100%
rename from modules/dep/mysqllite/strings/my_strtoll10.c
rename to modules/acore/deps/mysqllite/strings/my_strtoll10.c
diff --git a/modules/dep/mysqllite/strings/my_vsnprintf.c b/modules/acore/deps/mysqllite/strings/my_vsnprintf.c
similarity index 100%
rename from modules/dep/mysqllite/strings/my_vsnprintf.c
rename to modules/acore/deps/mysqllite/strings/my_vsnprintf.c
diff --git a/modules/dep/mysqllite/strings/str2int.c b/modules/acore/deps/mysqllite/strings/str2int.c
similarity index 100%
rename from modules/dep/mysqllite/strings/str2int.c
rename to modules/acore/deps/mysqllite/strings/str2int.c
diff --git a/modules/dep/mysqllite/strings/str_alloc.c b/modules/acore/deps/mysqllite/strings/str_alloc.c
similarity index 100%
rename from modules/dep/mysqllite/strings/str_alloc.c
rename to modules/acore/deps/mysqllite/strings/str_alloc.c
diff --git a/modules/dep/mysqllite/strings/strappend.c b/modules/acore/deps/mysqllite/strings/strappend.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strappend.c
rename to modules/acore/deps/mysqllite/strings/strappend.c
diff --git a/modules/dep/mysqllite/strings/strcend.c b/modules/acore/deps/mysqllite/strings/strcend.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strcend.c
rename to modules/acore/deps/mysqllite/strings/strcend.c
diff --git a/modules/dep/mysqllite/strings/strcont.c b/modules/acore/deps/mysqllite/strings/strcont.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strcont.c
rename to modules/acore/deps/mysqllite/strings/strcont.c
diff --git a/modules/dep/mysqllite/strings/strend.c b/modules/acore/deps/mysqllite/strings/strend.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strend.c
rename to modules/acore/deps/mysqllite/strings/strend.c
diff --git a/modules/dep/mysqllite/strings/strfill.c b/modules/acore/deps/mysqllite/strings/strfill.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strfill.c
rename to modules/acore/deps/mysqllite/strings/strfill.c
diff --git a/modules/dep/mysqllite/strings/strmake.c b/modules/acore/deps/mysqllite/strings/strmake.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strmake.c
rename to modules/acore/deps/mysqllite/strings/strmake.c
diff --git a/modules/dep/mysqllite/strings/strmov.c b/modules/acore/deps/mysqllite/strings/strmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strmov.c
rename to modules/acore/deps/mysqllite/strings/strmov.c
diff --git a/modules/dep/mysqllite/strings/strnlen.c b/modules/acore/deps/mysqllite/strings/strnlen.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strnlen.c
rename to modules/acore/deps/mysqllite/strings/strnlen.c
diff --git a/modules/dep/mysqllite/strings/strnmov.c b/modules/acore/deps/mysqllite/strings/strnmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strnmov.c
rename to modules/acore/deps/mysqllite/strings/strnmov.c
diff --git a/modules/dep/mysqllite/strings/strxmov.c b/modules/acore/deps/mysqllite/strings/strxmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strxmov.c
rename to modules/acore/deps/mysqllite/strings/strxmov.c
diff --git a/modules/dep/mysqllite/strings/strxnmov.c b/modules/acore/deps/mysqllite/strings/strxnmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strxnmov.c
rename to modules/acore/deps/mysqllite/strings/strxnmov.c
diff --git a/modules/dep/mysqllite/strings/t_ctype.h b/modules/acore/deps/mysqllite/strings/t_ctype.h
similarity index 100%
rename from modules/dep/mysqllite/strings/t_ctype.h
rename to modules/acore/deps/mysqllite/strings/t_ctype.h
diff --git a/modules/dep/mysqllite/strings/xml.c b/modules/acore/deps/mysqllite/strings/xml.c
similarity index 100%
rename from modules/dep/mysqllite/strings/xml.c
rename to modules/acore/deps/mysqllite/strings/xml.c
diff --git a/modules/dep/mysqllite/vio/vio.c b/modules/acore/deps/mysqllite/vio/vio.c
similarity index 100%
rename from modules/dep/mysqllite/vio/vio.c
rename to modules/acore/deps/mysqllite/vio/vio.c
diff --git a/modules/dep/mysqllite/vio/vio_priv.h b/modules/acore/deps/mysqllite/vio/vio_priv.h
similarity index 100%
rename from modules/dep/mysqllite/vio/vio_priv.h
rename to modules/acore/deps/mysqllite/vio/vio_priv.h
diff --git a/modules/dep/mysqllite/vio/viosocket.c b/modules/acore/deps/mysqllite/vio/viosocket.c
similarity index 100%
rename from modules/dep/mysqllite/vio/viosocket.c
rename to modules/acore/deps/mysqllite/vio/viosocket.c
diff --git a/modules/dep/mysqllite/vio/viossl.c b/modules/acore/deps/mysqllite/vio/viossl.c
similarity index 100%
rename from modules/dep/mysqllite/vio/viossl.c
rename to modules/acore/deps/mysqllite/vio/viossl.c
diff --git a/modules/dep/mysqllite/vio/viosslfactories.c b/modules/acore/deps/mysqllite/vio/viosslfactories.c
similarity index 100%
rename from modules/dep/mysqllite/vio/viosslfactories.c
rename to modules/acore/deps/mysqllite/vio/viosslfactories.c
diff --git a/modules/dep/recastnavigation/CMakeLists.txt b/modules/acore/deps/recastnavigation/CMakeLists.txt
similarity index 100%
rename from modules/dep/recastnavigation/CMakeLists.txt
rename to modules/acore/deps/recastnavigation/CMakeLists.txt
diff --git a/modules/dep/recastnavigation/Detour/CMakeLists.txt b/modules/acore/deps/recastnavigation/Detour/CMakeLists.txt
similarity index 100%
rename from modules/dep/recastnavigation/Detour/CMakeLists.txt
rename to modules/acore/deps/recastnavigation/Detour/CMakeLists.txt
diff --git a/modules/dep/recastnavigation/Detour/DetourAlloc.cpp b/modules/acore/deps/recastnavigation/Detour/DetourAlloc.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourAlloc.cpp
rename to modules/acore/deps/recastnavigation/Detour/DetourAlloc.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourAlloc.h b/modules/acore/deps/recastnavigation/Detour/DetourAlloc.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourAlloc.h
rename to modules/acore/deps/recastnavigation/Detour/DetourAlloc.h
diff --git a/modules/dep/recastnavigation/Detour/DetourAssert.h b/modules/acore/deps/recastnavigation/Detour/DetourAssert.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourAssert.h
rename to modules/acore/deps/recastnavigation/Detour/DetourAssert.h
diff --git a/modules/dep/recastnavigation/Detour/DetourCommon.cpp b/modules/acore/deps/recastnavigation/Detour/DetourCommon.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourCommon.cpp
rename to modules/acore/deps/recastnavigation/Detour/DetourCommon.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourCommon.h b/modules/acore/deps/recastnavigation/Detour/DetourCommon.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourCommon.h
rename to modules/acore/deps/recastnavigation/Detour/DetourCommon.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMesh.cpp b/modules/acore/deps/recastnavigation/Detour/DetourNavMesh.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMesh.cpp
rename to modules/acore/deps/recastnavigation/Detour/DetourNavMesh.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMesh.h b/modules/acore/deps/recastnavigation/Detour/DetourNavMesh.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMesh.h
rename to modules/acore/deps/recastnavigation/Detour/DetourNavMesh.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.cpp b/modules/acore/deps/recastnavigation/Detour/DetourNavMeshBuilder.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.cpp
rename to modules/acore/deps/recastnavigation/Detour/DetourNavMeshBuilder.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.h b/modules/acore/deps/recastnavigation/Detour/DetourNavMeshBuilder.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.h
rename to modules/acore/deps/recastnavigation/Detour/DetourNavMeshBuilder.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshQuery.cpp b/modules/acore/deps/recastnavigation/Detour/DetourNavMeshQuery.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshQuery.cpp
rename to modules/acore/deps/recastnavigation/Detour/DetourNavMeshQuery.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshQuery.h b/modules/acore/deps/recastnavigation/Detour/DetourNavMeshQuery.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshQuery.h
rename to modules/acore/deps/recastnavigation/Detour/DetourNavMeshQuery.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNode.cpp b/modules/acore/deps/recastnavigation/Detour/DetourNode.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNode.cpp
rename to modules/acore/deps/recastnavigation/Detour/DetourNode.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNode.h b/modules/acore/deps/recastnavigation/Detour/DetourNode.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNode.h
rename to modules/acore/deps/recastnavigation/Detour/DetourNode.h
diff --git a/modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.cpp b/modules/acore/deps/recastnavigation/Detour/DetourObstacleAvoidance.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.cpp
rename to modules/acore/deps/recastnavigation/Detour/DetourObstacleAvoidance.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.h b/modules/acore/deps/recastnavigation/Detour/DetourObstacleAvoidance.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.h
rename to modules/acore/deps/recastnavigation/Detour/DetourObstacleAvoidance.h
diff --git a/modules/dep/recastnavigation/License.txt b/modules/acore/deps/recastnavigation/License.txt
similarity index 100%
rename from modules/dep/recastnavigation/License.txt
rename to modules/acore/deps/recastnavigation/License.txt
diff --git a/modules/dep/recastnavigation/Readme.txt b/modules/acore/deps/recastnavigation/Readme.txt
similarity index 100%
rename from modules/dep/recastnavigation/Readme.txt
rename to modules/acore/deps/recastnavigation/Readme.txt
diff --git a/modules/dep/recastnavigation/Recast/CMakeLists.txt b/modules/acore/deps/recastnavigation/Recast/CMakeLists.txt
similarity index 100%
rename from modules/dep/recastnavigation/Recast/CMakeLists.txt
rename to modules/acore/deps/recastnavigation/Recast/CMakeLists.txt
diff --git a/modules/dep/recastnavigation/Recast/Recast.cpp b/modules/acore/deps/recastnavigation/Recast/Recast.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/Recast.cpp
rename to modules/acore/deps/recastnavigation/Recast/Recast.cpp
diff --git a/modules/dep/recastnavigation/Recast/Recast.h b/modules/acore/deps/recastnavigation/Recast/Recast.h
similarity index 100%
rename from modules/dep/recastnavigation/Recast/Recast.h
rename to modules/acore/deps/recastnavigation/Recast/Recast.h
diff --git a/modules/dep/recastnavigation/Recast/RecastAlloc.cpp b/modules/acore/deps/recastnavigation/Recast/RecastAlloc.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastAlloc.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastAlloc.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastAlloc.h b/modules/acore/deps/recastnavigation/Recast/RecastAlloc.h
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastAlloc.h
rename to modules/acore/deps/recastnavigation/Recast/RecastAlloc.h
diff --git a/modules/dep/recastnavigation/Recast/RecastArea.cpp b/modules/acore/deps/recastnavigation/Recast/RecastArea.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastArea.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastArea.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastAssert.h b/modules/acore/deps/recastnavigation/Recast/RecastAssert.h
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastAssert.h
rename to modules/acore/deps/recastnavigation/Recast/RecastAssert.h
diff --git a/modules/dep/recastnavigation/Recast/RecastContour.cpp b/modules/acore/deps/recastnavigation/Recast/RecastContour.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastContour.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastContour.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastFilter.cpp b/modules/acore/deps/recastnavigation/Recast/RecastFilter.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastFilter.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastFilter.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastMesh.cpp b/modules/acore/deps/recastnavigation/Recast/RecastMesh.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastMesh.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastMesh.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastMeshDetail.cpp b/modules/acore/deps/recastnavigation/Recast/RecastMeshDetail.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastMeshDetail.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastMeshDetail.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastRasterization.cpp b/modules/acore/deps/recastnavigation/Recast/RecastRasterization.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastRasterization.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastRasterization.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastRegion.cpp b/modules/acore/deps/recastnavigation/Recast/RecastRegion.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastRegion.cpp
rename to modules/acore/deps/recastnavigation/Recast/RecastRegion.cpp
diff --git a/modules/dep/recastnavigation/TODO.txt b/modules/acore/deps/recastnavigation/TODO.txt
similarity index 100%
rename from modules/dep/recastnavigation/TODO.txt
rename to modules/acore/deps/recastnavigation/TODO.txt
diff --git a/modules/dep/utf8cpp/utf8.h b/modules/acore/deps/utf8cpp/utf8.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8.h
rename to modules/acore/deps/utf8cpp/utf8.h
diff --git a/modules/dep/utf8cpp/utf8/checked.h b/modules/acore/deps/utf8cpp/utf8/checked.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8/checked.h
rename to modules/acore/deps/utf8cpp/utf8/checked.h
diff --git a/modules/dep/utf8cpp/utf8/core.h b/modules/acore/deps/utf8cpp/utf8/core.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8/core.h
rename to modules/acore/deps/utf8cpp/utf8/core.h
diff --git a/modules/dep/utf8cpp/utf8/unchecked.h b/modules/acore/deps/utf8cpp/utf8/unchecked.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8/unchecked.h
rename to modules/acore/deps/utf8cpp/utf8/unchecked.h
diff --git a/modules/dep/zlib/CMakeLists.txt b/modules/acore/deps/zlib/CMakeLists.txt
similarity index 100%
rename from modules/dep/zlib/CMakeLists.txt
rename to modules/acore/deps/zlib/CMakeLists.txt
diff --git a/modules/dep/zlib/adler32.c b/modules/acore/deps/zlib/adler32.c
similarity index 100%
rename from modules/dep/zlib/adler32.c
rename to modules/acore/deps/zlib/adler32.c
diff --git a/modules/dep/zlib/compress.c b/modules/acore/deps/zlib/compress.c
similarity index 100%
rename from modules/dep/zlib/compress.c
rename to modules/acore/deps/zlib/compress.c
diff --git a/modules/dep/zlib/crc32.c b/modules/acore/deps/zlib/crc32.c
similarity index 100%
rename from modules/dep/zlib/crc32.c
rename to modules/acore/deps/zlib/crc32.c
diff --git a/modules/dep/zlib/crc32.h b/modules/acore/deps/zlib/crc32.h
similarity index 100%
rename from modules/dep/zlib/crc32.h
rename to modules/acore/deps/zlib/crc32.h
diff --git a/modules/dep/zlib/deflate.c b/modules/acore/deps/zlib/deflate.c
similarity index 100%
rename from modules/dep/zlib/deflate.c
rename to modules/acore/deps/zlib/deflate.c
diff --git a/modules/dep/zlib/deflate.h b/modules/acore/deps/zlib/deflate.h
similarity index 100%
rename from modules/dep/zlib/deflate.h
rename to modules/acore/deps/zlib/deflate.h
diff --git a/modules/dep/zlib/example.c b/modules/acore/deps/zlib/example.c
similarity index 100%
rename from modules/dep/zlib/example.c
rename to modules/acore/deps/zlib/example.c
diff --git a/modules/dep/zlib/gzclose.c b/modules/acore/deps/zlib/gzclose.c
similarity index 100%
rename from modules/dep/zlib/gzclose.c
rename to modules/acore/deps/zlib/gzclose.c
diff --git a/modules/dep/zlib/gzguts.h b/modules/acore/deps/zlib/gzguts.h
similarity index 100%
rename from modules/dep/zlib/gzguts.h
rename to modules/acore/deps/zlib/gzguts.h
diff --git a/modules/dep/zlib/gzlib.c b/modules/acore/deps/zlib/gzlib.c
similarity index 100%
rename from modules/dep/zlib/gzlib.c
rename to modules/acore/deps/zlib/gzlib.c
diff --git a/modules/dep/zlib/gzread.c b/modules/acore/deps/zlib/gzread.c
similarity index 100%
rename from modules/dep/zlib/gzread.c
rename to modules/acore/deps/zlib/gzread.c
diff --git a/modules/dep/zlib/gzwrite.c b/modules/acore/deps/zlib/gzwrite.c
similarity index 100%
rename from modules/dep/zlib/gzwrite.c
rename to modules/acore/deps/zlib/gzwrite.c
diff --git a/modules/dep/zlib/infback.c b/modules/acore/deps/zlib/infback.c
similarity index 100%
rename from modules/dep/zlib/infback.c
rename to modules/acore/deps/zlib/infback.c
diff --git a/modules/dep/zlib/inffast.c b/modules/acore/deps/zlib/inffast.c
similarity index 100%
rename from modules/dep/zlib/inffast.c
rename to modules/acore/deps/zlib/inffast.c
diff --git a/modules/dep/zlib/inffast.h b/modules/acore/deps/zlib/inffast.h
similarity index 100%
rename from modules/dep/zlib/inffast.h
rename to modules/acore/deps/zlib/inffast.h
diff --git a/modules/dep/zlib/inffixed.h b/modules/acore/deps/zlib/inffixed.h
similarity index 100%
rename from modules/dep/zlib/inffixed.h
rename to modules/acore/deps/zlib/inffixed.h
diff --git a/modules/dep/zlib/inflate.c b/modules/acore/deps/zlib/inflate.c
similarity index 100%
rename from modules/dep/zlib/inflate.c
rename to modules/acore/deps/zlib/inflate.c
diff --git a/modules/dep/zlib/inflate.h b/modules/acore/deps/zlib/inflate.h
similarity index 100%
rename from modules/dep/zlib/inflate.h
rename to modules/acore/deps/zlib/inflate.h
diff --git a/modules/dep/zlib/inftrees.c b/modules/acore/deps/zlib/inftrees.c
similarity index 100%
rename from modules/dep/zlib/inftrees.c
rename to modules/acore/deps/zlib/inftrees.c
diff --git a/modules/dep/zlib/inftrees.h b/modules/acore/deps/zlib/inftrees.h
similarity index 100%
rename from modules/dep/zlib/inftrees.h
rename to modules/acore/deps/zlib/inftrees.h
diff --git a/modules/dep/zlib/minigzip.c b/modules/acore/deps/zlib/minigzip.c
similarity index 100%
rename from modules/dep/zlib/minigzip.c
rename to modules/acore/deps/zlib/minigzip.c
diff --git a/modules/dep/zlib/trees.c b/modules/acore/deps/zlib/trees.c
similarity index 100%
rename from modules/dep/zlib/trees.c
rename to modules/acore/deps/zlib/trees.c
diff --git a/modules/dep/zlib/trees.h b/modules/acore/deps/zlib/trees.h
similarity index 100%
rename from modules/dep/zlib/trees.h
rename to modules/acore/deps/zlib/trees.h
diff --git a/modules/dep/zlib/uncompr.c b/modules/acore/deps/zlib/uncompr.c
similarity index 100%
rename from modules/dep/zlib/uncompr.c
rename to modules/acore/deps/zlib/uncompr.c
diff --git a/modules/dep/zlib/zconf.h b/modules/acore/deps/zlib/zconf.h
similarity index 100%
rename from modules/dep/zlib/zconf.h
rename to modules/acore/deps/zlib/zconf.h
diff --git a/modules/dep/zlib/zlib.h b/modules/acore/deps/zlib/zlib.h
similarity index 100%
rename from modules/dep/zlib/zlib.h
rename to modules/acore/deps/zlib/zlib.h
diff --git a/modules/dep/zlib/zutil.c b/modules/acore/deps/zlib/zutil.c
similarity index 100%
rename from modules/dep/zlib/zutil.c
rename to modules/acore/deps/zlib/zutil.c
diff --git a/modules/dep/zlib/zutil.h b/modules/acore/deps/zlib/zutil.h
similarity index 100%
rename from modules/dep/zlib/zutil.h
rename to modules/acore/deps/zlib/zutil.h
diff --git a/src/tools/CMakeLists.txt b/modules/acore/extractors/CMakeLists.txt
similarity index 100%
rename from src/tools/CMakeLists.txt
rename to modules/acore/extractors/CMakeLists.txt
diff --git a/src/tools/map_extractor/CMakeLists.txt b/modules/acore/extractors/map_extractor/CMakeLists.txt
similarity index 100%
rename from src/tools/map_extractor/CMakeLists.txt
rename to modules/acore/extractors/map_extractor/CMakeLists.txt
diff --git a/src/tools/map_extractor/System.cpp b/modules/acore/extractors/map_extractor/System.cpp
similarity index 100%
rename from src/tools/map_extractor/System.cpp
rename to modules/acore/extractors/map_extractor/System.cpp
diff --git a/src/tools/map_extractor/adt.cpp b/modules/acore/extractors/map_extractor/adt.cpp
similarity index 100%
rename from src/tools/map_extractor/adt.cpp
rename to modules/acore/extractors/map_extractor/adt.cpp
diff --git a/src/tools/map_extractor/adt.h b/modules/acore/extractors/map_extractor/adt.h
similarity index 100%
rename from src/tools/map_extractor/adt.h
rename to modules/acore/extractors/map_extractor/adt.h
diff --git a/src/tools/map_extractor/dbcfile.cpp b/modules/acore/extractors/map_extractor/dbcfile.cpp
similarity index 100%
rename from src/tools/map_extractor/dbcfile.cpp
rename to modules/acore/extractors/map_extractor/dbcfile.cpp
diff --git a/src/tools/map_extractor/dbcfile.h b/modules/acore/extractors/map_extractor/dbcfile.h
similarity index 100%
rename from src/tools/map_extractor/dbcfile.h
rename to modules/acore/extractors/map_extractor/dbcfile.h
diff --git a/src/tools/map_extractor/loadlib.cpp b/modules/acore/extractors/map_extractor/loadlib.cpp
similarity index 100%
rename from src/tools/map_extractor/loadlib.cpp
rename to modules/acore/extractors/map_extractor/loadlib.cpp
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/modules/acore/extractors/map_extractor/loadlib/loadlib.h
similarity index 100%
rename from src/tools/map_extractor/loadlib/loadlib.h
rename to modules/acore/extractors/map_extractor/loadlib/loadlib.h
diff --git a/src/tools/map_extractor/mpq_libmpq.cpp b/modules/acore/extractors/map_extractor/mpq_libmpq.cpp
similarity index 100%
rename from src/tools/map_extractor/mpq_libmpq.cpp
rename to modules/acore/extractors/map_extractor/mpq_libmpq.cpp
diff --git a/src/tools/map_extractor/mpq_libmpq04.h b/modules/acore/extractors/map_extractor/mpq_libmpq04.h
similarity index 100%
rename from src/tools/map_extractor/mpq_libmpq04.h
rename to modules/acore/extractors/map_extractor/mpq_libmpq04.h
diff --git a/src/tools/map_extractor/wdt.cpp b/modules/acore/extractors/map_extractor/wdt.cpp
similarity index 100%
rename from src/tools/map_extractor/wdt.cpp
rename to modules/acore/extractors/map_extractor/wdt.cpp
diff --git a/src/tools/map_extractor/wdt.h b/modules/acore/extractors/map_extractor/wdt.h
similarity index 100%
rename from src/tools/map_extractor/wdt.h
rename to modules/acore/extractors/map_extractor/wdt.h
diff --git a/src/tools/mesh_extractor/ADT.cpp b/modules/acore/extractors/mesh_extractor/ADT.cpp
similarity index 100%
rename from src/tools/mesh_extractor/ADT.cpp
rename to modules/acore/extractors/mesh_extractor/ADT.cpp
diff --git a/src/tools/mesh_extractor/ADT.h b/modules/acore/extractors/mesh_extractor/ADT.h
similarity index 100%
rename from src/tools/mesh_extractor/ADT.h
rename to modules/acore/extractors/mesh_extractor/ADT.h
diff --git a/src/tools/mesh_extractor/CMakeLists.txt b/modules/acore/extractors/mesh_extractor/CMakeLists.txt
similarity index 100%
rename from src/tools/mesh_extractor/CMakeLists.txt
rename to modules/acore/extractors/mesh_extractor/CMakeLists.txt
diff --git a/src/tools/mesh_extractor/Cache.h b/modules/acore/extractors/mesh_extractor/Cache.h
similarity index 100%
rename from src/tools/mesh_extractor/Cache.h
rename to modules/acore/extractors/mesh_extractor/Cache.h
diff --git a/src/tools/mesh_extractor/Chunk.cpp b/modules/acore/extractors/mesh_extractor/Chunk.cpp
similarity index 100%
rename from src/tools/mesh_extractor/Chunk.cpp
rename to modules/acore/extractors/mesh_extractor/Chunk.cpp
diff --git a/src/tools/mesh_extractor/Chunk.h b/modules/acore/extractors/mesh_extractor/Chunk.h
similarity index 100%
rename from src/tools/mesh_extractor/Chunk.h
rename to modules/acore/extractors/mesh_extractor/Chunk.h
diff --git a/src/tools/mesh_extractor/ChunkedData.cpp b/modules/acore/extractors/mesh_extractor/ChunkedData.cpp
similarity index 100%
rename from src/tools/mesh_extractor/ChunkedData.cpp
rename to modules/acore/extractors/mesh_extractor/ChunkedData.cpp
diff --git a/src/tools/mesh_extractor/ChunkedData.h b/modules/acore/extractors/mesh_extractor/ChunkedData.h
similarity index 100%
rename from src/tools/mesh_extractor/ChunkedData.h
rename to modules/acore/extractors/mesh_extractor/ChunkedData.h
diff --git a/src/tools/mesh_extractor/Constants.h b/modules/acore/extractors/mesh_extractor/Constants.h
similarity index 100%
rename from src/tools/mesh_extractor/Constants.h
rename to modules/acore/extractors/mesh_extractor/Constants.h
diff --git a/src/tools/mesh_extractor/ContinentBuilder.cpp b/modules/acore/extractors/mesh_extractor/ContinentBuilder.cpp
similarity index 100%
rename from src/tools/mesh_extractor/ContinentBuilder.cpp
rename to modules/acore/extractors/mesh_extractor/ContinentBuilder.cpp
diff --git a/src/tools/mesh_extractor/ContinentBuilder.h b/modules/acore/extractors/mesh_extractor/ContinentBuilder.h
similarity index 100%
rename from src/tools/mesh_extractor/ContinentBuilder.h
rename to modules/acore/extractors/mesh_extractor/ContinentBuilder.h
diff --git a/src/tools/mesh_extractor/DBC.cpp b/modules/acore/extractors/mesh_extractor/DBC.cpp
similarity index 100%
rename from src/tools/mesh_extractor/DBC.cpp
rename to modules/acore/extractors/mesh_extractor/DBC.cpp
diff --git a/src/tools/mesh_extractor/DBC.h b/modules/acore/extractors/mesh_extractor/DBC.h
similarity index 100%
rename from src/tools/mesh_extractor/DBC.h
rename to modules/acore/extractors/mesh_extractor/DBC.h
diff --git a/src/tools/mesh_extractor/DoodadHandler.cpp b/modules/acore/extractors/mesh_extractor/DoodadHandler.cpp
similarity index 100%
rename from src/tools/mesh_extractor/DoodadHandler.cpp
rename to modules/acore/extractors/mesh_extractor/DoodadHandler.cpp
diff --git a/src/tools/mesh_extractor/DoodadHandler.h b/modules/acore/extractors/mesh_extractor/DoodadHandler.h
similarity index 100%
rename from src/tools/mesh_extractor/DoodadHandler.h
rename to modules/acore/extractors/mesh_extractor/DoodadHandler.h
diff --git a/src/tools/mesh_extractor/Geometry.cpp b/modules/acore/extractors/mesh_extractor/Geometry.cpp
similarity index 100%
rename from src/tools/mesh_extractor/Geometry.cpp
rename to modules/acore/extractors/mesh_extractor/Geometry.cpp
diff --git a/src/tools/mesh_extractor/Geometry.h b/modules/acore/extractors/mesh_extractor/Geometry.h
similarity index 100%
rename from src/tools/mesh_extractor/Geometry.h
rename to modules/acore/extractors/mesh_extractor/Geometry.h
diff --git a/src/tools/mesh_extractor/LiquidHandler.cpp b/modules/acore/extractors/mesh_extractor/LiquidHandler.cpp
similarity index 100%
rename from src/tools/mesh_extractor/LiquidHandler.cpp
rename to modules/acore/extractors/mesh_extractor/LiquidHandler.cpp
diff --git a/src/tools/mesh_extractor/LiquidHandler.h b/modules/acore/extractors/mesh_extractor/LiquidHandler.h
similarity index 100%
rename from src/tools/mesh_extractor/LiquidHandler.h
rename to modules/acore/extractors/mesh_extractor/LiquidHandler.h
diff --git a/src/tools/mesh_extractor/MPQ.cpp b/modules/acore/extractors/mesh_extractor/MPQ.cpp
similarity index 100%
rename from src/tools/mesh_extractor/MPQ.cpp
rename to modules/acore/extractors/mesh_extractor/MPQ.cpp
diff --git a/src/tools/mesh_extractor/MPQ.h b/modules/acore/extractors/mesh_extractor/MPQ.h
similarity index 100%
rename from src/tools/mesh_extractor/MPQ.h
rename to modules/acore/extractors/mesh_extractor/MPQ.h
diff --git a/src/tools/mesh_extractor/MPQManager.cpp b/modules/acore/extractors/mesh_extractor/MPQManager.cpp
similarity index 100%
rename from src/tools/mesh_extractor/MPQManager.cpp
rename to modules/acore/extractors/mesh_extractor/MPQManager.cpp
diff --git a/src/tools/mesh_extractor/MPQManager.h b/modules/acore/extractors/mesh_extractor/MPQManager.h
similarity index 100%
rename from src/tools/mesh_extractor/MPQManager.h
rename to modules/acore/extractors/mesh_extractor/MPQManager.h
diff --git a/src/tools/mesh_extractor/MapChunk.cpp b/modules/acore/extractors/mesh_extractor/MapChunk.cpp
similarity index 100%
rename from src/tools/mesh_extractor/MapChunk.cpp
rename to modules/acore/extractors/mesh_extractor/MapChunk.cpp
diff --git a/src/tools/mesh_extractor/MapChunk.h b/modules/acore/extractors/mesh_extractor/MapChunk.h
similarity index 100%
rename from src/tools/mesh_extractor/MapChunk.h
rename to modules/acore/extractors/mesh_extractor/MapChunk.h
diff --git a/src/tools/mesh_extractor/MeshExtractor.cpp b/modules/acore/extractors/mesh_extractor/MeshExtractor.cpp
similarity index 100%
rename from src/tools/mesh_extractor/MeshExtractor.cpp
rename to modules/acore/extractors/mesh_extractor/MeshExtractor.cpp
diff --git a/src/tools/mesh_extractor/Model.cpp b/modules/acore/extractors/mesh_extractor/Model.cpp
similarity index 100%
rename from src/tools/mesh_extractor/Model.cpp
rename to modules/acore/extractors/mesh_extractor/Model.cpp
diff --git a/src/tools/mesh_extractor/Model.h b/modules/acore/extractors/mesh_extractor/Model.h
similarity index 100%
rename from src/tools/mesh_extractor/Model.h
rename to modules/acore/extractors/mesh_extractor/Model.h
diff --git a/src/tools/mesh_extractor/ObjectDataHandler.cpp b/modules/acore/extractors/mesh_extractor/ObjectDataHandler.cpp
similarity index 100%
rename from src/tools/mesh_extractor/ObjectDataHandler.cpp
rename to modules/acore/extractors/mesh_extractor/ObjectDataHandler.cpp
diff --git a/src/tools/mesh_extractor/ObjectDataHandler.h b/modules/acore/extractors/mesh_extractor/ObjectDataHandler.h
similarity index 100%
rename from src/tools/mesh_extractor/ObjectDataHandler.h
rename to modules/acore/extractors/mesh_extractor/ObjectDataHandler.h
diff --git a/src/tools/mesh_extractor/TileBuilder.cpp b/modules/acore/extractors/mesh_extractor/TileBuilder.cpp
similarity index 100%
rename from src/tools/mesh_extractor/TileBuilder.cpp
rename to modules/acore/extractors/mesh_extractor/TileBuilder.cpp
diff --git a/src/tools/mesh_extractor/TileBuilder.h b/modules/acore/extractors/mesh_extractor/TileBuilder.h
similarity index 100%
rename from src/tools/mesh_extractor/TileBuilder.h
rename to modules/acore/extractors/mesh_extractor/TileBuilder.h
diff --git a/src/tools/mesh_extractor/Utils.cpp b/modules/acore/extractors/mesh_extractor/Utils.cpp
similarity index 100%
rename from src/tools/mesh_extractor/Utils.cpp
rename to modules/acore/extractors/mesh_extractor/Utils.cpp
diff --git a/src/tools/mesh_extractor/Utils.h b/modules/acore/extractors/mesh_extractor/Utils.h
similarity index 100%
rename from src/tools/mesh_extractor/Utils.h
rename to modules/acore/extractors/mesh_extractor/Utils.h
diff --git a/src/tools/mesh_extractor/WDT.cpp b/modules/acore/extractors/mesh_extractor/WDT.cpp
similarity index 100%
rename from src/tools/mesh_extractor/WDT.cpp
rename to modules/acore/extractors/mesh_extractor/WDT.cpp
diff --git a/src/tools/mesh_extractor/WDT.h b/modules/acore/extractors/mesh_extractor/WDT.h
similarity index 100%
rename from src/tools/mesh_extractor/WDT.h
rename to modules/acore/extractors/mesh_extractor/WDT.h
diff --git a/src/tools/mesh_extractor/WorldModelGroup.cpp b/modules/acore/extractors/mesh_extractor/WorldModelGroup.cpp
similarity index 100%
rename from src/tools/mesh_extractor/WorldModelGroup.cpp
rename to modules/acore/extractors/mesh_extractor/WorldModelGroup.cpp
diff --git a/src/tools/mesh_extractor/WorldModelGroup.h b/modules/acore/extractors/mesh_extractor/WorldModelGroup.h
similarity index 100%
rename from src/tools/mesh_extractor/WorldModelGroup.h
rename to modules/acore/extractors/mesh_extractor/WorldModelGroup.h
diff --git a/src/tools/mesh_extractor/WorldModelHandler.cpp b/modules/acore/extractors/mesh_extractor/WorldModelHandler.cpp
similarity index 100%
rename from src/tools/mesh_extractor/WorldModelHandler.cpp
rename to modules/acore/extractors/mesh_extractor/WorldModelHandler.cpp
diff --git a/src/tools/mesh_extractor/WorldModelHandler.h b/modules/acore/extractors/mesh_extractor/WorldModelHandler.h
similarity index 100%
rename from src/tools/mesh_extractor/WorldModelHandler.h
rename to modules/acore/extractors/mesh_extractor/WorldModelHandler.h
diff --git a/src/tools/mesh_extractor/WorldModelRoot.cpp b/modules/acore/extractors/mesh_extractor/WorldModelRoot.cpp
similarity index 100%
rename from src/tools/mesh_extractor/WorldModelRoot.cpp
rename to modules/acore/extractors/mesh_extractor/WorldModelRoot.cpp
diff --git a/src/tools/mesh_extractor/WorldModelRoot.h b/modules/acore/extractors/mesh_extractor/WorldModelRoot.h
similarity index 100%
rename from src/tools/mesh_extractor/WorldModelRoot.h
rename to modules/acore/extractors/mesh_extractor/WorldModelRoot.h
diff --git a/src/tools/mesh_extractor/readme b/modules/acore/extractors/mesh_extractor/readme
similarity index 100%
rename from src/tools/mesh_extractor/readme
rename to modules/acore/extractors/mesh_extractor/readme
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/modules/acore/extractors/mmaps_generator/CMakeLists.txt
similarity index 100%
rename from src/tools/mmaps_generator/CMakeLists.txt
rename to modules/acore/extractors/mmaps_generator/CMakeLists.txt
diff --git a/src/tools/mmaps_generator/Info/readme.txt b/modules/acore/extractors/mmaps_generator/Info/readme.txt
similarity index 100%
rename from src/tools/mmaps_generator/Info/readme.txt
rename to modules/acore/extractors/mmaps_generator/Info/readme.txt
diff --git a/src/tools/mmaps_generator/IntermediateValues.cpp b/modules/acore/extractors/mmaps_generator/IntermediateValues.cpp
similarity index 100%
rename from src/tools/mmaps_generator/IntermediateValues.cpp
rename to modules/acore/extractors/mmaps_generator/IntermediateValues.cpp
diff --git a/src/tools/mmaps_generator/IntermediateValues.h b/modules/acore/extractors/mmaps_generator/IntermediateValues.h
similarity index 100%
rename from src/tools/mmaps_generator/IntermediateValues.h
rename to modules/acore/extractors/mmaps_generator/IntermediateValues.h
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/modules/acore/extractors/mmaps_generator/MapBuilder.cpp
similarity index 100%
rename from src/tools/mmaps_generator/MapBuilder.cpp
rename to modules/acore/extractors/mmaps_generator/MapBuilder.cpp
diff --git a/src/tools/mmaps_generator/MapBuilder.h b/modules/acore/extractors/mmaps_generator/MapBuilder.h
similarity index 100%
rename from src/tools/mmaps_generator/MapBuilder.h
rename to modules/acore/extractors/mmaps_generator/MapBuilder.h
diff --git a/src/tools/mmaps_generator/PathCommon.h b/modules/acore/extractors/mmaps_generator/PathCommon.h
similarity index 100%
rename from src/tools/mmaps_generator/PathCommon.h
rename to modules/acore/extractors/mmaps_generator/PathCommon.h
diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/modules/acore/extractors/mmaps_generator/PathGenerator.cpp
similarity index 100%
rename from src/tools/mmaps_generator/PathGenerator.cpp
rename to modules/acore/extractors/mmaps_generator/PathGenerator.cpp
diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/modules/acore/extractors/mmaps_generator/TerrainBuilder.cpp
similarity index 100%
rename from src/tools/mmaps_generator/TerrainBuilder.cpp
rename to modules/acore/extractors/mmaps_generator/TerrainBuilder.cpp
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/modules/acore/extractors/mmaps_generator/TerrainBuilder.h
similarity index 100%
rename from src/tools/mmaps_generator/TerrainBuilder.h
rename to modules/acore/extractors/mmaps_generator/TerrainBuilder.h
diff --git a/src/tools/mmaps_generator/VMapExtensions.cpp b/modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
similarity index 100%
rename from src/tools/mmaps_generator/VMapExtensions.cpp
rename to modules/acore/extractors/mmaps_generator/VMapExtensions.cpp
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/modules/acore/extractors/vmap4_assembler/CMakeLists.txt
similarity index 100%
rename from src/tools/vmap4_assembler/CMakeLists.txt
rename to modules/acore/extractors/vmap4_assembler/CMakeLists.txt
diff --git a/src/tools/vmap4_assembler/VMapAssembler.cpp b/modules/acore/extractors/vmap4_assembler/VMapAssembler.cpp
similarity index 100%
rename from src/tools/vmap4_assembler/VMapAssembler.cpp
rename to modules/acore/extractors/vmap4_assembler/VMapAssembler.cpp
diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/modules/acore/extractors/vmap4_extractor/CMakeLists.txt
similarity index 100%
rename from src/tools/vmap4_extractor/CMakeLists.txt
rename to modules/acore/extractors/vmap4_extractor/CMakeLists.txt
diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/modules/acore/extractors/vmap4_extractor/adtfile.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/adtfile.cpp
rename to modules/acore/extractors/vmap4_extractor/adtfile.cpp
diff --git a/src/tools/vmap4_extractor/adtfile.h b/modules/acore/extractors/vmap4_extractor/adtfile.h
similarity index 100%
rename from src/tools/vmap4_extractor/adtfile.h
rename to modules/acore/extractors/vmap4_extractor/adtfile.h
diff --git a/src/tools/vmap4_extractor/dbcfile.cpp b/modules/acore/extractors/vmap4_extractor/dbcfile.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/dbcfile.cpp
rename to modules/acore/extractors/vmap4_extractor/dbcfile.cpp
diff --git a/src/tools/vmap4_extractor/dbcfile.h b/modules/acore/extractors/vmap4_extractor/dbcfile.h
similarity index 100%
rename from src/tools/vmap4_extractor/dbcfile.h
rename to modules/acore/extractors/vmap4_extractor/dbcfile.h
diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/modules/acore/extractors/vmap4_extractor/gameobject_extract.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/gameobject_extract.cpp
rename to modules/acore/extractors/vmap4_extractor/gameobject_extract.cpp
diff --git a/src/tools/vmap4_extractor/loadlib/loadlib.h b/modules/acore/extractors/vmap4_extractor/loadlib/loadlib.h
similarity index 100%
rename from src/tools/vmap4_extractor/loadlib/loadlib.h
rename to modules/acore/extractors/vmap4_extractor/loadlib/loadlib.h
diff --git a/src/tools/vmap4_extractor/model.cpp b/modules/acore/extractors/vmap4_extractor/model.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/model.cpp
rename to modules/acore/extractors/vmap4_extractor/model.cpp
diff --git a/src/tools/vmap4_extractor/model.h b/modules/acore/extractors/vmap4_extractor/model.h
similarity index 100%
rename from src/tools/vmap4_extractor/model.h
rename to modules/acore/extractors/vmap4_extractor/model.h
diff --git a/src/tools/vmap4_extractor/modelheaders.h b/modules/acore/extractors/vmap4_extractor/modelheaders.h
similarity index 100%
rename from src/tools/vmap4_extractor/modelheaders.h
rename to modules/acore/extractors/vmap4_extractor/modelheaders.h
diff --git a/src/tools/vmap4_extractor/mpq_libmpq.cpp b/modules/acore/extractors/vmap4_extractor/mpq_libmpq.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/mpq_libmpq.cpp
rename to modules/acore/extractors/vmap4_extractor/mpq_libmpq.cpp
diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/modules/acore/extractors/vmap4_extractor/mpq_libmpq04.h
similarity index 100%
rename from src/tools/vmap4_extractor/mpq_libmpq04.h
rename to modules/acore/extractors/vmap4_extractor/mpq_libmpq04.h
diff --git a/src/tools/vmap4_extractor/vec3d.h b/modules/acore/extractors/vmap4_extractor/vec3d.h
similarity index 100%
rename from src/tools/vmap4_extractor/vec3d.h
rename to modules/acore/extractors/vmap4_extractor/vec3d.h
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/modules/acore/extractors/vmap4_extractor/vmapexport.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/vmapexport.cpp
rename to modules/acore/extractors/vmap4_extractor/vmapexport.cpp
diff --git a/src/tools/vmap4_extractor/vmapexport.h b/modules/acore/extractors/vmap4_extractor/vmapexport.h
similarity index 100%
rename from src/tools/vmap4_extractor/vmapexport.h
rename to modules/acore/extractors/vmap4_extractor/vmapexport.h
diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/modules/acore/extractors/vmap4_extractor/wdtfile.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/wdtfile.cpp
rename to modules/acore/extractors/vmap4_extractor/wdtfile.cpp
diff --git a/src/tools/vmap4_extractor/wdtfile.h b/modules/acore/extractors/vmap4_extractor/wdtfile.h
similarity index 100%
rename from src/tools/vmap4_extractor/wdtfile.h
rename to modules/acore/extractors/vmap4_extractor/wdtfile.h
diff --git a/src/tools/vmap4_extractor/wmo.cpp b/modules/acore/extractors/vmap4_extractor/wmo.cpp
similarity index 100%
rename from src/tools/vmap4_extractor/wmo.cpp
rename to modules/acore/extractors/vmap4_extractor/wmo.cpp
diff --git a/src/tools/vmap4_extractor/wmo.h b/modules/acore/extractors/vmap4_extractor/wmo.h
similarity index 100%
rename from src/tools/vmap4_extractor/wmo.h
rename to modules/acore/extractors/vmap4_extractor/wmo.h
diff --git a/src/server/shared/AutoPtr.h b/modules/acore/framework/AutoPtr.h
similarity index 100%
rename from src/server/shared/AutoPtr.h
rename to modules/acore/framework/AutoPtr.h
diff --git a/src/server/shared/CMakeLists.txt b/modules/acore/framework/CMakeLists.txt
similarity index 100%
rename from src/server/shared/CMakeLists.txt
rename to modules/acore/framework/CMakeLists.txt
diff --git a/src/server/shared/Common.cpp b/modules/acore/framework/Common.cpp
similarity index 100%
rename from src/server/shared/Common.cpp
rename to modules/acore/framework/Common.cpp
diff --git a/src/server/shared/Common.h b/modules/acore/framework/Common.h
similarity index 100%
rename from src/server/shared/Common.h
rename to modules/acore/framework/Common.h
diff --git a/src/server/shared/CompilerDefs.h b/modules/acore/framework/CompilerDefs.h
similarity index 100%
rename from src/server/shared/CompilerDefs.h
rename to modules/acore/framework/CompilerDefs.h
diff --git a/src/server/shared/Configuration/Config.cpp b/modules/acore/framework/Configuration/Config.cpp
similarity index 100%
rename from src/server/shared/Configuration/Config.cpp
rename to modules/acore/framework/Configuration/Config.cpp
diff --git a/src/server/shared/Configuration/Config.h b/modules/acore/framework/Configuration/Config.h
similarity index 100%
rename from src/server/shared/Configuration/Config.h
rename to modules/acore/framework/Configuration/Config.h
diff --git a/src/server/shared/Containers.h b/modules/acore/framework/Containers.h
similarity index 100%
rename from src/server/shared/Containers.h
rename to modules/acore/framework/Containers.h
diff --git a/src/server/shared/Cryptography/ARC4.cpp b/modules/acore/framework/Cryptography/ARC4.cpp
similarity index 100%
rename from src/server/shared/Cryptography/ARC4.cpp
rename to modules/acore/framework/Cryptography/ARC4.cpp
diff --git a/src/server/shared/Cryptography/ARC4.h b/modules/acore/framework/Cryptography/ARC4.h
similarity index 100%
rename from src/server/shared/Cryptography/ARC4.h
rename to modules/acore/framework/Cryptography/ARC4.h
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/modules/acore/framework/Cryptography/Authentication/AuthCrypt.cpp
similarity index 100%
rename from src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
rename to modules/acore/framework/Cryptography/Authentication/AuthCrypt.cpp
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.h b/modules/acore/framework/Cryptography/Authentication/AuthCrypt.h
similarity index 100%
rename from src/server/shared/Cryptography/Authentication/AuthCrypt.h
rename to modules/acore/framework/Cryptography/Authentication/AuthCrypt.h
diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/modules/acore/framework/Cryptography/BigNumber.cpp
similarity index 100%
rename from src/server/shared/Cryptography/BigNumber.cpp
rename to modules/acore/framework/Cryptography/BigNumber.cpp
diff --git a/src/server/shared/Cryptography/BigNumber.h b/modules/acore/framework/Cryptography/BigNumber.h
similarity index 100%
rename from src/server/shared/Cryptography/BigNumber.h
rename to modules/acore/framework/Cryptography/BigNumber.h
diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/modules/acore/framework/Cryptography/HMACSHA1.cpp
similarity index 100%
rename from src/server/shared/Cryptography/HMACSHA1.cpp
rename to modules/acore/framework/Cryptography/HMACSHA1.cpp
diff --git a/src/server/shared/Cryptography/HMACSHA1.h b/modules/acore/framework/Cryptography/HMACSHA1.h
similarity index 100%
rename from src/server/shared/Cryptography/HMACSHA1.h
rename to modules/acore/framework/Cryptography/HMACSHA1.h
diff --git a/src/server/shared/Cryptography/OpenSSLCrypto.cpp b/modules/acore/framework/Cryptography/OpenSSLCrypto.cpp
similarity index 100%
rename from src/server/shared/Cryptography/OpenSSLCrypto.cpp
rename to modules/acore/framework/Cryptography/OpenSSLCrypto.cpp
diff --git a/src/server/shared/Cryptography/OpenSSLCrypto.h b/modules/acore/framework/Cryptography/OpenSSLCrypto.h
similarity index 100%
rename from src/server/shared/Cryptography/OpenSSLCrypto.h
rename to modules/acore/framework/Cryptography/OpenSSLCrypto.h
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/modules/acore/framework/Cryptography/SHA1.cpp
similarity index 100%
rename from src/server/shared/Cryptography/SHA1.cpp
rename to modules/acore/framework/Cryptography/SHA1.cpp
diff --git a/src/server/shared/Cryptography/SHA1.h b/modules/acore/framework/Cryptography/SHA1.h
similarity index 100%
rename from src/server/shared/Cryptography/SHA1.h
rename to modules/acore/framework/Cryptography/SHA1.h
diff --git a/src/server/shared/Cryptography/WardenKeyGeneration.h b/modules/acore/framework/Cryptography/WardenKeyGeneration.h
similarity index 100%
rename from src/server/shared/Cryptography/WardenKeyGeneration.h
rename to modules/acore/framework/Cryptography/WardenKeyGeneration.h
diff --git a/src/server/shared/DataStores/DBCFileLoader.cpp b/modules/acore/framework/DataStores/DBCFileLoader.cpp
similarity index 100%
rename from src/server/shared/DataStores/DBCFileLoader.cpp
rename to modules/acore/framework/DataStores/DBCFileLoader.cpp
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/modules/acore/framework/DataStores/DBCFileLoader.h
similarity index 100%
rename from src/server/shared/DataStores/DBCFileLoader.h
rename to modules/acore/framework/DataStores/DBCFileLoader.h
diff --git a/src/server/shared/DataStores/DBCStore.h b/modules/acore/framework/DataStores/DBCStore.h
similarity index 100%
rename from src/server/shared/DataStores/DBCStore.h
rename to modules/acore/framework/DataStores/DBCStore.h
diff --git a/src/server/shared/Database/AdhocStatement.cpp b/modules/acore/framework/Database/AdhocStatement.cpp
similarity index 100%
rename from src/server/shared/Database/AdhocStatement.cpp
rename to modules/acore/framework/Database/AdhocStatement.cpp
diff --git a/src/server/shared/Database/AdhocStatement.h b/modules/acore/framework/Database/AdhocStatement.h
similarity index 100%
rename from src/server/shared/Database/AdhocStatement.h
rename to modules/acore/framework/Database/AdhocStatement.h
diff --git a/src/server/shared/Database/DatabaseEnv.h b/modules/acore/framework/Database/DatabaseEnv.h
similarity index 100%
rename from src/server/shared/Database/DatabaseEnv.h
rename to modules/acore/framework/Database/DatabaseEnv.h
diff --git a/src/server/shared/Database/DatabaseWorker.cpp b/modules/acore/framework/Database/DatabaseWorker.cpp
similarity index 100%
rename from src/server/shared/Database/DatabaseWorker.cpp
rename to modules/acore/framework/Database/DatabaseWorker.cpp
diff --git a/src/server/shared/Database/DatabaseWorker.h b/modules/acore/framework/Database/DatabaseWorker.h
similarity index 100%
rename from src/server/shared/Database/DatabaseWorker.h
rename to modules/acore/framework/Database/DatabaseWorker.h
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/modules/acore/framework/Database/DatabaseWorkerPool.h
similarity index 100%
rename from src/server/shared/Database/DatabaseWorkerPool.h
rename to modules/acore/framework/Database/DatabaseWorkerPool.h
diff --git a/src/server/shared/Database/Field.cpp b/modules/acore/framework/Database/Field.cpp
similarity index 100%
rename from src/server/shared/Database/Field.cpp
rename to modules/acore/framework/Database/Field.cpp
diff --git a/src/server/shared/Database/Field.h b/modules/acore/framework/Database/Field.h
similarity index 100%
rename from src/server/shared/Database/Field.h
rename to modules/acore/framework/Database/Field.h
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/modules/acore/framework/Database/Implementation/CharacterDatabase.cpp
similarity index 100%
rename from src/server/shared/Database/Implementation/CharacterDatabase.cpp
rename to modules/acore/framework/Database/Implementation/CharacterDatabase.cpp
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/modules/acore/framework/Database/Implementation/CharacterDatabase.h
similarity index 100%
rename from src/server/shared/Database/Implementation/CharacterDatabase.h
rename to modules/acore/framework/Database/Implementation/CharacterDatabase.h
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/modules/acore/framework/Database/Implementation/LoginDatabase.cpp
similarity index 100%
rename from src/server/shared/Database/Implementation/LoginDatabase.cpp
rename to modules/acore/framework/Database/Implementation/LoginDatabase.cpp
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.h b/modules/acore/framework/Database/Implementation/LoginDatabase.h
similarity index 100%
rename from src/server/shared/Database/Implementation/LoginDatabase.h
rename to modules/acore/framework/Database/Implementation/LoginDatabase.h
diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/modules/acore/framework/Database/Implementation/WorldDatabase.cpp
similarity index 100%
rename from src/server/shared/Database/Implementation/WorldDatabase.cpp
rename to modules/acore/framework/Database/Implementation/WorldDatabase.cpp
diff --git a/src/server/shared/Database/Implementation/WorldDatabase.h b/modules/acore/framework/Database/Implementation/WorldDatabase.h
similarity index 100%
rename from src/server/shared/Database/Implementation/WorldDatabase.h
rename to modules/acore/framework/Database/Implementation/WorldDatabase.h
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/modules/acore/framework/Database/MySQLConnection.cpp
similarity index 100%
rename from src/server/shared/Database/MySQLConnection.cpp
rename to modules/acore/framework/Database/MySQLConnection.cpp
diff --git a/src/server/shared/Database/MySQLConnection.h b/modules/acore/framework/Database/MySQLConnection.h
similarity index 100%
rename from src/server/shared/Database/MySQLConnection.h
rename to modules/acore/framework/Database/MySQLConnection.h
diff --git a/src/server/shared/Database/MySQLThreading.h b/modules/acore/framework/Database/MySQLThreading.h
similarity index 100%
rename from src/server/shared/Database/MySQLThreading.h
rename to modules/acore/framework/Database/MySQLThreading.h
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/modules/acore/framework/Database/PreparedStatement.cpp
similarity index 100%
rename from src/server/shared/Database/PreparedStatement.cpp
rename to modules/acore/framework/Database/PreparedStatement.cpp
diff --git a/src/server/shared/Database/PreparedStatement.h b/modules/acore/framework/Database/PreparedStatement.h
similarity index 100%
rename from src/server/shared/Database/PreparedStatement.h
rename to modules/acore/framework/Database/PreparedStatement.h
diff --git a/src/server/shared/Database/QueryHolder.cpp b/modules/acore/framework/Database/QueryHolder.cpp
similarity index 100%
rename from src/server/shared/Database/QueryHolder.cpp
rename to modules/acore/framework/Database/QueryHolder.cpp
diff --git a/src/server/shared/Database/QueryHolder.h b/modules/acore/framework/Database/QueryHolder.h
similarity index 100%
rename from src/server/shared/Database/QueryHolder.h
rename to modules/acore/framework/Database/QueryHolder.h
diff --git a/src/server/shared/Database/QueryResult.cpp b/modules/acore/framework/Database/QueryResult.cpp
similarity index 100%
rename from src/server/shared/Database/QueryResult.cpp
rename to modules/acore/framework/Database/QueryResult.cpp
diff --git a/src/server/shared/Database/QueryResult.h b/modules/acore/framework/Database/QueryResult.h
similarity index 100%
rename from src/server/shared/Database/QueryResult.h
rename to modules/acore/framework/Database/QueryResult.h
diff --git a/src/server/shared/Database/SQLOperation.h b/modules/acore/framework/Database/SQLOperation.h
similarity index 100%
rename from src/server/shared/Database/SQLOperation.h
rename to modules/acore/framework/Database/SQLOperation.h
diff --git a/src/server/shared/Database/Transaction.cpp b/modules/acore/framework/Database/Transaction.cpp
similarity index 100%
rename from src/server/shared/Database/Transaction.cpp
rename to modules/acore/framework/Database/Transaction.cpp
diff --git a/src/server/shared/Database/Transaction.h b/modules/acore/framework/Database/Transaction.h
similarity index 100%
rename from src/server/shared/Database/Transaction.h
rename to modules/acore/framework/Database/Transaction.h
diff --git a/src/server/shared/Debugging/Errors.cpp b/modules/acore/framework/Debugging/Errors.cpp
similarity index 100%
rename from src/server/shared/Debugging/Errors.cpp
rename to modules/acore/framework/Debugging/Errors.cpp
diff --git a/src/server/shared/Debugging/Errors.h b/modules/acore/framework/Debugging/Errors.h
similarity index 100%
rename from src/server/shared/Debugging/Errors.h
rename to modules/acore/framework/Debugging/Errors.h
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/modules/acore/framework/Debugging/WheatyExceptionReport.cpp
similarity index 100%
rename from src/server/shared/Debugging/WheatyExceptionReport.cpp
rename to modules/acore/framework/Debugging/WheatyExceptionReport.cpp
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/modules/acore/framework/Debugging/WheatyExceptionReport.h
similarity index 100%
rename from src/server/shared/Debugging/WheatyExceptionReport.h
rename to modules/acore/framework/Debugging/WheatyExceptionReport.h
diff --git a/src/server/shared/Define.h b/modules/acore/framework/Define.h
similarity index 100%
rename from src/server/shared/Define.h
rename to modules/acore/framework/Define.h
diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/modules/acore/framework/Dynamic/FactoryHolder.h
similarity index 100%
rename from src/server/shared/Dynamic/FactoryHolder.h
rename to modules/acore/framework/Dynamic/FactoryHolder.h
diff --git a/src/server/shared/Dynamic/HashNamespace.h b/modules/acore/framework/Dynamic/HashNamespace.h
similarity index 100%
rename from src/server/shared/Dynamic/HashNamespace.h
rename to modules/acore/framework/Dynamic/HashNamespace.h
diff --git a/src/server/shared/Dynamic/LinkedList.h b/modules/acore/framework/Dynamic/LinkedList.h
similarity index 100%
rename from src/server/shared/Dynamic/LinkedList.h
rename to modules/acore/framework/Dynamic/LinkedList.h
diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/modules/acore/framework/Dynamic/LinkedReference/RefManager.h
similarity index 100%
rename from src/server/shared/Dynamic/LinkedReference/RefManager.h
rename to modules/acore/framework/Dynamic/LinkedReference/RefManager.h
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/modules/acore/framework/Dynamic/LinkedReference/Reference.h
similarity index 100%
rename from src/server/shared/Dynamic/LinkedReference/Reference.h
rename to modules/acore/framework/Dynamic/LinkedReference/Reference.h
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/modules/acore/framework/Dynamic/ObjectRegistry.h
similarity index 100%
rename from src/server/shared/Dynamic/ObjectRegistry.h
rename to modules/acore/framework/Dynamic/ObjectRegistry.h
diff --git a/src/server/shared/Dynamic/TypeContainer.h b/modules/acore/framework/Dynamic/TypeContainer.h
similarity index 100%
rename from src/server/shared/Dynamic/TypeContainer.h
rename to modules/acore/framework/Dynamic/TypeContainer.h
diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/modules/acore/framework/Dynamic/TypeContainerFunctions.h
similarity index 100%
rename from src/server/shared/Dynamic/TypeContainerFunctions.h
rename to modules/acore/framework/Dynamic/TypeContainerFunctions.h
diff --git a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h b/modules/acore/framework/Dynamic/TypeContainerFunctionsPtr.h
similarity index 100%
rename from src/server/shared/Dynamic/TypeContainerFunctionsPtr.h
rename to modules/acore/framework/Dynamic/TypeContainerFunctionsPtr.h
diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/modules/acore/framework/Dynamic/TypeContainerVisitor.h
similarity index 100%
rename from src/server/shared/Dynamic/TypeContainerVisitor.h
rename to modules/acore/framework/Dynamic/TypeContainerVisitor.h
diff --git a/src/server/shared/Dynamic/TypeList.h b/modules/acore/framework/Dynamic/TypeList.h
similarity index 100%
rename from src/server/shared/Dynamic/TypeList.h
rename to modules/acore/framework/Dynamic/TypeList.h
diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/modules/acore/framework/Dynamic/UnorderedMap.h
similarity index 100%
rename from src/server/shared/Dynamic/UnorderedMap.h
rename to modules/acore/framework/Dynamic/UnorderedMap.h
diff --git a/src/server/shared/Dynamic/UnorderedSet.h b/modules/acore/framework/Dynamic/UnorderedSet.h
similarity index 100%
rename from src/server/shared/Dynamic/UnorderedSet.h
rename to modules/acore/framework/Dynamic/UnorderedSet.h
diff --git a/src/server/shared/Logging/Log.cpp b/modules/acore/framework/Logging/Log.cpp
similarity index 100%
rename from src/server/shared/Logging/Log.cpp
rename to modules/acore/framework/Logging/Log.cpp
diff --git a/src/server/shared/Logging/Log.h b/modules/acore/framework/Logging/Log.h
similarity index 100%
rename from src/server/shared/Logging/Log.h
rename to modules/acore/framework/Logging/Log.h
diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/modules/acore/framework/Packets/ByteBuffer.cpp
similarity index 100%
rename from src/server/shared/Packets/ByteBuffer.cpp
rename to modules/acore/framework/Packets/ByteBuffer.cpp
diff --git a/src/server/shared/Packets/ByteBuffer.h b/modules/acore/framework/Packets/ByteBuffer.h
similarity index 100%
rename from src/server/shared/Packets/ByteBuffer.h
rename to modules/acore/framework/Packets/ByteBuffer.h
diff --git a/src/server/shared/Packets/WorldPacket.h b/modules/acore/framework/Packets/WorldPacket.h
similarity index 100%
rename from src/server/shared/Packets/WorldPacket.h
rename to modules/acore/framework/Packets/WorldPacket.h
diff --git a/src/server/shared/PrecompiledHeaders/sharedPCH.cpp b/modules/acore/framework/PrecompiledHeaders/sharedPCH.cpp
similarity index 100%
rename from src/server/shared/PrecompiledHeaders/sharedPCH.cpp
rename to modules/acore/framework/PrecompiledHeaders/sharedPCH.cpp
diff --git a/src/server/shared/PrecompiledHeaders/sharedPCH.h b/modules/acore/framework/PrecompiledHeaders/sharedPCH.h
similarity index 100%
rename from src/server/shared/PrecompiledHeaders/sharedPCH.h
rename to modules/acore/framework/PrecompiledHeaders/sharedPCH.h
diff --git a/src/server/shared/SystemConfig.h b/modules/acore/framework/SystemConfig.h
similarity index 100%
rename from src/server/shared/SystemConfig.h
rename to modules/acore/framework/SystemConfig.h
diff --git a/src/server/shared/Threading/Callback.h b/modules/acore/framework/Threading/Callback.h
similarity index 100%
rename from src/server/shared/Threading/Callback.h
rename to modules/acore/framework/Threading/Callback.h
diff --git a/src/server/shared/Threading/DelayExecutor.cpp b/modules/acore/framework/Threading/DelayExecutor.cpp
similarity index 100%
rename from src/server/shared/Threading/DelayExecutor.cpp
rename to modules/acore/framework/Threading/DelayExecutor.cpp
diff --git a/src/server/shared/Threading/DelayExecutor.h b/modules/acore/framework/Threading/DelayExecutor.h
similarity index 100%
rename from src/server/shared/Threading/DelayExecutor.h
rename to modules/acore/framework/Threading/DelayExecutor.h
diff --git a/src/server/shared/Threading/LockedQueue.h b/modules/acore/framework/Threading/LockedQueue.h
similarity index 100%
rename from src/server/shared/Threading/LockedQueue.h
rename to modules/acore/framework/Threading/LockedQueue.h
diff --git a/src/server/shared/Threading/Threading.cpp b/modules/acore/framework/Threading/Threading.cpp
similarity index 100%
rename from src/server/shared/Threading/Threading.cpp
rename to modules/acore/framework/Threading/Threading.cpp
diff --git a/src/server/shared/Threading/Threading.h b/modules/acore/framework/Threading/Threading.h
similarity index 100%
rename from src/server/shared/Threading/Threading.h
rename to modules/acore/framework/Threading/Threading.h
diff --git a/src/server/shared/Utilities/ByteConverter.h b/modules/acore/framework/Utilities/ByteConverter.h
similarity index 100%
rename from src/server/shared/Utilities/ByteConverter.h
rename to modules/acore/framework/Utilities/ByteConverter.h
diff --git a/src/server/shared/Utilities/EventProcessor.cpp b/modules/acore/framework/Utilities/EventProcessor.cpp
similarity index 100%
rename from src/server/shared/Utilities/EventProcessor.cpp
rename to modules/acore/framework/Utilities/EventProcessor.cpp
diff --git a/src/server/shared/Utilities/EventProcessor.h b/modules/acore/framework/Utilities/EventProcessor.h
similarity index 100%
rename from src/server/shared/Utilities/EventProcessor.h
rename to modules/acore/framework/Utilities/EventProcessor.h
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/modules/acore/framework/Utilities/ServiceWin32.cpp
similarity index 100%
rename from src/server/shared/Utilities/ServiceWin32.cpp
rename to modules/acore/framework/Utilities/ServiceWin32.cpp
diff --git a/src/server/shared/Utilities/ServiceWin32.h b/modules/acore/framework/Utilities/ServiceWin32.h
similarity index 100%
rename from src/server/shared/Utilities/ServiceWin32.h
rename to modules/acore/framework/Utilities/ServiceWin32.h
diff --git a/src/server/shared/Utilities/SignalHandler.h b/modules/acore/framework/Utilities/SignalHandler.h
similarity index 100%
rename from src/server/shared/Utilities/SignalHandler.h
rename to modules/acore/framework/Utilities/SignalHandler.h
diff --git a/src/server/shared/Utilities/Timer.h b/modules/acore/framework/Utilities/Timer.h
similarity index 100%
rename from src/server/shared/Utilities/Timer.h
rename to modules/acore/framework/Utilities/Timer.h
diff --git a/src/server/shared/Utilities/Util.cpp b/modules/acore/framework/Utilities/Util.cpp
similarity index 100%
rename from src/server/shared/Utilities/Util.cpp
rename to modules/acore/framework/Utilities/Util.cpp
diff --git a/src/server/shared/Utilities/Util.h b/modules/acore/framework/Utilities/Util.h
similarity index 100%
rename from src/server/shared/Utilities/Util.h
rename to modules/acore/framework/Utilities/Util.h
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/alterac_valley.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/alterac_valley.cpp
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_balinda.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_balinda.cpp
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_drekthar.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_drekthar.cpp
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_galvangar.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_galvangar.cpp
diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_vanndar.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/AlteracValley/boss_vanndar.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h
diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/modules/acore/scripts-wotlk/EasternKingdoms/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/EasternKingdoms/CMakeLists.txt
rename to modules/acore/scripts-wotlk/EasternKingdoms/CMakeLists.txt
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/boss_mr_smite.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/boss_mr_smite.cpp
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/deadmines.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/deadmines.h
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/instance_deadmines.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Deadmines/instance_deadmines.cpp
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_curator.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_curator.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_midnight.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_midnight.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_moroes.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_moroes.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_netherspite.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_netherspite.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_nightbane.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_nightbane.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/bosses_opera.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/bosses_opera.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/instance_karazhan.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/instance_karazhan.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.cpp
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.h b/modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Karazhan/karazhan.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/Karazhan/karazhan.h
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/magisters_terrace.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/MagistersTerrace/magisters_terrace.h
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter1.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter1.cpp
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter2.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter2.cpp
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter5.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/chapter5.cpp
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/instance_scholomance.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/instance_scholomance.cpp
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/scholomance.h b/modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/scholomance.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Scholomance/scholomance.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/Scholomance/scholomance.h
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/instance_stratholme.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/instance_stratholme.cpp
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.h b/modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/stratholme.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Stratholme/stratholme.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/Stratholme/stratholme.h
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h b/modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/sunken_temple.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunkenTemple/sunken_temple.h
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_muru.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/boss_muru.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/SunwellPlateau/sunwell_plateau.h
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/TheStockade/instance_the_stockade.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/TheStockade/instance_the_stockade.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/TheStockade/instance_the_stockade.cpp
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/instance_uldaman.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/instance_uldaman.cpp
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.h b/modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/uldaman.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/Uldaman/uldaman.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/Uldaman/uldaman.h
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_akilzon.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_akilzon.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_halazzi.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_halazzi.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_hexlord.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_hexlord.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_janalai.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_janalai.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_nalorakk.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_nalorakk.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_zuljin.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/boss_zuljin.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/instance_zulaman.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/instance_zulaman.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulAman/zulaman.h
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_arlokk.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_arlokk.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_grilek.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_grilek.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hakkar.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hakkar.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jeklik.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jeklik.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jindo.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_jindo.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_mandokir.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_mandokir.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_marli.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_marli.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_renataki.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_renataki.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_thekal.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_thekal.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_venoxis.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_venoxis.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/zulgurub.h
similarity index 100%
rename from src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
rename to modules/acore/scripts-wotlk/EasternKingdoms/ZulGurub/zulgurub.h
diff --git a/src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_alterac_mountains.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_alterac_mountains.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_arathi_highlands.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_arathi_highlands.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_blasted_lands.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_blasted_lands.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_burning_steppes.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_burning_steppes.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_duskwood.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_duskwood.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_duskwood.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_eastern_plaguelands.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_eastern_plaguelands.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_eversong_woods.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_eversong_woods.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_ghostlands.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_ghostlands.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_hinterlands.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_hinterlands.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_ironforge.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_ironforge.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_ironforge.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_isle_of_queldanas.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_isle_of_queldanas.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_loch_modan.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_loch_modan.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_redridge_mountains.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_redridge_mountains.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_silverpine_forest.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_silverpine_forest.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_stormwind_city.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_stormwind_city.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_stranglethorn_vale.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_stranglethorn_vale.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_swamp_of_sorrows.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_swamp_of_sorrows.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_tirisfal_glades.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_tirisfal_glades.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_undercity.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_undercity.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_undercity.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_western_plaguelands.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_western_plaguelands.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_westfall.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_westfall.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_westfall.cpp
diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/modules/acore/scripts-wotlk/EasternKingdoms/zone_wetlands.cpp
similarity index 100%
rename from src/server/scripts/EasternKingdoms/zone_wetlands.cpp
rename to modules/acore/scripts-wotlk/EasternKingdoms/zone_wetlands.cpp
diff --git a/src/server/scripts/Events/CMakeLists.txt b/modules/acore/scripts-wotlk/Events/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/Events/CMakeLists.txt
rename to modules/acore/scripts-wotlk/Events/CMakeLists.txt
diff --git a/src/server/scripts/Events/brewfest.cpp b/modules/acore/scripts-wotlk/Events/brewfest.cpp
similarity index 100%
rename from src/server/scripts/Events/brewfest.cpp
rename to modules/acore/scripts-wotlk/Events/brewfest.cpp
diff --git a/src/server/scripts/Events/childrens_week.cpp b/modules/acore/scripts-wotlk/Events/childrens_week.cpp
similarity index 100%
rename from src/server/scripts/Events/childrens_week.cpp
rename to modules/acore/scripts-wotlk/Events/childrens_week.cpp
diff --git a/src/server/scripts/Events/hallows_end.cpp b/modules/acore/scripts-wotlk/Events/hallows_end.cpp
similarity index 100%
rename from src/server/scripts/Events/hallows_end.cpp
rename to modules/acore/scripts-wotlk/Events/hallows_end.cpp
diff --git a/src/server/scripts/Events/love_in_air.cpp b/modules/acore/scripts-wotlk/Events/love_in_air.cpp
similarity index 100%
rename from src/server/scripts/Events/love_in_air.cpp
rename to modules/acore/scripts-wotlk/Events/love_in_air.cpp
diff --git a/src/server/scripts/Events/midsummer.cpp b/modules/acore/scripts-wotlk/Events/midsummer.cpp
similarity index 100%
rename from src/server/scripts/Events/midsummer.cpp
rename to modules/acore/scripts-wotlk/Events/midsummer.cpp
diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/modules/acore/scripts-wotlk/Events/pilgrims_bounty.cpp
similarity index 100%
rename from src/server/scripts/Events/pilgrims_bounty.cpp
rename to modules/acore/scripts-wotlk/Events/pilgrims_bounty.cpp
diff --git a/src/server/scripts/Events/winter_veil.cpp b/modules/acore/scripts-wotlk/Events/winter_veil.cpp
similarity index 100%
rename from src/server/scripts/Events/winter_veil.cpp
rename to modules/acore/scripts-wotlk/Events/winter_veil.cpp
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
similarity index 100%
rename from src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
rename to modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
diff --git a/src/server/scripts/Kalimdor/CMakeLists.txt b/modules/acore/scripts-wotlk/Kalimdor/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/Kalimdor/CMakeLists.txt
rename to modules/acore/scripts-wotlk/Kalimdor/CMakeLists.txt
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
similarity index 100%
rename from src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
rename to modules/acore/scripts-wotlk/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h
diff --git a/src/server/scripts/Kalimdor/DireMaul/dire_maul.h b/modules/acore/scripts-wotlk/Kalimdor/DireMaul/dire_maul.h
similarity index 100%
rename from src/server/scripts/Kalimdor/DireMaul/dire_maul.h
rename to modules/acore/scripts-wotlk/Kalimdor/DireMaul/dire_maul.h
diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/modules/acore/scripts-wotlk/Kalimdor/DireMaul/instance_dire_maul.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/DireMaul/instance_dire_maul.cpp
diff --git a/src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp b/modules/acore/scripts-wotlk/Kalimdor/Maraudon/instance_maraudon.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/Maraudon/instance_maraudon.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/Maraudon/instance_maraudon.cpp
diff --git a/src/server/scripts/Kalimdor/Maraudon/maraudon.h b/modules/acore/scripts-wotlk/Kalimdor/Maraudon/maraudon.h
similarity index 100%
rename from src/server/scripts/Kalimdor/Maraudon/maraudon.h
rename to modules/acore/scripts-wotlk/Kalimdor/Maraudon/maraudon.h
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/boss_onyxia.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/boss_onyxia.cpp
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/onyxias_lair.h
similarity index 100%
rename from src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h
rename to modules/acore/scripts-wotlk/Kalimdor/OnyxiasLair/onyxias_lair.h
diff --git a/src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp b/modules/acore/scripts-wotlk/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RagefireChasm/instance_ragefire_chasm.cpp
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.cpp
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.h
similarity index 100%
rename from src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h
rename to modules/acore/scripts-wotlk/Kalimdor/RazorfenDowns/razorfen_downs.h
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/modules/acore/scripts-wotlk/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
similarity index 100%
rename from src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
rename to modules/acore/scripts-wotlk/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
similarity index 100%
rename from src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
rename to modules/acore/scripts-wotlk/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/wailing_caverns.h
similarity index 100%
rename from src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h
rename to modules/acore/scripts-wotlk/Kalimdor/WailingCaverns/wailing_caverns.h
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/zulfarrak.h
similarity index 100%
rename from src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h
rename to modules/acore/scripts-wotlk/Kalimdor/ZulFarrak/zulfarrak.h
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/modules/acore/scripts-wotlk/Kalimdor/boss_azuregos.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/boss_azuregos.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/boss_azuregos.cpp
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_ashenvale.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_ashenvale.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_ashenvale.cpp
diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_azshara.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_azshara.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_azshara.cpp
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_azuremyst_isle.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_azuremyst_isle.cpp
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_bloodmyst_isle.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_bloodmyst_isle.cpp
diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_darkshore.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_darkshore.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_darkshore.cpp
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_desolace.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_desolace.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_desolace.cpp
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_durotar.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_durotar.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_durotar.cpp
diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_dustwallow_marsh.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_dustwallow_marsh.cpp
diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_felwood.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_felwood.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_felwood.cpp
diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_feralas.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_feralas.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_feralas.cpp
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_moonglade.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_moonglade.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_moonglade.cpp
diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_mulgore.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_mulgore.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_mulgore.cpp
diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_orgrimmar.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_orgrimmar.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_orgrimmar.cpp
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_silithus.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_silithus.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_silithus.cpp
diff --git a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_stonetalon_mountains.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_stonetalon_mountains.cpp
diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_tanaris.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_tanaris.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_tanaris.cpp
diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_teldrassil.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_teldrassil.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_teldrassil.cpp
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_the_barrens.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_the_barrens.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_the_barrens.cpp
diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_thousand_needles.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_thousand_needles.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_thousand_needles.cpp
diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_thunder_bluff.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_thunder_bluff.cpp
diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_ungoro_crater.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_ungoro_crater.cpp
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/modules/acore/scripts-wotlk/Kalimdor/zone_winterspring.cpp
similarity index 100%
rename from src/server/scripts/Kalimdor/zone_winterspring.cpp
rename to modules/acore/scripts-wotlk/Kalimdor/zone_winterspring.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/ahnkahet.h
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/def_ahnkahet.h
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
similarity index 100%
rename from src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
rename to modules/acore/scripts-wotlk/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp
diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/modules/acore/scripts-wotlk/Northrend/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/Northrend/CMakeLists.txt
rename to modules/acore/scripts-wotlk/Northrend/CMakeLists.txt
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
similarity index 100%
rename from src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
rename to modules/acore/scripts-wotlk/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
similarity index 100%
rename from src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
rename to modules/acore/scripts-wotlk/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_dred.cpp
similarity index 100%
rename from src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp
rename to modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_dred.cpp
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_novos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
rename to modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_novos.cpp
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_tharon_ja.cpp
similarity index 100%
rename from src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
rename to modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_tharon_ja.cpp
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_trollgore.cpp
similarity index 100%
rename from src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
rename to modules/acore/scripts-wotlk/Northrend/DraktharonKeep/boss_trollgore.cpp
diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/drak_tharon_keep.h
similarity index 100%
rename from src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h
rename to modules/acore/scripts-wotlk/Northrend/DraktharonKeep/drak_tharon_keep.h
diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/modules/acore/scripts-wotlk/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
similarity index 100%
rename from src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
rename to modules/acore/scripts-wotlk/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
similarity index 100%
rename from src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
rename to modules/acore/scripts-wotlk/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h
diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_drakkari_colossus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
rename to modules/acore/scripts-wotlk/Northrend/Gundrak/boss_drakkari_colossus.cpp
diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_eck.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Gundrak/boss_eck.cpp
rename to modules/acore/scripts-wotlk/Northrend/Gundrak/boss_eck.cpp
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_gal_darah.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
rename to modules/acore/scripts-wotlk/Northrend/Gundrak/boss_gal_darah.cpp
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_moorabi.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
rename to modules/acore/scripts-wotlk/Northrend/Gundrak/boss_moorabi.cpp
diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/modules/acore/scripts-wotlk/Northrend/Gundrak/boss_slad_ran.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp
rename to modules/acore/scripts-wotlk/Northrend/Gundrak/boss_slad_ran.cpp
diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/modules/acore/scripts-wotlk/Northrend/Gundrak/gundrak.h
similarity index 100%
rename from src/server/scripts/Northrend/Gundrak/gundrak.h
rename to modules/acore/scripts-wotlk/Northrend/Gundrak/gundrak.h
diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/modules/acore/scripts-wotlk/Northrend/Gundrak/instance_gundrak.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
rename to modules/acore/scripts-wotlk/Northrend/Gundrak/instance_gundrak.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_festergut.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_festergut.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_rotface.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_rotface.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_sindragosa.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_sindragosa.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.h
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel.h
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
similarity index 100%
rename from src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
rename to modules/acore/scripts-wotlk/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_anubrekhan.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_anubrekhan.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_faerlina.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_faerlina.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_four_horsemen.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_four_horsemen.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gluth.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gluth.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gothik.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_gothik.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_grobbulus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_grobbulus.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_heigan.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_heigan.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_kelthuzad.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_kelthuzad.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_loatheb.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_loatheb.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_maexxna.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_maexxna.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_noth.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_noth.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_patchwerk.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_patchwerk.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_razuvious.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_razuvious.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_sapphiron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_sapphiron.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_thaddius.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/boss_thaddius.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/modules/acore/scripts-wotlk/Northrend/Naxxramas/instance_naxxramas.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/instance_naxxramas.cpp
diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/modules/acore/scripts-wotlk/Northrend/Naxxramas/naxxramas.h
similarity index 100%
rename from src/server/scripts/Northrend/Naxxramas/naxxramas.h
rename to modules/acore/scripts-wotlk/Northrend/Naxxramas/naxxramas.h
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
rename to modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_anomalus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_anomalus.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_keristrasza.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_keristrasza.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_ormorok.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/boss_ormorok.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/instance_nexus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/instance_nexus.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/nexus.h
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Nexus/nexus.h
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Nexus/nexus.h
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_drakos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_drakos.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_eregos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_eregos.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_urom.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_urom.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_varos.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/boss_varos.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/instance_oculus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/instance_oculus.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.h
similarity index 100%
rename from src/server/scripts/Northrend/Nexus/Oculus/oculus.h
rename to modules/acore/scripts-wotlk/Northrend/Nexus/Oculus/oculus.h
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/halls_of_stone.h
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_freya.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_freya.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_hodir.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_hodir.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_ignis.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_ignis.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_thorim.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_thorim.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_xt002.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_xt002.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.cpp
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.cpp
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.h
similarity index 100%
rename from src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
rename to modules/acore/scripts-wotlk/Northrend/Ulduar/Ulduar/ulduar.h
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
similarity index 100%
rename from src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
rename to modules/acore/scripts-wotlk/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_archavon.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
rename to modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_archavon.cpp
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_emalon.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
rename to modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_emalon.cpp
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_koralon.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
rename to modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_koralon.cpp
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_toravon.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
rename to modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/boss_toravon.cpp
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
rename to modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/vault_of_archavon.h
similarity index 100%
rename from src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h
rename to modules/acore/scripts-wotlk/Northrend/VaultOfArchavon/vault_of_archavon.h
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_cyanigosa.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/boss_cyanigosa.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_erekem.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/boss_erekem.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/boss_erekem.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_ichoron.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/boss_ichoron.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_lavanthor.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/boss_lavanthor.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_moragg.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/boss_moragg.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_xevozz.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/boss_xevozz.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/boss_zuramat.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/boss_zuramat.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/instance_violet_hold.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/instance_violet_hold.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.cpp
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/violet_hold.cpp
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.cpp
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.h
similarity index 100%
rename from src/server/scripts/Northrend/VioletHold/violet_hold.h
rename to modules/acore/scripts-wotlk/Northrend/VioletHold/violet_hold.h
diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/modules/acore/scripts-wotlk/Northrend/isle_of_conquest.cpp
similarity index 100%
rename from src/server/scripts/Northrend/isle_of_conquest.cpp
rename to modules/acore/scripts-wotlk/Northrend/isle_of_conquest.cpp
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/modules/acore/scripts-wotlk/Northrend/zone_borean_tundra.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_borean_tundra.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_borean_tundra.cpp
diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/modules/acore/scripts-wotlk/Northrend/zone_crystalsong_forest.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_crystalsong_forest.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_crystalsong_forest.cpp
diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/modules/acore/scripts-wotlk/Northrend/zone_dalaran.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_dalaran.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_dalaran.cpp
diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/modules/acore/scripts-wotlk/Northrend/zone_dragonblight.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_dragonblight.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_dragonblight.cpp
diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/modules/acore/scripts-wotlk/Northrend/zone_grizzly_hills.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_grizzly_hills.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_grizzly_hills.cpp
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/modules/acore/scripts-wotlk/Northrend/zone_howling_fjord.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_howling_fjord.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_howling_fjord.cpp
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/modules/acore/scripts-wotlk/Northrend/zone_icecrown.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_icecrown.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_icecrown.cpp
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/modules/acore/scripts-wotlk/Northrend/zone_sholazar_basin.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_sholazar_basin.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_sholazar_basin.cpp
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/modules/acore/scripts-wotlk/Northrend/zone_storm_peaks.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_storm_peaks.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_storm_peaks.cpp
diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/modules/acore/scripts-wotlk/Northrend/zone_wintergrasp.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_wintergrasp.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_wintergrasp.cpp
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/modules/acore/scripts-wotlk/Northrend/zone_zuldrak.cpp
similarity index 100%
rename from src/server/scripts/Northrend/zone_zuldrak.cpp
rename to modules/acore/scripts-wotlk/Northrend/zone_zuldrak.cpp
diff --git a/src/server/scripts/OutdoorPvP/CMakeLists.txt b/modules/acore/scripts-wotlk/OutdoorPvP/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/OutdoorPvP/CMakeLists.txt
rename to modules/acore/scripts-wotlk/OutdoorPvP/CMakeLists.txt
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.cpp
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.cpp
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.h
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPEP.h
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.cpp
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.cpp
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.h b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.h
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPGH.h
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPGH.h
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.cpp
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.cpp
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.h
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPHP.h
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.cpp
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.cpp
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.h
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPNA.h
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.cpp
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.cpp
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.h
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPSI.h
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.cpp
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.cpp
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.h
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPTF.h
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.cpp
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.cpp
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.h
similarity index 100%
rename from src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
rename to modules/acore/scripts-wotlk/OutdoorPvP/OutdoorPvPZM.h
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/SethekkHalls/sethekk_halls.h
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
similarity index 100%
rename from src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
rename to modules/acore/scripts-wotlk/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/modules/acore/scripts-wotlk/Outland/BlackTemple/black_temple.h
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/black_temple.h
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/black_temple.h
diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_bloodboil.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_bloodboil.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_illidan.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_illidan.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_mother_shahraz.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_mother_shahraz.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_reliquary_of_souls.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_reliquary_of_souls.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_shade_of_akama.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_shade_of_akama.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_supremus.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_supremus.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_teron_gorefiend.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_teron_gorefiend.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/boss_warlord_najentus.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/boss_warlord_najentus.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/illidari_council.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/illidari_council.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/illidari_council.cpp
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/modules/acore/scripts-wotlk/Outland/BlackTemple/instance_black_temple.cpp
similarity index 100%
rename from src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
rename to modules/acore/scripts-wotlk/Outland/BlackTemple/instance_black_temple.cpp
diff --git a/src/server/scripts/Outland/CMakeLists.txt b/modules/acore/scripts-wotlk/Outland/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/Outland/CMakeLists.txt
rename to modules/acore/scripts-wotlk/Outland/CMakeLists.txt
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/steam_vault.h
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/SteamVault/steam_vault.h
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/modules/acore/scripts-wotlk/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
similarity index 100%
rename from src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
rename to modules/acore/scripts-wotlk/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/modules/acore/scripts-wotlk/Outland/GruulsLair/boss_gruul.cpp
similarity index 100%
rename from src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
rename to modules/acore/scripts-wotlk/Outland/GruulsLair/boss_gruul.cpp
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/modules/acore/scripts-wotlk/Outland/GruulsLair/boss_high_king_maulgar.cpp
similarity index 100%
rename from src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
rename to modules/acore/scripts-wotlk/Outland/GruulsLair/boss_high_king_maulgar.cpp
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/modules/acore/scripts-wotlk/Outland/GruulsLair/gruuls_lair.h
similarity index 100%
rename from src/server/scripts/Outland/GruulsLair/gruuls_lair.h
rename to modules/acore/scripts-wotlk/Outland/GruulsLair/gruuls_lair.h
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/modules/acore/scripts-wotlk/Outland/GruulsLair/instance_gruuls_lair.cpp
similarity index 100%
rename from src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
rename to modules/acore/scripts-wotlk/Outland/GruulsLair/instance_gruuls_lair.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
similarity index 100%
rename from src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
rename to modules/acore/scripts-wotlk/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_alar.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_alar.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_astromancer.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_astromancer.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_kaelthas.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_kaelthas.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_void_reaver.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/boss_void_reaver.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/instance_the_eye.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/instance_the_eye.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/the_eye.h
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Eye/the_eye.h
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/instance_mechanar.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/mechanar.h
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/Mechanar/mechanar.h
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.h
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/arcatraz.h
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_laj.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_laj.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/instance_the_botanica.cpp
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/instance_the_botanica.cpp
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/the_botanica.h
similarity index 100%
rename from src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
rename to modules/acore/scripts-wotlk/Outland/TempestKeep/botanica/the_botanica.h
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/modules/acore/scripts-wotlk/Outland/boss_doomlord_kazzak.cpp
similarity index 100%
rename from src/server/scripts/Outland/boss_doomlord_kazzak.cpp
rename to modules/acore/scripts-wotlk/Outland/boss_doomlord_kazzak.cpp
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/modules/acore/scripts-wotlk/Outland/boss_doomwalker.cpp
similarity index 100%
rename from src/server/scripts/Outland/boss_doomwalker.cpp
rename to modules/acore/scripts-wotlk/Outland/boss_doomwalker.cpp
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/modules/acore/scripts-wotlk/Outland/zone_blades_edge_mountains.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_blades_edge_mountains.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_blades_edge_mountains.cpp
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/modules/acore/scripts-wotlk/Outland/zone_hellfire_peninsula.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_hellfire_peninsula.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_hellfire_peninsula.cpp
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/modules/acore/scripts-wotlk/Outland/zone_nagrand.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_nagrand.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_nagrand.cpp
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/modules/acore/scripts-wotlk/Outland/zone_netherstorm.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_netherstorm.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_netherstorm.cpp
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/modules/acore/scripts-wotlk/Outland/zone_shadowmoon_valley.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_shadowmoon_valley.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_shadowmoon_valley.cpp
diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/modules/acore/scripts-wotlk/Outland/zone_shattrath_city.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_shattrath_city.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_shattrath_city.cpp
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/modules/acore/scripts-wotlk/Outland/zone_terokkar_forest.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_terokkar_forest.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_terokkar_forest.cpp
diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/modules/acore/scripts-wotlk/Outland/zone_zangarmarsh.cpp
similarity index 100%
rename from src/server/scripts/Outland/zone_zangarmarsh.cpp
rename to modules/acore/scripts-wotlk/Outland/zone_zangarmarsh.cpp
diff --git a/src/server/scripts/Pet/CMakeLists.txt b/modules/acore/scripts-wotlk/Pet/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/Pet/CMakeLists.txt
rename to modules/acore/scripts-wotlk/Pet/CMakeLists.txt
diff --git a/src/server/scripts/Pet/pet_dk.cpp b/modules/acore/scripts-wotlk/Pet/pet_dk.cpp
similarity index 100%
rename from src/server/scripts/Pet/pet_dk.cpp
rename to modules/acore/scripts-wotlk/Pet/pet_dk.cpp
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/modules/acore/scripts-wotlk/Pet/pet_generic.cpp
similarity index 100%
rename from src/server/scripts/Pet/pet_generic.cpp
rename to modules/acore/scripts-wotlk/Pet/pet_generic.cpp
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/modules/acore/scripts-wotlk/Pet/pet_hunter.cpp
similarity index 100%
rename from src/server/scripts/Pet/pet_hunter.cpp
rename to modules/acore/scripts-wotlk/Pet/pet_hunter.cpp
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/modules/acore/scripts-wotlk/Pet/pet_mage.cpp
similarity index 100%
rename from src/server/scripts/Pet/pet_mage.cpp
rename to modules/acore/scripts-wotlk/Pet/pet_mage.cpp
diff --git a/src/server/scripts/Pet/pet_priest.cpp b/modules/acore/scripts-wotlk/Pet/pet_priest.cpp
similarity index 100%
rename from src/server/scripts/Pet/pet_priest.cpp
rename to modules/acore/scripts-wotlk/Pet/pet_priest.cpp
diff --git a/src/server/scripts/Pet/pet_shaman.cpp b/modules/acore/scripts-wotlk/Pet/pet_shaman.cpp
similarity index 100%
rename from src/server/scripts/Pet/pet_shaman.cpp
rename to modules/acore/scripts-wotlk/Pet/pet_shaman.cpp
diff --git a/modules/acore/scripts-wotlk/ScriptLoader.cpp b/modules/acore/scripts-wotlk/ScriptLoader.cpp
new file mode 100644
index 000000000..89ac21bb3
--- /dev/null
+++ b/modules/acore/scripts-wotlk/ScriptLoader.cpp
@@ -0,0 +1,1182 @@
+/*
+ * Copyright (C)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ScriptLoader.h"
+#include "ScriptMgr.h"
+
+//examples
+void AddSC_example_creature();
+void AddSC_example_escort();
+void AddSC_example_gossip_codebox();
+void AddSC_example_misc();
+void AddSC_example_commandscript();
+
+// spells
+void AddSC_deathknight_spell_scripts();
+void AddSC_druid_spell_scripts();
+void AddSC_generic_spell_scripts();
+void AddSC_hunter_spell_scripts();
+void AddSC_mage_spell_scripts();
+void AddSC_paladin_spell_scripts();
+void AddSC_priest_spell_scripts();
+void AddSC_rogue_spell_scripts();
+void AddSC_shaman_spell_scripts();
+void AddSC_warlock_spell_scripts();
+void AddSC_warrior_spell_scripts();
+void AddSC_quest_spell_scripts();
+void AddSC_item_spell_scripts();
+
+void AddSC_SmartScripts();
+
+//Commands
+void AddSC_account_commandscript();
+void AddSC_achievement_commandscript();
+void AddSC_ban_commandscript();
+void AddSC_bf_commandscript();
+void AddSC_cast_commandscript();
+void AddSC_character_commandscript();
+void AddSC_debug_commandscript();
+void AddSC_event_commandscript();
+void AddSC_gm_commandscript();
+void AddSC_go_commandscript();
+void AddSC_gobject_commandscript();
+void AddSC_guild_commandscript();
+void AddSC_honor_commandscript();
+void AddSC_instance_commandscript();
+void AddSC_learn_commandscript();
+void AddSC_lfg_commandscript();
+void AddSC_list_commandscript();
+void AddSC_lookup_commandscript();
+void AddSC_message_commandscript();
+void AddSC_misc_commandscript();
+void AddSC_modify_commandscript();
+void AddSC_npc_commandscript();
+void AddSC_quest_commandscript();
+void AddSC_reload_commandscript();
+void AddSC_reset_commandscript();
+void AddSC_server_commandscript();
+void AddSC_spectator_commandscript();
+void AddSC_tele_commandscript();
+void AddSC_ticket_commandscript();
+void AddSC_titles_commandscript();
+void AddSC_wp_commandscript();
+
+#ifdef SCRIPTS
+//world
+void AddSC_areatrigger_scripts();
+void AddSC_emerald_dragons();
+void AddSC_generic_creature();
+void AddSC_go_scripts();
+void AddSC_guards();
+void AddSC_item_scripts();
+void AddSC_npc_professions();
+void AddSC_npc_innkeeper();
+void AddSC_npcs_special();
+void AddSC_npc_taxi();
+void AddSC_achievement_scripts();
+
+//events
+void AddSC_event_brewfest_scripts();
+void AddSC_event_hallows_end_scripts();
+void AddSC_event_pilgrims_end_scripts();
+void AddSC_event_winter_veil_scripts();
+void AddSC_event_love_in_the_air();
+void AddSC_event_midsummer_scripts();
+void AddSC_event_childrens_week();
+
+//eastern kingdoms
+void AddSC_alterac_valley();                 //Alterac Valley
+void AddSC_boss_balinda();
+void AddSC_boss_drekthar();
+void AddSC_boss_galvangar();
+void AddSC_boss_vanndar();
+void AddSC_blackrock_depths();               //Blackrock Depths
+void AddSC_boss_ambassador_flamelash();
+void AddSC_boss_anubshiah();
+void AddSC_boss_draganthaurissan();
+void AddSC_boss_general_angerforge();
+void AddSC_boss_gorosh_the_dervish();
+void AddSC_boss_grizzle();
+void AddSC_boss_high_interrogator_gerstahn();
+void AddSC_boss_magmus();
+void AddSC_boss_moira_bronzebeard();
+void AddSC_boss_tomb_of_seven();
+void AddSC_instance_blackrock_depths();
+void AddSC_boss_drakkisath();                //Blackrock Spire
+void AddSC_boss_halycon();
+void AddSC_boss_highlordomokk();
+void AddSC_boss_mothersmolderweb();
+void AddSC_boss_overlordwyrmthalak();
+void AddSC_boss_shadowvosh();
+void AddSC_boss_thebeast();
+void AddSC_boss_warmastervoone();
+void AddSC_boss_quatermasterzigris();
+void AddSC_boss_pyroguard_emberseer();
+void AddSC_boss_gyth();
+void AddSC_boss_rend_blackhand();
+void AddSC_boss_urok_doomhowl();
+void AddSC_boss_gizrul_the_slavener();
+void AddSC_instance_blackrock_spire();
+void AddSC_boss_razorgore();                 //Blackwing lair
+void AddSC_boss_vaelastrasz();
+void AddSC_boss_broodlord();
+void AddSC_boss_firemaw();
+void AddSC_boss_ebonroc();
+void AddSC_boss_flamegor();
+void AddSC_boss_chromaggus();
+void AddSC_boss_nefarian();
+void AddSC_instance_blackwing_lair();
+void AddSC_boss_mr_smite();
+void AddSC_instance_deadmines();             //Deadmines
+void AddSC_instance_gnomeregan();            //Gnomeregan
+void AddSC_instance_karazhan();              //Karazhan
+void AddSC_boss_servant_quarters();
+void AddSC_boss_attumen();
+void AddSC_boss_curator();
+void AddSC_boss_maiden_of_virtue();
+void AddSC_boss_shade_of_aran();
+void AddSC_boss_malchezaar();
+void AddSC_boss_terestian_illhoof();
+void AddSC_boss_moroes();
+void AddSC_bosses_opera();
+void AddSC_boss_netherspite();
+void AddSC_karazhan();
+void AddSC_boss_nightbane();
+void AddSC_boss_felblood_kaelthas();         // Magister's Terrace
+void AddSC_boss_selin_fireheart();
+void AddSC_boss_vexallus();
+void AddSC_boss_priestess_delrissa();
+void AddSC_instance_magisters_terrace();
+void AddSC_boss_lucifron();                  //Molten core
+void AddSC_boss_magmadar();
+void AddSC_boss_gehennas();
+void AddSC_boss_garr();
+void AddSC_boss_baron_geddon();
+void AddSC_boss_shazzrah();
+void AddSC_boss_golemagg();
+void AddSC_boss_sulfuron();
+void AddSC_boss_majordomo();
+void AddSC_boss_ragnaros();
+void AddSC_instance_molten_core();
+void AddSC_the_scarlet_enclave();            //Scarlet Enclave
+void AddSC_the_scarlet_enclave_c1();
+void AddSC_the_scarlet_enclave_c2();
+void AddSC_the_scarlet_enclave_c5();
+void AddSC_instance_scarlet_monastery();     //Scarlet Monastery
+void AddSC_boss_kirtonos_the_herald();
+void AddSC_instance_scholomance();           //Scholomance
+void AddSC_instance_shadowfang_keep();       //Shadowfang keep
+void AddSC_instance_stratholme();            //Stratholme
+void AddSC_instance_sunken_temple();         //Sunken Temple
+void AddSC_instance_sunwell_plateau();       //Sunwell Plateau
+void AddSC_boss_kalecgos();
+void AddSC_boss_brutallus();
+void AddSC_boss_felmyst();
+void AddSC_boss_eredar_twins();
+void AddSC_boss_muru();
+void AddSC_boss_kiljaeden();
+void AddSC_instance_the_stockade();          //The Stockade
+void AddSC_instance_uldaman();               //Uldaman
+void AddSC_boss_akilzon();                   //Zul'Aman
+void AddSC_boss_halazzi();
+void AddSC_boss_hex_lord_malacrass();
+void AddSC_boss_janalai();
+void AddSC_boss_nalorakk();
+void AddSC_boss_zuljin();
+void AddSC_instance_zulaman();
+void AddSC_zulaman();
+void AddSC_boss_jeklik();                    //Zul'Gurub
+void AddSC_boss_venoxis();
+void AddSC_boss_marli();
+void AddSC_boss_mandokir();
+void AddSC_boss_gahzranka();
+void AddSC_boss_thekal();
+void AddSC_boss_arlokk();
+void AddSC_boss_jindo();
+void AddSC_boss_hakkar();
+void AddSC_boss_grilek();
+void AddSC_boss_hazzarah();
+void AddSC_boss_renataki();
+void AddSC_boss_wushoolay();
+void AddSC_instance_zulgurub();
+
+//void AddSC_alterac_mountains();
+void AddSC_arathi_highlands();
+void AddSC_blasted_lands();
+void AddSC_burning_steppes();
+void AddSC_duskwood();
+void AddSC_eastern_plaguelands();
+void AddSC_eversong_woods();
+void AddSC_ghostlands();
+void AddSC_hinterlands();
+void AddSC_ironforge();
+void AddSC_isle_of_queldanas();
+void AddSC_loch_modan();
+void AddSC_redridge_mountains();
+void AddSC_silverpine_forest();
+void AddSC_stormwind_city();
+void AddSC_stranglethorn_vale();
+void AddSC_swamp_of_sorrows();
+void AddSC_tirisfal_glades();
+void AddSC_undercity();
+void AddSC_western_plaguelands();
+void AddSC_westfall();
+void AddSC_wetlands();
+
+//kalimdor
+void AddSC_instance_blackfathom_deeps();     //Blackfathom Depths
+void AddSC_hyjal();                          //CoT Battle for Mt. Hyjal
+void AddSC_boss_archimonde();
+void AddSC_instance_mount_hyjal();
+void AddSC_hyjal_trash();
+void AddSC_boss_rage_winterchill();
+void AddSC_boss_anetheron();
+void AddSC_boss_kazrogal();
+void AddSC_boss_azgalor();
+void AddSC_boss_captain_skarloc();           //CoT Old Hillsbrad
+void AddSC_boss_epoch_hunter();
+void AddSC_boss_lieutenant_drake();
+void AddSC_instance_old_hillsbrad();
+void AddSC_old_hillsbrad();
+void AddSC_boss_aeonus();                    //CoT The Dark Portal
+void AddSC_boss_chrono_lord_deja();
+void AddSC_boss_temporus();
+void AddSC_the_black_morass();
+void AddSC_instance_the_black_morass();
+void AddSC_boss_epoch();                     //CoT Culling Of Stratholme
+void AddSC_boss_infinite_corruptor();
+void AddSC_boss_salramm();
+void AddSC_boss_mal_ganis();
+void AddSC_boss_meathook();
+void AddSC_culling_of_stratholme();
+void AddSC_instance_culling_of_stratholme();
+void AddSC_instance_dire_maul();             //Dire Maul
+void AddSC_instance_maraudon();              //Maraudon
+void AddSC_boss_onyxia();                    //Onyxia's Lair
+void AddSC_instance_onyxias_lair();
+void AddSC_instance_ragefire_chasm();        //Ragefire Chasm
+void AddSC_razorfen_downs();                 //Razorfen Downs
+void AddSC_instance_razorfen_downs();
+void AddSC_instance_razorfen_kraul();        //Razorfen Kraul
+void AddSC_boss_kurinnaxx();                 //Ruins of ahn'qiraj
+void AddSC_boss_rajaxx();
+void AddSC_boss_moam();
+void AddSC_boss_buru();
+void AddSC_boss_ayamiss();
+void AddSC_boss_ossirian();
+void AddSC_instance_ruins_of_ahnqiraj();
+void AddSC_boss_cthun();                     //Temple of ahn'qiraj
+void AddSC_boss_viscidus();
+void AddSC_boss_fankriss();
+void AddSC_boss_huhuran();
+void AddSC_bug_trio();
+void AddSC_boss_sartura();
+void AddSC_boss_skeram();
+void AddSC_boss_twinemperors();
+void AddSC_boss_ouro();
+void AddSC_npc_anubisath_sentinel();
+void AddSC_instance_temple_of_ahnqiraj();
+void AddSC_instance_wailing_caverns();       //Wailing caverns
+void AddSC_instance_zulfarrak();             //Zul'Farrak
+
+void AddSC_ashenvale();
+void AddSC_azshara();
+void AddSC_azuremyst_isle();
+void AddSC_bloodmyst_isle();
+void AddSC_boss_azuregos();
+void AddSC_darkshore();
+void AddSC_desolace();
+void AddSC_durotar();
+void AddSC_dustwallow_marsh();
+void AddSC_felwood();
+void AddSC_feralas();
+void AddSC_moonglade();
+void AddSC_mulgore();
+void AddSC_orgrimmar();
+void AddSC_silithus();
+void AddSC_stonetalon_mountains();
+void AddSC_tanaris();
+void AddSC_teldrassil();
+void AddSC_the_barrens();
+void AddSC_thousand_needles();
+void AddSC_thunder_bluff();
+void AddSC_ungoro_crater();
+void AddSC_winterspring();
+
+//northrend
+void AddSC_boss_slad_ran();
+void AddSC_boss_moorabi();
+void AddSC_boss_drakkari_colossus();
+void AddSC_boss_gal_darah();
+void AddSC_boss_eck();
+void AddSC_instance_gundrak();
+void AddSC_boss_krik_thir();             //Azjol-Nerub
+void AddSC_boss_hadronox();
+void AddSC_boss_anub_arak();
+void AddSC_instance_azjol_nerub();
+void AddSC_instance_ahnkahet();          //Azjol-Nerub Ahn'kahet
+void AddSC_boss_amanitar();
+void AddSC_boss_taldaram();
+void AddSC_boss_jedoga_shadowseeker();
+void AddSC_boss_elder_nadox();
+void AddSC_boss_volazj();
+void AddSC_boss_argent_challenge();      //Trial of the Champion
+void AddSC_boss_black_knight();
+void AddSC_boss_grand_champions();
+void AddSC_instance_trial_of_the_champion();
+void AddSC_trial_of_the_champion();
+void AddSC_boss_anubarak_trial();        //Trial of the Crusader
+void AddSC_boss_faction_champions();
+void AddSC_boss_jaraxxus();
+void AddSC_boss_northrend_beasts();
+void AddSC_boss_twin_valkyr();
+void AddSC_trial_of_the_crusader();
+void AddSC_instance_trial_of_the_crusader();
+void AddSC_boss_anubrekhan();            //Naxxramas
+void AddSC_boss_maexxna();
+void AddSC_boss_patchwerk();
+void AddSC_boss_grobbulus();
+void AddSC_boss_razuvious();
+void AddSC_boss_kelthuzad();
+void AddSC_boss_loatheb();
+void AddSC_boss_noth();
+void AddSC_boss_gluth();
+void AddSC_boss_sapphiron();
+void AddSC_boss_four_horsemen();
+void AddSC_boss_faerlina();
+void AddSC_boss_heigan();
+void AddSC_boss_gothik();
+void AddSC_boss_thaddius();
+void AddSC_instance_naxxramas();
+void AddSC_boss_magus_telestra();        //The Nexus Nexus
+void AddSC_boss_anomalus();
+void AddSC_boss_ormorok();
+void AddSC_boss_keristrasza();
+void AddSC_boss_commander_stoutbeard();
+void AddSC_instance_nexus();
+void AddSC_boss_drakos();                //The Nexus The Oculus
+void AddSC_boss_varos();
+void AddSC_boss_urom();
+void AddSC_boss_eregos();
+void AddSC_instance_oculus();
+void AddSC_oculus();
+void AddSC_boss_sartharion();            //Obsidian Sanctum
+void AddSC_instance_obsidian_sanctum();
+void AddSC_boss_malygos();               //Eye of Eternity
+void AddSC_instance_eye_of_eternity();
+void AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
+void AddSC_boss_loken();
+void AddSC_boss_ionar();
+void AddSC_boss_volkhan();
+void AddSC_instance_halls_of_lightning();
+void AddSC_boss_maiden_of_grief();       //Ulduar Halls of Stone
+void AddSC_boss_krystallus();
+void AddSC_boss_sjonnir();
+void AddSC_brann_bronzebeard();
+void AddSC_instance_halls_of_stone();
+void AddSC_boss_auriaya();               //Ulduar Ulduar
+void AddSC_boss_flame_leviathan();
+void AddSC_boss_ignis();
+void AddSC_boss_razorscale();
+void AddSC_boss_xt002();
+void AddSC_boss_kologarn();
+void AddSC_boss_assembly_of_iron();
+void AddSC_boss_freya();
+void AddSC_boss_mimiron();
+void AddSC_boss_hodir();
+void AddSC_boss_thorim();
+void AddSC_boss_vezax();
+void AddSC_boss_yoggsaron();
+void AddSC_ulduar();
+void AddSC_boss_algalon_the_observer();
+void AddSC_instance_ulduar();
+void AddSC_boss_keleseth();              //Utgarde Keep
+void AddSC_boss_skarvald_dalronn();
+void AddSC_boss_ingvar_the_plunderer();
+void AddSC_instance_utgarde_keep();
+void AddSC_boss_svala();                 //Utgarde pinnacle
+void AddSC_boss_palehoof();
+void AddSC_boss_skadi();
+void AddSC_boss_ymiron();
+void AddSC_instance_utgarde_pinnacle();
+void AddSC_utgarde_keep();
+void AddSC_boss_archavon();              //Vault of Archavon
+void AddSC_boss_emalon();
+void AddSC_boss_koralon();
+void AddSC_boss_toravon();
+void AddSC_instance_vault_of_archavon();
+void AddSC_boss_trollgore();             //Drak'Tharon Keep
+void AddSC_boss_novos();
+void AddSC_boss_dred();
+void AddSC_boss_tharon_ja();
+void AddSC_instance_drak_tharon_keep();
+void AddSC_boss_cyanigosa();             //Violet Hold
+void AddSC_boss_erekem();
+void AddSC_boss_ichoron();
+void AddSC_boss_lavanthor();
+void AddSC_boss_moragg();
+void AddSC_boss_xevozz();
+void AddSC_boss_zuramat();
+void AddSC_instance_violet_hold();
+void AddSC_violet_hold();
+void AddSC_instance_forge_of_souls();   //Forge of Souls
+void AddSC_forge_of_souls();
+void AddSC_boss_bronjahm();
+void AddSC_boss_devourer_of_souls();
+void AddSC_instance_pit_of_saron();     //Pit of Saron
+void AddSC_pit_of_saron();
+void AddSC_boss_garfrost();
+void AddSC_boss_ick();
+void AddSC_boss_tyrannus();
+void AddSC_instance_halls_of_reflection();   // Halls of Reflection
+void AddSC_halls_of_reflection();
+void AddSC_boss_falric();
+void AddSC_boss_marwyn();
+void AddSC_boss_lord_marrowgar();       // Icecrown Citadel
+void AddSC_boss_lady_deathwhisper();
+void AddSC_boss_icecrown_gunship_battle();
+void AddSC_boss_deathbringer_saurfang();
+void AddSC_boss_festergut();
+void AddSC_boss_rotface();
+void AddSC_boss_professor_putricide();
+void AddSC_boss_blood_prince_council();
+void AddSC_boss_blood_queen_lana_thel();
+void AddSC_boss_valithria_dreamwalker();
+void AddSC_boss_sindragosa();
+void AddSC_boss_the_lich_king();
+void AddSC_icecrown_citadel_teleport();
+void AddSC_instance_icecrown_citadel();
+void AddSC_icecrown_citadel();
+void AddSC_instance_ruby_sanctum();      // Ruby Sanctum
+void AddSC_boss_baltharus_the_warborn();
+void AddSC_boss_saviana_ragefire();
+void AddSC_boss_general_zarithrian();
+void AddSC_boss_halion();
+
+void AddSC_dalaran();
+void AddSC_borean_tundra();
+void AddSC_dragonblight();
+void AddSC_grizzly_hills();
+void AddSC_howling_fjord();
+void AddSC_icecrown();
+void AddSC_sholazar_basin();
+void AddSC_storm_peaks();
+void AddSC_zuldrak();
+void AddSC_crystalsong_forest();
+void AddSC_isle_of_conquest();
+void AddSC_wintergrasp();
+
+//outland
+void AddSC_boss_exarch_maladaar();           //Auchindoun Auchenai Crypts
+void AddSC_boss_shirrak_the_dead_watcher();
+void AddSC_boss_nexusprince_shaffar();       //Auchindoun Mana Tombs
+void AddSC_boss_talon_king_ikiss();          //Auchindoun Sekketh Halls
+void AddSC_instance_sethekk_halls();
+void AddSC_instance_shadow_labyrinth();      //Auchindoun Shadow Labyrinth
+void AddSC_boss_ambassador_hellmaw();
+void AddSC_boss_blackheart_the_inciter();
+void AddSC_boss_grandmaster_vorpil();
+void AddSC_boss_murmur();
+void AddSC_boss_illidan();                   //Black Temple
+void AddSC_boss_shade_of_akama();
+void AddSC_boss_supremus();
+void AddSC_boss_gurtogg_bloodboil();
+void AddSC_boss_mother_shahraz();
+void AddSC_boss_reliquary_of_souls();
+void AddSC_boss_teron_gorefiend();
+void AddSC_boss_najentus();
+void AddSC_boss_illidari_council();
+void AddSC_instance_black_temple();
+void AddSC_boss_fathomlord_karathress();     //CR Serpent Shrine Cavern
+void AddSC_boss_hydross_the_unstable();
+void AddSC_boss_lady_vashj();
+void AddSC_boss_leotheras_the_blind();
+void AddSC_boss_morogrim_tidewalker();
+void AddSC_instance_serpentshrine_cavern();
+void AddSC_boss_the_lurker_below();
+void AddSC_boss_hydromancer_thespia();       //CR Steam Vault
+void AddSC_boss_mekgineer_steamrigger();
+void AddSC_boss_warlord_kalithresh();
+void AddSC_instance_steam_vault();
+void AddSC_boss_the_black_stalker();         //CR Underbog
+void AddSC_boss_ahune();
+void AddSC_boss_gruul();                     //Gruul's Lair
+void AddSC_boss_high_king_maulgar();
+void AddSC_instance_gruuls_lair();
+void AddSC_boss_broggok();                   //HC Blood Furnace
+void AddSC_boss_kelidan_the_breaker();
+void AddSC_boss_the_maker();
+void AddSC_instance_blood_furnace();
+void AddSC_boss_magtheridon();               //HC Magtheridon's Lair
+void AddSC_instance_magtheridons_lair();
+void AddSC_boss_grand_warlock_nethekurse();  //HC Shattered Halls
+void AddSC_boss_warbringer_omrogg();
+void AddSC_boss_warchief_kargath_bladefist();
+void AddSC_instance_shattered_halls();
+void AddSC_boss_watchkeeper_gargolmar();     //HC Ramparts
+void AddSC_boss_omor_the_unscarred();
+void AddSC_boss_vazruden_the_herald();
+void AddSC_instance_ramparts();
+void AddSC_arcatraz();                       //TK Arcatraz
+void AddSC_boss_harbinger_skyriss();
+void AddSC_boss_wrath_scryer_soccothrates();
+void AddSC_boss_zereketh_the_unbound();
+void AddSC_boss_dalliah_the_doomsayer();
+void AddSC_instance_arcatraz();
+void AddSC_boss_high_botanist_freywinn();    //TK Botanica
+void AddSC_boss_laj();
+void AddSC_boss_warp_splinter();
+void AddSC_boss_thorngrin_the_tender();
+void AddSC_boss_commander_sarannis();
+void AddSC_instance_the_botanica();
+void AddSC_boss_alar();                      //TK The Eye
+void AddSC_boss_kaelthas();
+void AddSC_boss_void_reaver();
+void AddSC_boss_high_astromancer_solarian();
+void AddSC_instance_the_eye();
+void AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
+void AddSC_boss_gatewatcher_gyrokill();
+void AddSC_boss_nethermancer_sepethrea();
+void AddSC_boss_pathaleon_the_calculator();
+void AddSC_boss_mechano_lord_capacitus();
+void AddSC_instance_mechanar();
+
+void AddSC_blades_edge_mountains();
+void AddSC_boss_doomlordkazzak();
+void AddSC_boss_doomwalker();
+void AddSC_hellfire_peninsula();
+void AddSC_nagrand();
+void AddSC_netherstorm();
+void AddSC_shadowmoon_valley();
+void AddSC_shattrath_city();
+void AddSC_terokkar_forest();
+void AddSC_zangarmarsh();
+
+// Pets
+void AddSC_deathknight_pet_scripts();
+void AddSC_generic_pet_scripts();
+void AddSC_hunter_pet_scripts();
+void AddSC_mage_pet_scripts();
+void AddSC_priest_pet_scripts();
+void AddSC_shaman_pet_scripts();
+
+// battlegrounds
+
+// outdoor pvp
+void AddSC_outdoorpvp_ep();
+void AddSC_outdoorpvp_hp();
+void AddSC_outdoorpvp_na();
+void AddSC_outdoorpvp_si();
+void AddSC_outdoorpvp_tf();
+void AddSC_outdoorpvp_zm();
+void AddSC_outdoorpvp_gh();
+
+
+#endif
+
+void AddSpellScripts()
+{
+    AddSC_deathknight_spell_scripts();
+    AddSC_druid_spell_scripts();
+    AddSC_generic_spell_scripts();
+    AddSC_hunter_spell_scripts();
+    AddSC_mage_spell_scripts();
+    AddSC_paladin_spell_scripts();
+    AddSC_priest_spell_scripts();
+    AddSC_rogue_spell_scripts();
+    AddSC_shaman_spell_scripts();
+    AddSC_warlock_spell_scripts();
+    AddSC_warrior_spell_scripts();
+    AddSC_quest_spell_scripts();
+    AddSC_item_spell_scripts();
+}
+
+void AddCommandScripts()
+{
+    AddSC_server_commandscript();
+
+    AddSC_account_commandscript();
+    AddSC_achievement_commandscript();
+    AddSC_ban_commandscript();
+    AddSC_bf_commandscript();
+    AddSC_cast_commandscript();
+    AddSC_character_commandscript();
+    AddSC_debug_commandscript();
+    AddSC_event_commandscript();
+    AddSC_gm_commandscript();
+    AddSC_go_commandscript();
+    AddSC_gobject_commandscript();
+    AddSC_guild_commandscript();
+    AddSC_honor_commandscript();
+    AddSC_instance_commandscript();
+    AddSC_learn_commandscript();
+    AddSC_lfg_commandscript();
+    AddSC_list_commandscript();
+    AddSC_lookup_commandscript();
+    AddSC_message_commandscript();
+    AddSC_misc_commandscript();
+    AddSC_modify_commandscript();
+    AddSC_npc_commandscript();
+    AddSC_quest_commandscript();
+    AddSC_reload_commandscript();
+    AddSC_reset_commandscript();
+    AddSC_spectator_commandscript();
+    AddSC_tele_commandscript();
+    AddSC_ticket_commandscript();
+    AddSC_titles_commandscript();
+    AddSC_wp_commandscript();
+}
+
+void AddWorldScripts()
+{
+#ifdef SCRIPTS
+    AddSC_areatrigger_scripts();
+    AddSC_emerald_dragons();
+    AddSC_generic_creature();
+    AddSC_go_scripts();
+    AddSC_guards();
+    AddSC_item_scripts();
+    AddSC_npc_professions();
+    AddSC_npc_innkeeper();
+    AddSC_npcs_special();
+    AddSC_npc_taxi();
+    AddSC_achievement_scripts();
+#endif
+}
+
+void AddEventScripts()
+{
+#ifdef SCRIPTS
+    AddSC_event_brewfest_scripts();
+    AddSC_event_hallows_end_scripts();
+    AddSC_event_pilgrims_end_scripts();
+    AddSC_event_winter_veil_scripts();
+    AddSC_event_love_in_the_air();
+    AddSC_event_midsummer_scripts();
+    AddSC_event_childrens_week();
+#endif
+}
+
+void AddEasternKingdomsScripts()
+{
+#ifdef SCRIPTS
+    AddSC_alterac_valley();                 //Alterac Valley
+    AddSC_boss_balinda();
+    AddSC_boss_drekthar();
+    AddSC_boss_galvangar();
+    AddSC_boss_vanndar();
+    AddSC_blackrock_depths();               //Blackrock Depths
+    AddSC_boss_ambassador_flamelash();
+    AddSC_boss_anubshiah();
+    AddSC_boss_draganthaurissan();
+    AddSC_boss_general_angerforge();
+    AddSC_boss_gorosh_the_dervish();
+    AddSC_boss_grizzle();
+    AddSC_boss_high_interrogator_gerstahn();
+    AddSC_boss_magmus();
+    AddSC_boss_moira_bronzebeard();
+    AddSC_boss_tomb_of_seven();
+    AddSC_instance_blackrock_depths();
+    AddSC_boss_drakkisath();                //Blackrock Spire
+    AddSC_boss_halycon();
+    AddSC_boss_highlordomokk();
+    AddSC_boss_mothersmolderweb();
+    AddSC_boss_overlordwyrmthalak();
+    AddSC_boss_shadowvosh();
+    AddSC_boss_thebeast();
+    AddSC_boss_warmastervoone();
+    AddSC_boss_quatermasterzigris();
+    AddSC_boss_pyroguard_emberseer();
+    AddSC_boss_gyth();
+    AddSC_boss_rend_blackhand();
+    AddSC_boss_urok_doomhowl();
+    AddSC_boss_gizrul_the_slavener();
+    AddSC_instance_blackrock_spire();
+    AddSC_boss_razorgore();                 //Blackwing lair
+    AddSC_boss_vaelastrasz();
+    AddSC_boss_broodlord();
+    AddSC_boss_firemaw();
+    AddSC_boss_ebonroc();
+    AddSC_boss_flamegor();
+    AddSC_boss_chromaggus();
+    AddSC_boss_nefarian();
+    AddSC_instance_blackwing_lair();
+    AddSC_boss_mr_smite();
+    AddSC_instance_deadmines();             //Deadmines
+    AddSC_instance_gnomeregan();            //Gnomeregan
+    AddSC_instance_karazhan();              //Karazhan
+    AddSC_boss_servant_quarters();
+    AddSC_boss_attumen();
+    AddSC_boss_curator();
+    AddSC_boss_maiden_of_virtue();
+    AddSC_boss_shade_of_aran();
+    AddSC_boss_malchezaar();
+    AddSC_boss_terestian_illhoof();
+    AddSC_boss_moroes();
+    AddSC_bosses_opera();
+    AddSC_boss_netherspite();
+    AddSC_karazhan();
+    AddSC_boss_nightbane();
+    AddSC_boss_felblood_kaelthas();         // Magister's Terrace
+    AddSC_boss_selin_fireheart();
+    AddSC_boss_vexallus();
+    AddSC_boss_priestess_delrissa();
+    AddSC_instance_magisters_terrace();
+    AddSC_boss_lucifron();                  //Molten core
+    AddSC_boss_magmadar();
+    AddSC_boss_gehennas();
+    AddSC_boss_garr();
+    AddSC_boss_baron_geddon();
+    AddSC_boss_shazzrah();
+    AddSC_boss_golemagg();
+    AddSC_boss_sulfuron();
+    AddSC_boss_majordomo();
+    AddSC_boss_ragnaros();
+    AddSC_instance_molten_core();
+    AddSC_the_scarlet_enclave();            //Scarlet Enclave
+    AddSC_the_scarlet_enclave_c1();
+    AddSC_the_scarlet_enclave_c2();
+    AddSC_the_scarlet_enclave_c5();
+    AddSC_instance_scarlet_monastery();     //Scarlet Monastery
+    AddSC_boss_kirtonos_the_herald();
+    AddSC_instance_scholomance();           //Scholomance
+    AddSC_instance_shadowfang_keep();       //Shadowfang keep
+    AddSC_instance_stratholme();            //Stratholme
+    AddSC_instance_sunken_temple();         //Sunken Temple
+    AddSC_instance_sunwell_plateau();       //Sunwell Plateau
+    AddSC_boss_kalecgos();
+    AddSC_boss_brutallus();
+    AddSC_boss_felmyst();
+    AddSC_boss_eredar_twins();
+    AddSC_boss_muru();
+    AddSC_boss_kiljaeden();
+    AddSC_instance_the_stockade();          //The Stockade
+    AddSC_instance_uldaman();               //Uldaman
+    AddSC_boss_akilzon();                   //Zul'Aman
+    AddSC_boss_halazzi();
+    AddSC_boss_hex_lord_malacrass();
+    AddSC_boss_janalai();
+    AddSC_boss_nalorakk();
+    AddSC_boss_zuljin();
+    AddSC_instance_zulaman();
+    AddSC_zulaman();
+    AddSC_boss_jeklik();                    //Zul'Gurub
+    AddSC_boss_venoxis();
+    AddSC_boss_marli();
+    AddSC_boss_mandokir();
+    AddSC_boss_gahzranka();
+    AddSC_boss_thekal();
+    AddSC_boss_arlokk();
+    AddSC_boss_jindo();
+    AddSC_boss_hakkar();
+    AddSC_boss_grilek();
+    AddSC_boss_hazzarah();
+    AddSC_boss_renataki();
+    AddSC_boss_wushoolay();
+    AddSC_instance_zulgurub();
+
+    //AddSC_alterac_mountains();
+    AddSC_arathi_highlands();
+    AddSC_blasted_lands();
+    AddSC_burning_steppes();
+    AddSC_duskwood();
+    AddSC_eastern_plaguelands();
+    AddSC_eversong_woods();
+    AddSC_ghostlands();
+    AddSC_hinterlands();
+    AddSC_ironforge();
+    AddSC_isle_of_queldanas();
+    AddSC_loch_modan();
+    AddSC_redridge_mountains();
+    AddSC_silverpine_forest();
+    AddSC_stormwind_city();
+    AddSC_stranglethorn_vale();
+    AddSC_swamp_of_sorrows();
+    AddSC_tirisfal_glades();
+    AddSC_undercity();
+    AddSC_western_plaguelands();
+    AddSC_westfall();
+    AddSC_wetlands();
+#endif
+}
+
+void AddKalimdorScripts()
+{
+#ifdef SCRIPTS
+    AddSC_instance_blackfathom_deeps();     //Blackfathom Depths
+    AddSC_hyjal();                          //CoT Battle for Mt. Hyjal
+    AddSC_boss_archimonde();
+    AddSC_instance_mount_hyjal();
+    AddSC_hyjal_trash();
+    AddSC_boss_rage_winterchill();
+    AddSC_boss_anetheron();
+    AddSC_boss_kazrogal();
+    AddSC_boss_azgalor();
+    AddSC_boss_captain_skarloc();           //CoT Old Hillsbrad
+    AddSC_boss_epoch_hunter();
+    AddSC_boss_lieutenant_drake();
+    AddSC_instance_old_hillsbrad();
+    AddSC_old_hillsbrad();
+    AddSC_boss_aeonus();                    //CoT The Black Morass
+    AddSC_boss_chrono_lord_deja();
+    AddSC_boss_temporus();
+    AddSC_the_black_morass();
+    AddSC_instance_the_black_morass();
+    AddSC_boss_epoch();                     //CoT Culling Of Stratholme
+    AddSC_boss_infinite_corruptor();
+    AddSC_boss_salramm();
+    AddSC_boss_mal_ganis();
+    AddSC_boss_meathook();
+    AddSC_culling_of_stratholme();
+    AddSC_instance_culling_of_stratholme();
+    AddSC_instance_dire_maul();             //Dire Maul
+    AddSC_instance_maraudon();              //Maraudon
+    AddSC_boss_onyxia();                    //Onyxia's Lair
+    AddSC_instance_onyxias_lair();
+    AddSC_instance_ragefire_chasm();        //Ragefire Chasm
+    AddSC_razorfen_downs();
+    AddSC_instance_razorfen_downs();        //Razorfen Downs
+    AddSC_instance_razorfen_kraul();        //Razorfen Kraul
+    AddSC_boss_kurinnaxx();                 //Ruins of ahn'qiraj
+    AddSC_boss_rajaxx();
+    AddSC_boss_moam();
+    AddSC_boss_buru();
+    AddSC_boss_ayamiss();
+    AddSC_boss_ossirian();
+    AddSC_instance_ruins_of_ahnqiraj();
+    AddSC_boss_cthun();                     //Temple of ahn'qiraj
+    AddSC_boss_viscidus();
+    AddSC_boss_fankriss();
+    AddSC_boss_huhuran();
+    AddSC_bug_trio();
+    AddSC_boss_sartura();
+    AddSC_boss_skeram();
+    AddSC_boss_twinemperors();
+    AddSC_boss_ouro();
+    AddSC_npc_anubisath_sentinel();
+    AddSC_instance_temple_of_ahnqiraj();
+    AddSC_instance_wailing_caverns();       //Wailing caverns
+    AddSC_instance_zulfarrak();             //Zul'Farrak instance script
+
+    AddSC_ashenvale();
+    AddSC_azshara();
+    AddSC_azuremyst_isle();
+    AddSC_bloodmyst_isle();
+    AddSC_boss_azuregos();
+    AddSC_darkshore();
+    AddSC_desolace();
+    AddSC_durotar();
+    AddSC_dustwallow_marsh();
+    AddSC_felwood();
+    AddSC_feralas();
+    AddSC_moonglade();
+    AddSC_mulgore();
+    AddSC_orgrimmar();
+    AddSC_silithus();
+    AddSC_stonetalon_mountains();
+    AddSC_tanaris();
+    AddSC_teldrassil();
+    AddSC_the_barrens();
+    AddSC_thousand_needles();
+    AddSC_thunder_bluff();
+    AddSC_ungoro_crater();
+    AddSC_winterspring();
+#endif
+}
+
+void AddOutlandScripts()
+{
+#ifdef SCRIPTS
+    AddSC_boss_exarch_maladaar();           //Auchindoun Auchenai Crypts
+    AddSC_boss_shirrak_the_dead_watcher();
+    AddSC_boss_nexusprince_shaffar();       //Auchindoun Mana Tombs
+    AddSC_boss_talon_king_ikiss();          //Auchindoun Sekketh Halls
+    AddSC_instance_sethekk_halls();
+    AddSC_instance_shadow_labyrinth();      //Auchindoun Shadow Labyrinth
+    AddSC_boss_ambassador_hellmaw();
+    AddSC_boss_blackheart_the_inciter();
+    AddSC_boss_grandmaster_vorpil();
+    AddSC_boss_murmur();
+    AddSC_boss_illidan();                   //Black Temple
+    AddSC_boss_shade_of_akama();
+    AddSC_boss_supremus();
+    AddSC_boss_gurtogg_bloodboil();
+    AddSC_boss_mother_shahraz();
+    AddSC_boss_reliquary_of_souls();
+    AddSC_boss_teron_gorefiend();
+    AddSC_boss_najentus();
+    AddSC_boss_illidari_council();
+    AddSC_instance_black_temple();
+    AddSC_boss_fathomlord_karathress();     //CR Serpent Shrine Cavern
+    AddSC_boss_hydross_the_unstable();
+    AddSC_boss_lady_vashj();
+    AddSC_boss_leotheras_the_blind();
+    AddSC_boss_morogrim_tidewalker();
+    AddSC_instance_serpentshrine_cavern();
+    AddSC_boss_the_lurker_below();
+    AddSC_boss_hydromancer_thespia();       //CR Steam Vault
+    AddSC_boss_mekgineer_steamrigger();
+    AddSC_boss_warlord_kalithresh();
+    AddSC_instance_steam_vault();
+    AddSC_boss_the_black_stalker();         //CR Underbog
+    AddSC_boss_ahune();
+    AddSC_boss_gruul();                     //Gruul's Lair
+    AddSC_boss_high_king_maulgar();
+    AddSC_instance_gruuls_lair();
+    AddSC_boss_broggok();                   //HC Blood Furnace
+    AddSC_boss_kelidan_the_breaker();
+    AddSC_boss_the_maker();
+    AddSC_instance_blood_furnace();
+    AddSC_boss_magtheridon();               //HC Magtheridon's Lair
+    AddSC_instance_magtheridons_lair();
+    AddSC_boss_grand_warlock_nethekurse();  //HC Shattered Halls
+    AddSC_boss_warbringer_omrogg();
+    AddSC_boss_warchief_kargath_bladefist();
+    AddSC_instance_shattered_halls();
+    AddSC_boss_watchkeeper_gargolmar();     //HC Ramparts
+    AddSC_boss_omor_the_unscarred();
+    AddSC_boss_vazruden_the_herald();
+    AddSC_instance_ramparts();
+    AddSC_arcatraz();                       //TK Arcatraz
+    AddSC_boss_harbinger_skyriss();
+    AddSC_boss_wrath_scryer_soccothrates();
+    AddSC_boss_zereketh_the_unbound();
+    AddSC_boss_dalliah_the_doomsayer();
+    AddSC_instance_arcatraz();
+    AddSC_boss_high_botanist_freywinn();    //TK Botanica
+    AddSC_boss_laj();
+    AddSC_boss_warp_splinter();
+    AddSC_boss_thorngrin_the_tender();
+    AddSC_boss_commander_sarannis();
+    AddSC_instance_the_botanica();
+    AddSC_boss_alar();                      //TK The Eye
+    AddSC_boss_kaelthas();
+    AddSC_boss_void_reaver();
+    AddSC_boss_high_astromancer_solarian();
+    AddSC_instance_the_eye();
+    AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
+    AddSC_boss_gatewatcher_gyrokill();
+    AddSC_boss_nethermancer_sepethrea();
+    AddSC_boss_pathaleon_the_calculator();
+    AddSC_boss_mechano_lord_capacitus();
+    AddSC_instance_mechanar();
+
+    AddSC_blades_edge_mountains();
+    AddSC_boss_doomlordkazzak();
+    AddSC_boss_doomwalker();
+    AddSC_hellfire_peninsula();
+    AddSC_nagrand();
+    AddSC_netherstorm();
+    AddSC_shadowmoon_valley();
+    AddSC_shattrath_city();
+    AddSC_terokkar_forest();
+    AddSC_zangarmarsh();
+#endif
+}
+
+void AddNorthrendScripts()
+{
+#ifdef SCRIPTS
+    AddSC_boss_slad_ran();               //Gundrak
+    AddSC_boss_moorabi();
+    AddSC_boss_drakkari_colossus();
+    AddSC_boss_gal_darah();
+    AddSC_boss_eck();
+    AddSC_instance_gundrak();
+    AddSC_boss_amanitar();
+    AddSC_boss_taldaram();              //Azjol-Nerub Ahn'kahet
+    AddSC_boss_elder_nadox();
+    AddSC_boss_jedoga_shadowseeker();
+    AddSC_boss_volazj();
+    AddSC_instance_ahnkahet();
+    AddSC_boss_argent_challenge();      //Trial of the Champion
+    AddSC_boss_black_knight();
+    AddSC_boss_grand_champions();
+    AddSC_instance_trial_of_the_champion();
+    AddSC_trial_of_the_champion();
+    AddSC_boss_anubarak_trial();        //Trial of the Crusader
+    AddSC_boss_faction_champions();
+    AddSC_boss_jaraxxus();
+    AddSC_trial_of_the_crusader();
+    AddSC_boss_twin_valkyr();
+    AddSC_boss_northrend_beasts();
+    AddSC_instance_trial_of_the_crusader();
+    AddSC_boss_krik_thir();             //Azjol-Nerub Azjol-Nerub
+    AddSC_boss_hadronox();
+    AddSC_boss_anub_arak();
+    AddSC_instance_azjol_nerub();
+    AddSC_boss_anubrekhan();            //Naxxramas
+    AddSC_boss_maexxna();
+    AddSC_boss_patchwerk();
+    AddSC_boss_grobbulus();
+    AddSC_boss_razuvious();
+    AddSC_boss_kelthuzad();
+    AddSC_boss_loatheb();
+    AddSC_boss_noth();
+    AddSC_boss_gluth();
+    AddSC_boss_sapphiron();
+    AddSC_boss_four_horsemen();
+    AddSC_boss_faerlina();
+    AddSC_boss_heigan();
+    AddSC_boss_gothik();
+    AddSC_boss_thaddius();
+    AddSC_instance_naxxramas();
+    AddSC_boss_magus_telestra();        //The Nexus Nexus
+    AddSC_boss_anomalus();
+    AddSC_boss_ormorok();
+    AddSC_boss_keristrasza();
+    AddSC_boss_commander_stoutbeard();
+    AddSC_instance_nexus();
+    AddSC_boss_drakos();                //The Nexus The Oculus
+    AddSC_boss_varos();
+    AddSC_boss_urom();
+    AddSC_boss_eregos();
+    AddSC_instance_oculus();
+    AddSC_oculus();
+    AddSC_boss_sartharion();            //Obsidian Sanctum
+    AddSC_instance_obsidian_sanctum();
+    AddSC_boss_malygos();                //Eye of Eternity
+    AddSC_instance_eye_of_eternity();
+    AddSC_boss_bjarngrim();             //Ulduar Halls of Lightning
+    AddSC_boss_loken();
+    AddSC_boss_ionar();
+    AddSC_boss_volkhan();
+    AddSC_instance_halls_of_lightning();
+    AddSC_boss_maiden_of_grief();       //Ulduar Halls of Stone
+    AddSC_boss_krystallus();
+    AddSC_boss_sjonnir();
+    AddSC_brann_bronzebeard();
+    AddSC_instance_halls_of_stone();
+    AddSC_boss_auriaya();               //Ulduar Ulduar
+    AddSC_boss_flame_leviathan();
+    AddSC_boss_ignis();
+    AddSC_boss_razorscale();
+    AddSC_boss_xt002();
+    AddSC_boss_assembly_of_iron();
+    AddSC_boss_mimiron();
+    AddSC_boss_hodir();
+    AddSC_boss_vezax();
+    AddSC_boss_kologarn();
+    AddSC_boss_freya();
+    AddSC_boss_thorim();
+    AddSC_boss_yoggsaron();
+    AddSC_ulduar();
+    AddSC_boss_algalon_the_observer();
+    AddSC_instance_ulduar();
+    AddSC_boss_keleseth();              //Utgarde Keep
+    AddSC_boss_skarvald_dalronn();
+    AddSC_boss_ingvar_the_plunderer();
+    AddSC_instance_utgarde_keep();
+    AddSC_boss_svala();                 //Utgarde pinnacle
+    AddSC_boss_palehoof();
+    AddSC_boss_skadi();
+    AddSC_boss_ymiron();
+    AddSC_instance_utgarde_pinnacle();
+    AddSC_utgarde_keep();
+    AddSC_boss_archavon();              //Vault of Archavon
+    AddSC_boss_emalon();
+    AddSC_boss_koralon();
+    AddSC_boss_toravon();
+    AddSC_instance_vault_of_archavon();
+    AddSC_boss_trollgore();             //Drak'Tharon Keep
+    AddSC_boss_novos();
+    AddSC_boss_dred();
+    AddSC_boss_tharon_ja();
+    AddSC_instance_drak_tharon_keep();
+    AddSC_boss_cyanigosa();             //Violet Hold
+    AddSC_boss_erekem();
+    AddSC_boss_ichoron();
+    AddSC_boss_lavanthor();
+    AddSC_boss_moragg();
+    AddSC_boss_xevozz();
+    AddSC_boss_zuramat();
+    AddSC_instance_violet_hold();
+    AddSC_violet_hold();
+    AddSC_instance_forge_of_souls();   //Forge of Souls
+    AddSC_forge_of_souls();
+    AddSC_boss_bronjahm();
+    AddSC_boss_devourer_of_souls();
+    AddSC_instance_pit_of_saron();      //Pit of Saron
+    AddSC_pit_of_saron();
+    AddSC_boss_garfrost();
+    AddSC_boss_ick();
+    AddSC_boss_tyrannus();
+    AddSC_instance_halls_of_reflection();   // Halls of Reflection
+    AddSC_halls_of_reflection();
+    AddSC_boss_falric();
+    AddSC_boss_marwyn();
+    AddSC_boss_lord_marrowgar();        // Icecrown Citadel
+    AddSC_boss_lady_deathwhisper();
+    AddSC_boss_icecrown_gunship_battle();
+    AddSC_boss_deathbringer_saurfang();
+    AddSC_boss_festergut();
+    AddSC_boss_rotface();
+    AddSC_boss_professor_putricide();
+    AddSC_boss_blood_prince_council();
+    AddSC_boss_blood_queen_lana_thel();
+    AddSC_boss_valithria_dreamwalker();
+    AddSC_boss_sindragosa();
+    AddSC_boss_the_lich_king();
+    AddSC_icecrown_citadel_teleport();
+    AddSC_instance_icecrown_citadel();
+    AddSC_icecrown_citadel();
+    AddSC_instance_ruby_sanctum();      // Ruby Sanctum
+    AddSC_boss_baltharus_the_warborn();
+    AddSC_boss_saviana_ragefire();
+    AddSC_boss_general_zarithrian();
+    AddSC_boss_halion();
+
+    AddSC_dalaran();
+    AddSC_borean_tundra();
+    AddSC_dragonblight();
+    AddSC_grizzly_hills();
+    AddSC_howling_fjord();
+    AddSC_icecrown();
+    AddSC_sholazar_basin();
+    AddSC_storm_peaks();
+    AddSC_zuldrak();
+    AddSC_crystalsong_forest();
+    AddSC_isle_of_conquest();
+    AddSC_wintergrasp();
+#endif
+}
+
+void AddPetScripts()
+{
+#ifdef SCRIPTS
+    AddSC_deathknight_pet_scripts();
+    AddSC_generic_pet_scripts();
+    AddSC_hunter_pet_scripts();
+    AddSC_mage_pet_scripts();
+    AddSC_priest_pet_scripts();
+    AddSC_shaman_pet_scripts();
+#endif
+}
+
+void AddOutdoorPvPScripts()
+{
+#ifdef SCRIPTS
+    AddSC_outdoorpvp_ep();
+    AddSC_outdoorpvp_hp();
+    AddSC_outdoorpvp_na();
+    AddSC_outdoorpvp_si();
+    AddSC_outdoorpvp_tf();
+    AddSC_outdoorpvp_zm();
+    AddSC_outdoorpvp_gh();
+#endif
+}
+
diff --git a/modules/acore/scripts-wotlk/ScriptLoader.h b/modules/acore/scripts-wotlk/ScriptLoader.h
new file mode 100644
index 000000000..2ca37df35
--- /dev/null
+++ b/modules/acore/scripts-wotlk/ScriptLoader.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SC_SCRIPTLOADER_H
+#define SC_SCRIPTLOADER_H
+
+void AddScripts();
+void AddSpellScripts();
+void AddCommandScripts();
+void AddSC_SmartScripts();
+void AddWorldScripts();
+void AddEventScripts();
+void AddEasternKingdomsScripts();
+void AddKalimdorScripts();
+void AddOutlandScripts();
+void AddNorthrendScripts();
+void AddPetScripts();
+void AddOutdoorPvPScripts();
+
+#endif
diff --git a/src/server/scripts/World/CMakeLists.txt b/modules/acore/scripts-wotlk/World/CMakeLists.txt
similarity index 100%
rename from src/server/scripts/World/CMakeLists.txt
rename to modules/acore/scripts-wotlk/World/CMakeLists.txt
diff --git a/src/server/scripts/World/achievement_scripts.cpp b/modules/acore/scripts-wotlk/World/achievement_scripts.cpp
similarity index 100%
rename from src/server/scripts/World/achievement_scripts.cpp
rename to modules/acore/scripts-wotlk/World/achievement_scripts.cpp
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/modules/acore/scripts-wotlk/World/areatrigger_scripts.cpp
similarity index 100%
rename from src/server/scripts/World/areatrigger_scripts.cpp
rename to modules/acore/scripts-wotlk/World/areatrigger_scripts.cpp
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/modules/acore/scripts-wotlk/World/boss_emerald_dragons.cpp
similarity index 100%
rename from src/server/scripts/World/boss_emerald_dragons.cpp
rename to modules/acore/scripts-wotlk/World/boss_emerald_dragons.cpp
diff --git a/src/server/scripts/World/go_scripts.cpp b/modules/acore/scripts-wotlk/World/go_scripts.cpp
similarity index 100%
rename from src/server/scripts/World/go_scripts.cpp
rename to modules/acore/scripts-wotlk/World/go_scripts.cpp
diff --git a/src/server/scripts/World/guards.cpp b/modules/acore/scripts-wotlk/World/guards.cpp
similarity index 100%
rename from src/server/scripts/World/guards.cpp
rename to modules/acore/scripts-wotlk/World/guards.cpp
diff --git a/src/server/scripts/World/item_scripts.cpp b/modules/acore/scripts-wotlk/World/item_scripts.cpp
similarity index 100%
rename from src/server/scripts/World/item_scripts.cpp
rename to modules/acore/scripts-wotlk/World/item_scripts.cpp
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/modules/acore/scripts-wotlk/World/mob_generic_creature.cpp
similarity index 100%
rename from src/server/scripts/World/mob_generic_creature.cpp
rename to modules/acore/scripts-wotlk/World/mob_generic_creature.cpp
diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/modules/acore/scripts-wotlk/World/npc_innkeeper.cpp
similarity index 100%
rename from src/server/scripts/World/npc_innkeeper.cpp
rename to modules/acore/scripts-wotlk/World/npc_innkeeper.cpp
diff --git a/src/server/scripts/World/npc_professions.cpp b/modules/acore/scripts-wotlk/World/npc_professions.cpp
similarity index 100%
rename from src/server/scripts/World/npc_professions.cpp
rename to modules/acore/scripts-wotlk/World/npc_professions.cpp
diff --git a/src/server/scripts/World/npc_taxi.cpp b/modules/acore/scripts-wotlk/World/npc_taxi.cpp
similarity index 100%
rename from src/server/scripts/World/npc_taxi.cpp
rename to modules/acore/scripts-wotlk/World/npc_taxi.cpp
diff --git a/src/server/scripts/World/npcs_special.cpp b/modules/acore/scripts-wotlk/World/npcs_special.cpp
similarity index 100%
rename from src/server/scripts/World/npcs_special.cpp
rename to modules/acore/scripts-wotlk/World/npcs_special.cpp
diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/modules/acore/world-engine/collision/BoundingIntervalHierarchy.cpp
similarity index 100%
rename from src/server/collision/BoundingIntervalHierarchy.cpp
rename to modules/acore/world-engine/collision/BoundingIntervalHierarchy.cpp
diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/modules/acore/world-engine/collision/BoundingIntervalHierarchy.h
similarity index 100%
rename from src/server/collision/BoundingIntervalHierarchy.h
rename to modules/acore/world-engine/collision/BoundingIntervalHierarchy.h
diff --git a/src/server/collision/BoundingIntervalHierarchyWrapper.h b/modules/acore/world-engine/collision/BoundingIntervalHierarchyWrapper.h
similarity index 100%
rename from src/server/collision/BoundingIntervalHierarchyWrapper.h
rename to modules/acore/world-engine/collision/BoundingIntervalHierarchyWrapper.h
diff --git a/src/server/collision/CMakeLists.txt b/modules/acore/world-engine/collision/CMakeLists.txt
similarity index 100%
rename from src/server/collision/CMakeLists.txt
rename to modules/acore/world-engine/collision/CMakeLists.txt
diff --git a/src/server/collision/DynamicTree.cpp b/modules/acore/world-engine/collision/DynamicTree.cpp
similarity index 100%
rename from src/server/collision/DynamicTree.cpp
rename to modules/acore/world-engine/collision/DynamicTree.cpp
diff --git a/src/server/collision/DynamicTree.h b/modules/acore/world-engine/collision/DynamicTree.h
similarity index 100%
rename from src/server/collision/DynamicTree.h
rename to modules/acore/world-engine/collision/DynamicTree.h
diff --git a/src/server/collision/Management/IMMAPManager.h b/modules/acore/world-engine/collision/Management/IMMAPManager.h
similarity index 100%
rename from src/server/collision/Management/IMMAPManager.h
rename to modules/acore/world-engine/collision/Management/IMMAPManager.h
diff --git a/src/server/collision/Management/IVMapManager.h b/modules/acore/world-engine/collision/Management/IVMapManager.h
similarity index 100%
rename from src/server/collision/Management/IVMapManager.h
rename to modules/acore/world-engine/collision/Management/IVMapManager.h
diff --git a/src/server/collision/Management/MMapFactory.cpp b/modules/acore/world-engine/collision/Management/MMapFactory.cpp
similarity index 100%
rename from src/server/collision/Management/MMapFactory.cpp
rename to modules/acore/world-engine/collision/Management/MMapFactory.cpp
diff --git a/src/server/collision/Management/MMapFactory.h b/modules/acore/world-engine/collision/Management/MMapFactory.h
similarity index 100%
rename from src/server/collision/Management/MMapFactory.h
rename to modules/acore/world-engine/collision/Management/MMapFactory.h
diff --git a/src/server/collision/Management/MMapManager.cpp b/modules/acore/world-engine/collision/Management/MMapManager.cpp
similarity index 100%
rename from src/server/collision/Management/MMapManager.cpp
rename to modules/acore/world-engine/collision/Management/MMapManager.cpp
diff --git a/src/server/collision/Management/MMapManager.h b/modules/acore/world-engine/collision/Management/MMapManager.h
similarity index 100%
rename from src/server/collision/Management/MMapManager.h
rename to modules/acore/world-engine/collision/Management/MMapManager.h
diff --git a/src/server/collision/Management/VMapFactory.cpp b/modules/acore/world-engine/collision/Management/VMapFactory.cpp
similarity index 100%
rename from src/server/collision/Management/VMapFactory.cpp
rename to modules/acore/world-engine/collision/Management/VMapFactory.cpp
diff --git a/src/server/collision/Management/VMapFactory.h b/modules/acore/world-engine/collision/Management/VMapFactory.h
similarity index 100%
rename from src/server/collision/Management/VMapFactory.h
rename to modules/acore/world-engine/collision/Management/VMapFactory.h
diff --git a/src/server/collision/Management/VMapManager2.cpp b/modules/acore/world-engine/collision/Management/VMapManager2.cpp
similarity index 100%
rename from src/server/collision/Management/VMapManager2.cpp
rename to modules/acore/world-engine/collision/Management/VMapManager2.cpp
diff --git a/src/server/collision/Management/VMapManager2.h b/modules/acore/world-engine/collision/Management/VMapManager2.h
similarity index 100%
rename from src/server/collision/Management/VMapManager2.h
rename to modules/acore/world-engine/collision/Management/VMapManager2.h
diff --git a/src/server/collision/Maps/MapTree.cpp b/modules/acore/world-engine/collision/Maps/MapTree.cpp
similarity index 100%
rename from src/server/collision/Maps/MapTree.cpp
rename to modules/acore/world-engine/collision/Maps/MapTree.cpp
diff --git a/src/server/collision/Maps/MapTree.h b/modules/acore/world-engine/collision/Maps/MapTree.h
similarity index 100%
rename from src/server/collision/Maps/MapTree.h
rename to modules/acore/world-engine/collision/Maps/MapTree.h
diff --git a/src/server/collision/Maps/TileAssembler.cpp b/modules/acore/world-engine/collision/Maps/TileAssembler.cpp
similarity index 100%
rename from src/server/collision/Maps/TileAssembler.cpp
rename to modules/acore/world-engine/collision/Maps/TileAssembler.cpp
diff --git a/src/server/collision/Maps/TileAssembler.h b/modules/acore/world-engine/collision/Maps/TileAssembler.h
similarity index 100%
rename from src/server/collision/Maps/TileAssembler.h
rename to modules/acore/world-engine/collision/Maps/TileAssembler.h
diff --git a/src/server/collision/Models/GameObjectModel.cpp b/modules/acore/world-engine/collision/Models/GameObjectModel.cpp
similarity index 100%
rename from src/server/collision/Models/GameObjectModel.cpp
rename to modules/acore/world-engine/collision/Models/GameObjectModel.cpp
diff --git a/src/server/collision/Models/GameObjectModel.h b/modules/acore/world-engine/collision/Models/GameObjectModel.h
similarity index 100%
rename from src/server/collision/Models/GameObjectModel.h
rename to modules/acore/world-engine/collision/Models/GameObjectModel.h
diff --git a/src/server/collision/Models/ModelInstance.cpp b/modules/acore/world-engine/collision/Models/ModelInstance.cpp
similarity index 100%
rename from src/server/collision/Models/ModelInstance.cpp
rename to modules/acore/world-engine/collision/Models/ModelInstance.cpp
diff --git a/src/server/collision/Models/ModelInstance.h b/modules/acore/world-engine/collision/Models/ModelInstance.h
similarity index 100%
rename from src/server/collision/Models/ModelInstance.h
rename to modules/acore/world-engine/collision/Models/ModelInstance.h
diff --git a/src/server/collision/Models/WorldModel.cpp b/modules/acore/world-engine/collision/Models/WorldModel.cpp
similarity index 100%
rename from src/server/collision/Models/WorldModel.cpp
rename to modules/acore/world-engine/collision/Models/WorldModel.cpp
diff --git a/src/server/collision/Models/WorldModel.h b/modules/acore/world-engine/collision/Models/WorldModel.h
similarity index 100%
rename from src/server/collision/Models/WorldModel.h
rename to modules/acore/world-engine/collision/Models/WorldModel.h
diff --git a/src/server/collision/PrecompiledHeaders/collisionPCH.cpp b/modules/acore/world-engine/collision/PrecompiledHeaders/collisionPCH.cpp
similarity index 100%
rename from src/server/collision/PrecompiledHeaders/collisionPCH.cpp
rename to modules/acore/world-engine/collision/PrecompiledHeaders/collisionPCH.cpp
diff --git a/src/server/collision/PrecompiledHeaders/collisionPCH.h b/modules/acore/world-engine/collision/PrecompiledHeaders/collisionPCH.h
similarity index 100%
rename from src/server/collision/PrecompiledHeaders/collisionPCH.h
rename to modules/acore/world-engine/collision/PrecompiledHeaders/collisionPCH.h
diff --git a/src/server/collision/RegularGrid.h b/modules/acore/world-engine/collision/RegularGrid.h
similarity index 100%
rename from src/server/collision/RegularGrid.h
rename to modules/acore/world-engine/collision/RegularGrid.h
diff --git a/src/server/collision/VMapDefinitions.h b/modules/acore/world-engine/collision/VMapDefinitions.h
similarity index 100%
rename from src/server/collision/VMapDefinitions.h
rename to modules/acore/world-engine/collision/VMapDefinitions.h
diff --git a/src/server/collision/VMapTools.h b/modules/acore/world-engine/collision/VMapTools.h
similarity index 100%
rename from src/server/collision/VMapTools.h
rename to modules/acore/world-engine/collision/VMapTools.h
diff --git a/modules/uwd/cmake-utils/.gitignore b/modules/uwd/cmake-utils/.gitignore
new file mode 100644
index 000000000..92da74b03
--- /dev/null
+++ b/modules/uwd/cmake-utils/.gitignore
@@ -0,0 +1,50 @@
+!.gitignore
+
+!*
+
+#
+#Generic
+#
+
+.directory
+.mailmap
+*.orig
+*.rej
+*~
+.hg/
+*.kdev*
+.DS_Store
+CMakeLists.txt.user
+*.bak
+*.patch
+*.diff
+*.REMOTE.*
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+
+#
+# IDE & other softwares
+#
+/.settings/
+/.externalToolBuilders/*
+# exclude in all levels
+nbproject/
+.sync.ffs_db
+*.kate-swp
+
+#
+# Eclipse
+#
+*.pydevproject
+.metadata
+.gradle
+tmp/
+*.tmp
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.project
+.cproject
diff --git a/src/cmake/utils.cmake b/modules/uwd/cmake-utils/utils.cmake
similarity index 100%
rename from src/cmake/utils.cmake
rename to modules/uwd/cmake-utils/utils.cmake