diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76260629c5..812b01d004 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
+# modifications, as long as this notice is preserved. 
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
@@ -26,7 +26,7 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 
 # set macro-directory
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/macros")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/macros")
 
 # build in Release-mode by default if not explicitly set
 if( NOT CMAKE_BUILD_TYPE )
@@ -37,7 +37,7 @@ include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
 
 # set default buildoptions and print them
-include(src/cmake/options.cmake)
+include(cmake/options.cmake)
 
 # turn off PCH totally if enabled (hidden setting, mainly for devs)
 if( NOPCH )
@@ -71,13 +71,13 @@ endif()
 #endif()
 
 # Find revision ID and hash of the sourcetree
-include(src/cmake/genrev.cmake)
+include(cmake/genrev.cmake)
 
 # print out the results before continuing
-include(src/cmake/showoptions.cmake)
+include(cmake/showoptions.cmake)
 
 # add dependencies
-add_subdirectory(modules/dep)
+add_subdirectory(dep)
 
 # add core sources
 add_subdirectory(src)
diff --git a/bin/bash_shared/defines.sh b/bin/bash_shared/defines.sh
deleted file mode 100644
index 67cde98ef9..0000000000
--- a/bin/bash_shared/defines.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-AZTH_PATH_ROOT=$(readlink -f "$AZTH_PATH_BIN/../")
-
-AZTH_PATH_CONF="$AZTH_PATH_ROOT/conf"
-
-AZTH_PATH_CUSTOM=$(readlink -f "$AZTH_PATH_ROOT/../azth_custom")
diff --git a/bin/bash_shared/functions.sh b/bin/bash_shared/functions.sh
deleted file mode 100644
index 6da557adea..0000000000
--- a/bin/bash_shared/functions.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# par 1: hook_name
-function runHooks() {
-  hook_name="HOOKS_MAP_$1"
-  read -r -a SRCS <<< ${!hook_name}
-  echo "Running hooks: $hook_name"
-  for i in "${SRCS[@]}"
-  do
-  	$i # run registered hook
-  done
-}
-
-function registerHooks() {
-  hook_name="HOOKS_MAP_$1"
-  hooks=${@:2}
-  declare -g "$hook_name+=$hooks "
-}
diff --git a/bin/bash_shared/includes.sh b/bin/bash_shared/includes.sh
deleted file mode 100644
index 3e53937a2b..0000000000
--- a/bin/bash_shared/includes.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-AZTH_PATH_BIN="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
-
-AZTH_PATH_SHARED="$AZTH_PATH_BIN/bash_shared"
-
-source "$AZTH_PATH_SHARED/defines.sh"
-
-source "$AZTH_PATH_SHARED/functions.sh"
diff --git a/bin/compiler/1-clean.sh b/bin/compiler/1-clean.sh
index 7fbe9a84b5..10c61b8527 100755
--- a/bin/compiler/1-clean.sh
+++ b/bin/compiler/1-clean.sh
@@ -1,8 +1,16 @@
 #!/bin/bash
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-source "$CURRENT_PATH/includes/common.sh"
+. "defines.sh"
 
-source "$CURRENT_PATH/includes/includes.sh"
+echo "Cleaning build files"
+
+CWD=$(pwd)
+
+cd $BUILDPATH
+
+make -f Makefile clean
+make clean
+find -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
+
+cd $CWD
 
-clean
diff --git a/bin/compiler/2-configure.sh b/bin/compiler/2-configure.sh
index 6acc934686..c74b52f3e2 100755
--- a/bin/compiler/2-configure.sh
+++ b/bin/compiler/2-configure.sh
@@ -1,8 +1,19 @@
 #!/bin/bash
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-source "$CURRENT_PATH/includes/common.sh"
+. "defines.sh"
 
-source "$CURRENT_PATH/includes/includes.sh"
+CWD=$(pwd)
 
-configure
+cd $BUILDPATH
+
+echo "Build path: $BUILDPATH"
+echo "DEBUG info: $CDEBUG"
+echo "Compilation type: $CCTYPE"
+# -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram"
+# -DWITH_COREDEBUG=$CDEBUG compiled with debug information
+
+cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS -DSCRIPTS=$CSCRIPTS  \
+-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CC_COMPILER=$COMPILER_CC -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
+-DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG  -DCMAKE_BUILD_TYPE=$CCTYPE -DWITH_WARNINGS=$CWARNINGS 
+
+cd $CWD
diff --git a/bin/compiler/3-build.sh b/bin/compiler/3-build.sh
index 20b77ecb44..2aee4d92b5 100755
--- a/bin/compiler/3-build.sh
+++ b/bin/compiler/3-build.sh
@@ -1,8 +1,17 @@
 #!/bin/bash
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-source "$CURRENT_PATH/includes/common.sh"
+. "defines.sh"
 
-source "$CURRENT_PATH/includes/includes.sh"
 
-build
+[ $MTHREADS == 0 ] && MTHREADS=`grep -c ^processor /proc/cpuinfo` && MTHREADS=$(($MTHREADS + 2))
+
+echo "Using $MTHREADS threads"
+
+CWD=$(pwd)
+
+cd $BUILDPATH
+
+time make -j $MTHREADS
+make -j $MTHREADS install
+
+cd $CWD
diff --git a/bin/compiler/config.sh.dist b/bin/compiler/config.sh.dist
index c7a4661b0e..e78c34e855 100644
--- a/bin/compiler/config.sh.dist
+++ b/bin/compiler/config.sh.dist
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-
-# set preferred compilers
-CCOMPILERC="/usr/bin/clang-3.6"
-CCOMPILERCXX="/usr/bin/clang++-3.6"
+COMPILER_C="/usr/bin/gcc"
+COMPILER_CC="/usr/bin/gcc"
+COMPILER_CXX="/usr/bin/g++"
 
 # how many thread must be used for compilation ( leave zero to use all available )
 MTHREADS=0
@@ -24,12 +23,12 @@ CSCRIPTPCH=1
 CCOREPCH=1
 
 # AZTH
-# compile azth custom plugins
-CAZTH_CUSTOM_PLG=1
-# compile azth plugins 
+# compile azth plugins for custom features
 CAZTH_PLG=1
+# compile azth plugins for trinitycore features
+CAZTH_TC_PLG=1
 # enable unit test on TC load
-CAZTH_UNIT_TEST=0
+CAZTH_UNIT_TEST=1
 
 # absolute root path of your azerothshard repository
 SRCPATH=
diff --git a/bin/compiler/includes/defines.sh b/bin/compiler/defines.sh
similarity index 55%
rename from bin/compiler/includes/defines.sh
rename to bin/compiler/defines.sh
index e6b37f4eae..7fc6779bd2 100644
--- a/bin/compiler/includes/defines.sh
+++ b/bin/compiler/defines.sh
@@ -1,16 +1,21 @@
 #!/bin/bash
 
+source ./config.sh.dist # "hack" to avoid missing conf variables
+
+source ./config.sh # should overwrite previous
+
 # you can choose build type from cmd argument
-if [ ! -z $1 ]
-then
+if [ ! -z $1 ] 
+then 
     CCTYPE=$1
     CCTYPE=${CCTYPE^} # capitalize first letter if it's not yet
 fi
 
 BUILDPATH=$BINPATH
 
-INSTALL_PATH=$(readlink -f "$BINPATH/../")
+[ $CCTYPE == "Debug" ] && BUILDPATH="$BUILDPATH/debug/build/" ||  BUILDPATH="$BUILDPATH/release/build/" 
 
-[ $CCTYPE == "Debug" ] && BUILDPATH="$BUILDPATH/debug/build/" ||  BUILDPATH="$BUILDPATH/release/build/"
+[ $CCTYPE == "Debug" ] && BINPATH="$BINPATH/debug" || BINPATH="$BINPATH/release" 
 
-[ $CCTYPE == "Debug" ] && BINPATH="$BINPATH/debug" || BINPATH="$BINPATH/release"
+mkdir -p $BUILDPATH
+mkdir -p $BINPATH
diff --git a/bin/compiler/includes/common.sh b/bin/compiler/includes/common.sh
deleted file mode 100644
index 61a73ca130..0000000000
--- a/bin/compiler/includes/common.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source "./config.sh.dist" # "hack" to avoid missing conf variables
-
-if [ -f "./config.sh"  ]; then
-    source "./config.sh" # should overwrite previous
-fi
diff --git a/bin/compiler/includes/functions.sh b/bin/compiler/includes/functions.sh
deleted file mode 100644
index 9f97b43b80..0000000000
--- a/bin/compiler/includes/functions.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-
-function clean() {
-  echo "Cleaning build files"
-
-  CWD=$(pwd)
-
-  cd $BUILDPATH
-
-  make -f Makefile clean
-  make clean
-  find -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
-
-  cd $CWD
-}
-
-function configure() {
-  CWD=$(pwd)
-
-  cd $BUILDPATH
-
-  echo "Build path: $BUILDPATH"
-  echo "DEBUG info: $CDEBUG"
-  echo "Compilation type: $CCTYPE"
-  # -DCMAKE_BUILD_TYPE=$CCTYPE disable optimization "slow and huge amount of ram"
-  # -DWITH_COREDEBUG=$CDEBUG compiled with debug information
-
-  cmake $SRCPATH -DCMAKE_INSTALL_PREFIX=$BINPATH -DCONF_DIR=$CONFDIR -DSERVERS=$CSERVERS \
-  -DSCRIPTS=$CSCRIPTS -DSCRIPTS_COMMANDS=$CSCRIPTS -DSCRIPTS_CUSTOM=$CSCRIPTS -DSCRIPTS_EASTERNKINGDOMS=$CSCRIPTS -DSCRIPTS_EVENTS=$CSCRIPTS -DSCRIPTS_KALIMDOR=$CSCRIPTS \
-  -DSCRIPTS_NORTHREND=$CSCRIPTS -DSCRIPTS_OUTDOORPVP=$CSCRIPTS -DSCRIPTS_OUTLAND=$CSCRIPTS -DSCRIPTS_PET=$CSCRIPTS -DSCRIPTS_SPELLS=$CSCRIPTS -DSCRIPTS_WORLD=$CSCRIPTS \
-  -DTOOLS=$CTOOLS -DUSE_SCRIPTPCH=$CSCRIPTPCH -DUSE_COREPCH=$CCOREPCH -DWITH_COREDEBUG=$CDEBUG  -DCMAKE_BUILD_TYPE=$CCTYPE -DWITH_WARNINGS=$CWARNINGS \
-  -DAZTH_WITH_UNIT_TEST=$CAZTH_UNIT_TEST -DAZTH_WITH_CUSTOM_PLUGINS=$CAZTH_CUSTOM_PLG -DAZTH_WITH_PLUGINS=$CAZTH_PLG \
-  -DCMAKE_C_COMPILER=$CCOMPILERC -DCMAKE_CXX_COMPILER=$CCOMPILERCXX
-
-  cd $CWD
-
-  runHooks "ON_AFTER_CONFIG"
-}
-
-
-function build() {
-  [ $MTHREADS == 0 ] && MTHREADS=`grep -c ^processor /proc/cpuinfo` && MTHREADS=$(($MTHREADS + 2))
-
-  echo "Using $MTHREADS threads"
-
-  CWD=$(pwd)
-
-  cd $BUILDPATH
-
-  time make -j $MTHREADS
-  make -j $MTHREADS install
-
-  cd $CWD
-
-  runHooks "ON_AFTER_BUILD"
-}
diff --git a/bin/compiler/includes/includes.sh b/bin/compiler/includes/includes.sh
deleted file mode 100644
index 4150841891..0000000000
--- a/bin/compiler/includes/includes.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_PATH/../../bash_shared/includes.sh"
-
-AZTH_PATH_COMPILER="$AZTH_PATH_BIN/compiler"
-
-function azth_on_after_build() {
-    # move the run engine
-    cp -rvf "$AZTH_PATH_BIN/runners/"* "$INSTALL_PATH/bin/"
-}
-
-registerHooks "ON_AFTER_BUILD" azth_on_after_build
-
-source "$AZTH_PATH_COMPILER/includes/defines.sh"
-
-source "$AZTH_PATH_COMPILER/includes/functions.sh"
-
-mkdir -p $BUILDPATH
-mkdir -p $BINPATH
diff --git a/bin/runners/config.dist b/bin/runners/config.dist
deleted file mode 100644
index 6b5b275544..0000000000
--- a/bin/runners/config.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-######################
-
-# enable/disable GDB execution
-export GDB_ENABLED=0
-
-# gdb file
-export GDB=""
-
-# directory where binary are stored
-exoirt BINPATH=""
-
- ### Put here the pid you configured on your worldserver.conf file ###
-export SERVERPID=""
- 
-# path to conf file
-export CONFIG=""
-
-# path of log files
-export LOGS_PATH="";
-
-# exec name
-export SERVERBIN=""
-
-# name of screen service ( for restarter )
-export SCREEN_NAME=""
- 
-######################
-
-
diff --git a/bin/runners/run-engine b/bin/runners/run-engine
deleted file mode 100755
index 43aec1a7c5..0000000000
--- a/bin/runners/run-engine
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-function checkStatus() {
-        if [ -d "/proc/"$1 ]; then
-                eval "TEST=1"
-        else
-                eval "TEST=0"
-        fi
-}
-
-function starter() {
-    local CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-    cd $BINPATH
-
-    mkdir -p "$LOGS_PATH"
-
-    TRACE_BEGIN_STRING="SIGSEGV"
-    TRACE_FILE="$LOGS_PATH/"$SCREEN_NAME"_trace.log"
-    ERR_FILE="$LOGS_PATH/"$SCREEN_NAME"_error.log"
-    SYSLOG="$LOGS_PATH/"$SCREEN_NAME"_system.log"
-    SYSERR="$LOGS_PATH/"$SCREEN_NAME"_system.err"
-    LINKS_FILE="$LOGS_PATH/"$SCREEN_NAME"_crash_links.link"
-
-    $CURRENT_PATH/starter $SERVERBIN $GDB "$CONFIG" "$SYSLOG" "$SYSERR" $GDB_ENABLED
-}
-
-
-function restarter() {
-    local CURRENT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-    cd $BINPATH
-
-    mkdir -p "$LOGS_PATH"
-
-    TRACE_BEGIN_STRING="SIGSEGV"
-    TRACE_FILE="$LOGS_PATH/"$SCREEN_NAME"_trace.log"
-    ERR_FILE="$LOGS_PATH/"$SCREEN_NAME"_error.log"
-    SYSLOG="$LOGS_PATH/"$SCREEN_NAME"_system.log"
-    SYSERR="$LOGS_PATH/"$SCREEN_NAME"_system.err"
-    LINKS_FILE="$LOGS_PATH/"$SCREEN_NAME"_crash_links.link"
-
-    if [ ! -f $TRACE_FILE ]; then
-        touch $TRACE_FILE
-    fi
-
-    while :
-    do
-            PID=$(cat $SERVERPID)
-            checkStatus $PID
-            if [ $TEST -eq 0 ]; then
-                    DATE=$(date)
-                    echo "Restarting $SCREEN_NAME Core blizz($DATE)"
-                    if [ $GDB_ENABLED -eq 1 ]; then
-                            echo "GDB enabled"
-                            grep -B 10 -A 1800 "$TRACE_BEGIN_STRING" "$SYSLOG" >> "$TRACE_FILE"
-                            cat "$SYSERR" > "$ERR_FILE"
-                            screen -A -m -d -S $SCREEN_NAME "$CURRENT_PATH/starter" $SERVERBIN $GDB "$CONFIG" "$SYSLOG" "$SYSERR" 1
-                    fi
-
-                    if [ $GDB_ENABLED -eq 0 ]; then
-                            echo "GDB disabled"
-                            screen -A -m -d -S $SCREEN_NAME "$CURRENT_PATH/starter" $SERVERBIN null "$CONFIG" null null 0
-                    fi
-            fi
-
-            sleep 15
-    done
-}
diff --git a/bin/runners/starter b/bin/runners/starter
deleted file mode 100755
index 4cd6dd2411..0000000000
--- a/bin/runners/starter
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-GDB_FILE="$2"
-CONFIG="$3"
-SYSLOG="$4"
-SYSERR="$5"
-GBD_ENABLED="$6"
-
-if [ $GBD_ENABLED -eq 1 ]; then
-    echo "run -c $3" > "$GDB_FILE"
-    echo "bt" >> "$GDB_FILE"
-    echo "bt full" >> "$GDB_FILE"
-    echo "info threads" >> "$GDB_FILE"
-    echo "thread apply all bt full" >> "$GDB_FILE"
-
-    [ ! -f "$SYSLOG" ] && touch "$SYSLOG"
-    [ ! -f "$SYSERR" ] && touch "$SYSERR"
-
-    gdb -x $GDB_FILE --batch $1 >> "$SYSLOG" 2>> "$SYSERR"
-elif [ $GBD_ENABLED -eq 0 ]; then
-    "./$1" -c "$CONFIG"
-fi
\ No newline at end of file
diff --git a/src/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake
similarity index 100%
rename from src/cmake/compiler/clang/settings.cmake
rename to cmake/compiler/clang/settings.cmake
diff --git a/src/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
similarity index 100%
rename from src/cmake/compiler/gcc/settings.cmake
rename to cmake/compiler/gcc/settings.cmake
diff --git a/src/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake
similarity index 100%
rename from src/cmake/compiler/icc/settings.cmake
rename to cmake/compiler/icc/settings.cmake
diff --git a/src/cmake/compiler/mingw/settings.cmake b/cmake/compiler/mingw/settings.cmake
similarity index 100%
rename from src/cmake/compiler/mingw/settings.cmake
rename to cmake/compiler/mingw/settings.cmake
diff --git a/src/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake
similarity index 100%
rename from src/cmake/compiler/msvc/settings.cmake
rename to cmake/compiler/msvc/settings.cmake
diff --git a/src/cmake/genrev.cmake b/cmake/genrev.cmake
similarity index 93%
rename from src/cmake/genrev.cmake
rename to cmake/genrev.cmake
index 23a72aa27b..35194fbee9 100644
--- a/src/cmake/genrev.cmake
+++ b/cmake/genrev.cmake
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -8,7 +8,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/macros/EnsureVersion.cmake)
 
 set(_REQUIRED_GIT_VERSION "1.7")
 
@@ -31,11 +31,11 @@ if (SVN_EXECUTABLE)
 
     Subversion_GET_REVISION(${CMAKE_SOURCE_DIR} REV2)
 endif ()
-
+  
   set(rev_hash_str ${REV2})
   set(rev_hash ${REV2})
   set(rev_id_str ${REV2})
   set(rev_id ${REV2})
-
-
+  
+  
   configure_file ( ${CMAKE_SOURCE_DIR}/revision.h.in.cmake ${BUILDDIR}/revision.h )
diff --git a/src/cmake/macros/CheckBuildDir.cmake b/cmake/macros/CheckBuildDir.cmake
similarity index 100%
rename from src/cmake/macros/CheckBuildDir.cmake
rename to cmake/macros/CheckBuildDir.cmake
diff --git a/src/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake
similarity index 60%
rename from src/cmake/macros/CheckPlatform.cmake
rename to cmake/macros/CheckPlatform.cmake
index 49bd1b9539..e08aaed8db 100644
--- a/src/cmake/macros/CheckPlatform.cmake
+++ b/cmake/macros/CheckPlatform.cmake
@@ -7,10 +7,10 @@ else()
     MESSAGE(STATUS "Detected 32-bit platform")
 endif()
 
-include("${CMAKE_SOURCE_DIR}/src/cmake/platform/settings.cmake")
+include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
 
 if(WIN32)
-  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/win/settings.cmake")
+  include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
 elseif(UNIX)
-  include("${CMAKE_SOURCE_DIR}/src/cmake/platform/unix/settings.cmake")
+  include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
 endif()
diff --git a/src/cmake/macros/EnsureVersion.cmake b/cmake/macros/EnsureVersion.cmake
similarity index 100%
rename from src/cmake/macros/EnsureVersion.cmake
rename to cmake/macros/EnsureVersion.cmake
diff --git a/src/cmake/macros/FindACE.cmake b/cmake/macros/FindACE.cmake
similarity index 100%
rename from src/cmake/macros/FindACE.cmake
rename to cmake/macros/FindACE.cmake
diff --git a/src/cmake/macros/FindGit.cmake b/cmake/macros/FindGit.cmake
similarity index 95%
rename from src/cmake/macros/FindGit.cmake
rename to cmake/macros/FindGit.cmake
index a37370c849..71b827c9d3 100644
--- a/src/cmake/macros/FindGit.cmake
+++ b/cmake/macros/FindGit.cmake
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -7,7 +7,7 @@
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-include(${CMAKE_SOURCE_DIR}/src/cmake/macros/EnsureVersion.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/macros/EnsureVersion.cmake)
 
 set(_REQUIRED_GIT_VERSION "1.7")
 
diff --git a/src/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake
similarity index 100%
rename from src/cmake/macros/FindMySQL.cmake
rename to cmake/macros/FindMySQL.cmake
diff --git a/src/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake
similarity index 100%
rename from src/cmake/macros/FindOpenSSL.cmake
rename to cmake/macros/FindOpenSSL.cmake
diff --git a/src/cmake/macros/FindPCHSupport.cmake b/cmake/macros/FindPCHSupport.cmake
similarity index 100%
rename from src/cmake/macros/FindPCHSupport.cmake
rename to cmake/macros/FindPCHSupport.cmake
diff --git a/src/cmake/macros/FindReadline.cmake b/cmake/macros/FindReadline.cmake
similarity index 100%
rename from src/cmake/macros/FindReadline.cmake
rename to cmake/macros/FindReadline.cmake
diff --git a/src/cmake/options.cmake b/cmake/options.cmake
similarity index 100%
rename from src/cmake/options.cmake
rename to cmake/options.cmake
diff --git a/src/cmake/platform/cmake_uninstall.in.cmake b/cmake/platform/cmake_uninstall.in.cmake
similarity index 100%
rename from src/cmake/platform/cmake_uninstall.in.cmake
rename to cmake/platform/cmake_uninstall.in.cmake
diff --git a/src/cmake/platform/settings.cmake b/cmake/platform/settings.cmake
similarity index 100%
rename from src/cmake/platform/settings.cmake
rename to cmake/platform/settings.cmake
diff --git a/src/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
similarity index 80%
rename from src/cmake/platform/unix/settings.cmake
rename to cmake/platform/unix/settings.cmake
index daa2653434..42bfefa699 100644
--- a/src/cmake/platform/unix/settings.cmake
+++ b/cmake/platform/unix/settings.cmake
@@ -20,7 +20,7 @@ endif()
 
 # configure uninstaller
 configure_file(
-  "${CMAKE_SOURCE_DIR}/src/cmake/platform/cmake_uninstall.in.cmake"
+  "${CMAKE_SOURCE_DIR}/cmake/platform/cmake_uninstall.in.cmake"
   "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
   @ONLY
 )
@@ -34,11 +34,11 @@ message(STATUS "UNIX: Created uninstall target")
 
 message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}")
 if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/gcc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "icc")
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/icc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake)
 elseif(CMAKE_C_COMPILER MATCHES "clang")
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/clang/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
 else()
 add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 endif()
diff --git a/src/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake
similarity index 70%
rename from src/cmake/platform/win/settings.cmake
rename to cmake/platform/win/settings.cmake
index 6a75f37c60..c0f724922e 100644
--- a/src/cmake/platform/win/settings.cmake
+++ b/cmake/platform/win/settings.cmake
@@ -2,13 +2,13 @@
 option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1)
 
 # Package overloads
-set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/dep/acelite)
+set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite)
 set(ACE_LIBRARY "ace")
 set(BZIP2_LIBRARIES "bzip2")
 set(ZLIB_LIBRARIES "zlib")
 
 if( USE_MYSQL_SOURCES )
-  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/dep/mysqllite/include)
+  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include)
   set(MYSQL_LIBRARY "libmysql")
   set( MYSQL_FOUND 1 )
   message(STATUS "Using supplied MySQL sources")
@@ -26,7 +26,7 @@ endif()
 #endif()
 
 if ( MSVC )
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/msvc/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake)
 elseif ( MINGW )
-  include(${CMAKE_SOURCE_DIR}/src/cmake/compiler/mingw/settings.cmake)
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/mingw/settings.cmake)
 endif()
diff --git a/src/cmake/showoptions.cmake b/cmake/showoptions.cmake
similarity index 100%
rename from src/cmake/showoptions.cmake
rename to cmake/showoptions.cmake
diff --git a/modules/dep/mysqllite/cmake/stack_direction.c b/cmake/stack_direction.c
similarity index 100%
rename from modules/dep/mysqllite/cmake/stack_direction.c
rename to cmake/stack_direction.c
diff --git a/data/contrib/valgrind/helgrind.supp b/contrib/valgrind/helgrind.supp
similarity index 100%
rename from data/contrib/valgrind/helgrind.supp
rename to contrib/valgrind/helgrind.supp
diff --git a/modules/dep/CMakeLists.txt b/dep/CMakeLists.txt
similarity index 100%
rename from modules/dep/CMakeLists.txt
rename to dep/CMakeLists.txt
diff --git a/modules/dep/PackageList.txt b/dep/PackageList.txt
similarity index 100%
rename from modules/dep/PackageList.txt
rename to dep/PackageList.txt
diff --git a/modules/dep/SFMT/SFMT.h b/dep/SFMT/SFMT.h
similarity index 100%
rename from modules/dep/SFMT/SFMT.h
rename to dep/SFMT/SFMT.h
diff --git a/modules/dep/SFMT/randomc.h b/dep/SFMT/randomc.h
similarity index 100%
rename from modules/dep/SFMT/randomc.h
rename to dep/SFMT/randomc.h
diff --git a/modules/dep/acelite/AUTHORS b/dep/acelite/AUTHORS
similarity index 100%
rename from modules/dep/acelite/AUTHORS
rename to dep/acelite/AUTHORS
diff --git a/modules/dep/acelite/CMakeLists.txt b/dep/acelite/CMakeLists.txt
similarity index 100%
rename from modules/dep/acelite/CMakeLists.txt
rename to dep/acelite/CMakeLists.txt
diff --git a/modules/dep/acelite/COPYING b/dep/acelite/COPYING
similarity index 100%
rename from modules/dep/acelite/COPYING
rename to dep/acelite/COPYING
diff --git a/modules/dep/acelite/NEWS b/dep/acelite/NEWS
similarity index 100%
rename from modules/dep/acelite/NEWS
rename to dep/acelite/NEWS
diff --git a/modules/dep/acelite/README b/dep/acelite/README
similarity index 100%
rename from modules/dep/acelite/README
rename to dep/acelite/README
diff --git a/modules/dep/acelite/THANKS b/dep/acelite/THANKS
similarity index 100%
rename from modules/dep/acelite/THANKS
rename to dep/acelite/THANKS
diff --git a/modules/dep/acelite/VERSION b/dep/acelite/VERSION
similarity index 100%
rename from modules/dep/acelite/VERSION
rename to dep/acelite/VERSION
diff --git a/modules/dep/acelite/ace/ACE.cpp b/dep/acelite/ace/ACE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ACE.cpp
rename to dep/acelite/ace/ACE.cpp
diff --git a/modules/dep/acelite/ace/ACE.h b/dep/acelite/ace/ACE.h
similarity index 100%
rename from modules/dep/acelite/ace/ACE.h
rename to dep/acelite/ace/ACE.h
diff --git a/modules/dep/acelite/ace/ACE.inl b/dep/acelite/ace/ACE.inl
similarity index 100%
rename from modules/dep/acelite/ace/ACE.inl
rename to dep/acelite/ace/ACE.inl
diff --git a/modules/dep/acelite/ace/ACE.pc.in b/dep/acelite/ace/ACE.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/ACE.pc.in
rename to dep/acelite/ace/ACE.pc.in
diff --git a/modules/dep/acelite/ace/ACE_crc32.cpp b/dep/acelite/ace/ACE_crc32.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ACE_crc32.cpp
rename to dep/acelite/ace/ACE_crc32.cpp
diff --git a/modules/dep/acelite/ace/ACE_crc_ccitt.cpp b/dep/acelite/ace/ACE_crc_ccitt.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ACE_crc_ccitt.cpp
rename to dep/acelite/ace/ACE_crc_ccitt.cpp
diff --git a/modules/dep/acelite/ace/ACE_export.h b/dep/acelite/ace/ACE_export.h
similarity index 100%
rename from modules/dep/acelite/ace/ACE_export.h
rename to dep/acelite/ace/ACE_export.h
diff --git a/modules/dep/acelite/ace/ARGV.cpp b/dep/acelite/ace/ARGV.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ARGV.cpp
rename to dep/acelite/ace/ARGV.cpp
diff --git a/modules/dep/acelite/ace/ARGV.h b/dep/acelite/ace/ARGV.h
similarity index 100%
rename from modules/dep/acelite/ace/ARGV.h
rename to dep/acelite/ace/ARGV.h
diff --git a/modules/dep/acelite/ace/ARGV.inl b/dep/acelite/ace/ARGV.inl
similarity index 100%
rename from modules/dep/acelite/ace/ARGV.inl
rename to dep/acelite/ace/ARGV.inl
diff --git a/modules/dep/acelite/ace/ATM_Acceptor.cpp b/dep/acelite/ace/ATM_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Acceptor.cpp
rename to dep/acelite/ace/ATM_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/ATM_Acceptor.h b/dep/acelite/ace/ATM_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Acceptor.h
rename to dep/acelite/ace/ATM_Acceptor.h
diff --git a/modules/dep/acelite/ace/ATM_Acceptor.inl b/dep/acelite/ace/ATM_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Acceptor.inl
rename to dep/acelite/ace/ATM_Acceptor.inl
diff --git a/modules/dep/acelite/ace/ATM_Addr.cpp b/dep/acelite/ace/ATM_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Addr.cpp
rename to dep/acelite/ace/ATM_Addr.cpp
diff --git a/modules/dep/acelite/ace/ATM_Addr.h b/dep/acelite/ace/ATM_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Addr.h
rename to dep/acelite/ace/ATM_Addr.h
diff --git a/modules/dep/acelite/ace/ATM_Addr.inl b/dep/acelite/ace/ATM_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Addr.inl
rename to dep/acelite/ace/ATM_Addr.inl
diff --git a/modules/dep/acelite/ace/ATM_Connector.cpp b/dep/acelite/ace/ATM_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Connector.cpp
rename to dep/acelite/ace/ATM_Connector.cpp
diff --git a/modules/dep/acelite/ace/ATM_Connector.h b/dep/acelite/ace/ATM_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Connector.h
rename to dep/acelite/ace/ATM_Connector.h
diff --git a/modules/dep/acelite/ace/ATM_Connector.inl b/dep/acelite/ace/ATM_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Connector.inl
rename to dep/acelite/ace/ATM_Connector.inl
diff --git a/modules/dep/acelite/ace/ATM_Params.cpp b/dep/acelite/ace/ATM_Params.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Params.cpp
rename to dep/acelite/ace/ATM_Params.cpp
diff --git a/modules/dep/acelite/ace/ATM_Params.h b/dep/acelite/ace/ATM_Params.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Params.h
rename to dep/acelite/ace/ATM_Params.h
diff --git a/modules/dep/acelite/ace/ATM_Params.inl b/dep/acelite/ace/ATM_Params.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Params.inl
rename to dep/acelite/ace/ATM_Params.inl
diff --git a/modules/dep/acelite/ace/ATM_QoS.cpp b/dep/acelite/ace/ATM_QoS.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_QoS.cpp
rename to dep/acelite/ace/ATM_QoS.cpp
diff --git a/modules/dep/acelite/ace/ATM_QoS.h b/dep/acelite/ace/ATM_QoS.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_QoS.h
rename to dep/acelite/ace/ATM_QoS.h
diff --git a/modules/dep/acelite/ace/ATM_QoS.inl b/dep/acelite/ace/ATM_QoS.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_QoS.inl
rename to dep/acelite/ace/ATM_QoS.inl
diff --git a/modules/dep/acelite/ace/ATM_Stream.cpp b/dep/acelite/ace/ATM_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Stream.cpp
rename to dep/acelite/ace/ATM_Stream.cpp
diff --git a/modules/dep/acelite/ace/ATM_Stream.h b/dep/acelite/ace/ATM_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Stream.h
rename to dep/acelite/ace/ATM_Stream.h
diff --git a/modules/dep/acelite/ace/ATM_Stream.inl b/dep/acelite/ace/ATM_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/ATM_Stream.inl
rename to dep/acelite/ace/ATM_Stream.inl
diff --git a/modules/dep/acelite/ace/Abstract_Timer_Queue.cpp b/dep/acelite/ace/Abstract_Timer_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Abstract_Timer_Queue.cpp
rename to dep/acelite/ace/Abstract_Timer_Queue.cpp
diff --git a/modules/dep/acelite/ace/Abstract_Timer_Queue.h b/dep/acelite/ace/Abstract_Timer_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Abstract_Timer_Queue.h
rename to dep/acelite/ace/Abstract_Timer_Queue.h
diff --git a/modules/dep/acelite/ace/Acceptor.cpp b/dep/acelite/ace/Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Acceptor.cpp
rename to dep/acelite/ace/Acceptor.cpp
diff --git a/modules/dep/acelite/ace/Acceptor.h b/dep/acelite/ace/Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/Acceptor.h
rename to dep/acelite/ace/Acceptor.h
diff --git a/modules/dep/acelite/ace/Activation_Queue.cpp b/dep/acelite/ace/Activation_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Activation_Queue.cpp
rename to dep/acelite/ace/Activation_Queue.cpp
diff --git a/modules/dep/acelite/ace/Activation_Queue.h b/dep/acelite/ace/Activation_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Activation_Queue.h
rename to dep/acelite/ace/Activation_Queue.h
diff --git a/modules/dep/acelite/ace/Activation_Queue.inl b/dep/acelite/ace/Activation_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Activation_Queue.inl
rename to dep/acelite/ace/Activation_Queue.inl
diff --git a/modules/dep/acelite/ace/Active_Map_Manager.cpp b/dep/acelite/ace/Active_Map_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager.cpp
rename to dep/acelite/ace/Active_Map_Manager.cpp
diff --git a/modules/dep/acelite/ace/Active_Map_Manager.h b/dep/acelite/ace/Active_Map_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager.h
rename to dep/acelite/ace/Active_Map_Manager.h
diff --git a/modules/dep/acelite/ace/Active_Map_Manager.inl b/dep/acelite/ace/Active_Map_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager.inl
rename to dep/acelite/ace/Active_Map_Manager.inl
diff --git a/modules/dep/acelite/ace/Active_Map_Manager_T.cpp b/dep/acelite/ace/Active_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager_T.cpp
rename to dep/acelite/ace/Active_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Active_Map_Manager_T.h b/dep/acelite/ace/Active_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager_T.h
rename to dep/acelite/ace/Active_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Active_Map_Manager_T.inl b/dep/acelite/ace/Active_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Active_Map_Manager_T.inl
rename to dep/acelite/ace/Active_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Addr.cpp b/dep/acelite/ace/Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Addr.cpp
rename to dep/acelite/ace/Addr.cpp
diff --git a/modules/dep/acelite/ace/Addr.h b/dep/acelite/ace/Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/Addr.h
rename to dep/acelite/ace/Addr.h
diff --git a/modules/dep/acelite/ace/Addr.inl b/dep/acelite/ace/Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Addr.inl
rename to dep/acelite/ace/Addr.inl
diff --git a/modules/dep/acelite/ace/Arg_Shifter.cpp b/dep/acelite/ace/Arg_Shifter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Arg_Shifter.cpp
rename to dep/acelite/ace/Arg_Shifter.cpp
diff --git a/modules/dep/acelite/ace/Arg_Shifter.h b/dep/acelite/ace/Arg_Shifter.h
similarity index 100%
rename from modules/dep/acelite/ace/Arg_Shifter.h
rename to dep/acelite/ace/Arg_Shifter.h
diff --git a/modules/dep/acelite/ace/Argv_Type_Converter.cpp b/dep/acelite/ace/Argv_Type_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Argv_Type_Converter.cpp
rename to dep/acelite/ace/Argv_Type_Converter.cpp
diff --git a/modules/dep/acelite/ace/Argv_Type_Converter.h b/dep/acelite/ace/Argv_Type_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/Argv_Type_Converter.h
rename to dep/acelite/ace/Argv_Type_Converter.h
diff --git a/modules/dep/acelite/ace/Argv_Type_Converter.inl b/dep/acelite/ace/Argv_Type_Converter.inl
similarity index 100%
rename from modules/dep/acelite/ace/Argv_Type_Converter.inl
rename to dep/acelite/ace/Argv_Type_Converter.inl
diff --git a/modules/dep/acelite/ace/Array_Base.cpp b/dep/acelite/ace/Array_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Array_Base.cpp
rename to dep/acelite/ace/Array_Base.cpp
diff --git a/modules/dep/acelite/ace/Array_Base.h b/dep/acelite/ace/Array_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Array_Base.h
rename to dep/acelite/ace/Array_Base.h
diff --git a/modules/dep/acelite/ace/Array_Base.inl b/dep/acelite/ace/Array_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Array_Base.inl
rename to dep/acelite/ace/Array_Base.inl
diff --git a/modules/dep/acelite/ace/Array_Map.cpp b/dep/acelite/ace/Array_Map.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Array_Map.cpp
rename to dep/acelite/ace/Array_Map.cpp
diff --git a/modules/dep/acelite/ace/Array_Map.h b/dep/acelite/ace/Array_Map.h
similarity index 100%
rename from modules/dep/acelite/ace/Array_Map.h
rename to dep/acelite/ace/Array_Map.h
diff --git a/modules/dep/acelite/ace/Array_Map.inl b/dep/acelite/ace/Array_Map.inl
similarity index 100%
rename from modules/dep/acelite/ace/Array_Map.inl
rename to dep/acelite/ace/Array_Map.inl
diff --git a/modules/dep/acelite/ace/Assert.cpp b/dep/acelite/ace/Assert.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Assert.cpp
rename to dep/acelite/ace/Assert.cpp
diff --git a/modules/dep/acelite/ace/Assert.h b/dep/acelite/ace/Assert.h
similarity index 100%
rename from modules/dep/acelite/ace/Assert.h
rename to dep/acelite/ace/Assert.h
diff --git a/modules/dep/acelite/ace/Asynch_Acceptor.cpp b/dep/acelite/ace/Asynch_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Acceptor.cpp
rename to dep/acelite/ace/Asynch_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/Asynch_Acceptor.h b/dep/acelite/ace/Asynch_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Acceptor.h
rename to dep/acelite/ace/Asynch_Acceptor.h
diff --git a/modules/dep/acelite/ace/Asynch_Connector.cpp b/dep/acelite/ace/Asynch_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Connector.cpp
rename to dep/acelite/ace/Asynch_Connector.cpp
diff --git a/modules/dep/acelite/ace/Asynch_Connector.h b/dep/acelite/ace/Asynch_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Connector.h
rename to dep/acelite/ace/Asynch_Connector.h
diff --git a/modules/dep/acelite/ace/Asynch_IO.cpp b/dep/acelite/ace/Asynch_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO.cpp
rename to dep/acelite/ace/Asynch_IO.cpp
diff --git a/modules/dep/acelite/ace/Asynch_IO.h b/dep/acelite/ace/Asynch_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO.h
rename to dep/acelite/ace/Asynch_IO.h
diff --git a/modules/dep/acelite/ace/Asynch_IO_Impl.cpp b/dep/acelite/ace/Asynch_IO_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO_Impl.cpp
rename to dep/acelite/ace/Asynch_IO_Impl.cpp
diff --git a/modules/dep/acelite/ace/Asynch_IO_Impl.h b/dep/acelite/ace/Asynch_IO_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO_Impl.h
rename to dep/acelite/ace/Asynch_IO_Impl.h
diff --git a/modules/dep/acelite/ace/Asynch_IO_Impl.inl b/dep/acelite/ace/Asynch_IO_Impl.inl
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_IO_Impl.inl
rename to dep/acelite/ace/Asynch_IO_Impl.inl
diff --git a/modules/dep/acelite/ace/Asynch_Pseudo_Task.cpp b/dep/acelite/ace/Asynch_Pseudo_Task.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Pseudo_Task.cpp
rename to dep/acelite/ace/Asynch_Pseudo_Task.cpp
diff --git a/modules/dep/acelite/ace/Asynch_Pseudo_Task.h b/dep/acelite/ace/Asynch_Pseudo_Task.h
similarity index 100%
rename from modules/dep/acelite/ace/Asynch_Pseudo_Task.h
rename to dep/acelite/ace/Asynch_Pseudo_Task.h
diff --git a/modules/dep/acelite/ace/Atomic_Op.cpp b/dep/acelite/ace/Atomic_Op.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op.cpp
rename to dep/acelite/ace/Atomic_Op.cpp
diff --git a/modules/dep/acelite/ace/Atomic_Op.h b/dep/acelite/ace/Atomic_Op.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op.h
rename to dep/acelite/ace/Atomic_Op.h
diff --git a/modules/dep/acelite/ace/Atomic_Op.inl b/dep/acelite/ace/Atomic_Op.inl
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op.inl
rename to dep/acelite/ace/Atomic_Op.inl
diff --git a/modules/dep/acelite/ace/Atomic_Op_GCC_T.cpp b/dep/acelite/ace/Atomic_Op_GCC_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_GCC_T.cpp
rename to dep/acelite/ace/Atomic_Op_GCC_T.cpp
diff --git a/modules/dep/acelite/ace/Atomic_Op_GCC_T.h b/dep/acelite/ace/Atomic_Op_GCC_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_GCC_T.h
rename to dep/acelite/ace/Atomic_Op_GCC_T.h
diff --git a/modules/dep/acelite/ace/Atomic_Op_GCC_T.inl b/dep/acelite/ace/Atomic_Op_GCC_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_GCC_T.inl
rename to dep/acelite/ace/Atomic_Op_GCC_T.inl
diff --git a/modules/dep/acelite/ace/Atomic_Op_Sparc.c b/dep/acelite/ace/Atomic_Op_Sparc.c
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_Sparc.c
rename to dep/acelite/ace/Atomic_Op_Sparc.c
diff --git a/modules/dep/acelite/ace/Atomic_Op_Sparc.h b/dep/acelite/ace/Atomic_Op_Sparc.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_Sparc.h
rename to dep/acelite/ace/Atomic_Op_Sparc.h
diff --git a/modules/dep/acelite/ace/Atomic_Op_T.cpp b/dep/acelite/ace/Atomic_Op_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_T.cpp
rename to dep/acelite/ace/Atomic_Op_T.cpp
diff --git a/modules/dep/acelite/ace/Atomic_Op_T.h b/dep/acelite/ace/Atomic_Op_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_T.h
rename to dep/acelite/ace/Atomic_Op_T.h
diff --git a/modules/dep/acelite/ace/Atomic_Op_T.inl b/dep/acelite/ace/Atomic_Op_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Atomic_Op_T.inl
rename to dep/acelite/ace/Atomic_Op_T.inl
diff --git a/modules/dep/acelite/ace/Auto_Event.cpp b/dep/acelite/ace/Auto_Event.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Event.cpp
rename to dep/acelite/ace/Auto_Event.cpp
diff --git a/modules/dep/acelite/ace/Auto_Event.h b/dep/acelite/ace/Auto_Event.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Event.h
rename to dep/acelite/ace/Auto_Event.h
diff --git a/modules/dep/acelite/ace/Auto_Event.inl b/dep/acelite/ace/Auto_Event.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Event.inl
rename to dep/acelite/ace/Auto_Event.inl
diff --git a/modules/dep/acelite/ace/Auto_Functor.cpp b/dep/acelite/ace/Auto_Functor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Functor.cpp
rename to dep/acelite/ace/Auto_Functor.cpp
diff --git a/modules/dep/acelite/ace/Auto_Functor.h b/dep/acelite/ace/Auto_Functor.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Functor.h
rename to dep/acelite/ace/Auto_Functor.h
diff --git a/modules/dep/acelite/ace/Auto_Functor.inl b/dep/acelite/ace/Auto_Functor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Functor.inl
rename to dep/acelite/ace/Auto_Functor.inl
diff --git a/modules/dep/acelite/ace/Auto_IncDec_T.cpp b/dep/acelite/ace/Auto_IncDec_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_IncDec_T.cpp
rename to dep/acelite/ace/Auto_IncDec_T.cpp
diff --git a/modules/dep/acelite/ace/Auto_IncDec_T.h b/dep/acelite/ace/Auto_IncDec_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_IncDec_T.h
rename to dep/acelite/ace/Auto_IncDec_T.h
diff --git a/modules/dep/acelite/ace/Auto_IncDec_T.inl b/dep/acelite/ace/Auto_IncDec_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_IncDec_T.inl
rename to dep/acelite/ace/Auto_IncDec_T.inl
diff --git a/modules/dep/acelite/ace/Auto_Ptr.cpp b/dep/acelite/ace/Auto_Ptr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Ptr.cpp
rename to dep/acelite/ace/Auto_Ptr.cpp
diff --git a/modules/dep/acelite/ace/Auto_Ptr.h b/dep/acelite/ace/Auto_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Ptr.h
rename to dep/acelite/ace/Auto_Ptr.h
diff --git a/modules/dep/acelite/ace/Auto_Ptr.inl b/dep/acelite/ace/Auto_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Auto_Ptr.inl
rename to dep/acelite/ace/Auto_Ptr.inl
diff --git a/modules/dep/acelite/ace/Barrier.cpp b/dep/acelite/ace/Barrier.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Barrier.cpp
rename to dep/acelite/ace/Barrier.cpp
diff --git a/modules/dep/acelite/ace/Barrier.h b/dep/acelite/ace/Barrier.h
similarity index 100%
rename from modules/dep/acelite/ace/Barrier.h
rename to dep/acelite/ace/Barrier.h
diff --git a/modules/dep/acelite/ace/Barrier.inl b/dep/acelite/ace/Barrier.inl
similarity index 100%
rename from modules/dep/acelite/ace/Barrier.inl
rename to dep/acelite/ace/Barrier.inl
diff --git a/modules/dep/acelite/ace/Base_Thread_Adapter.cpp b/dep/acelite/ace/Base_Thread_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Base_Thread_Adapter.cpp
rename to dep/acelite/ace/Base_Thread_Adapter.cpp
diff --git a/modules/dep/acelite/ace/Base_Thread_Adapter.h b/dep/acelite/ace/Base_Thread_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/Base_Thread_Adapter.h
rename to dep/acelite/ace/Base_Thread_Adapter.h
diff --git a/modules/dep/acelite/ace/Base_Thread_Adapter.inl b/dep/acelite/ace/Base_Thread_Adapter.inl
similarity index 100%
rename from modules/dep/acelite/ace/Base_Thread_Adapter.inl
rename to dep/acelite/ace/Base_Thread_Adapter.inl
diff --git a/modules/dep/acelite/ace/Based_Pointer_Repository.cpp b/dep/acelite/ace/Based_Pointer_Repository.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_Repository.cpp
rename to dep/acelite/ace/Based_Pointer_Repository.cpp
diff --git a/modules/dep/acelite/ace/Based_Pointer_Repository.h b/dep/acelite/ace/Based_Pointer_Repository.h
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_Repository.h
rename to dep/acelite/ace/Based_Pointer_Repository.h
diff --git a/modules/dep/acelite/ace/Based_Pointer_T.cpp b/dep/acelite/ace/Based_Pointer_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_T.cpp
rename to dep/acelite/ace/Based_Pointer_T.cpp
diff --git a/modules/dep/acelite/ace/Based_Pointer_T.h b/dep/acelite/ace/Based_Pointer_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_T.h
rename to dep/acelite/ace/Based_Pointer_T.h
diff --git a/modules/dep/acelite/ace/Based_Pointer_T.inl b/dep/acelite/ace/Based_Pointer_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Based_Pointer_T.inl
rename to dep/acelite/ace/Based_Pointer_T.inl
diff --git a/modules/dep/acelite/ace/Basic_Stats.cpp b/dep/acelite/ace/Basic_Stats.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Stats.cpp
rename to dep/acelite/ace/Basic_Stats.cpp
diff --git a/modules/dep/acelite/ace/Basic_Stats.h b/dep/acelite/ace/Basic_Stats.h
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Stats.h
rename to dep/acelite/ace/Basic_Stats.h
diff --git a/modules/dep/acelite/ace/Basic_Stats.inl b/dep/acelite/ace/Basic_Stats.inl
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Stats.inl
rename to dep/acelite/ace/Basic_Stats.inl
diff --git a/modules/dep/acelite/ace/Basic_Types.cpp b/dep/acelite/ace/Basic_Types.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Types.cpp
rename to dep/acelite/ace/Basic_Types.cpp
diff --git a/modules/dep/acelite/ace/Basic_Types.h b/dep/acelite/ace/Basic_Types.h
similarity index 100%
rename from modules/dep/acelite/ace/Basic_Types.h
rename to dep/acelite/ace/Basic_Types.h
diff --git a/modules/dep/acelite/ace/Bound_Ptr.h b/dep/acelite/ace/Bound_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Bound_Ptr.h
rename to dep/acelite/ace/Bound_Ptr.h
diff --git a/modules/dep/acelite/ace/Bound_Ptr.inl b/dep/acelite/ace/Bound_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Bound_Ptr.inl
rename to dep/acelite/ace/Bound_Ptr.inl
diff --git a/modules/dep/acelite/ace/CDR_Base.cpp b/dep/acelite/ace/CDR_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Base.cpp
rename to dep/acelite/ace/CDR_Base.cpp
diff --git a/modules/dep/acelite/ace/CDR_Base.h b/dep/acelite/ace/CDR_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Base.h
rename to dep/acelite/ace/CDR_Base.h
diff --git a/modules/dep/acelite/ace/CDR_Base.inl b/dep/acelite/ace/CDR_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Base.inl
rename to dep/acelite/ace/CDR_Base.inl
diff --git a/modules/dep/acelite/ace/CDR_Size.cpp b/dep/acelite/ace/CDR_Size.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Size.cpp
rename to dep/acelite/ace/CDR_Size.cpp
diff --git a/modules/dep/acelite/ace/CDR_Size.h b/dep/acelite/ace/CDR_Size.h
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Size.h
rename to dep/acelite/ace/CDR_Size.h
diff --git a/modules/dep/acelite/ace/CDR_Size.inl b/dep/acelite/ace/CDR_Size.inl
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Size.inl
rename to dep/acelite/ace/CDR_Size.inl
diff --git a/modules/dep/acelite/ace/CDR_Stream.cpp b/dep/acelite/ace/CDR_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Stream.cpp
rename to dep/acelite/ace/CDR_Stream.cpp
diff --git a/modules/dep/acelite/ace/CDR_Stream.h b/dep/acelite/ace/CDR_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Stream.h
rename to dep/acelite/ace/CDR_Stream.h
diff --git a/modules/dep/acelite/ace/CDR_Stream.inl b/dep/acelite/ace/CDR_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/CDR_Stream.inl
rename to dep/acelite/ace/CDR_Stream.inl
diff --git a/modules/dep/acelite/ace/CE_Screen_Output.cpp b/dep/acelite/ace/CE_Screen_Output.cpp
similarity index 100%
rename from modules/dep/acelite/ace/CE_Screen_Output.cpp
rename to dep/acelite/ace/CE_Screen_Output.cpp
diff --git a/modules/dep/acelite/ace/CE_Screen_Output.h b/dep/acelite/ace/CE_Screen_Output.h
similarity index 100%
rename from modules/dep/acelite/ace/CE_Screen_Output.h
rename to dep/acelite/ace/CE_Screen_Output.h
diff --git a/modules/dep/acelite/ace/CMakeLists.txt b/dep/acelite/ace/CMakeLists.txt
similarity index 98%
rename from modules/dep/acelite/ace/CMakeLists.txt
rename to dep/acelite/ace/CMakeLists.txt
index a926e097e8..ca9aa6d32d 100644
--- a/modules/dep/acelite/ace/CMakeLists.txt
+++ b/dep/acelite/ace/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -328,9 +328,9 @@ if (USE_COREPCH)
 endif()
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/dep/acelite
+  ${CMAKE_SOURCE_DIR}/dep/acelite
   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-  ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+  ${CMAKE_SOURCE_DIR}/dep/zlib
 )
 
 # Needed for PCH support
diff --git a/modules/dep/acelite/ace/CORBA_macros.h b/dep/acelite/ace/CORBA_macros.h
similarity index 100%
rename from modules/dep/acelite/ace/CORBA_macros.h
rename to dep/acelite/ace/CORBA_macros.h
diff --git a/modules/dep/acelite/ace/Cache_Map_Manager_T.cpp b/dep/acelite/ace/Cache_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cache_Map_Manager_T.cpp
rename to dep/acelite/ace/Cache_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Cache_Map_Manager_T.h b/dep/acelite/ace/Cache_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Cache_Map_Manager_T.h
rename to dep/acelite/ace/Cache_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Cache_Map_Manager_T.inl b/dep/acelite/ace/Cache_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Cache_Map_Manager_T.inl
rename to dep/acelite/ace/Cache_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Cached_Connect_Strategy_T.cpp b/dep/acelite/ace/Cached_Connect_Strategy_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cached_Connect_Strategy_T.cpp
rename to dep/acelite/ace/Cached_Connect_Strategy_T.cpp
diff --git a/modules/dep/acelite/ace/Cached_Connect_Strategy_T.h b/dep/acelite/ace/Cached_Connect_Strategy_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Cached_Connect_Strategy_T.h
rename to dep/acelite/ace/Cached_Connect_Strategy_T.h
diff --git a/modules/dep/acelite/ace/Caching_Strategies_T.cpp b/dep/acelite/ace/Caching_Strategies_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Strategies_T.cpp
rename to dep/acelite/ace/Caching_Strategies_T.cpp
diff --git a/modules/dep/acelite/ace/Caching_Strategies_T.h b/dep/acelite/ace/Caching_Strategies_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Strategies_T.h
rename to dep/acelite/ace/Caching_Strategies_T.h
diff --git a/modules/dep/acelite/ace/Caching_Strategies_T.inl b/dep/acelite/ace/Caching_Strategies_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Strategies_T.inl
rename to dep/acelite/ace/Caching_Strategies_T.inl
diff --git a/modules/dep/acelite/ace/Caching_Utility_T.cpp b/dep/acelite/ace/Caching_Utility_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Utility_T.cpp
rename to dep/acelite/ace/Caching_Utility_T.cpp
diff --git a/modules/dep/acelite/ace/Caching_Utility_T.h b/dep/acelite/ace/Caching_Utility_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Caching_Utility_T.h
rename to dep/acelite/ace/Caching_Utility_T.h
diff --git a/modules/dep/acelite/ace/Capabilities.cpp b/dep/acelite/ace/Capabilities.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Capabilities.cpp
rename to dep/acelite/ace/Capabilities.cpp
diff --git a/modules/dep/acelite/ace/Capabilities.h b/dep/acelite/ace/Capabilities.h
similarity index 100%
rename from modules/dep/acelite/ace/Capabilities.h
rename to dep/acelite/ace/Capabilities.h
diff --git a/modules/dep/acelite/ace/Capabilities.inl b/dep/acelite/ace/Capabilities.inl
similarity index 100%
rename from modules/dep/acelite/ace/Capabilities.inl
rename to dep/acelite/ace/Capabilities.inl
diff --git a/modules/dep/acelite/ace/Cleanup.cpp b/dep/acelite/ace/Cleanup.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup.cpp
rename to dep/acelite/ace/Cleanup.cpp
diff --git a/modules/dep/acelite/ace/Cleanup.h b/dep/acelite/ace/Cleanup.h
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup.h
rename to dep/acelite/ace/Cleanup.h
diff --git a/modules/dep/acelite/ace/Cleanup.inl b/dep/acelite/ace/Cleanup.inl
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup.inl
rename to dep/acelite/ace/Cleanup.inl
diff --git a/modules/dep/acelite/ace/Cleanup_Strategies_T.cpp b/dep/acelite/ace/Cleanup_Strategies_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup_Strategies_T.cpp
rename to dep/acelite/ace/Cleanup_Strategies_T.cpp
diff --git a/modules/dep/acelite/ace/Cleanup_Strategies_T.h b/dep/acelite/ace/Cleanup_Strategies_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Cleanup_Strategies_T.h
rename to dep/acelite/ace/Cleanup_Strategies_T.h
diff --git a/modules/dep/acelite/ace/Codecs.cpp b/dep/acelite/ace/Codecs.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codecs.cpp
rename to dep/acelite/ace/Codecs.cpp
diff --git a/modules/dep/acelite/ace/Codecs.h b/dep/acelite/ace/Codecs.h
similarity index 100%
rename from modules/dep/acelite/ace/Codecs.h
rename to dep/acelite/ace/Codecs.h
diff --git a/modules/dep/acelite/ace/Codeset_IBM1047.cpp b/dep/acelite/ace/Codeset_IBM1047.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_IBM1047.cpp
rename to dep/acelite/ace/Codeset_IBM1047.cpp
diff --git a/modules/dep/acelite/ace/Codeset_IBM1047.h b/dep/acelite/ace/Codeset_IBM1047.h
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_IBM1047.h
rename to dep/acelite/ace/Codeset_IBM1047.h
diff --git a/modules/dep/acelite/ace/Codeset_Registry.cpp b/dep/acelite/ace/Codeset_Registry.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry.cpp
rename to dep/acelite/ace/Codeset_Registry.cpp
diff --git a/modules/dep/acelite/ace/Codeset_Registry.h b/dep/acelite/ace/Codeset_Registry.h
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry.h
rename to dep/acelite/ace/Codeset_Registry.h
diff --git a/modules/dep/acelite/ace/Codeset_Registry.inl b/dep/acelite/ace/Codeset_Registry.inl
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry.inl
rename to dep/acelite/ace/Codeset_Registry.inl
diff --git a/modules/dep/acelite/ace/Codeset_Registry_db.cpp b/dep/acelite/ace/Codeset_Registry_db.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Registry_db.cpp
rename to dep/acelite/ace/Codeset_Registry_db.cpp
diff --git a/modules/dep/acelite/ace/Codeset_Symbols.h b/dep/acelite/ace/Codeset_Symbols.h
similarity index 100%
rename from modules/dep/acelite/ace/Codeset_Symbols.h
rename to dep/acelite/ace/Codeset_Symbols.h
diff --git a/modules/dep/acelite/ace/Compression/ACE_Compression.mpc b/dep/acelite/ace/Compression/ACE_Compression.mpc
similarity index 100%
rename from modules/dep/acelite/ace/Compression/ACE_Compression.mpc
rename to dep/acelite/ace/Compression/ACE_Compression.mpc
diff --git a/modules/dep/acelite/ace/Compression/ACE_Compression_export.h b/dep/acelite/ace/Compression/ACE_Compression_export.h
similarity index 100%
rename from modules/dep/acelite/ace/Compression/ACE_Compression_export.h
rename to dep/acelite/ace/Compression/ACE_Compression_export.h
diff --git a/modules/dep/acelite/ace/Compression/Compressor.cpp b/dep/acelite/ace/Compression/Compressor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Compression/Compressor.cpp
rename to dep/acelite/ace/Compression/Compressor.cpp
diff --git a/modules/dep/acelite/ace/Compression/Compressor.h b/dep/acelite/ace/Compression/Compressor.h
similarity index 100%
rename from modules/dep/acelite/ace/Compression/Compressor.h
rename to dep/acelite/ace/Compression/Compressor.h
diff --git a/modules/dep/acelite/ace/Compression/Compressor.inl b/dep/acelite/ace/Compression/Compressor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Compression/Compressor.inl
rename to dep/acelite/ace/Compression/Compressor.inl
diff --git a/modules/dep/acelite/ace/Compression/rle/ACE_RLECompression.mpc b/dep/acelite/ace/Compression/rle/ACE_RLECompression.mpc
similarity index 100%
rename from modules/dep/acelite/ace/Compression/rle/ACE_RLECompression.mpc
rename to dep/acelite/ace/Compression/rle/ACE_RLECompression.mpc
diff --git a/modules/dep/acelite/ace/Compression/rle/ACE_RLECompression_export.h b/dep/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 dep/acelite/ace/Compression/rle/ACE_RLECompression_export.h
diff --git a/modules/dep/acelite/ace/Compression/rle/RLECompressor.cpp b/dep/acelite/ace/Compression/rle/RLECompressor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Compression/rle/RLECompressor.cpp
rename to dep/acelite/ace/Compression/rle/RLECompressor.cpp
diff --git a/modules/dep/acelite/ace/Compression/rle/RLECompressor.h b/dep/acelite/ace/Compression/rle/RLECompressor.h
similarity index 100%
rename from modules/dep/acelite/ace/Compression/rle/RLECompressor.h
rename to dep/acelite/ace/Compression/rle/RLECompressor.h
diff --git a/modules/dep/acelite/ace/Condition_Attributes.cpp b/dep/acelite/ace/Condition_Attributes.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Attributes.cpp
rename to dep/acelite/ace/Condition_Attributes.cpp
diff --git a/modules/dep/acelite/ace/Condition_Attributes.h b/dep/acelite/ace/Condition_Attributes.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Attributes.h
rename to dep/acelite/ace/Condition_Attributes.h
diff --git a/modules/dep/acelite/ace/Condition_Attributes.inl b/dep/acelite/ace/Condition_Attributes.inl
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Attributes.inl
rename to dep/acelite/ace/Condition_Attributes.inl
diff --git a/modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp b/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
rename to dep/acelite/ace/Condition_Recursive_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.h b/dep/acelite/ace/Condition_Recursive_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Recursive_Thread_Mutex.h
rename to dep/acelite/ace/Condition_Recursive_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Condition_T.cpp b/dep/acelite/ace/Condition_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_T.cpp
rename to dep/acelite/ace/Condition_T.cpp
diff --git a/modules/dep/acelite/ace/Condition_T.h b/dep/acelite/ace/Condition_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_T.h
rename to dep/acelite/ace/Condition_T.h
diff --git a/modules/dep/acelite/ace/Condition_T.inl b/dep/acelite/ace/Condition_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Condition_T.inl
rename to dep/acelite/ace/Condition_T.inl
diff --git a/modules/dep/acelite/ace/Condition_Thread_Mutex.cpp b/dep/acelite/ace/Condition_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Thread_Mutex.cpp
rename to dep/acelite/ace/Condition_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Condition_Thread_Mutex.h b/dep/acelite/ace/Condition_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Thread_Mutex.h
rename to dep/acelite/ace/Condition_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Condition_Thread_Mutex.inl b/dep/acelite/ace/Condition_Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Condition_Thread_Mutex.inl
rename to dep/acelite/ace/Condition_Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Configuration.cpp b/dep/acelite/ace/Configuration.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Configuration.cpp
rename to dep/acelite/ace/Configuration.cpp
diff --git a/modules/dep/acelite/ace/Configuration.h b/dep/acelite/ace/Configuration.h
similarity index 100%
rename from modules/dep/acelite/ace/Configuration.h
rename to dep/acelite/ace/Configuration.h
diff --git a/modules/dep/acelite/ace/Configuration.inl b/dep/acelite/ace/Configuration.inl
similarity index 100%
rename from modules/dep/acelite/ace/Configuration.inl
rename to dep/acelite/ace/Configuration.inl
diff --git a/modules/dep/acelite/ace/Configuration_Import_Export.cpp b/dep/acelite/ace/Configuration_Import_Export.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Configuration_Import_Export.cpp
rename to dep/acelite/ace/Configuration_Import_Export.cpp
diff --git a/modules/dep/acelite/ace/Configuration_Import_Export.h b/dep/acelite/ace/Configuration_Import_Export.h
similarity index 100%
rename from modules/dep/acelite/ace/Configuration_Import_Export.h
rename to dep/acelite/ace/Configuration_Import_Export.h
diff --git a/modules/dep/acelite/ace/Connection_Recycling_Strategy.cpp b/dep/acelite/ace/Connection_Recycling_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Connection_Recycling_Strategy.cpp
rename to dep/acelite/ace/Connection_Recycling_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Connection_Recycling_Strategy.h b/dep/acelite/ace/Connection_Recycling_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Connection_Recycling_Strategy.h
rename to dep/acelite/ace/Connection_Recycling_Strategy.h
diff --git a/modules/dep/acelite/ace/Connector.cpp b/dep/acelite/ace/Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Connector.cpp
rename to dep/acelite/ace/Connector.cpp
diff --git a/modules/dep/acelite/ace/Connector.h b/dep/acelite/ace/Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/Connector.h
rename to dep/acelite/ace/Connector.h
diff --git a/modules/dep/acelite/ace/Containers.cpp b/dep/acelite/ace/Containers.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Containers.cpp
rename to dep/acelite/ace/Containers.cpp
diff --git a/modules/dep/acelite/ace/Containers.h b/dep/acelite/ace/Containers.h
similarity index 100%
rename from modules/dep/acelite/ace/Containers.h
rename to dep/acelite/ace/Containers.h
diff --git a/modules/dep/acelite/ace/Containers.inl b/dep/acelite/ace/Containers.inl
similarity index 100%
rename from modules/dep/acelite/ace/Containers.inl
rename to dep/acelite/ace/Containers.inl
diff --git a/modules/dep/acelite/ace/Containers_T.cpp b/dep/acelite/ace/Containers_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Containers_T.cpp
rename to dep/acelite/ace/Containers_T.cpp
diff --git a/modules/dep/acelite/ace/Containers_T.h b/dep/acelite/ace/Containers_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Containers_T.h
rename to dep/acelite/ace/Containers_T.h
diff --git a/modules/dep/acelite/ace/Containers_T.inl b/dep/acelite/ace/Containers_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Containers_T.inl
rename to dep/acelite/ace/Containers_T.inl
diff --git a/modules/dep/acelite/ace/Copy_Disabled.cpp b/dep/acelite/ace/Copy_Disabled.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Copy_Disabled.cpp
rename to dep/acelite/ace/Copy_Disabled.cpp
diff --git a/modules/dep/acelite/ace/Copy_Disabled.h b/dep/acelite/ace/Copy_Disabled.h
similarity index 100%
rename from modules/dep/acelite/ace/Copy_Disabled.h
rename to dep/acelite/ace/Copy_Disabled.h
diff --git a/modules/dep/acelite/ace/Countdown_Time.h b/dep/acelite/ace/Countdown_Time.h
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time.h
rename to dep/acelite/ace/Countdown_Time.h
diff --git a/modules/dep/acelite/ace/Countdown_Time_T.cpp b/dep/acelite/ace/Countdown_Time_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time_T.cpp
rename to dep/acelite/ace/Countdown_Time_T.cpp
diff --git a/modules/dep/acelite/ace/Countdown_Time_T.h b/dep/acelite/ace/Countdown_Time_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time_T.h
rename to dep/acelite/ace/Countdown_Time_T.h
diff --git a/modules/dep/acelite/ace/Countdown_Time_T.inl b/dep/acelite/ace/Countdown_Time_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Countdown_Time_T.inl
rename to dep/acelite/ace/Countdown_Time_T.inl
diff --git a/modules/dep/acelite/ace/DEV.cpp b/dep/acelite/ace/DEV.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV.cpp
rename to dep/acelite/ace/DEV.cpp
diff --git a/modules/dep/acelite/ace/DEV.h b/dep/acelite/ace/DEV.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV.h
rename to dep/acelite/ace/DEV.h
diff --git a/modules/dep/acelite/ace/DEV.inl b/dep/acelite/ace/DEV.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV.inl
rename to dep/acelite/ace/DEV.inl
diff --git a/modules/dep/acelite/ace/DEV_Addr.cpp b/dep/acelite/ace/DEV_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Addr.cpp
rename to dep/acelite/ace/DEV_Addr.cpp
diff --git a/modules/dep/acelite/ace/DEV_Addr.h b/dep/acelite/ace/DEV_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Addr.h
rename to dep/acelite/ace/DEV_Addr.h
diff --git a/modules/dep/acelite/ace/DEV_Addr.inl b/dep/acelite/ace/DEV_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Addr.inl
rename to dep/acelite/ace/DEV_Addr.inl
diff --git a/modules/dep/acelite/ace/DEV_Connector.cpp b/dep/acelite/ace/DEV_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Connector.cpp
rename to dep/acelite/ace/DEV_Connector.cpp
diff --git a/modules/dep/acelite/ace/DEV_Connector.h b/dep/acelite/ace/DEV_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Connector.h
rename to dep/acelite/ace/DEV_Connector.h
diff --git a/modules/dep/acelite/ace/DEV_Connector.inl b/dep/acelite/ace/DEV_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV_Connector.inl
rename to dep/acelite/ace/DEV_Connector.inl
diff --git a/modules/dep/acelite/ace/DEV_IO.cpp b/dep/acelite/ace/DEV_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DEV_IO.cpp
rename to dep/acelite/ace/DEV_IO.cpp
diff --git a/modules/dep/acelite/ace/DEV_IO.h b/dep/acelite/ace/DEV_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/DEV_IO.h
rename to dep/acelite/ace/DEV_IO.h
diff --git a/modules/dep/acelite/ace/DEV_IO.inl b/dep/acelite/ace/DEV_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/DEV_IO.inl
rename to dep/acelite/ace/DEV_IO.inl
diff --git a/modules/dep/acelite/ace/DLL.cpp b/dep/acelite/ace/DLL.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DLL.cpp
rename to dep/acelite/ace/DLL.cpp
diff --git a/modules/dep/acelite/ace/DLL.h b/dep/acelite/ace/DLL.h
similarity index 100%
rename from modules/dep/acelite/ace/DLL.h
rename to dep/acelite/ace/DLL.h
diff --git a/modules/dep/acelite/ace/DLL_Manager.cpp b/dep/acelite/ace/DLL_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/DLL_Manager.cpp
rename to dep/acelite/ace/DLL_Manager.cpp
diff --git a/modules/dep/acelite/ace/DLL_Manager.h b/dep/acelite/ace/DLL_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/DLL_Manager.h
rename to dep/acelite/ace/DLL_Manager.h
diff --git a/modules/dep/acelite/ace/Date_Time.cpp b/dep/acelite/ace/Date_Time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Date_Time.cpp
rename to dep/acelite/ace/Date_Time.cpp
diff --git a/modules/dep/acelite/ace/Date_Time.h b/dep/acelite/ace/Date_Time.h
similarity index 100%
rename from modules/dep/acelite/ace/Date_Time.h
rename to dep/acelite/ace/Date_Time.h
diff --git a/modules/dep/acelite/ace/Date_Time.inl b/dep/acelite/ace/Date_Time.inl
similarity index 100%
rename from modules/dep/acelite/ace/Date_Time.inl
rename to dep/acelite/ace/Date_Time.inl
diff --git a/modules/dep/acelite/ace/Default_Constants.h b/dep/acelite/ace/Default_Constants.h
similarity index 100%
rename from modules/dep/acelite/ace/Default_Constants.h
rename to dep/acelite/ace/Default_Constants.h
diff --git a/modules/dep/acelite/ace/Dev_Poll_Reactor.cpp b/dep/acelite/ace/Dev_Poll_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dev_Poll_Reactor.cpp
rename to dep/acelite/ace/Dev_Poll_Reactor.cpp
diff --git a/modules/dep/acelite/ace/Dev_Poll_Reactor.h b/dep/acelite/ace/Dev_Poll_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Dev_Poll_Reactor.h
rename to dep/acelite/ace/Dev_Poll_Reactor.h
diff --git a/modules/dep/acelite/ace/Dev_Poll_Reactor.inl b/dep/acelite/ace/Dev_Poll_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dev_Poll_Reactor.inl
rename to dep/acelite/ace/Dev_Poll_Reactor.inl
diff --git a/modules/dep/acelite/ace/Dirent.cpp b/dep/acelite/ace/Dirent.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dirent.cpp
rename to dep/acelite/ace/Dirent.cpp
diff --git a/modules/dep/acelite/ace/Dirent.h b/dep/acelite/ace/Dirent.h
similarity index 100%
rename from modules/dep/acelite/ace/Dirent.h
rename to dep/acelite/ace/Dirent.h
diff --git a/modules/dep/acelite/ace/Dirent.inl b/dep/acelite/ace/Dirent.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dirent.inl
rename to dep/acelite/ace/Dirent.inl
diff --git a/modules/dep/acelite/ace/Dirent_Selector.cpp b/dep/acelite/ace/Dirent_Selector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dirent_Selector.cpp
rename to dep/acelite/ace/Dirent_Selector.cpp
diff --git a/modules/dep/acelite/ace/Dirent_Selector.h b/dep/acelite/ace/Dirent_Selector.h
similarity index 100%
rename from modules/dep/acelite/ace/Dirent_Selector.h
rename to dep/acelite/ace/Dirent_Selector.h
diff --git a/modules/dep/acelite/ace/Dirent_Selector.inl b/dep/acelite/ace/Dirent_Selector.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dirent_Selector.inl
rename to dep/acelite/ace/Dirent_Selector.inl
diff --git a/modules/dep/acelite/ace/Dump.cpp b/dep/acelite/ace/Dump.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dump.cpp
rename to dep/acelite/ace/Dump.cpp
diff --git a/modules/dep/acelite/ace/Dump.h b/dep/acelite/ace/Dump.h
similarity index 100%
rename from modules/dep/acelite/ace/Dump.h
rename to dep/acelite/ace/Dump.h
diff --git a/modules/dep/acelite/ace/Dump_T.cpp b/dep/acelite/ace/Dump_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dump_T.cpp
rename to dep/acelite/ace/Dump_T.cpp
diff --git a/modules/dep/acelite/ace/Dump_T.h b/dep/acelite/ace/Dump_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Dump_T.h
rename to dep/acelite/ace/Dump_T.h
diff --git a/modules/dep/acelite/ace/Dynamic.cpp b/dep/acelite/ace/Dynamic.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic.cpp
rename to dep/acelite/ace/Dynamic.cpp
diff --git a/modules/dep/acelite/ace/Dynamic.h b/dep/acelite/ace/Dynamic.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic.h
rename to dep/acelite/ace/Dynamic.h
diff --git a/modules/dep/acelite/ace/Dynamic.inl b/dep/acelite/ace/Dynamic.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic.inl
rename to dep/acelite/ace/Dynamic.inl
diff --git a/modules/dep/acelite/ace/Dynamic_Message_Strategy.cpp b/dep/acelite/ace/Dynamic_Message_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Message_Strategy.cpp
rename to dep/acelite/ace/Dynamic_Message_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Message_Strategy.h b/dep/acelite/ace/Dynamic_Message_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Message_Strategy.h
rename to dep/acelite/ace/Dynamic_Message_Strategy.h
diff --git a/modules/dep/acelite/ace/Dynamic_Message_Strategy.inl b/dep/acelite/ace/Dynamic_Message_Strategy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Message_Strategy.inl
rename to dep/acelite/ace/Dynamic_Message_Strategy.inl
diff --git a/modules/dep/acelite/ace/Dynamic_Service.cpp b/dep/acelite/ace/Dynamic_Service.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service.cpp
rename to dep/acelite/ace/Dynamic_Service.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Service.h b/dep/acelite/ace/Dynamic_Service.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service.h
rename to dep/acelite/ace/Dynamic_Service.h
diff --git a/modules/dep/acelite/ace/Dynamic_Service.inl b/dep/acelite/ace/Dynamic_Service.inl
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service.inl
rename to dep/acelite/ace/Dynamic_Service.inl
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Base.cpp b/dep/acelite/ace/Dynamic_Service_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Base.cpp
rename to dep/acelite/ace/Dynamic_Service_Base.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Base.h b/dep/acelite/ace/Dynamic_Service_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Base.h
rename to dep/acelite/ace/Dynamic_Service_Base.h
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Dependency.cpp b/dep/acelite/ace/Dynamic_Service_Dependency.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Dependency.cpp
rename to dep/acelite/ace/Dynamic_Service_Dependency.cpp
diff --git a/modules/dep/acelite/ace/Dynamic_Service_Dependency.h b/dep/acelite/ace/Dynamic_Service_Dependency.h
similarity index 100%
rename from modules/dep/acelite/ace/Dynamic_Service_Dependency.h
rename to dep/acelite/ace/Dynamic_Service_Dependency.h
diff --git a/modules/dep/acelite/ace/ETCL/ACE_ETCL.pc.in b/dep/acelite/ace/ETCL/ACE_ETCL.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ACE_ETCL.pc.in
rename to dep/acelite/ace/ETCL/ACE_ETCL.pc.in
diff --git a/modules/dep/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in b/dep/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 dep/acelite/ace/ETCL/ACE_ETCL_Parser.pc.in
diff --git a/modules/dep/acelite/ace/ETCL/ETCL.ll b/dep/acelite/ace/ETCL/ETCL.ll
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL.ll
rename to dep/acelite/ace/ETCL/ETCL.ll
diff --git a/modules/dep/acelite/ace/ETCL/ETCL.mpc b/dep/acelite/ace/ETCL/ETCL.mpc
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL.mpc
rename to dep/acelite/ace/ETCL/ETCL.mpc
diff --git a/modules/dep/acelite/ace/ETCL/ETCL.yy b/dep/acelite/ace/ETCL/ETCL.yy
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL.yy
rename to dep/acelite/ace/ETCL/ETCL.yy
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint.cpp b/dep/acelite/ace/ETCL/ETCL_Constraint.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint.cpp
rename to dep/acelite/ace/ETCL/ETCL_Constraint.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint.h b/dep/acelite/ace/ETCL/ETCL_Constraint.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint.h
rename to dep/acelite/ace/ETCL/ETCL_Constraint.h
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint.inl b/dep/acelite/ace/ETCL/ETCL_Constraint.inl
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint.inl
rename to dep/acelite/ace/ETCL/ETCL_Constraint.inl
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp b/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
rename to dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h b/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
rename to dep/acelite/ace/ETCL/ETCL_Constraint_Visitor.h
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp b/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Interpreter.cpp
rename to dep/acelite/ace/ETCL/ETCL_Interpreter.cpp
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_Interpreter.h b/dep/acelite/ace/ETCL/ETCL_Interpreter.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_Interpreter.h
rename to dep/acelite/ace/ETCL/ETCL_Interpreter.h
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_l.cpp b/dep/acelite/ace/ETCL/ETCL_l.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_l.cpp
rename to dep/acelite/ace/ETCL/ETCL_l.cpp
diff --git a/dep/acelite/ace/ETCL/ETCL_l.cpp.diff b/dep/acelite/ace/ETCL/ETCL_l.cpp.diff
new file mode 100644
index 0000000000..aba0a06375
--- /dev/null
+++ b/dep/acelite/ace/ETCL/ETCL_l.cpp.diff
@@ -0,0 +1,512 @@
+--- bison_gen\ETCL_l.cpp	2005-07-19 10:09:28.523824100 -0700
++++ ETCL_l.cpp	2005-07-19 09:47:22.138585300 -0700
+@@ -1,15 +1,14 @@
++
+ /* A lexical scanner generated by flex */
+
+ /* Scanner skeleton version:
+- * $Header$
++ * $Id$
+  */
+
+ #define FLEX_SCANNER
+ #define YY_FLEX_MAJOR_VERSION 2
+ #define YY_FLEX_MINOR_VERSION 5
+
+-#include <stdio.h>
+-
+
+ /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+ #ifdef c_plusplus
+@@ -21,8 +20,7 @@
+
+ #ifdef __cplusplus
+
+-#include <stdlib.h>
+-#include <unistd.h>
++#include "ace/OS_NS_unistd.h"
++#include "ace/OS_NS_stdio.h"
+
+ /* Use prototypes in function declarations. */
+ #define YY_USE_PROTOS
+@@ -262,8 +260,8 @@
+ #define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
+
+
+-#define yywrap() 1
+-#define YY_SKIP_YYWRAP
++//#define yywrap() 1
++//#define YY_SKIP_YYWRAP
+ typedef unsigned char YY_CHAR;
+ FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+ typedef int yy_state_type;
+@@ -444,15 +442,15 @@
+ #define YY_MORE_ADJ 0
+ #define YY_RESTORE_YY_MORE_OFFSET
+ char *yytext;
+-#line 1 "ETCL.ll"
++//#line 1 "ETCL/ETCL.ll"
+ #define INITIAL 0
+-#line 4 "ETCL.ll"
++//#line 4 "ETCL/ETCL.ll"
+ // $Id$
+ // ========================================================================
+ //
+ // = LIBRARY
+ //   orbsvcs/ECTL
+-//
++//
+ // = FILENAME
+ //   ETCL.ll
+ //
+@@ -462,12 +460,12 @@
+ //
+ // ========================================================================
+
+-#include "ace/OS.h"
+-
++#include "ETCL_Interpreter.h"
+ #include "ETCL_Constraint.h"
+ #include "ETCL_y.h"
+
+-static const char * extract_string(char*);
++static const char* extract_string(char*);
++//static const char * extract_string(char*);
+
+ #define TAO_YY_LEX_DEBUG
+
+@@ -475,12 +473,11 @@
+ #define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext)
+ #endif /* TAO_CONSTRAINT_DEBUG */
+
+-#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state)
++//#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state)
+
+ #define YY_BREAK
+ #define YY_NO_UNPUT
+
+-#line 484 "lex.yy.c"
+
+ /* Macros after this point can all be overridden by user definitions in
+  * section 1.
+@@ -494,10 +491,6 @@
+ #endif
+ #endif
+
+-#ifndef YY_NO_UNPUT
+-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+-#endif
+-
+ #ifndef yytext_ptr
+ static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+ #endif
+@@ -556,11 +549,11 @@
+
+ /* Copy whatever the last rule matched to the standard output. */
+
+-#ifndef ECHO
++#ifndef TAO_ETCL_ECHO
+ /* This used to be an fputs(), but since the string might contain NUL's,
+  * we now use fwrite().
+  */
+-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
++#define TAO_ETCL_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+ #endif
+
+ /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+@@ -628,13 +621,11 @@
+ YY_DECL
+ 	{
+ 	ACE_REGISTER yy_state_type yy_current_state;
+-	ACE_REGISTER char *yy_cp, *yy_bp;
++	ACE_REGISTER char *yy_cp = 0;
++  ACE_REGISTER char *yy_bp = 0;
+ 	ACE_REGISTER int yy_act;
+
+-#line 50 "ETCL.ll"
+-
+-
+-#line 638 "lex.yy.c"
++//#line 50 "ETCL/ETCL.ll"
+
+ 	if ( yy_init )
+ 		{
+@@ -719,240 +710,239 @@
+
+ case 1:
+ YY_RULE_SETUP
+-#line 52 "ETCL.ll"
++//#line 52 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_MIN; }
+ 	YY_BREAK
+ case 2:
+ YY_RULE_SETUP
+-#line 53 "ETCL.ll"
++//#line 53 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_MAX; }
+ 	YY_BREAK
+ case 3:
+ YY_RULE_SETUP
+-#line 54 "ETCL.ll"
++//#line 54 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_FIRST; }
+ 	YY_BREAK
+ case 4:
+ YY_RULE_SETUP
+-#line 55 "ETCL.ll"
++//#line 55 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_RANDOM; }
+ 	YY_BREAK
+ case 5:
+ YY_RULE_SETUP
+-#line 56 "ETCL.ll"
++//#line 56 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_WITH; }
+ 	YY_BREAK
+ case 6:
+ YY_RULE_SETUP
+-#line 57 "ETCL.ll"
++//#line 57 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_EXIST; }
+ 	YY_BREAK
+ case 7:
+ YY_RULE_SETUP
+-#line 58 "ETCL.ll"
++//#line 58 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_NOT; }
+ 	YY_BREAK
+ case 8:
+ YY_RULE_SETUP
+-#line 59 "ETCL.ll"
++//#line 59 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_AND; }
+ 	YY_BREAK
+ case 9:
+ YY_RULE_SETUP
+-#line 60 "ETCL.ll"
++//#line 60 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_OR; }
+ 	YY_BREAK
+ case 10:
+ YY_RULE_SETUP
+-#line 61 "ETCL.ll"
++//#line 61 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_IN; }
+ 	YY_BREAK
+ case 11:
+ YY_RULE_SETUP
+-#line 62 "ETCL.ll"
++//#line 62 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_TWIDDLE; }
+ 	YY_BREAK
+ case 12:
+ YY_RULE_SETUP
+-#line 63 "ETCL.ll"
++//#line 63 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_PLUS; }
+ 	YY_BREAK
+ case 13:
+ YY_RULE_SETUP
+-#line 64 "ETCL.ll"
++//#line 64 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_MINUS; }
+ 	YY_BREAK
+ case 14:
+ YY_RULE_SETUP
+-#line 65 "ETCL.ll"
++//#line 65 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_MULT; }
+ 	YY_BREAK
+ case 15:
+ YY_RULE_SETUP
+-#line 66 "ETCL.ll"
++//#line 66 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_DIV; }
+ 	YY_BREAK
+ case 16:
+ YY_RULE_SETUP
+-#line 67 "ETCL.ll"
++//#line 67 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_LT; }
+ 	YY_BREAK
+ case 17:
+ YY_RULE_SETUP
+-#line 68 "ETCL.ll"
++//#line 68 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_LE; }
+ 	YY_BREAK
+ case 18:
+ YY_RULE_SETUP
+-#line 69 "ETCL.ll"
++//#line 69 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_GT; }
+ 	YY_BREAK
+ case 19:
+ YY_RULE_SETUP
+-#line 70 "ETCL.ll"
++//#line 70 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_GE; }
+ 	YY_BREAK
+ case 20:
+ YY_RULE_SETUP
+-#line 71 "ETCL.ll"
++//#line 71 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_EQ; }
+ 	YY_BREAK
+ case 21:
+ YY_RULE_SETUP
+-#line 72 "ETCL.ll"
++//#line 72 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_NE; }
+ 	YY_BREAK
+ case 22:
+ YY_RULE_SETUP
+-#line 73 "ETCL.ll"
++//#line 73 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_LPAREN; }
+ 	YY_BREAK
+ case 23:
+ YY_RULE_SETUP
+-#line 74 "ETCL.ll"
++//#line 74 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_RPAREN; }
+ 	YY_BREAK
+ case 24:
+ YY_RULE_SETUP
+-#line 75 "ETCL.ll"
++//#line 75 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_DOLLAR; }
+ 	YY_BREAK
+ case 25:
+ YY_RULE_SETUP
+-#line 76 "ETCL.ll"
++//#line 76 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_DOT; }
+ 	YY_BREAK
+ case 26:
+ YY_RULE_SETUP
+-#line 77 "ETCL.ll"
++//#line 77 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_DEFAULT; }
+ 	YY_BREAK
+ case 27:
+ YY_RULE_SETUP
+-#line 78 "ETCL.ll"
++//#line 78 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_DISCRIMINANT; }
+ 	YY_BREAK
+ case 28:
+ YY_RULE_SETUP
+-#line 79 "ETCL.ll"
++//#line 79 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_TYPE_ID; }
+ 	YY_BREAK
+ case 29:
+ YY_RULE_SETUP
+-#line 80 "ETCL.ll"
++//#line 80 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_REPOS_ID; }
+ 	YY_BREAK
+ case 30:
+ YY_RULE_SETUP
+-#line 81 "ETCL.ll"
++//#line 81 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_LENGTH; }
+ 	YY_BREAK
+ case 31:
+ YY_RULE_SETUP
+-#line 82 "ETCL.ll"
++//#line 82 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_LBRA; }
+ 	YY_BREAK
+ case 32:
+ YY_RULE_SETUP
+-#line 83 "ETCL.ll"
++//#line 83 "ETCL/ETCL.ll"
+ { TAO_YY_LEX_DEBUG; return TAO_ETCL_RBRA; }
+ 	YY_BREAK
+ case 33:
+ YY_RULE_SETUP
+-#line 84 "ETCL.ll"
+-{
+-		  lvalp->constraint =
++//#line 84 "ETCL/ETCL.ll"
++{
++		  yylval.constraint =
+ 		    new TAO_ETCL_Literal_Constraint ((CORBA::Boolean) 1);
+ 		  TAO_YY_LEX_DEBUG; return TAO_ETCL_BOOLEAN;
+ 		}
+ 	YY_BREAK
+ case 34:
+ YY_RULE_SETUP
+-#line 89 "ETCL.ll"
+-{
+-		  lvalp->constraint =
++//#line 89 "ETCL/ETCL.ll"
++{
++		  yylval.constraint =
+ 		    new TAO_ETCL_Literal_Constraint ((CORBA::Boolean) 0);
+ 		  TAO_YY_LEX_DEBUG; return TAO_ETCL_BOOLEAN;
+ 		}
+ 	YY_BREAK
+ case 35:
+ YY_RULE_SETUP
+-#line 94 "ETCL.ll"
+-{
+-		  lvalp->constraint =
++//#line 94 "ETCL/ETCL.ll"
++{
++		  yylval.constraint =
+ 		    new TAO_ETCL_Literal_Constraint (ACE_OS::atoi (yytext));
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_INTEGER;
++		  TAO_YY_LEX_DEBUG; return TAO_ETCL_INTEGER;
+ 		}
+ 	YY_BREAK
+ case 36:
+ YY_RULE_SETUP
+-#line 99 "ETCL.ll"
++//#line 99 "ETCL/ETCL.ll"
+ {
+ 		  double v;
+-		  sscanf (yytext, "%lf", &v);
+-		  lvalp->constraint =
++		  sscanf (yytext, "%lf", &v);
++		  yylval.constraint =
+ 		    new TAO_ETCL_Literal_Constraint (v);
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_FLOAT;
++		  TAO_YY_LEX_DEBUG; return TAO_ETCL_FLOAT;
+ 		}
+ 	YY_BREAK
+ case 37:
+ YY_RULE_SETUP
+-#line 106 "ETCL.ll"
+-{
+-		  lvalp->constraint =
+-		    new TAO_ETCL_Literal_Constraint (extract_string (yytext));
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_STRING;
++//#line 106 "ETCL/ETCL.ll"
++{
++		  yylval.constraint =
++		    new TAO_ETCL_Literal_Constraint (extract_string(yytext));
++		  TAO_YY_LEX_DEBUG; return TAO_ETCL_STRING;
+ 		}
+ 	YY_BREAK
+ case 38:
+ YY_RULE_SETUP
+-#line 111 "ETCL.ll"
+-{
+-		  lvalp->constraint =
++//#line 111 "ETCL/ETCL.ll"
++{
++		  yylval.constraint =
+ 		    new TAO_ETCL_Identifier (yytext);
+-		  TAO_YY_LEX_DEBUG; return TAO_ETCL_IDENT;
++		  TAO_YY_LEX_DEBUG; return TAO_ETCL_IDENT;
+ 		}
+ 	YY_BREAK
+ case 39:
+ YY_RULE_SETUP
+-#line 116 "ETCL.ll"
+-{
++//#line 116 "ETCL/ETCL.ll"
++{
+                   TAO_YY_LEX_DEBUG; break; // Ignore
+                 }
+ 	YY_BREAK
+ case 40:
+ YY_RULE_SETUP
+-#line 119 "ETCL.ll"
+-{
++//#line 119 "ETCL/ETCL.ll"
++{
+                   TAO_YY_LEX_DEBUG; break; // @@ TODO
+                 }
+ 	YY_BREAK
+ case 41:
+ YY_RULE_SETUP
+-#line 122 "ETCL.ll"
+-ECHO;
++//#line 122 "ETCL/ETCL.ll"
++TAO_ETCL_ECHO;
+ 	YY_BREAK
+-#line 956 "lex.yy.c"
+ case YY_STATE_EOF(INITIAL):
+ 	yyterminate();
+
+@@ -1288,7 +1278,7 @@
+ 	return yy_is_jam ? 0 : yy_current_state;
+ 	}
+
+-
++#if 0
+ #ifndef YY_NO_UNPUT
+ #ifdef YY_USE_PROTOS
+ static void yyunput( int c, ACE_REGISTER char *yy_bp )
+@@ -1332,7 +1322,7 @@
+ 	yy_c_buf_p = yy_cp;
+ 	}
+ #endif	/* ifndef YY_NO_UNPUT */
+-
++#endif /* 0 */
+
+ #ifdef __cplusplus
+ static int yyinput()
+@@ -1406,6 +1396,11 @@
+ 	return c;
+ 	}
+
++void yyflush_current_buffer (void)
++{
++	YY_FLUSH_BUFFER;
++}
++
+
+ #ifdef YY_USE_PROTOS
+ void yyrestart( FILE *input_file )
+@@ -1516,11 +1511,6 @@
+ 	}
+
+
+-#ifndef YY_ALWAYS_INTERACTIVE
+-#ifndef YY_NEVER_INTERACTIVE
+-extern int isatty YY_PROTO(( int ));
+-#endif
+-#endif
+
+ #ifdef YY_USE_PROTOS
+ void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+@@ -1537,15 +1527,18 @@
+ 	b->yy_input_file = file;
+ 	b->yy_fill_buffer = 1;
+
+-#if YY_ALWAYS_INTERACTIVE
+-	b->yy_is_interactive = 1;
+-#else
+-#if YY_NEVER_INTERACTIVE
+-	b->yy_is_interactive = 0;
++#if defined (ACE_HAS_WINCE)
++    // Mimic the behavior as WinCE does not have isatty().
++    if ((file != 0) && (file == ACE_OS::fileno(file))) {
++        b->yy_is_interactive = 1;
++    }
++    else {
++        b->yy_is_interactive = 0;
++    }
+ #else
+        b->yy_is_interactive = file ? (ACE_OS::isatty( ACE_OS::fileno(file) ) > 0) : 0;
+-#endif
+-#endif
++#endif  // ACE_HAS_WINCE
++
+ 	}
+
+
+@@ -1838,7 +1831,7 @@
+ 	return 0;
+ 	}
+ #endif
+-#line 122 "ETCL.ll"
++//#line 122 "ETCL/ETCL.ll"
+
+
+ const char*
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_y.cpp b/dep/acelite/ace/ETCL/ETCL_y.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_y.cpp
rename to dep/acelite/ace/ETCL/ETCL_y.cpp
diff --git a/dep/acelite/ace/ETCL/ETCL_y.cpp.diff b/dep/acelite/ace/ETCL/ETCL_y.cpp.diff
new file mode 100644
index 0000000000..ef90ad78ef
--- /dev/null
+++ b/dep/acelite/ace/ETCL/ETCL_y.cpp.diff
@@ -0,0 +1,607 @@
+--- bison_gen\ETCL_y.cpp	2005-07-19 09:56:06.368807400 -0700
++++ ETCL_y.cpp	2005-07-19 09:45:00.160274900 -0700
+@@ -1,5 +1,6 @@
++// $Id$
+ 
+-/*  A Bison parser, made from ETCL.yy
++/*  A Bison parser, made from ETCL/ETCL.yy
+     by GNU Bison version 1.28  */
+ 
+ #define YYBISON 1  /* Identify Bison output.  */
+@@ -48,9 +49,9 @@
+ #define	TAO_ETCL_TYPE_ID	298
+ #define	TAO_ETCL_REPOS_ID	299
+ 
+-#line 1 "ETCL.yy"
++//#line 1 "ETCL/ETCL.yy"
+ 
+-// ETCL.yy,v 1.3 2002/01/14 19:52:28 parsons Exp
++// $Id$
+ // ========================================================================
+ //
+ // = LIBRARY
+@@ -70,6 +71,7 @@
+ #include "ETCL_Interpreter.h"
+ 
+ extern int yylex (void);
++extern void yyflush_current_buffer (void);
+ 
+ static void yyerror (const char *)
+ {
+@@ -77,9 +79,6 @@
+   // Ignore error messages
+ }
+ 
+-#ifndef YYSTYPE
+-#define YYSTYPE int
+-#endif
+ #include <stdio.h>
+ 
+ #ifndef __cplusplus
+@@ -293,8 +292,9 @@
+     -1,    -1,    29,     3,     4,     5,     6,     7,     8,    -1,
+     -1,    -1,    -1,    40,    49,    50,    51,    52,    53,    54
+ };
+-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+-#line 3 "/usr/local/share/bison.simple"
++/* -*-C-*-  Note some compilers choke on comments on `//#line' lines.  */
++//#line 3 "/pkg/gnu/share/bison.simple"
++/* This file comes from bison-1.28.  */
+ 
+ /* Skeleton output parser for bison,
+    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+@@ -311,46 +311,66 @@
+ 
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
++   Foundation, Inc., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.  */
+ 
+ /* As a special exception, when this file is copied by Bison into a
+    Bison output file, you may use that output file without restriction.
+    This special exception was added by the Free Software Foundation
+    in version 1.24 of Bison.  */
+ 
+-#ifndef alloca
++/* This is the parser code that is written into each bison parser
++  when the %semantic_parser declaration is not specified in the grammar.
++  It was written by Richard Stallman by simplifying the hairy parser
++  used when %semantic_parser is specified.  */
++
++#ifndef YYSTACK_USE_ALLOCA
++#ifdef alloca
++#define YYSTACK_USE_ALLOCA
++#else /* alloca not defined */
+ #ifdef __GNUC__
++#define YYSTACK_USE_ALLOCA
+ #define alloca __builtin_alloca
+ #else /* not GNU C.  */
+-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
++#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
++#define YYSTACK_USE_ALLOCA
+ #include <alloca.h>
+ #else /* not sparc */
+-#if defined (MSDOS) && !defined (__TURBOC__)
++/* We think this test detects Watcom and Microsoft C.  */
++/* This used to test MSDOS, but that is a bad idea
++   since that symbol is in the user namespace.  */
++#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
++#if 0 /* No need for malloc.h, which pollutes the namespace;
++	 instead, just don't use alloca.  */
+ #include <malloc.h>
++#endif
+ #else /* not MSDOS, or __TURBOC__ */
+ #if defined(_AIX)
+-#include <malloc.h>
++/* I don't know what this was needed for, but it pollutes the namespace.
++   So I turned it off.   rms, 2 May 1997.  */
++/* #include <malloc.h>  */
+  #pragma alloca
+-#else /* not MSDOS, __TURBOC__, or _AIX */
+-#ifdef __hpux
+-#ifdef __cplusplus
+-extern "C" {
+-void *alloca (unsigned int);
+-};
+-#else /* not __cplusplus */
+-void *alloca ();
+-#endif /* not __cplusplus */
++#define YYSTACK_USE_ALLOCA
++#else /* not MSDOS, or __TURBOC__, or _AIX */
++#if 0
++#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
++		 and on HPUX 10.  Eventually we can turn this on.  */
++#define YYSTACK_USE_ALLOCA
++#define alloca __builtin_alloca
+ #endif /* __hpux */
++#endif
+ #endif /* not _AIX */
+ #endif /* not MSDOS, or __TURBOC__ */
+-#endif /* not sparc.  */
+-#endif /* not GNU C.  */
+-#endif /* alloca not defined.  */
++#endif /* not sparc */
++#endif /* not GNU C */
++#endif /* alloca not defined */
++#endif /* YYSTACK_USE_ALLOCA not defined */
+ 
+-/* This is the parser code that is written into each bison parser
+-  when the %semantic_parser declaration is not specified in the grammar.
+-  It was written by Richard Stallman by simplifying the hairy parser
+-  used when %semantic_parser is specified.  */
++#ifdef YYSTACK_USE_ALLOCA
++#define YYSTACK_ALLOC alloca
++#else
++#define YYSTACK_ALLOC malloc
++#endif
+ 
+ /* Note: there must be only one dollar sign in this file.
+    It is replaced by the list of actions, each action
+@@ -360,8 +380,8 @@
+ #define yyclearin	(yychar = YYEMPTY)
+ #define YYEMPTY		-2
+ #define YYEOF		0
+-#define YYACCEPT	return(0)
+-#define YYABORT 	return(1)
++#define YYACCEPT	goto yyacceptlab
++#define YYABORT 	goto yyabortlab
+ #define YYERROR		goto yyerrlab1
+ /* Like YYERROR except do call yyerror.
+    This remains here temporarily to ease the
+@@ -411,6 +431,10 @@
+ int	yychar;			/*  the lookahead symbol		*/
+ YYSTYPE	yylval;			/*  the semantic value of the		*/
+ 				/*  lookahead symbol			*/
++YYSTYPE yyval;		/*  the variable used to return		*/
++				/*  semantic values from the action	*/
++				/*  routines				*/
++
+ 
+ #ifdef YYLSP_NEEDED
+ YYLTYPE yylloc;			/*  location data for the lookahead	*/
+@@ -443,11 +467,11 @@
+ #define YYMAXDEPTH 10000
+ #endif
+ 
+-/* Prevent warning if -Wstrict-prototypes.  */
+-#ifdef __GNUC__
+-int yyparse (void);
+-#endif
+-
++/* Define __yy_memcpy.  Note that the size argument
++   should be passed with type unsigned int, because that is what the non-GCC
++   definitions require.  With GCC, __builtin_memcpy takes an arg
++   of type size_t, but it can handle unsigned int.  */
++
+ #if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
+ #define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
+ #else				/* not GNU C or C++ */
+@@ -459,7 +483,7 @@
+ __yy_memcpy (to, from, count)
+      char *to;
+      char *from;
+-     int count;
++     unsigned int count;
+ {
+   ACE_REGISTER char *f = from;
+   ACE_REGISTER char *t = to;
+@@ -474,10 +498,10 @@
+ /* This is the most reliable way to avoid incompatibilities
+    in available built-in functions on various systems.  */
+ static void
+-__yy_memcpy (char *to, char *from, int count)
++__yy_memcpy (char *to, char *from, unsigned int count)
+ {
+-  ACE_REGISTER char *f = from;
+   ACE_REGISTER char *t = to;
++  ACE_REGISTER char *f = from;
+   ACE_REGISTER int i = count;
+ 
+   while (i-- > 0)
+@@ -486,8 +510,8 @@
+ 
+ #endif
+ #endif
+-
+-#line 196 "/usr/local/share/bison.simple"
++
++//#line 217 "/pkg/gnu/share/bison.simple"
+ 
+ /* The user can define YYPARSE_PARAM as the name of an argument to be passed
+    into yyparse.  The argument should have type void *.
+@@ -508,6 +532,15 @@
+ #define YYPARSE_PARAM_DECL
+ #endif /* not YYPARSE_PARAM */
+ 
++/* Prevent warning if -Wstrict-prototypes.  */
++#ifdef __GNUC__
++#ifdef YYPARSE_PARAM
++int yyparse (void *);
++#else
++int yyparse (void);
++#endif
++#endif
++
+ int
+ yyparse(YYPARSE_PARAM_ARG)
+      YYPARSE_PARAM_DECL
+@@ -536,6 +569,7 @@
+ #endif
+ 
+   int yystacksize = YYINITDEPTH;
++  int yyfree_stacks = 0;
+ 
+ #ifdef YYPURE
+   int yychar;
+@@ -546,10 +580,6 @@
+ #endif
+ #endif
+ 
+-  YYSTYPE yyval;		/*  the variable used to return		*/
+-				/*  semantic values from the action	*/
+-				/*  routines				*/
+-
+   int yylen;
+ 
+ #if YYDEBUG != 0
+@@ -620,18 +650,32 @@
+       if (yystacksize >= YYMAXDEPTH)
+ 	{
+ 	  yyerror("parser stack overflow");
++	  if (yyfree_stacks)
++	    {
++	      free (yyss);
++	      free (yyvs);
++#ifdef YYLSP_NEEDED
++	      free (yyls);
++#endif
++	    }
+ 	  return 2;
+ 	}
+       yystacksize *= 2;
+       if (yystacksize > YYMAXDEPTH)
+ 	yystacksize = YYMAXDEPTH;
+-      yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
+-      __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
+-      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
+-      __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
++#ifndef YYSTACK_USE_ALLOCA
++      yyfree_stacks = 1;
++#endif
++      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
++      __yy_memcpy ((char *)yyss, (char *)yyss1,
++		   size * (unsigned int) sizeof (*yyssp));
++      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
++      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
++		   size * (unsigned int) sizeof (*yyvsp));
+ #ifdef YYLSP_NEEDED
+-      yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
+-      __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
++      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
++      __yy_memcpy ((char *)yyls, (char *)yyls1,
++		   size * (unsigned int) sizeof (*yylsp));
+ #endif
+ #endif /* no yyoverflow */
+ 
+@@ -792,225 +836,225 @@
+   switch (yyn) {
+ 
+ case 3:
+-#line 97 "ETCL.yy"
++//#line 97 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Preference (TAO_ETCL_MIN, yyvsp[0].constraint); ;
+     break;}
+ case 4:
+-#line 99 "ETCL.yy"
++//#line 99 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Preference (TAO_ETCL_MAX, yyvsp[0].constraint); ;
+     break;}
+ case 5:
+-#line 101 "ETCL.yy"
++//#line 101 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Preference (TAO_ETCL_WITH, yyvsp[0].constraint); ;
+     break;}
+ case 6:
+-#line 103 "ETCL.yy"
++//#line 103 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Preference (TAO_ETCL_FIRST); ;
+     break;}
+ case 7:
+-#line 105 "ETCL.yy"
++//#line 105 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Preference (TAO_ETCL_RANDOM); ;
+     break;}
+ case 8:
+-#line 109 "ETCL.yy"
++//#line 109 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_OR, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 10:
+-#line 114 "ETCL.yy"
++//#line 114 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_AND, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 12:
+-#line 119 "ETCL.yy"
++//#line 119 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_EQ, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 13:
+-#line 121 "ETCL.yy"
++//#line 121 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_NE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 14:
+-#line 123 "ETCL.yy"
++//#line 123 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_GT, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 15:
+-#line 125 "ETCL.yy"
++//#line 125 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_GE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 16:
+-#line 127 "ETCL.yy"
++//#line 127 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_LT, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 17:
+-#line 129 "ETCL.yy"
++//#line 129 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_LE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 19:
+-#line 134 "ETCL.yy"
++//#line 134 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_IN, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 20:
+-#line 136 "ETCL.yy"
++//#line 136 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_IN, yyvsp[-3].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 22:
+-#line 141 "ETCL.yy"
++//#line 141 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_TWIDDLE, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 24:
+-#line 146 "ETCL.yy"
++//#line 146 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_PLUS, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 25:
+-#line 148 "ETCL.yy"
++//#line 148 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_MINUS, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 27:
+-#line 153 "ETCL.yy"
++//#line 153 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_MULT, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 28:
+-#line 155 "ETCL.yy"
++//#line 155 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Binary_Expr (TAO_ETCL_DIV, yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 30:
+-#line 160 "ETCL.yy"
++//#line 160 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Unary_Expr (TAO_ETCL_NOT, yyvsp[0].constraint); ;
+     break;}
+ case 32:
+-#line 165 "ETCL.yy"
++//#line 165 "ETCL/ETCL.yy"
+ { yyval.constraint = yyvsp[-1].constraint; ;
+     break;}
+ case 33:
+-#line 167 "ETCL.yy"
++//#line 167 "ETCL/ETCL.yy"
+ { yyval.constraint = yyvsp[0].constraint; ;
+     break;}
+ case 34:
+-#line 169 "ETCL.yy"
++//#line 169 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Unary_Expr (TAO_ETCL_PLUS, yyvsp[0].constraint); ;
+     break;}
+ case 35:
+-#line 171 "ETCL.yy"
++//#line 171 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Unary_Expr (TAO_ETCL_MINUS, yyvsp[0].constraint); ;
+     break;}
+ case 36:
+-#line 173 "ETCL.yy"
++//#line 173 "ETCL/ETCL.yy"
+ { yyval.constraint = yyvsp[0].constraint; ;
+     break;}
+ case 37:
+-#line 175 "ETCL.yy"
++//#line 175 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Unary_Expr (TAO_ETCL_PLUS, yyvsp[0].constraint); ;
+     break;}
+ case 38:
+-#line 177 "ETCL.yy"
++//#line 177 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Unary_Expr (TAO_ETCL_MINUS, yyvsp[0].constraint); ;
+     break;}
+ case 39:
+-#line 179 "ETCL.yy"
++//#line 179 "ETCL/ETCL.yy"
+ { yyval.constraint = yyvsp[0].constraint; ;
+     break;}
+ case 40:
+-#line 181 "ETCL.yy"
++//#line 181 "ETCL/ETCL.yy"
+ { yyval.constraint = yyvsp[0].constraint; ;
+     break;}
+ case 41:
+-#line 183 "ETCL.yy"
++//#line 183 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Exist (yyvsp[0].constraint); ;
+     break;}
+ case 42:
+-#line 185 "ETCL.yy"
++//#line 185 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Exist (yyvsp[0].constraint); ;
+     break;}
+ case 43:
+-#line 187 "ETCL.yy"
++//#line 187 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Default (yyvsp[0].constraint); ;
+     break;}
+ case 44:
+-#line 189 "ETCL.yy"
++//#line 189 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Eval (yyvsp[0].constraint); ;
+     break;}
+ case 45:
+-#line 191 "ETCL.yy"
++//#line 191 "ETCL/ETCL.yy"
+ { yyval.constraint = yyvsp[0].constraint; ;
+     break;}
+ case 46:
+-#line 195 "ETCL.yy"
++//#line 195 "ETCL/ETCL.yy"
+ { yyval.constraint = 0; ;
+     break;}
+ case 47:
+-#line 197 "ETCL.yy"
++//#line 197 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Dot (yyvsp[0].constraint); ;
+     break;}
+ case 48:
+-#line 200 "ETCL.yy"
++//#line 200 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Component (yyvsp[-1].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 51:
+-#line 207 "ETCL.yy"
++//#line 207 "ETCL/ETCL.yy"
+ { yyval.constraint = 0; ;
+     break;}
+ case 52:
+-#line 209 "ETCL.yy"
++//#line 209 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Dot (yyvsp[0].constraint); ;
+     break;}
+ case 55:
+-#line 216 "ETCL.yy"
++//#line 216 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Component (yyvsp[-1].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 56:
+-#line 218 "ETCL.yy"
++//#line 218 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Special (TAO_ETCL_LENGTH); ;
+     break;}
+ case 57:
+-#line 220 "ETCL.yy"
++//#line 220 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Special (TAO_ETCL_DISCRIMINANT); ;
+     break;}
+ case 58:
+-#line 222 "ETCL.yy"
++//#line 222 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Special (TAO_ETCL_TYPE_ID); ;
+     break;}
+ case 59:
+-#line 224 "ETCL.yy"
++//#line 224 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Special (TAO_ETCL_REPOS_ID); ;
+     break;}
+ case 62:
+-#line 230 "ETCL.yy"
++//#line 230 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Component_Array (yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 63:
+-#line 234 "ETCL.yy"
++//#line 234 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Component_Assoc (yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 64:
+-#line 238 "ETCL.yy"
++//#line 238 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Component_Pos (yyvsp[-1].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 65:
+-#line 242 "ETCL.yy"
++//#line 242 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Union_Pos (yyvsp[-2].constraint, yyvsp[0].constraint); ;
+     break;}
+ case 66:
+-#line 246 "ETCL.yy"
++//#line 246 "ETCL/ETCL.yy"
+ { yyval.constraint = 0; ;
+     break;}
+ case 67:
+-#line 248 "ETCL.yy"
++//#line 248 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Union_Value (+1, yyvsp[0].constraint); ;
+     break;}
+ case 68:
+-#line 250 "ETCL.yy"
++//#line 250 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Union_Value (+1, yyvsp[0].constraint); ;
+     break;}
+ case 69:
+-#line 252 "ETCL.yy"
++//#line 252 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Union_Value (-1, yyvsp[0].constraint); ;
+     break;}
+ case 70:
+-#line 254 "ETCL.yy"
++//#line 254 "ETCL/ETCL.yy"
+ { yyval.constraint = new TAO_ETCL_Union_Value (yyvsp[0].constraint); ;
+     break;}
+ }
+    /* the action file gets copied in in place of this dollarsign */
+-#line 498 "/usr/local/share/bison.simple"
+-
++//#line 543 "/pkg/gnu/share/bison.simple"
++
+   yyvsp -= yylen;
+   yyssp -= yylen;
+ #ifdef YYLSP_NEEDED
+@@ -1204,7 +1248,37 @@
+ 
+   yystate = yyn;
+   goto yynewstate;
++
++ yyacceptlab:
++  /* YYACCEPT comes here.  */
++  if (yyfree_stacks)
++    {
++      free (yyss);
++      free (yyvs);
++#ifdef YYLSP_NEEDED
++      free (yyls);
++#endif
++    }
++  return 0;
++
++ yyabortlab:
++  /* YYABORT comes here.  */
++
++  /* Flush out yy_current_buffer before next parse.  Since there is
++     no error recovery, the buffer could still contain tokens from this
++     parse. */
++  yyflush_current_buffer();
++
++  if (yyfree_stacks)
++    {
++      free (yyss);
++      free (yyvs);
++#ifdef YYLSP_NEEDED
++      free (yyls);
++#endif
++    }
++  return 1;
+ }
+-#line 257 "ETCL.yy"
++//#line 257 "ETCL/ETCL.yy"
+ 
+ 
diff --git a/modules/dep/acelite/ace/ETCL/ETCL_y.h b/dep/acelite/ace/ETCL/ETCL_y.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ETCL_y.h
rename to dep/acelite/ace/ETCL/ETCL_y.h
diff --git a/dep/acelite/ace/ETCL/ETCL_y.h.diff b/dep/acelite/ace/ETCL/ETCL_y.h.diff
new file mode 100644
index 0000000000..85acf91276
--- /dev/null
+++ b/dep/acelite/ace/ETCL/ETCL_y.h.diff
@@ -0,0 +1,25 @@
+--- ETCL_y.h	Mon Nov 12 16:07:25 2001
++++ ETCL_y.h.safe	Thu Oct 11 20:53:13 2001
+@@ -1,7 +1,4 @@
+ // $Id$
+-#ifndef YYSTYPE
+-#define YYSTYPE int
+-#endif
+ #define	TAO_ETCL_GT	257
+ #define	TAO_ETCL_GE	258
+ #define	TAO_ETCL_LT	259
+@@ -33,7 +30,7 @@
+ #define	TAO_ETCL_SIGNED	285
+ #define	TAO_ETCL_DOUBLE	286
+ #define	TAO_ETCL_CONSTRAINT	287
+-#define	TAO_ETCL_SEQUENCE	288
++#define	TAO_ETCL_COMPONENT	288
+ #define	TAO_ETCL_WITH	289
+ #define	TAO_ETCL_MAX	290
+ #define	TAO_ETCL_MIN	291
+@@ -46,5 +43,3 @@
+ #define	TAO_ETCL_TYPE_ID	298
+ #define	TAO_ETCL_REPOS_ID	299
+ 
+-
+-extern YYSTYPE yylval;
diff --git a/modules/dep/acelite/ace/ETCL/ace_etcl_export.h b/dep/acelite/ace/ETCL/ace_etcl_export.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/ace_etcl_export.h
rename to dep/acelite/ace/ETCL/ace_etcl_export.h
diff --git a/modules/dep/acelite/ace/ETCL/etcl_parser_export.h b/dep/acelite/ace/ETCL/etcl_parser_export.h
similarity index 100%
rename from modules/dep/acelite/ace/ETCL/etcl_parser_export.h
rename to dep/acelite/ace/ETCL/etcl_parser_export.h
diff --git a/modules/dep/acelite/ace/Encoding_Converter.cpp b/dep/acelite/ace/Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter.cpp
rename to dep/acelite/ace/Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/Encoding_Converter.h b/dep/acelite/ace/Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter.h
rename to dep/acelite/ace/Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/Encoding_Converter_Factory.cpp b/dep/acelite/ace/Encoding_Converter_Factory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter_Factory.cpp
rename to dep/acelite/ace/Encoding_Converter_Factory.cpp
diff --git a/modules/dep/acelite/ace/Encoding_Converter_Factory.h b/dep/acelite/ace/Encoding_Converter_Factory.h
similarity index 100%
rename from modules/dep/acelite/ace/Encoding_Converter_Factory.h
rename to dep/acelite/ace/Encoding_Converter_Factory.h
diff --git a/modules/dep/acelite/ace/Env_Value_T.cpp b/dep/acelite/ace/Env_Value_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Env_Value_T.cpp
rename to dep/acelite/ace/Env_Value_T.cpp
diff --git a/modules/dep/acelite/ace/Env_Value_T.h b/dep/acelite/ace/Env_Value_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Env_Value_T.h
rename to dep/acelite/ace/Env_Value_T.h
diff --git a/modules/dep/acelite/ace/Env_Value_T.inl b/dep/acelite/ace/Env_Value_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Env_Value_T.inl
rename to dep/acelite/ace/Env_Value_T.inl
diff --git a/modules/dep/acelite/ace/Event.cpp b/dep/acelite/ace/Event.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event.cpp
rename to dep/acelite/ace/Event.cpp
diff --git a/modules/dep/acelite/ace/Event.h b/dep/acelite/ace/Event.h
similarity index 100%
rename from modules/dep/acelite/ace/Event.h
rename to dep/acelite/ace/Event.h
diff --git a/modules/dep/acelite/ace/Event.inl b/dep/acelite/ace/Event.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event.inl
rename to dep/acelite/ace/Event.inl
diff --git a/modules/dep/acelite/ace/Event_Base.cpp b/dep/acelite/ace/Event_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event_Base.cpp
rename to dep/acelite/ace/Event_Base.cpp
diff --git a/modules/dep/acelite/ace/Event_Base.h b/dep/acelite/ace/Event_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Event_Base.h
rename to dep/acelite/ace/Event_Base.h
diff --git a/modules/dep/acelite/ace/Event_Base.inl b/dep/acelite/ace/Event_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event_Base.inl
rename to dep/acelite/ace/Event_Base.inl
diff --git a/modules/dep/acelite/ace/Event_Handler.cpp b/dep/acelite/ace/Event_Handler.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler.cpp
rename to dep/acelite/ace/Event_Handler.cpp
diff --git a/modules/dep/acelite/ace/Event_Handler.h b/dep/acelite/ace/Event_Handler.h
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler.h
rename to dep/acelite/ace/Event_Handler.h
diff --git a/modules/dep/acelite/ace/Event_Handler.inl b/dep/acelite/ace/Event_Handler.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler.inl
rename to dep/acelite/ace/Event_Handler.inl
diff --git a/modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp b/dep/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 dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.cpp
diff --git a/modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h b/dep/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 dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.h
diff --git a/modules/dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl b/dep/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 dep/acelite/ace/Event_Handler_Handle_Timeout_Upcall.inl
diff --git a/modules/dep/acelite/ace/Event_Handler_T.cpp b/dep/acelite/ace/Event_Handler_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_T.cpp
rename to dep/acelite/ace/Event_Handler_T.cpp
diff --git a/modules/dep/acelite/ace/Event_Handler_T.h b/dep/acelite/ace/Event_Handler_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_T.h
rename to dep/acelite/ace/Event_Handler_T.h
diff --git a/modules/dep/acelite/ace/Event_Handler_T.inl b/dep/acelite/ace/Event_Handler_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Event_Handler_T.inl
rename to dep/acelite/ace/Event_Handler_T.inl
diff --git a/modules/dep/acelite/ace/FIFO.cpp b/dep/acelite/ace/FIFO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO.cpp
rename to dep/acelite/ace/FIFO.cpp
diff --git a/modules/dep/acelite/ace/FIFO.h b/dep/acelite/ace/FIFO.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO.h
rename to dep/acelite/ace/FIFO.h
diff --git a/modules/dep/acelite/ace/FIFO.inl b/dep/acelite/ace/FIFO.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO.inl
rename to dep/acelite/ace/FIFO.inl
diff --git a/modules/dep/acelite/ace/FIFO_Recv.cpp b/dep/acelite/ace/FIFO_Recv.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv.cpp
rename to dep/acelite/ace/FIFO_Recv.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Recv.h b/dep/acelite/ace/FIFO_Recv.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv.h
rename to dep/acelite/ace/FIFO_Recv.h
diff --git a/modules/dep/acelite/ace/FIFO_Recv.inl b/dep/acelite/ace/FIFO_Recv.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv.inl
rename to dep/acelite/ace/FIFO_Recv.inl
diff --git a/modules/dep/acelite/ace/FIFO_Recv_Msg.cpp b/dep/acelite/ace/FIFO_Recv_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv_Msg.cpp
rename to dep/acelite/ace/FIFO_Recv_Msg.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Recv_Msg.h b/dep/acelite/ace/FIFO_Recv_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv_Msg.h
rename to dep/acelite/ace/FIFO_Recv_Msg.h
diff --git a/modules/dep/acelite/ace/FIFO_Recv_Msg.inl b/dep/acelite/ace/FIFO_Recv_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Recv_Msg.inl
rename to dep/acelite/ace/FIFO_Recv_Msg.inl
diff --git a/modules/dep/acelite/ace/FIFO_Send.cpp b/dep/acelite/ace/FIFO_Send.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send.cpp
rename to dep/acelite/ace/FIFO_Send.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Send.h b/dep/acelite/ace/FIFO_Send.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send.h
rename to dep/acelite/ace/FIFO_Send.h
diff --git a/modules/dep/acelite/ace/FIFO_Send.inl b/dep/acelite/ace/FIFO_Send.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send.inl
rename to dep/acelite/ace/FIFO_Send.inl
diff --git a/modules/dep/acelite/ace/FIFO_Send_Msg.cpp b/dep/acelite/ace/FIFO_Send_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send_Msg.cpp
rename to dep/acelite/ace/FIFO_Send_Msg.cpp
diff --git a/modules/dep/acelite/ace/FIFO_Send_Msg.h b/dep/acelite/ace/FIFO_Send_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send_Msg.h
rename to dep/acelite/ace/FIFO_Send_Msg.h
diff --git a/modules/dep/acelite/ace/FIFO_Send_Msg.inl b/dep/acelite/ace/FIFO_Send_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/FIFO_Send_Msg.inl
rename to dep/acelite/ace/FIFO_Send_Msg.inl
diff --git a/modules/dep/acelite/ace/FILE.cpp b/dep/acelite/ace/FILE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE.cpp
rename to dep/acelite/ace/FILE.cpp
diff --git a/modules/dep/acelite/ace/FILE.h b/dep/acelite/ace/FILE.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE.h
rename to dep/acelite/ace/FILE.h
diff --git a/modules/dep/acelite/ace/FILE.inl b/dep/acelite/ace/FILE.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE.inl
rename to dep/acelite/ace/FILE.inl
diff --git a/modules/dep/acelite/ace/FILE_Addr.cpp b/dep/acelite/ace/FILE_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Addr.cpp
rename to dep/acelite/ace/FILE_Addr.cpp
diff --git a/modules/dep/acelite/ace/FILE_Addr.h b/dep/acelite/ace/FILE_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Addr.h
rename to dep/acelite/ace/FILE_Addr.h
diff --git a/modules/dep/acelite/ace/FILE_Addr.inl b/dep/acelite/ace/FILE_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Addr.inl
rename to dep/acelite/ace/FILE_Addr.inl
diff --git a/modules/dep/acelite/ace/FILE_Connector.cpp b/dep/acelite/ace/FILE_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Connector.cpp
rename to dep/acelite/ace/FILE_Connector.cpp
diff --git a/modules/dep/acelite/ace/FILE_Connector.h b/dep/acelite/ace/FILE_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Connector.h
rename to dep/acelite/ace/FILE_Connector.h
diff --git a/modules/dep/acelite/ace/FILE_Connector.inl b/dep/acelite/ace/FILE_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE_Connector.inl
rename to dep/acelite/ace/FILE_Connector.inl
diff --git a/modules/dep/acelite/ace/FILE_IO.cpp b/dep/acelite/ace/FILE_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FILE_IO.cpp
rename to dep/acelite/ace/FILE_IO.cpp
diff --git a/modules/dep/acelite/ace/FILE_IO.h b/dep/acelite/ace/FILE_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/FILE_IO.h
rename to dep/acelite/ace/FILE_IO.h
diff --git a/modules/dep/acelite/ace/FILE_IO.inl b/dep/acelite/ace/FILE_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/FILE_IO.inl
rename to dep/acelite/ace/FILE_IO.inl
diff --git a/modules/dep/acelite/ace/File_Lock.cpp b/dep/acelite/ace/File_Lock.cpp
similarity index 100%
rename from modules/dep/acelite/ace/File_Lock.cpp
rename to dep/acelite/ace/File_Lock.cpp
diff --git a/modules/dep/acelite/ace/File_Lock.h b/dep/acelite/ace/File_Lock.h
similarity index 100%
rename from modules/dep/acelite/ace/File_Lock.h
rename to dep/acelite/ace/File_Lock.h
diff --git a/modules/dep/acelite/ace/File_Lock.inl b/dep/acelite/ace/File_Lock.inl
similarity index 100%
rename from modules/dep/acelite/ace/File_Lock.inl
rename to dep/acelite/ace/File_Lock.inl
diff --git a/modules/dep/acelite/ace/Filecache.cpp b/dep/acelite/ace/Filecache.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Filecache.cpp
rename to dep/acelite/ace/Filecache.cpp
diff --git a/modules/dep/acelite/ace/Filecache.h b/dep/acelite/ace/Filecache.h
similarity index 100%
rename from modules/dep/acelite/ace/Filecache.h
rename to dep/acelite/ace/Filecache.h
diff --git a/modules/dep/acelite/ace/FlReactor/ACE_FlReactor.pc.in b/dep/acelite/ace/FlReactor/ACE_FlReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/ACE_FlReactor.pc.in
rename to dep/acelite/ace/FlReactor/ACE_FlReactor.pc.in
diff --git a/modules/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h b/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/ACE_FlReactor_export.h
rename to dep/acelite/ace/FlReactor/ACE_FlReactor_export.h
diff --git a/modules/dep/acelite/ace/FlReactor/FlReactor.cpp b/dep/acelite/ace/FlReactor/FlReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/FlReactor.cpp
rename to dep/acelite/ace/FlReactor/FlReactor.cpp
diff --git a/modules/dep/acelite/ace/FlReactor/FlReactor.h b/dep/acelite/ace/FlReactor/FlReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/FlReactor.h
rename to dep/acelite/ace/FlReactor/FlReactor.h
diff --git a/modules/dep/acelite/ace/FlReactor/ace_flreactor.mpc b/dep/acelite/ace/FlReactor/ace_flreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/FlReactor/ace_flreactor.mpc
rename to dep/acelite/ace/FlReactor/ace_flreactor.mpc
diff --git a/modules/dep/acelite/ace/Flag_Manip.cpp b/dep/acelite/ace/Flag_Manip.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Flag_Manip.cpp
rename to dep/acelite/ace/Flag_Manip.cpp
diff --git a/modules/dep/acelite/ace/Flag_Manip.h b/dep/acelite/ace/Flag_Manip.h
similarity index 100%
rename from modules/dep/acelite/ace/Flag_Manip.h
rename to dep/acelite/ace/Flag_Manip.h
diff --git a/modules/dep/acelite/ace/Flag_Manip.inl b/dep/acelite/ace/Flag_Manip.inl
similarity index 100%
rename from modules/dep/acelite/ace/Flag_Manip.inl
rename to dep/acelite/ace/Flag_Manip.inl
diff --git a/modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in b/dep/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
rename to dep/acelite/ace/FoxReactor/ACE_FoxReactor.pc.in
diff --git a/modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h b/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
rename to dep/acelite/ace/FoxReactor/ACE_FoxReactor_export.h
diff --git a/modules/dep/acelite/ace/FoxReactor/FoxReactor.cpp b/dep/acelite/ace/FoxReactor/FoxReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/FoxReactor.cpp
rename to dep/acelite/ace/FoxReactor/FoxReactor.cpp
diff --git a/modules/dep/acelite/ace/FoxReactor/FoxReactor.h b/dep/acelite/ace/FoxReactor/FoxReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/FoxReactor.h
rename to dep/acelite/ace/FoxReactor/FoxReactor.h
diff --git a/modules/dep/acelite/ace/FoxReactor/ace_foxreactor.mpc b/dep/acelite/ace/FoxReactor/ace_foxreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/FoxReactor/ace_foxreactor.mpc
rename to dep/acelite/ace/FoxReactor/ace_foxreactor.mpc
diff --git a/modules/dep/acelite/ace/Framework_Component.cpp b/dep/acelite/ace/Framework_Component.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component.cpp
rename to dep/acelite/ace/Framework_Component.cpp
diff --git a/modules/dep/acelite/ace/Framework_Component.h b/dep/acelite/ace/Framework_Component.h
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component.h
rename to dep/acelite/ace/Framework_Component.h
diff --git a/modules/dep/acelite/ace/Framework_Component.inl b/dep/acelite/ace/Framework_Component.inl
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component.inl
rename to dep/acelite/ace/Framework_Component.inl
diff --git a/modules/dep/acelite/ace/Framework_Component_T.cpp b/dep/acelite/ace/Framework_Component_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component_T.cpp
rename to dep/acelite/ace/Framework_Component_T.cpp
diff --git a/modules/dep/acelite/ace/Framework_Component_T.h b/dep/acelite/ace/Framework_Component_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Framework_Component_T.h
rename to dep/acelite/ace/Framework_Component_T.h
diff --git a/modules/dep/acelite/ace/Free_List.cpp b/dep/acelite/ace/Free_List.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Free_List.cpp
rename to dep/acelite/ace/Free_List.cpp
diff --git a/modules/dep/acelite/ace/Free_List.h b/dep/acelite/ace/Free_List.h
similarity index 100%
rename from modules/dep/acelite/ace/Free_List.h
rename to dep/acelite/ace/Free_List.h
diff --git a/modules/dep/acelite/ace/Functor.cpp b/dep/acelite/ace/Functor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Functor.cpp
rename to dep/acelite/ace/Functor.cpp
diff --git a/modules/dep/acelite/ace/Functor.h b/dep/acelite/ace/Functor.h
similarity index 100%
rename from modules/dep/acelite/ace/Functor.h
rename to dep/acelite/ace/Functor.h
diff --git a/modules/dep/acelite/ace/Functor.inl b/dep/acelite/ace/Functor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Functor.inl
rename to dep/acelite/ace/Functor.inl
diff --git a/modules/dep/acelite/ace/Functor_String.cpp b/dep/acelite/ace/Functor_String.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Functor_String.cpp
rename to dep/acelite/ace/Functor_String.cpp
diff --git a/modules/dep/acelite/ace/Functor_String.h b/dep/acelite/ace/Functor_String.h
similarity index 100%
rename from modules/dep/acelite/ace/Functor_String.h
rename to dep/acelite/ace/Functor_String.h
diff --git a/modules/dep/acelite/ace/Functor_String.inl b/dep/acelite/ace/Functor_String.inl
similarity index 100%
rename from modules/dep/acelite/ace/Functor_String.inl
rename to dep/acelite/ace/Functor_String.inl
diff --git a/modules/dep/acelite/ace/Functor_T.cpp b/dep/acelite/ace/Functor_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Functor_T.cpp
rename to dep/acelite/ace/Functor_T.cpp
diff --git a/modules/dep/acelite/ace/Functor_T.h b/dep/acelite/ace/Functor_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Functor_T.h
rename to dep/acelite/ace/Functor_T.h
diff --git a/modules/dep/acelite/ace/Functor_T.inl b/dep/acelite/ace/Functor_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Functor_T.inl
rename to dep/acelite/ace/Functor_T.inl
diff --git a/modules/dep/acelite/ace/Future.cpp b/dep/acelite/ace/Future.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Future.cpp
rename to dep/acelite/ace/Future.cpp
diff --git a/modules/dep/acelite/ace/Future.h b/dep/acelite/ace/Future.h
similarity index 100%
rename from modules/dep/acelite/ace/Future.h
rename to dep/acelite/ace/Future.h
diff --git a/modules/dep/acelite/ace/Future_Set.cpp b/dep/acelite/ace/Future_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Future_Set.cpp
rename to dep/acelite/ace/Future_Set.cpp
diff --git a/modules/dep/acelite/ace/Future_Set.h b/dep/acelite/ace/Future_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Future_Set.h
rename to dep/acelite/ace/Future_Set.h
diff --git a/modules/dep/acelite/ace/Get_Opt.cpp b/dep/acelite/ace/Get_Opt.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Get_Opt.cpp
rename to dep/acelite/ace/Get_Opt.cpp
diff --git a/modules/dep/acelite/ace/Get_Opt.h b/dep/acelite/ace/Get_Opt.h
similarity index 100%
rename from modules/dep/acelite/ace/Get_Opt.h
rename to dep/acelite/ace/Get_Opt.h
diff --git a/modules/dep/acelite/ace/Get_Opt.inl b/dep/acelite/ace/Get_Opt.inl
similarity index 100%
rename from modules/dep/acelite/ace/Get_Opt.inl
rename to dep/acelite/ace/Get_Opt.inl
diff --git a/modules/dep/acelite/ace/Global_Macros.h b/dep/acelite/ace/Global_Macros.h
similarity index 100%
rename from modules/dep/acelite/ace/Global_Macros.h
rename to dep/acelite/ace/Global_Macros.h
diff --git a/modules/dep/acelite/ace/Guard_T.cpp b/dep/acelite/ace/Guard_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Guard_T.cpp
rename to dep/acelite/ace/Guard_T.cpp
diff --git a/modules/dep/acelite/ace/Guard_T.h b/dep/acelite/ace/Guard_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Guard_T.h
rename to dep/acelite/ace/Guard_T.h
diff --git a/modules/dep/acelite/ace/Guard_T.inl b/dep/acelite/ace/Guard_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Guard_T.inl
rename to dep/acelite/ace/Guard_T.inl
diff --git a/modules/dep/acelite/ace/Handle_Gobbler.h b/dep/acelite/ace/Handle_Gobbler.h
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Gobbler.h
rename to dep/acelite/ace/Handle_Gobbler.h
diff --git a/modules/dep/acelite/ace/Handle_Gobbler.inl b/dep/acelite/ace/Handle_Gobbler.inl
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Gobbler.inl
rename to dep/acelite/ace/Handle_Gobbler.inl
diff --git a/modules/dep/acelite/ace/Handle_Ops.cpp b/dep/acelite/ace/Handle_Ops.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Ops.cpp
rename to dep/acelite/ace/Handle_Ops.cpp
diff --git a/modules/dep/acelite/ace/Handle_Ops.h b/dep/acelite/ace/Handle_Ops.h
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Ops.h
rename to dep/acelite/ace/Handle_Ops.h
diff --git a/modules/dep/acelite/ace/Handle_Set.cpp b/dep/acelite/ace/Handle_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Set.cpp
rename to dep/acelite/ace/Handle_Set.cpp
diff --git a/modules/dep/acelite/ace/Handle_Set.h b/dep/acelite/ace/Handle_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Set.h
rename to dep/acelite/ace/Handle_Set.h
diff --git a/modules/dep/acelite/ace/Handle_Set.inl b/dep/acelite/ace/Handle_Set.inl
similarity index 100%
rename from modules/dep/acelite/ace/Handle_Set.inl
rename to dep/acelite/ace/Handle_Set.inl
diff --git a/modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.cpp b/dep/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 dep/acelite/ace/Hash_Cache_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.h b/dep/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 dep/acelite/ace/Hash_Cache_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Hash_Cache_Map_Manager_T.inl b/dep/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 dep/acelite/ace/Hash_Cache_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager.h b/dep/acelite/ace/Hash_Map_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager.h
rename to dep/acelite/ace/Hash_Map_Manager.h
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager_T.cpp b/dep/acelite/ace/Hash_Map_Manager_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager_T.cpp
rename to dep/acelite/ace/Hash_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager_T.h b/dep/acelite/ace/Hash_Map_Manager_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager_T.h
rename to dep/acelite/ace/Hash_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Hash_Map_Manager_T.inl b/dep/acelite/ace/Hash_Map_Manager_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Hash_Map_Manager_T.inl
rename to dep/acelite/ace/Hash_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Hash_Map_With_Allocator_T.cpp b/dep/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 dep/acelite/ace/Hash_Map_With_Allocator_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Map_With_Allocator_T.h b/dep/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 dep/acelite/ace/Hash_Map_With_Allocator_T.h
diff --git a/modules/dep/acelite/ace/Hash_Map_With_Allocator_T.inl b/dep/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 dep/acelite/ace/Hash_Map_With_Allocator_T.inl
diff --git a/modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp b/dep/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 dep/acelite/ace/Hash_Multi_Map_Manager_T.cpp
diff --git a/modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.h b/dep/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 dep/acelite/ace/Hash_Multi_Map_Manager_T.h
diff --git a/modules/dep/acelite/ace/Hash_Multi_Map_Manager_T.inl b/dep/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 dep/acelite/ace/Hash_Multi_Map_Manager_T.inl
diff --git a/modules/dep/acelite/ace/Hashable.cpp b/dep/acelite/ace/Hashable.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Hashable.cpp
rename to dep/acelite/ace/Hashable.cpp
diff --git a/modules/dep/acelite/ace/Hashable.h b/dep/acelite/ace/Hashable.h
similarity index 100%
rename from modules/dep/acelite/ace/Hashable.h
rename to dep/acelite/ace/Hashable.h
diff --git a/modules/dep/acelite/ace/Hashable.inl b/dep/acelite/ace/Hashable.inl
similarity index 100%
rename from modules/dep/acelite/ace/Hashable.inl
rename to dep/acelite/ace/Hashable.inl
diff --git a/modules/dep/acelite/ace/High_Res_Timer.cpp b/dep/acelite/ace/High_Res_Timer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/High_Res_Timer.cpp
rename to dep/acelite/ace/High_Res_Timer.cpp
diff --git a/modules/dep/acelite/ace/High_Res_Timer.h b/dep/acelite/ace/High_Res_Timer.h
similarity index 100%
rename from modules/dep/acelite/ace/High_Res_Timer.h
rename to dep/acelite/ace/High_Res_Timer.h
diff --git a/modules/dep/acelite/ace/High_Res_Timer.inl b/dep/acelite/ace/High_Res_Timer.inl
similarity index 100%
rename from modules/dep/acelite/ace/High_Res_Timer.inl
rename to dep/acelite/ace/High_Res_Timer.inl
diff --git a/modules/dep/acelite/ace/ICMP_Socket.cpp b/dep/acelite/ace/ICMP_Socket.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ICMP_Socket.cpp
rename to dep/acelite/ace/ICMP_Socket.cpp
diff --git a/modules/dep/acelite/ace/ICMP_Socket.h b/dep/acelite/ace/ICMP_Socket.h
similarity index 100%
rename from modules/dep/acelite/ace/ICMP_Socket.h
rename to dep/acelite/ace/ICMP_Socket.h
diff --git a/modules/dep/acelite/ace/INET_Addr.cpp b/dep/acelite/ace/INET_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/INET_Addr.cpp
rename to dep/acelite/ace/INET_Addr.cpp
diff --git a/modules/dep/acelite/ace/INET_Addr.h b/dep/acelite/ace/INET_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/INET_Addr.h
rename to dep/acelite/ace/INET_Addr.h
diff --git a/modules/dep/acelite/ace/INET_Addr.inl b/dep/acelite/ace/INET_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/INET_Addr.inl
rename to dep/acelite/ace/INET_Addr.inl
diff --git a/modules/dep/acelite/ace/IOStream.cpp b/dep/acelite/ace/IOStream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IOStream.cpp
rename to dep/acelite/ace/IOStream.cpp
diff --git a/modules/dep/acelite/ace/IOStream.h b/dep/acelite/ace/IOStream.h
similarity index 100%
rename from modules/dep/acelite/ace/IOStream.h
rename to dep/acelite/ace/IOStream.h
diff --git a/modules/dep/acelite/ace/IOStream_T.cpp b/dep/acelite/ace/IOStream_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IOStream_T.cpp
rename to dep/acelite/ace/IOStream_T.cpp
diff --git a/modules/dep/acelite/ace/IOStream_T.h b/dep/acelite/ace/IOStream_T.h
similarity index 100%
rename from modules/dep/acelite/ace/IOStream_T.h
rename to dep/acelite/ace/IOStream_T.h
diff --git a/modules/dep/acelite/ace/IOStream_T.inl b/dep/acelite/ace/IOStream_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/IOStream_T.inl
rename to dep/acelite/ace/IOStream_T.inl
diff --git a/modules/dep/acelite/ace/IO_Cntl_Msg.cpp b/dep/acelite/ace/IO_Cntl_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IO_Cntl_Msg.cpp
rename to dep/acelite/ace/IO_Cntl_Msg.cpp
diff --git a/modules/dep/acelite/ace/IO_Cntl_Msg.h b/dep/acelite/ace/IO_Cntl_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/IO_Cntl_Msg.h
rename to dep/acelite/ace/IO_Cntl_Msg.h
diff --git a/modules/dep/acelite/ace/IO_Cntl_Msg.inl b/dep/acelite/ace/IO_Cntl_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/IO_Cntl_Msg.inl
rename to dep/acelite/ace/IO_Cntl_Msg.inl
diff --git a/modules/dep/acelite/ace/IO_SAP.cpp b/dep/acelite/ace/IO_SAP.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IO_SAP.cpp
rename to dep/acelite/ace/IO_SAP.cpp
diff --git a/modules/dep/acelite/ace/IO_SAP.h b/dep/acelite/ace/IO_SAP.h
similarity index 100%
rename from modules/dep/acelite/ace/IO_SAP.h
rename to dep/acelite/ace/IO_SAP.h
diff --git a/modules/dep/acelite/ace/IO_SAP.inl b/dep/acelite/ace/IO_SAP.inl
similarity index 100%
rename from modules/dep/acelite/ace/IO_SAP.inl
rename to dep/acelite/ace/IO_SAP.inl
diff --git a/modules/dep/acelite/ace/IPC_SAP.cpp b/dep/acelite/ace/IPC_SAP.cpp
similarity index 100%
rename from modules/dep/acelite/ace/IPC_SAP.cpp
rename to dep/acelite/ace/IPC_SAP.cpp
diff --git a/modules/dep/acelite/ace/IPC_SAP.h b/dep/acelite/ace/IPC_SAP.h
similarity index 100%
rename from modules/dep/acelite/ace/IPC_SAP.h
rename to dep/acelite/ace/IPC_SAP.h
diff --git a/modules/dep/acelite/ace/IPC_SAP.inl b/dep/acelite/ace/IPC_SAP.inl
similarity index 100%
rename from modules/dep/acelite/ace/IPC_SAP.inl
rename to dep/acelite/ace/IPC_SAP.inl
diff --git a/modules/dep/acelite/ace/If_Then_Else.h b/dep/acelite/ace/If_Then_Else.h
similarity index 100%
rename from modules/dep/acelite/ace/If_Then_Else.h
rename to dep/acelite/ace/If_Then_Else.h
diff --git a/modules/dep/acelite/ace/Init_ACE.cpp b/dep/acelite/ace/Init_ACE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Init_ACE.cpp
rename to dep/acelite/ace/Init_ACE.cpp
diff --git a/modules/dep/acelite/ace/Init_ACE.h b/dep/acelite/ace/Init_ACE.h
similarity index 100%
rename from modules/dep/acelite/ace/Init_ACE.h
rename to dep/acelite/ace/Init_ACE.h
diff --git a/modules/dep/acelite/ace/Intrusive_Auto_Ptr.cpp b/dep/acelite/ace/Intrusive_Auto_Ptr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_Auto_Ptr.cpp
rename to dep/acelite/ace/Intrusive_Auto_Ptr.cpp
diff --git a/modules/dep/acelite/ace/Intrusive_Auto_Ptr.h b/dep/acelite/ace/Intrusive_Auto_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_Auto_Ptr.h
rename to dep/acelite/ace/Intrusive_Auto_Ptr.h
diff --git a/modules/dep/acelite/ace/Intrusive_Auto_Ptr.inl b/dep/acelite/ace/Intrusive_Auto_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_Auto_Ptr.inl
rename to dep/acelite/ace/Intrusive_Auto_Ptr.inl
diff --git a/modules/dep/acelite/ace/Intrusive_List.cpp b/dep/acelite/ace/Intrusive_List.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List.cpp
rename to dep/acelite/ace/Intrusive_List.cpp
diff --git a/modules/dep/acelite/ace/Intrusive_List.h b/dep/acelite/ace/Intrusive_List.h
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List.h
rename to dep/acelite/ace/Intrusive_List.h
diff --git a/modules/dep/acelite/ace/Intrusive_List.inl b/dep/acelite/ace/Intrusive_List.inl
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List.inl
rename to dep/acelite/ace/Intrusive_List.inl
diff --git a/modules/dep/acelite/ace/Intrusive_List_Node.cpp b/dep/acelite/ace/Intrusive_List_Node.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List_Node.cpp
rename to dep/acelite/ace/Intrusive_List_Node.cpp
diff --git a/modules/dep/acelite/ace/Intrusive_List_Node.h b/dep/acelite/ace/Intrusive_List_Node.h
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List_Node.h
rename to dep/acelite/ace/Intrusive_List_Node.h
diff --git a/modules/dep/acelite/ace/Intrusive_List_Node.inl b/dep/acelite/ace/Intrusive_List_Node.inl
similarity index 100%
rename from modules/dep/acelite/ace/Intrusive_List_Node.inl
rename to dep/acelite/ace/Intrusive_List_Node.inl
diff --git a/modules/dep/acelite/ace/LOCK_SOCK_Acceptor.cpp b/dep/acelite/ace/LOCK_SOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LOCK_SOCK_Acceptor.cpp
rename to dep/acelite/ace/LOCK_SOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/LOCK_SOCK_Acceptor.h b/dep/acelite/ace/LOCK_SOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/LOCK_SOCK_Acceptor.h
rename to dep/acelite/ace/LOCK_SOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/LSOCK.cpp b/dep/acelite/ace/LSOCK.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK.cpp
rename to dep/acelite/ace/LSOCK.cpp
diff --git a/modules/dep/acelite/ace/LSOCK.h b/dep/acelite/ace/LSOCK.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK.h
rename to dep/acelite/ace/LSOCK.h
diff --git a/modules/dep/acelite/ace/LSOCK.inl b/dep/acelite/ace/LSOCK.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK.inl
rename to dep/acelite/ace/LSOCK.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Acceptor.cpp b/dep/acelite/ace/LSOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Acceptor.cpp
rename to dep/acelite/ace/LSOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Acceptor.h b/dep/acelite/ace/LSOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Acceptor.h
rename to dep/acelite/ace/LSOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/LSOCK_CODgram.cpp b/dep/acelite/ace/LSOCK_CODgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_CODgram.cpp
rename to dep/acelite/ace/LSOCK_CODgram.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_CODgram.h b/dep/acelite/ace/LSOCK_CODgram.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_CODgram.h
rename to dep/acelite/ace/LSOCK_CODgram.h
diff --git a/modules/dep/acelite/ace/LSOCK_CODgram.inl b/dep/acelite/ace/LSOCK_CODgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_CODgram.inl
rename to dep/acelite/ace/LSOCK_CODgram.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Connector.cpp b/dep/acelite/ace/LSOCK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Connector.cpp
rename to dep/acelite/ace/LSOCK_Connector.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Connector.h b/dep/acelite/ace/LSOCK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Connector.h
rename to dep/acelite/ace/LSOCK_Connector.h
diff --git a/modules/dep/acelite/ace/LSOCK_Connector.inl b/dep/acelite/ace/LSOCK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Connector.inl
rename to dep/acelite/ace/LSOCK_Connector.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Dgram.cpp b/dep/acelite/ace/LSOCK_Dgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Dgram.cpp
rename to dep/acelite/ace/LSOCK_Dgram.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Dgram.h b/dep/acelite/ace/LSOCK_Dgram.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Dgram.h
rename to dep/acelite/ace/LSOCK_Dgram.h
diff --git a/modules/dep/acelite/ace/LSOCK_Dgram.inl b/dep/acelite/ace/LSOCK_Dgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Dgram.inl
rename to dep/acelite/ace/LSOCK_Dgram.inl
diff --git a/modules/dep/acelite/ace/LSOCK_Stream.cpp b/dep/acelite/ace/LSOCK_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Stream.cpp
rename to dep/acelite/ace/LSOCK_Stream.cpp
diff --git a/modules/dep/acelite/ace/LSOCK_Stream.h b/dep/acelite/ace/LSOCK_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Stream.h
rename to dep/acelite/ace/LSOCK_Stream.h
diff --git a/modules/dep/acelite/ace/LSOCK_Stream.inl b/dep/acelite/ace/LSOCK_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/LSOCK_Stream.inl
rename to dep/acelite/ace/LSOCK_Stream.inl
diff --git a/modules/dep/acelite/ace/Lib_Find.cpp b/dep/acelite/ace/Lib_Find.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Lib_Find.cpp
rename to dep/acelite/ace/Lib_Find.cpp
diff --git a/modules/dep/acelite/ace/Lib_Find.h b/dep/acelite/ace/Lib_Find.h
similarity index 100%
rename from modules/dep/acelite/ace/Lib_Find.h
rename to dep/acelite/ace/Lib_Find.h
diff --git a/modules/dep/acelite/ace/Local_Memory_Pool.cpp b/dep/acelite/ace/Local_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Memory_Pool.cpp
rename to dep/acelite/ace/Local_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Local_Memory_Pool.h b/dep/acelite/ace/Local_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Memory_Pool.h
rename to dep/acelite/ace/Local_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Local_Name_Space.cpp b/dep/acelite/ace/Local_Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space.cpp
rename to dep/acelite/ace/Local_Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Local_Name_Space.h b/dep/acelite/ace/Local_Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space.h
rename to dep/acelite/ace/Local_Name_Space.h
diff --git a/modules/dep/acelite/ace/Local_Name_Space_T.cpp b/dep/acelite/ace/Local_Name_Space_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space_T.cpp
rename to dep/acelite/ace/Local_Name_Space_T.cpp
diff --git a/modules/dep/acelite/ace/Local_Name_Space_T.h b/dep/acelite/ace/Local_Name_Space_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Name_Space_T.h
rename to dep/acelite/ace/Local_Name_Space_T.h
diff --git a/modules/dep/acelite/ace/Local_Tokens.cpp b/dep/acelite/ace/Local_Tokens.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Local_Tokens.cpp
rename to dep/acelite/ace/Local_Tokens.cpp
diff --git a/modules/dep/acelite/ace/Local_Tokens.h b/dep/acelite/ace/Local_Tokens.h
similarity index 100%
rename from modules/dep/acelite/ace/Local_Tokens.h
rename to dep/acelite/ace/Local_Tokens.h
diff --git a/modules/dep/acelite/ace/Local_Tokens.inl b/dep/acelite/ace/Local_Tokens.inl
similarity index 100%
rename from modules/dep/acelite/ace/Local_Tokens.inl
rename to dep/acelite/ace/Local_Tokens.inl
diff --git a/modules/dep/acelite/ace/Lock.cpp b/dep/acelite/ace/Lock.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Lock.cpp
rename to dep/acelite/ace/Lock.cpp
diff --git a/modules/dep/acelite/ace/Lock.h b/dep/acelite/ace/Lock.h
similarity index 100%
rename from modules/dep/acelite/ace/Lock.h
rename to dep/acelite/ace/Lock.h
diff --git a/modules/dep/acelite/ace/Lock.inl b/dep/acelite/ace/Lock.inl
similarity index 100%
rename from modules/dep/acelite/ace/Lock.inl
rename to dep/acelite/ace/Lock.inl
diff --git a/modules/dep/acelite/ace/Lock_Adapter_T.cpp b/dep/acelite/ace/Lock_Adapter_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Lock_Adapter_T.cpp
rename to dep/acelite/ace/Lock_Adapter_T.cpp
diff --git a/modules/dep/acelite/ace/Lock_Adapter_T.h b/dep/acelite/ace/Lock_Adapter_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Lock_Adapter_T.h
rename to dep/acelite/ace/Lock_Adapter_T.h
diff --git a/modules/dep/acelite/ace/Lock_Adapter_T.inl b/dep/acelite/ace/Lock_Adapter_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Lock_Adapter_T.inl
rename to dep/acelite/ace/Lock_Adapter_T.inl
diff --git a/modules/dep/acelite/ace/Log_Category.cpp b/dep/acelite/ace/Log_Category.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Category.cpp
rename to dep/acelite/ace/Log_Category.cpp
diff --git a/modules/dep/acelite/ace/Log_Category.h b/dep/acelite/ace/Log_Category.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Category.h
rename to dep/acelite/ace/Log_Category.h
diff --git a/modules/dep/acelite/ace/Log_Category.inl b/dep/acelite/ace/Log_Category.inl
similarity index 100%
rename from modules/dep/acelite/ace/Log_Category.inl
rename to dep/acelite/ace/Log_Category.inl
diff --git a/modules/dep/acelite/ace/Log_Msg.cpp b/dep/acelite/ace/Log_Msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg.cpp
rename to dep/acelite/ace/Log_Msg.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg.h b/dep/acelite/ace/Log_Msg.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg.h
rename to dep/acelite/ace/Log_Msg.h
diff --git a/modules/dep/acelite/ace/Log_Msg.inl b/dep/acelite/ace/Log_Msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg.inl
rename to dep/acelite/ace/Log_Msg.inl
diff --git a/modules/dep/acelite/ace/Log_Msg_Backend.cpp b/dep/acelite/ace/Log_Msg_Backend.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Backend.cpp
rename to dep/acelite/ace/Log_Msg_Backend.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_Backend.h b/dep/acelite/ace/Log_Msg_Backend.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Backend.h
rename to dep/acelite/ace/Log_Msg_Backend.h
diff --git a/modules/dep/acelite/ace/Log_Msg_Callback.cpp b/dep/acelite/ace/Log_Msg_Callback.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Callback.cpp
rename to dep/acelite/ace/Log_Msg_Callback.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_Callback.h b/dep/acelite/ace/Log_Msg_Callback.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_Callback.h
rename to dep/acelite/ace/Log_Msg_Callback.h
diff --git a/modules/dep/acelite/ace/Log_Msg_IPC.cpp b/dep/acelite/ace/Log_Msg_IPC.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_IPC.cpp
rename to dep/acelite/ace/Log_Msg_IPC.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_IPC.h b/dep/acelite/ace/Log_Msg_IPC.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_IPC.h
rename to dep/acelite/ace/Log_Msg_IPC.h
diff --git a/modules/dep/acelite/ace/Log_Msg_NT_Event_Log.cpp b/dep/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 dep/acelite/ace/Log_Msg_NT_Event_Log.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_NT_Event_Log.h b/dep/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 dep/acelite/ace/Log_Msg_NT_Event_Log.h
diff --git a/modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp b/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp
rename to dep/acelite/ace/Log_Msg_UNIX_Syslog.cpp
diff --git a/modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.h b/dep/acelite/ace/Log_Msg_UNIX_Syslog.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Msg_UNIX_Syslog.h
rename to dep/acelite/ace/Log_Msg_UNIX_Syslog.h
diff --git a/modules/dep/acelite/ace/Log_Priority.h b/dep/acelite/ace/Log_Priority.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Priority.h
rename to dep/acelite/ace/Log_Priority.h
diff --git a/modules/dep/acelite/ace/Log_Record.cpp b/dep/acelite/ace/Log_Record.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Log_Record.cpp
rename to dep/acelite/ace/Log_Record.cpp
diff --git a/modules/dep/acelite/ace/Log_Record.h b/dep/acelite/ace/Log_Record.h
similarity index 100%
rename from modules/dep/acelite/ace/Log_Record.h
rename to dep/acelite/ace/Log_Record.h
diff --git a/modules/dep/acelite/ace/Log_Record.inl b/dep/acelite/ace/Log_Record.inl
similarity index 100%
rename from modules/dep/acelite/ace/Log_Record.inl
rename to dep/acelite/ace/Log_Record.inl
diff --git a/modules/dep/acelite/ace/Logging_Strategy.cpp b/dep/acelite/ace/Logging_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Logging_Strategy.cpp
rename to dep/acelite/ace/Logging_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Logging_Strategy.h b/dep/acelite/ace/Logging_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Logging_Strategy.h
rename to dep/acelite/ace/Logging_Strategy.h
diff --git a/modules/dep/acelite/ace/MEM_Acceptor.cpp b/dep/acelite/ace/MEM_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Acceptor.cpp
rename to dep/acelite/ace/MEM_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/MEM_Acceptor.h b/dep/acelite/ace/MEM_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Acceptor.h
rename to dep/acelite/ace/MEM_Acceptor.h
diff --git a/modules/dep/acelite/ace/MEM_Acceptor.inl b/dep/acelite/ace/MEM_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Acceptor.inl
rename to dep/acelite/ace/MEM_Acceptor.inl
diff --git a/modules/dep/acelite/ace/MEM_Addr.cpp b/dep/acelite/ace/MEM_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Addr.cpp
rename to dep/acelite/ace/MEM_Addr.cpp
diff --git a/modules/dep/acelite/ace/MEM_Addr.h b/dep/acelite/ace/MEM_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Addr.h
rename to dep/acelite/ace/MEM_Addr.h
diff --git a/modules/dep/acelite/ace/MEM_Addr.inl b/dep/acelite/ace/MEM_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Addr.inl
rename to dep/acelite/ace/MEM_Addr.inl
diff --git a/modules/dep/acelite/ace/MEM_Connector.cpp b/dep/acelite/ace/MEM_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Connector.cpp
rename to dep/acelite/ace/MEM_Connector.cpp
diff --git a/modules/dep/acelite/ace/MEM_Connector.h b/dep/acelite/ace/MEM_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Connector.h
rename to dep/acelite/ace/MEM_Connector.h
diff --git a/modules/dep/acelite/ace/MEM_Connector.inl b/dep/acelite/ace/MEM_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Connector.inl
rename to dep/acelite/ace/MEM_Connector.inl
diff --git a/modules/dep/acelite/ace/MEM_IO.cpp b/dep/acelite/ace/MEM_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_IO.cpp
rename to dep/acelite/ace/MEM_IO.cpp
diff --git a/modules/dep/acelite/ace/MEM_IO.h b/dep/acelite/ace/MEM_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_IO.h
rename to dep/acelite/ace/MEM_IO.h
diff --git a/modules/dep/acelite/ace/MEM_IO.inl b/dep/acelite/ace/MEM_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_IO.inl
rename to dep/acelite/ace/MEM_IO.inl
diff --git a/modules/dep/acelite/ace/MEM_SAP.cpp b/dep/acelite/ace/MEM_SAP.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_SAP.cpp
rename to dep/acelite/ace/MEM_SAP.cpp
diff --git a/modules/dep/acelite/ace/MEM_SAP.h b/dep/acelite/ace/MEM_SAP.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_SAP.h
rename to dep/acelite/ace/MEM_SAP.h
diff --git a/modules/dep/acelite/ace/MEM_SAP.inl b/dep/acelite/ace/MEM_SAP.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_SAP.inl
rename to dep/acelite/ace/MEM_SAP.inl
diff --git a/modules/dep/acelite/ace/MEM_Stream.cpp b/dep/acelite/ace/MEM_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Stream.cpp
rename to dep/acelite/ace/MEM_Stream.cpp
diff --git a/modules/dep/acelite/ace/MEM_Stream.h b/dep/acelite/ace/MEM_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Stream.h
rename to dep/acelite/ace/MEM_Stream.h
diff --git a/modules/dep/acelite/ace/MEM_Stream.inl b/dep/acelite/ace/MEM_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/MEM_Stream.inl
rename to dep/acelite/ace/MEM_Stream.inl
diff --git a/modules/dep/acelite/ace/MMAP_Memory_Pool.cpp b/dep/acelite/ace/MMAP_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/MMAP_Memory_Pool.cpp
rename to dep/acelite/ace/MMAP_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/MMAP_Memory_Pool.h b/dep/acelite/ace/MMAP_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/MMAP_Memory_Pool.h
rename to dep/acelite/ace/MMAP_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/MMAP_Memory_Pool.inl b/dep/acelite/ace/MMAP_Memory_Pool.inl
similarity index 100%
rename from modules/dep/acelite/ace/MMAP_Memory_Pool.inl
rename to dep/acelite/ace/MMAP_Memory_Pool.inl
diff --git a/modules/dep/acelite/ace/Malloc.cpp b/dep/acelite/ace/Malloc.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Malloc.cpp
rename to dep/acelite/ace/Malloc.cpp
diff --git a/modules/dep/acelite/ace/Malloc.h b/dep/acelite/ace/Malloc.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc.h
rename to dep/acelite/ace/Malloc.h
diff --git a/modules/dep/acelite/ace/Malloc.inl b/dep/acelite/ace/Malloc.inl
similarity index 100%
rename from modules/dep/acelite/ace/Malloc.inl
rename to dep/acelite/ace/Malloc.inl
diff --git a/modules/dep/acelite/ace/Malloc_Allocator.cpp b/dep/acelite/ace/Malloc_Allocator.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Allocator.cpp
rename to dep/acelite/ace/Malloc_Allocator.cpp
diff --git a/modules/dep/acelite/ace/Malloc_Allocator.h b/dep/acelite/ace/Malloc_Allocator.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Allocator.h
rename to dep/acelite/ace/Malloc_Allocator.h
diff --git a/modules/dep/acelite/ace/Malloc_Allocator.inl b/dep/acelite/ace/Malloc_Allocator.inl
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Allocator.inl
rename to dep/acelite/ace/Malloc_Allocator.inl
diff --git a/modules/dep/acelite/ace/Malloc_Base.h b/dep/acelite/ace/Malloc_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_Base.h
rename to dep/acelite/ace/Malloc_Base.h
diff --git a/modules/dep/acelite/ace/Malloc_T.cpp b/dep/acelite/ace/Malloc_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_T.cpp
rename to dep/acelite/ace/Malloc_T.cpp
diff --git a/modules/dep/acelite/ace/Malloc_T.h b/dep/acelite/ace/Malloc_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_T.h
rename to dep/acelite/ace/Malloc_T.h
diff --git a/modules/dep/acelite/ace/Malloc_T.inl b/dep/acelite/ace/Malloc_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Malloc_T.inl
rename to dep/acelite/ace/Malloc_T.inl
diff --git a/modules/dep/acelite/ace/Managed_Object.cpp b/dep/acelite/ace/Managed_Object.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Managed_Object.cpp
rename to dep/acelite/ace/Managed_Object.cpp
diff --git a/modules/dep/acelite/ace/Managed_Object.h b/dep/acelite/ace/Managed_Object.h
similarity index 100%
rename from modules/dep/acelite/ace/Managed_Object.h
rename to dep/acelite/ace/Managed_Object.h
diff --git a/modules/dep/acelite/ace/Managed_Object.inl b/dep/acelite/ace/Managed_Object.inl
similarity index 100%
rename from modules/dep/acelite/ace/Managed_Object.inl
rename to dep/acelite/ace/Managed_Object.inl
diff --git a/modules/dep/acelite/ace/Manual_Event.cpp b/dep/acelite/ace/Manual_Event.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Manual_Event.cpp
rename to dep/acelite/ace/Manual_Event.cpp
diff --git a/modules/dep/acelite/ace/Manual_Event.h b/dep/acelite/ace/Manual_Event.h
similarity index 100%
rename from modules/dep/acelite/ace/Manual_Event.h
rename to dep/acelite/ace/Manual_Event.h
diff --git a/modules/dep/acelite/ace/Manual_Event.inl b/dep/acelite/ace/Manual_Event.inl
similarity index 100%
rename from modules/dep/acelite/ace/Manual_Event.inl
rename to dep/acelite/ace/Manual_Event.inl
diff --git a/modules/dep/acelite/ace/Map_Manager.cpp b/dep/acelite/ace/Map_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Map_Manager.cpp
rename to dep/acelite/ace/Map_Manager.cpp
diff --git a/modules/dep/acelite/ace/Map_Manager.h b/dep/acelite/ace/Map_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Map_Manager.h
rename to dep/acelite/ace/Map_Manager.h
diff --git a/modules/dep/acelite/ace/Map_Manager.inl b/dep/acelite/ace/Map_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Map_Manager.inl
rename to dep/acelite/ace/Map_Manager.inl
diff --git a/modules/dep/acelite/ace/Map_T.cpp b/dep/acelite/ace/Map_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Map_T.cpp
rename to dep/acelite/ace/Map_T.cpp
diff --git a/modules/dep/acelite/ace/Map_T.h b/dep/acelite/ace/Map_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Map_T.h
rename to dep/acelite/ace/Map_T.h
diff --git a/modules/dep/acelite/ace/Map_T.inl b/dep/acelite/ace/Map_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Map_T.inl
rename to dep/acelite/ace/Map_T.inl
diff --git a/modules/dep/acelite/ace/Mem_Map.cpp b/dep/acelite/ace/Mem_Map.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Mem_Map.cpp
rename to dep/acelite/ace/Mem_Map.cpp
diff --git a/modules/dep/acelite/ace/Mem_Map.h b/dep/acelite/ace/Mem_Map.h
similarity index 100%
rename from modules/dep/acelite/ace/Mem_Map.h
rename to dep/acelite/ace/Mem_Map.h
diff --git a/modules/dep/acelite/ace/Mem_Map.inl b/dep/acelite/ace/Mem_Map.inl
similarity index 100%
rename from modules/dep/acelite/ace/Mem_Map.inl
rename to dep/acelite/ace/Mem_Map.inl
diff --git a/modules/dep/acelite/ace/Memory_Pool.h b/dep/acelite/ace/Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Memory_Pool.h
rename to dep/acelite/ace/Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Message_Block.cpp b/dep/acelite/ace/Message_Block.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block.cpp
rename to dep/acelite/ace/Message_Block.cpp
diff --git a/modules/dep/acelite/ace/Message_Block.h b/dep/acelite/ace/Message_Block.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block.h
rename to dep/acelite/ace/Message_Block.h
diff --git a/modules/dep/acelite/ace/Message_Block.inl b/dep/acelite/ace/Message_Block.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block.inl
rename to dep/acelite/ace/Message_Block.inl
diff --git a/modules/dep/acelite/ace/Message_Block_T.cpp b/dep/acelite/ace/Message_Block_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block_T.cpp
rename to dep/acelite/ace/Message_Block_T.cpp
diff --git a/modules/dep/acelite/ace/Message_Block_T.h b/dep/acelite/ace/Message_Block_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block_T.h
rename to dep/acelite/ace/Message_Block_T.h
diff --git a/modules/dep/acelite/ace/Message_Block_T.inl b/dep/acelite/ace/Message_Block_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Block_T.inl
rename to dep/acelite/ace/Message_Block_T.inl
diff --git a/modules/dep/acelite/ace/Message_Queue.cpp b/dep/acelite/ace/Message_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue.cpp
rename to dep/acelite/ace/Message_Queue.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue.h b/dep/acelite/ace/Message_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue.h
rename to dep/acelite/ace/Message_Queue.h
diff --git a/modules/dep/acelite/ace/Message_Queue.inl b/dep/acelite/ace/Message_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue.inl
rename to dep/acelite/ace/Message_Queue.inl
diff --git a/modules/dep/acelite/ace/Message_Queue_NT.cpp b/dep/acelite/ace/Message_Queue_NT.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_NT.cpp
rename to dep/acelite/ace/Message_Queue_NT.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue_NT.h b/dep/acelite/ace/Message_Queue_NT.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_NT.h
rename to dep/acelite/ace/Message_Queue_NT.h
diff --git a/modules/dep/acelite/ace/Message_Queue_NT.inl b/dep/acelite/ace/Message_Queue_NT.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_NT.inl
rename to dep/acelite/ace/Message_Queue_NT.inl
diff --git a/modules/dep/acelite/ace/Message_Queue_T.cpp b/dep/acelite/ace/Message_Queue_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_T.cpp
rename to dep/acelite/ace/Message_Queue_T.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue_T.h b/dep/acelite/ace/Message_Queue_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_T.h
rename to dep/acelite/ace/Message_Queue_T.h
diff --git a/modules/dep/acelite/ace/Message_Queue_Vx.cpp b/dep/acelite/ace/Message_Queue_Vx.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_Vx.cpp
rename to dep/acelite/ace/Message_Queue_Vx.cpp
diff --git a/modules/dep/acelite/ace/Message_Queue_Vx.h b/dep/acelite/ace/Message_Queue_Vx.h
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_Vx.h
rename to dep/acelite/ace/Message_Queue_Vx.h
diff --git a/modules/dep/acelite/ace/Message_Queue_Vx.inl b/dep/acelite/ace/Message_Queue_Vx.inl
similarity index 100%
rename from modules/dep/acelite/ace/Message_Queue_Vx.inl
rename to dep/acelite/ace/Message_Queue_Vx.inl
diff --git a/modules/dep/acelite/ace/Method_Request.cpp b/dep/acelite/ace/Method_Request.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Method_Request.cpp
rename to dep/acelite/ace/Method_Request.cpp
diff --git a/modules/dep/acelite/ace/Method_Request.h b/dep/acelite/ace/Method_Request.h
similarity index 100%
rename from modules/dep/acelite/ace/Method_Request.h
rename to dep/acelite/ace/Method_Request.h
diff --git a/modules/dep/acelite/ace/Metrics_Cache.h b/dep/acelite/ace/Metrics_Cache.h
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache.h
rename to dep/acelite/ace/Metrics_Cache.h
diff --git a/modules/dep/acelite/ace/Metrics_Cache_T.cpp b/dep/acelite/ace/Metrics_Cache_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache_T.cpp
rename to dep/acelite/ace/Metrics_Cache_T.cpp
diff --git a/modules/dep/acelite/ace/Metrics_Cache_T.h b/dep/acelite/ace/Metrics_Cache_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache_T.h
rename to dep/acelite/ace/Metrics_Cache_T.h
diff --git a/modules/dep/acelite/ace/Metrics_Cache_T.inl b/dep/acelite/ace/Metrics_Cache_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Metrics_Cache_T.inl
rename to dep/acelite/ace/Metrics_Cache_T.inl
diff --git a/modules/dep/acelite/ace/Min_Max.h b/dep/acelite/ace/Min_Max.h
similarity index 100%
rename from modules/dep/acelite/ace/Min_Max.h
rename to dep/acelite/ace/Min_Max.h
diff --git a/modules/dep/acelite/ace/Module.cpp b/dep/acelite/ace/Module.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Module.cpp
rename to dep/acelite/ace/Module.cpp
diff --git a/modules/dep/acelite/ace/Module.h b/dep/acelite/ace/Module.h
similarity index 100%
rename from modules/dep/acelite/ace/Module.h
rename to dep/acelite/ace/Module.h
diff --git a/modules/dep/acelite/ace/Module.inl b/dep/acelite/ace/Module.inl
similarity index 100%
rename from modules/dep/acelite/ace/Module.inl
rename to dep/acelite/ace/Module.inl
diff --git a/modules/dep/acelite/ace/Monitor_Admin.cpp b/dep/acelite/ace/Monitor_Admin.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin.cpp
rename to dep/acelite/ace/Monitor_Admin.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Admin.h b/dep/acelite/ace/Monitor_Admin.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin.h
rename to dep/acelite/ace/Monitor_Admin.h
diff --git a/modules/dep/acelite/ace/Monitor_Admin_Manager.cpp b/dep/acelite/ace/Monitor_Admin_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin_Manager.cpp
rename to dep/acelite/ace/Monitor_Admin_Manager.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Admin_Manager.h b/dep/acelite/ace/Monitor_Admin_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Admin_Manager.h
rename to dep/acelite/ace/Monitor_Admin_Manager.h
diff --git a/modules/dep/acelite/ace/Monitor_Base.cpp b/dep/acelite/ace/Monitor_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Base.cpp
rename to dep/acelite/ace/Monitor_Base.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Base.h b/dep/acelite/ace/Monitor_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Base.h
rename to dep/acelite/ace/Monitor_Base.h
diff --git a/modules/dep/acelite/ace/Monitor_Base.inl b/dep/acelite/ace/Monitor_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Base.inl
rename to dep/acelite/ace/Monitor_Base.inl
diff --git a/modules/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Auto_Update_Starter.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Auto_Update_Starter.h b/dep/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 dep/acelite/ace/Monitor_Control/Auto_Update_Starter.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Bytes_Received_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Bytes_Sent_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/CPU_Load_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp b/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
rename to dep/acelite/ace/Monitor_Control/Constraint_Interpreter.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h b/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h
rename to dep/acelite/ace/Monitor_Control/Constraint_Interpreter.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp b/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
rename to dep/acelite/ace/Monitor_Control/Constraint_Visitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h b/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Constraint_Visitor.h
rename to dep/acelite/ace/Monitor_Control/Constraint_Visitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Memory_Usage_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control.h b/dep/acelite/ace/Monitor_Control/Monitor_Control.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control.h
rename to dep/acelite/ace/Monitor_Control/Monitor_Control.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control.mpc b/dep/acelite/ace/Monitor_Control/Monitor_Control.mpc
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control.mpc
rename to dep/acelite/ace/Monitor_Control/Monitor_Control.mpc
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control.vsd b/dep/acelite/ace/Monitor_Control/Monitor_Control.vsd
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Control.vsd
rename to dep/acelite/ace/Monitor_Control/Monitor_Control.vsd
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control_export.h b/dep/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 dep/acelite/ace/Monitor_Control/Monitor_Control_export.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Control_utils.h b/dep/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 dep/acelite/ace/Monitor_Control/Monitor_Control_utils.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp b/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Group.cpp
rename to dep/acelite/ace/Monitor_Control/Monitor_Group.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Group.h b/dep/acelite/ace/Monitor_Control/Monitor_Group.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Group.h
rename to dep/acelite/ace/Monitor_Control/Monitor_Group.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp b/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Query.cpp
rename to dep/acelite/ace/Monitor_Control/Monitor_Query.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Monitor_Query.h b/dep/acelite/ace/Monitor_Control/Monitor_Query.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Monitor_Query.h
rename to dep/acelite/ace/Monitor_Control/Monitor_Query.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Null_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Num_Threads_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Packets_Received_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Packets_Sent_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp b/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp
rename to dep/acelite/ace/Monitor_Control/Windows_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.h b/dep/acelite/ace/Monitor_Control/Windows_Monitor.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control/Windows_Monitor.h
rename to dep/acelite/ace/Monitor_Control/Windows_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/dep/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 dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h b/dep/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 dep/acelite/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
diff --git a/modules/dep/acelite/ace/Monitor_Control_Action.cpp b/dep/acelite/ace/Monitor_Control_Action.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Action.cpp
rename to dep/acelite/ace/Monitor_Control_Action.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control_Action.h b/dep/acelite/ace/Monitor_Control_Action.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Action.h
rename to dep/acelite/ace/Monitor_Control_Action.h
diff --git a/modules/dep/acelite/ace/Monitor_Control_Types.cpp b/dep/acelite/ace/Monitor_Control_Types.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Types.cpp
rename to dep/acelite/ace/Monitor_Control_Types.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Control_Types.h b/dep/acelite/ace/Monitor_Control_Types.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Control_Types.h
rename to dep/acelite/ace/Monitor_Control_Types.h
diff --git a/modules/dep/acelite/ace/Monitor_Point_Registry.cpp b/dep/acelite/ace/Monitor_Point_Registry.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Point_Registry.cpp
rename to dep/acelite/ace/Monitor_Point_Registry.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Point_Registry.h b/dep/acelite/ace/Monitor_Point_Registry.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Point_Registry.h
rename to dep/acelite/ace/Monitor_Point_Registry.h
diff --git a/modules/dep/acelite/ace/Monitor_Size.cpp b/dep/acelite/ace/Monitor_Size.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Size.cpp
rename to dep/acelite/ace/Monitor_Size.cpp
diff --git a/modules/dep/acelite/ace/Monitor_Size.h b/dep/acelite/ace/Monitor_Size.h
similarity index 100%
rename from modules/dep/acelite/ace/Monitor_Size.h
rename to dep/acelite/ace/Monitor_Size.h
diff --git a/modules/dep/acelite/ace/Monotonic_Time_Policy.cpp b/dep/acelite/ace/Monotonic_Time_Policy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Monotonic_Time_Policy.cpp
rename to dep/acelite/ace/Monotonic_Time_Policy.cpp
diff --git a/modules/dep/acelite/ace/Monotonic_Time_Policy.h b/dep/acelite/ace/Monotonic_Time_Policy.h
similarity index 100%
rename from modules/dep/acelite/ace/Monotonic_Time_Policy.h
rename to dep/acelite/ace/Monotonic_Time_Policy.h
diff --git a/modules/dep/acelite/ace/Monotonic_Time_Policy.inl b/dep/acelite/ace/Monotonic_Time_Policy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Monotonic_Time_Policy.inl
rename to dep/acelite/ace/Monotonic_Time_Policy.inl
diff --git a/modules/dep/acelite/ace/Msg_WFMO_Reactor.cpp b/dep/acelite/ace/Msg_WFMO_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Msg_WFMO_Reactor.cpp
rename to dep/acelite/ace/Msg_WFMO_Reactor.cpp
diff --git a/modules/dep/acelite/ace/Msg_WFMO_Reactor.h b/dep/acelite/ace/Msg_WFMO_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Msg_WFMO_Reactor.h
rename to dep/acelite/ace/Msg_WFMO_Reactor.h
diff --git a/modules/dep/acelite/ace/Msg_WFMO_Reactor.inl b/dep/acelite/ace/Msg_WFMO_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Msg_WFMO_Reactor.inl
rename to dep/acelite/ace/Msg_WFMO_Reactor.inl
diff --git a/modules/dep/acelite/ace/Multihomed_INET_Addr.cpp b/dep/acelite/ace/Multihomed_INET_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Multihomed_INET_Addr.cpp
rename to dep/acelite/ace/Multihomed_INET_Addr.cpp
diff --git a/modules/dep/acelite/ace/Multihomed_INET_Addr.h b/dep/acelite/ace/Multihomed_INET_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/Multihomed_INET_Addr.h
rename to dep/acelite/ace/Multihomed_INET_Addr.h
diff --git a/modules/dep/acelite/ace/Multihomed_INET_Addr.inl b/dep/acelite/ace/Multihomed_INET_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Multihomed_INET_Addr.inl
rename to dep/acelite/ace/Multihomed_INET_Addr.inl
diff --git a/modules/dep/acelite/ace/Mutex.cpp b/dep/acelite/ace/Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Mutex.cpp
rename to dep/acelite/ace/Mutex.cpp
diff --git a/modules/dep/acelite/ace/Mutex.h b/dep/acelite/ace/Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Mutex.h
rename to dep/acelite/ace/Mutex.h
diff --git a/modules/dep/acelite/ace/Mutex.inl b/dep/acelite/ace/Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Mutex.inl
rename to dep/acelite/ace/Mutex.inl
diff --git a/modules/dep/acelite/ace/NT_Service.cpp b/dep/acelite/ace/NT_Service.cpp
similarity index 100%
rename from modules/dep/acelite/ace/NT_Service.cpp
rename to dep/acelite/ace/NT_Service.cpp
diff --git a/modules/dep/acelite/ace/NT_Service.h b/dep/acelite/ace/NT_Service.h
similarity index 100%
rename from modules/dep/acelite/ace/NT_Service.h
rename to dep/acelite/ace/NT_Service.h
diff --git a/modules/dep/acelite/ace/NT_Service.inl b/dep/acelite/ace/NT_Service.inl
similarity index 100%
rename from modules/dep/acelite/ace/NT_Service.inl
rename to dep/acelite/ace/NT_Service.inl
diff --git a/modules/dep/acelite/ace/Name_Proxy.cpp b/dep/acelite/ace/Name_Proxy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Name_Proxy.cpp
rename to dep/acelite/ace/Name_Proxy.cpp
diff --git a/modules/dep/acelite/ace/Name_Proxy.h b/dep/acelite/ace/Name_Proxy.h
similarity index 100%
rename from modules/dep/acelite/ace/Name_Proxy.h
rename to dep/acelite/ace/Name_Proxy.h
diff --git a/modules/dep/acelite/ace/Name_Request_Reply.cpp b/dep/acelite/ace/Name_Request_Reply.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Name_Request_Reply.cpp
rename to dep/acelite/ace/Name_Request_Reply.cpp
diff --git a/modules/dep/acelite/ace/Name_Request_Reply.h b/dep/acelite/ace/Name_Request_Reply.h
similarity index 100%
rename from modules/dep/acelite/ace/Name_Request_Reply.h
rename to dep/acelite/ace/Name_Request_Reply.h
diff --git a/modules/dep/acelite/ace/Name_Space.cpp b/dep/acelite/ace/Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Name_Space.cpp
rename to dep/acelite/ace/Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Name_Space.h b/dep/acelite/ace/Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Name_Space.h
rename to dep/acelite/ace/Name_Space.h
diff --git a/modules/dep/acelite/ace/Naming_Context.cpp b/dep/acelite/ace/Naming_Context.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Naming_Context.cpp
rename to dep/acelite/ace/Naming_Context.cpp
diff --git a/modules/dep/acelite/ace/Naming_Context.h b/dep/acelite/ace/Naming_Context.h
similarity index 100%
rename from modules/dep/acelite/ace/Naming_Context.h
rename to dep/acelite/ace/Naming_Context.h
diff --git a/modules/dep/acelite/ace/Naming_Context.inl b/dep/acelite/ace/Naming_Context.inl
similarity index 100%
rename from modules/dep/acelite/ace/Naming_Context.inl
rename to dep/acelite/ace/Naming_Context.inl
diff --git a/modules/dep/acelite/ace/Netlink_Addr.cpp b/dep/acelite/ace/Netlink_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Netlink_Addr.cpp
rename to dep/acelite/ace/Netlink_Addr.cpp
diff --git a/modules/dep/acelite/ace/Netlink_Addr.h b/dep/acelite/ace/Netlink_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/Netlink_Addr.h
rename to dep/acelite/ace/Netlink_Addr.h
diff --git a/modules/dep/acelite/ace/Netlink_Addr.inl b/dep/acelite/ace/Netlink_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Netlink_Addr.inl
rename to dep/acelite/ace/Netlink_Addr.inl
diff --git a/modules/dep/acelite/ace/Node.cpp b/dep/acelite/ace/Node.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Node.cpp
rename to dep/acelite/ace/Node.cpp
diff --git a/modules/dep/acelite/ace/Node.h b/dep/acelite/ace/Node.h
similarity index 100%
rename from modules/dep/acelite/ace/Node.h
rename to dep/acelite/ace/Node.h
diff --git a/modules/dep/acelite/ace/Notification_Queue.cpp b/dep/acelite/ace/Notification_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Queue.cpp
rename to dep/acelite/ace/Notification_Queue.cpp
diff --git a/modules/dep/acelite/ace/Notification_Queue.h b/dep/acelite/ace/Notification_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Queue.h
rename to dep/acelite/ace/Notification_Queue.h
diff --git a/modules/dep/acelite/ace/Notification_Queue.inl b/dep/acelite/ace/Notification_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Queue.inl
rename to dep/acelite/ace/Notification_Queue.inl
diff --git a/modules/dep/acelite/ace/Notification_Strategy.cpp b/dep/acelite/ace/Notification_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Strategy.cpp
rename to dep/acelite/ace/Notification_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Notification_Strategy.h b/dep/acelite/ace/Notification_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Strategy.h
rename to dep/acelite/ace/Notification_Strategy.h
diff --git a/modules/dep/acelite/ace/Notification_Strategy.inl b/dep/acelite/ace/Notification_Strategy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Notification_Strategy.inl
rename to dep/acelite/ace/Notification_Strategy.inl
diff --git a/modules/dep/acelite/ace/Null_Barrier.h b/dep/acelite/ace/Null_Barrier.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Barrier.h
rename to dep/acelite/ace/Null_Barrier.h
diff --git a/modules/dep/acelite/ace/Null_Condition.h b/dep/acelite/ace/Null_Condition.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Condition.h
rename to dep/acelite/ace/Null_Condition.h
diff --git a/modules/dep/acelite/ace/Null_Mutex.h b/dep/acelite/ace/Null_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Mutex.h
rename to dep/acelite/ace/Null_Mutex.h
diff --git a/modules/dep/acelite/ace/Null_Semaphore.h b/dep/acelite/ace/Null_Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Null_Semaphore.h
rename to dep/acelite/ace/Null_Semaphore.h
diff --git a/modules/dep/acelite/ace/Numeric_Limits.h b/dep/acelite/ace/Numeric_Limits.h
similarity index 100%
rename from modules/dep/acelite/ace/Numeric_Limits.h
rename to dep/acelite/ace/Numeric_Limits.h
diff --git a/modules/dep/acelite/ace/OS.h b/dep/acelite/ace/OS.h
similarity index 100%
rename from modules/dep/acelite/ace/OS.h
rename to dep/acelite/ace/OS.h
diff --git a/modules/dep/acelite/ace/OS_Errno.cpp b/dep/acelite/ace/OS_Errno.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_Errno.cpp
rename to dep/acelite/ace/OS_Errno.cpp
diff --git a/modules/dep/acelite/ace/OS_Errno.h b/dep/acelite/ace/OS_Errno.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Errno.h
rename to dep/acelite/ace/OS_Errno.h
diff --git a/modules/dep/acelite/ace/OS_Errno.inl b/dep/acelite/ace/OS_Errno.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_Errno.inl
rename to dep/acelite/ace/OS_Errno.inl
diff --git a/modules/dep/acelite/ace/OS_Log_Msg_Attributes.cpp b/dep/acelite/ace/OS_Log_Msg_Attributes.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_Log_Msg_Attributes.cpp
rename to dep/acelite/ace/OS_Log_Msg_Attributes.cpp
diff --git a/modules/dep/acelite/ace/OS_Log_Msg_Attributes.h b/dep/acelite/ace/OS_Log_Msg_Attributes.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Log_Msg_Attributes.h
rename to dep/acelite/ace/OS_Log_Msg_Attributes.h
diff --git a/modules/dep/acelite/ace/OS_Log_Msg_Attributes.inl b/dep/acelite/ace/OS_Log_Msg_Attributes.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_Log_Msg_Attributes.inl
rename to dep/acelite/ace/OS_Log_Msg_Attributes.inl
diff --git a/modules/dep/acelite/ace/OS_Memory.h b/dep/acelite/ace/OS_Memory.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Memory.h
rename to dep/acelite/ace/OS_Memory.h
diff --git a/modules/dep/acelite/ace/OS_NS_Thread.cpp b/dep/acelite/ace/OS_NS_Thread.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_Thread.cpp
rename to dep/acelite/ace/OS_NS_Thread.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_Thread.h b/dep/acelite/ace/OS_NS_Thread.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_Thread.h
rename to dep/acelite/ace/OS_NS_Thread.h
diff --git a/modules/dep/acelite/ace/OS_NS_Thread.inl b/dep/acelite/ace/OS_NS_Thread.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_Thread.inl
rename to dep/acelite/ace/OS_NS_Thread.inl
diff --git a/modules/dep/acelite/ace/OS_NS_arpa_inet.cpp b/dep/acelite/ace/OS_NS_arpa_inet.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_arpa_inet.cpp
rename to dep/acelite/ace/OS_NS_arpa_inet.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_arpa_inet.h b/dep/acelite/ace/OS_NS_arpa_inet.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_arpa_inet.h
rename to dep/acelite/ace/OS_NS_arpa_inet.h
diff --git a/modules/dep/acelite/ace/OS_NS_arpa_inet.inl b/dep/acelite/ace/OS_NS_arpa_inet.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_arpa_inet.inl
rename to dep/acelite/ace/OS_NS_arpa_inet.inl
diff --git a/modules/dep/acelite/ace/OS_NS_ctype.cpp b/dep/acelite/ace/OS_NS_ctype.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_ctype.cpp
rename to dep/acelite/ace/OS_NS_ctype.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_ctype.h b/dep/acelite/ace/OS_NS_ctype.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_ctype.h
rename to dep/acelite/ace/OS_NS_ctype.h
diff --git a/modules/dep/acelite/ace/OS_NS_ctype.inl b/dep/acelite/ace/OS_NS_ctype.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_ctype.inl
rename to dep/acelite/ace/OS_NS_ctype.inl
diff --git a/modules/dep/acelite/ace/OS_NS_dirent.cpp b/dep/acelite/ace/OS_NS_dirent.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dirent.cpp
rename to dep/acelite/ace/OS_NS_dirent.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_dirent.h b/dep/acelite/ace/OS_NS_dirent.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dirent.h
rename to dep/acelite/ace/OS_NS_dirent.h
diff --git a/modules/dep/acelite/ace/OS_NS_dirent.inl b/dep/acelite/ace/OS_NS_dirent.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dirent.inl
rename to dep/acelite/ace/OS_NS_dirent.inl
diff --git a/modules/dep/acelite/ace/OS_NS_dlfcn.cpp b/dep/acelite/ace/OS_NS_dlfcn.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dlfcn.cpp
rename to dep/acelite/ace/OS_NS_dlfcn.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_dlfcn.h b/dep/acelite/ace/OS_NS_dlfcn.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dlfcn.h
rename to dep/acelite/ace/OS_NS_dlfcn.h
diff --git a/modules/dep/acelite/ace/OS_NS_dlfcn.inl b/dep/acelite/ace/OS_NS_dlfcn.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_dlfcn.inl
rename to dep/acelite/ace/OS_NS_dlfcn.inl
diff --git a/modules/dep/acelite/ace/OS_NS_errno.cpp b/dep/acelite/ace/OS_NS_errno.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_errno.cpp
rename to dep/acelite/ace/OS_NS_errno.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_errno.h b/dep/acelite/ace/OS_NS_errno.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_errno.h
rename to dep/acelite/ace/OS_NS_errno.h
diff --git a/modules/dep/acelite/ace/OS_NS_errno.inl b/dep/acelite/ace/OS_NS_errno.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_errno.inl
rename to dep/acelite/ace/OS_NS_errno.inl
diff --git a/modules/dep/acelite/ace/OS_NS_fcntl.cpp b/dep/acelite/ace/OS_NS_fcntl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_fcntl.cpp
rename to dep/acelite/ace/OS_NS_fcntl.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_fcntl.h b/dep/acelite/ace/OS_NS_fcntl.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_fcntl.h
rename to dep/acelite/ace/OS_NS_fcntl.h
diff --git a/modules/dep/acelite/ace/OS_NS_fcntl.inl b/dep/acelite/ace/OS_NS_fcntl.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_fcntl.inl
rename to dep/acelite/ace/OS_NS_fcntl.inl
diff --git a/modules/dep/acelite/ace/OS_NS_macros.h b/dep/acelite/ace/OS_NS_macros.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_macros.h
rename to dep/acelite/ace/OS_NS_macros.h
diff --git a/modules/dep/acelite/ace/OS_NS_math.cpp b/dep/acelite/ace/OS_NS_math.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_math.cpp
rename to dep/acelite/ace/OS_NS_math.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_math.h b/dep/acelite/ace/OS_NS_math.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_math.h
rename to dep/acelite/ace/OS_NS_math.h
diff --git a/modules/dep/acelite/ace/OS_NS_math.inl b/dep/acelite/ace/OS_NS_math.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_math.inl
rename to dep/acelite/ace/OS_NS_math.inl
diff --git a/modules/dep/acelite/ace/OS_NS_netdb.cpp b/dep/acelite/ace/OS_NS_netdb.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_netdb.cpp
rename to dep/acelite/ace/OS_NS_netdb.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_netdb.h b/dep/acelite/ace/OS_NS_netdb.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_netdb.h
rename to dep/acelite/ace/OS_NS_netdb.h
diff --git a/modules/dep/acelite/ace/OS_NS_netdb.inl b/dep/acelite/ace/OS_NS_netdb.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_netdb.inl
rename to dep/acelite/ace/OS_NS_netdb.inl
diff --git a/modules/dep/acelite/ace/OS_NS_poll.cpp b/dep/acelite/ace/OS_NS_poll.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_poll.cpp
rename to dep/acelite/ace/OS_NS_poll.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_poll.h b/dep/acelite/ace/OS_NS_poll.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_poll.h
rename to dep/acelite/ace/OS_NS_poll.h
diff --git a/modules/dep/acelite/ace/OS_NS_poll.inl b/dep/acelite/ace/OS_NS_poll.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_poll.inl
rename to dep/acelite/ace/OS_NS_poll.inl
diff --git a/modules/dep/acelite/ace/OS_NS_pwd.cpp b/dep/acelite/ace/OS_NS_pwd.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_pwd.cpp
rename to dep/acelite/ace/OS_NS_pwd.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_pwd.h b/dep/acelite/ace/OS_NS_pwd.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_pwd.h
rename to dep/acelite/ace/OS_NS_pwd.h
diff --git a/modules/dep/acelite/ace/OS_NS_pwd.inl b/dep/acelite/ace/OS_NS_pwd.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_pwd.inl
rename to dep/acelite/ace/OS_NS_pwd.inl
diff --git a/modules/dep/acelite/ace/OS_NS_regex.cpp b/dep/acelite/ace/OS_NS_regex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_regex.cpp
rename to dep/acelite/ace/OS_NS_regex.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_regex.h b/dep/acelite/ace/OS_NS_regex.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_regex.h
rename to dep/acelite/ace/OS_NS_regex.h
diff --git a/modules/dep/acelite/ace/OS_NS_regex.inl b/dep/acelite/ace/OS_NS_regex.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_regex.inl
rename to dep/acelite/ace/OS_NS_regex.inl
diff --git a/modules/dep/acelite/ace/OS_NS_signal.cpp b/dep/acelite/ace/OS_NS_signal.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_signal.cpp
rename to dep/acelite/ace/OS_NS_signal.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_signal.h b/dep/acelite/ace/OS_NS_signal.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_signal.h
rename to dep/acelite/ace/OS_NS_signal.h
diff --git a/modules/dep/acelite/ace/OS_NS_signal.inl b/dep/acelite/ace/OS_NS_signal.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_signal.inl
rename to dep/acelite/ace/OS_NS_signal.inl
diff --git a/modules/dep/acelite/ace/OS_NS_stdio.cpp b/dep/acelite/ace/OS_NS_stdio.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdio.cpp
rename to dep/acelite/ace/OS_NS_stdio.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_stdio.h b/dep/acelite/ace/OS_NS_stdio.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdio.h
rename to dep/acelite/ace/OS_NS_stdio.h
diff --git a/modules/dep/acelite/ace/OS_NS_stdio.inl b/dep/acelite/ace/OS_NS_stdio.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdio.inl
rename to dep/acelite/ace/OS_NS_stdio.inl
diff --git a/modules/dep/acelite/ace/OS_NS_stdlib.cpp b/dep/acelite/ace/OS_NS_stdlib.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdlib.cpp
rename to dep/acelite/ace/OS_NS_stdlib.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_stdlib.h b/dep/acelite/ace/OS_NS_stdlib.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdlib.h
rename to dep/acelite/ace/OS_NS_stdlib.h
diff --git a/modules/dep/acelite/ace/OS_NS_stdlib.inl b/dep/acelite/ace/OS_NS_stdlib.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stdlib.inl
rename to dep/acelite/ace/OS_NS_stdlib.inl
diff --git a/modules/dep/acelite/ace/OS_NS_string.cpp b/dep/acelite/ace/OS_NS_string.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_string.cpp
rename to dep/acelite/ace/OS_NS_string.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_string.h b/dep/acelite/ace/OS_NS_string.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_string.h
rename to dep/acelite/ace/OS_NS_string.h
diff --git a/modules/dep/acelite/ace/OS_NS_string.inl b/dep/acelite/ace/OS_NS_string.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_string.inl
rename to dep/acelite/ace/OS_NS_string.inl
diff --git a/modules/dep/acelite/ace/OS_NS_strings.cpp b/dep/acelite/ace/OS_NS_strings.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_strings.cpp
rename to dep/acelite/ace/OS_NS_strings.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_strings.h b/dep/acelite/ace/OS_NS_strings.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_strings.h
rename to dep/acelite/ace/OS_NS_strings.h
diff --git a/modules/dep/acelite/ace/OS_NS_strings.inl b/dep/acelite/ace/OS_NS_strings.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_strings.inl
rename to dep/acelite/ace/OS_NS_strings.inl
diff --git a/modules/dep/acelite/ace/OS_NS_stropts.cpp b/dep/acelite/ace/OS_NS_stropts.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stropts.cpp
rename to dep/acelite/ace/OS_NS_stropts.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_stropts.h b/dep/acelite/ace/OS_NS_stropts.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stropts.h
rename to dep/acelite/ace/OS_NS_stropts.h
diff --git a/modules/dep/acelite/ace/OS_NS_stropts.inl b/dep/acelite/ace/OS_NS_stropts.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_stropts.inl
rename to dep/acelite/ace/OS_NS_stropts.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_mman.cpp b/dep/acelite/ace/OS_NS_sys_mman.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_mman.cpp
rename to dep/acelite/ace/OS_NS_sys_mman.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_mman.h b/dep/acelite/ace/OS_NS_sys_mman.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_mman.h
rename to dep/acelite/ace/OS_NS_sys_mman.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_mman.inl b/dep/acelite/ace/OS_NS_sys_mman.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_mman.inl
rename to dep/acelite/ace/OS_NS_sys_mman.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_msg.cpp b/dep/acelite/ace/OS_NS_sys_msg.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_msg.cpp
rename to dep/acelite/ace/OS_NS_sys_msg.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_msg.h b/dep/acelite/ace/OS_NS_sys_msg.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_msg.h
rename to dep/acelite/ace/OS_NS_sys_msg.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_msg.inl b/dep/acelite/ace/OS_NS_sys_msg.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_msg.inl
rename to dep/acelite/ace/OS_NS_sys_msg.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_resource.cpp b/dep/acelite/ace/OS_NS_sys_resource.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_resource.cpp
rename to dep/acelite/ace/OS_NS_sys_resource.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_resource.h b/dep/acelite/ace/OS_NS_sys_resource.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_resource.h
rename to dep/acelite/ace/OS_NS_sys_resource.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_resource.inl b/dep/acelite/ace/OS_NS_sys_resource.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_resource.inl
rename to dep/acelite/ace/OS_NS_sys_resource.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_select.cpp b/dep/acelite/ace/OS_NS_sys_select.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_select.cpp
rename to dep/acelite/ace/OS_NS_sys_select.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_select.h b/dep/acelite/ace/OS_NS_sys_select.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_select.h
rename to dep/acelite/ace/OS_NS_sys_select.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_select.inl b/dep/acelite/ace/OS_NS_sys_select.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_select.inl
rename to dep/acelite/ace/OS_NS_sys_select.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_sendfile.cpp b/dep/acelite/ace/OS_NS_sys_sendfile.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_sendfile.cpp
rename to dep/acelite/ace/OS_NS_sys_sendfile.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_sendfile.h b/dep/acelite/ace/OS_NS_sys_sendfile.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_sendfile.h
rename to dep/acelite/ace/OS_NS_sys_sendfile.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_sendfile.inl b/dep/acelite/ace/OS_NS_sys_sendfile.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_sendfile.inl
rename to dep/acelite/ace/OS_NS_sys_sendfile.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_shm.cpp b/dep/acelite/ace/OS_NS_sys_shm.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_shm.cpp
rename to dep/acelite/ace/OS_NS_sys_shm.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_shm.h b/dep/acelite/ace/OS_NS_sys_shm.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_shm.h
rename to dep/acelite/ace/OS_NS_sys_shm.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_shm.inl b/dep/acelite/ace/OS_NS_sys_shm.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_shm.inl
rename to dep/acelite/ace/OS_NS_sys_shm.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_socket.cpp b/dep/acelite/ace/OS_NS_sys_socket.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_socket.cpp
rename to dep/acelite/ace/OS_NS_sys_socket.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_socket.h b/dep/acelite/ace/OS_NS_sys_socket.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_socket.h
rename to dep/acelite/ace/OS_NS_sys_socket.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_socket.inl b/dep/acelite/ace/OS_NS_sys_socket.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_socket.inl
rename to dep/acelite/ace/OS_NS_sys_socket.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_stat.cpp b/dep/acelite/ace/OS_NS_sys_stat.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_stat.cpp
rename to dep/acelite/ace/OS_NS_sys_stat.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_stat.h b/dep/acelite/ace/OS_NS_sys_stat.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_stat.h
rename to dep/acelite/ace/OS_NS_sys_stat.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_stat.inl b/dep/acelite/ace/OS_NS_sys_stat.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_stat.inl
rename to dep/acelite/ace/OS_NS_sys_stat.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_time.cpp b/dep/acelite/ace/OS_NS_sys_time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_time.cpp
rename to dep/acelite/ace/OS_NS_sys_time.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_time.h b/dep/acelite/ace/OS_NS_sys_time.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_time.h
rename to dep/acelite/ace/OS_NS_sys_time.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_time.inl b/dep/acelite/ace/OS_NS_sys_time.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_time.inl
rename to dep/acelite/ace/OS_NS_sys_time.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_uio.cpp b/dep/acelite/ace/OS_NS_sys_uio.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_uio.cpp
rename to dep/acelite/ace/OS_NS_sys_uio.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_uio.h b/dep/acelite/ace/OS_NS_sys_uio.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_uio.h
rename to dep/acelite/ace/OS_NS_sys_uio.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_uio.inl b/dep/acelite/ace/OS_NS_sys_uio.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_uio.inl
rename to dep/acelite/ace/OS_NS_sys_uio.inl
diff --git a/modules/dep/acelite/ace/OS_NS_sys_utsname.cpp b/dep/acelite/ace/OS_NS_sys_utsname.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_utsname.cpp
rename to dep/acelite/ace/OS_NS_sys_utsname.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_utsname.h b/dep/acelite/ace/OS_NS_sys_utsname.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_utsname.h
rename to dep/acelite/ace/OS_NS_sys_utsname.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_wait.cpp b/dep/acelite/ace/OS_NS_sys_wait.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_wait.cpp
rename to dep/acelite/ace/OS_NS_sys_wait.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_sys_wait.h b/dep/acelite/ace/OS_NS_sys_wait.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_wait.h
rename to dep/acelite/ace/OS_NS_sys_wait.h
diff --git a/modules/dep/acelite/ace/OS_NS_sys_wait.inl b/dep/acelite/ace/OS_NS_sys_wait.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_sys_wait.inl
rename to dep/acelite/ace/OS_NS_sys_wait.inl
diff --git a/modules/dep/acelite/ace/OS_NS_time.cpp b/dep/acelite/ace/OS_NS_time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_time.cpp
rename to dep/acelite/ace/OS_NS_time.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_time.h b/dep/acelite/ace/OS_NS_time.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_time.h
rename to dep/acelite/ace/OS_NS_time.h
diff --git a/modules/dep/acelite/ace/OS_NS_time.inl b/dep/acelite/ace/OS_NS_time.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_time.inl
rename to dep/acelite/ace/OS_NS_time.inl
diff --git a/modules/dep/acelite/ace/OS_NS_unistd.cpp b/dep/acelite/ace/OS_NS_unistd.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_unistd.cpp
rename to dep/acelite/ace/OS_NS_unistd.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_unistd.h b/dep/acelite/ace/OS_NS_unistd.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_unistd.h
rename to dep/acelite/ace/OS_NS_unistd.h
diff --git a/modules/dep/acelite/ace/OS_NS_unistd.inl b/dep/acelite/ace/OS_NS_unistd.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_unistd.inl
rename to dep/acelite/ace/OS_NS_unistd.inl
diff --git a/modules/dep/acelite/ace/OS_NS_wchar.cpp b/dep/acelite/ace/OS_NS_wchar.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wchar.cpp
rename to dep/acelite/ace/OS_NS_wchar.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_wchar.h b/dep/acelite/ace/OS_NS_wchar.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wchar.h
rename to dep/acelite/ace/OS_NS_wchar.h
diff --git a/modules/dep/acelite/ace/OS_NS_wchar.inl b/dep/acelite/ace/OS_NS_wchar.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wchar.inl
rename to dep/acelite/ace/OS_NS_wchar.inl
diff --git a/modules/dep/acelite/ace/OS_NS_wctype.cpp b/dep/acelite/ace/OS_NS_wctype.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wctype.cpp
rename to dep/acelite/ace/OS_NS_wctype.cpp
diff --git a/modules/dep/acelite/ace/OS_NS_wctype.h b/dep/acelite/ace/OS_NS_wctype.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wctype.h
rename to dep/acelite/ace/OS_NS_wctype.h
diff --git a/modules/dep/acelite/ace/OS_NS_wctype.inl b/dep/acelite/ace/OS_NS_wctype.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_NS_wctype.inl
rename to dep/acelite/ace/OS_NS_wctype.inl
diff --git a/modules/dep/acelite/ace/OS_QoS.cpp b/dep/acelite/ace/OS_QoS.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_QoS.cpp
rename to dep/acelite/ace/OS_QoS.cpp
diff --git a/modules/dep/acelite/ace/OS_QoS.h b/dep/acelite/ace/OS_QoS.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_QoS.h
rename to dep/acelite/ace/OS_QoS.h
diff --git a/modules/dep/acelite/ace/OS_TLI.cpp b/dep/acelite/ace/OS_TLI.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_TLI.cpp
rename to dep/acelite/ace/OS_TLI.cpp
diff --git a/modules/dep/acelite/ace/OS_TLI.h b/dep/acelite/ace/OS_TLI.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_TLI.h
rename to dep/acelite/ace/OS_TLI.h
diff --git a/modules/dep/acelite/ace/OS_TLI.inl b/dep/acelite/ace/OS_TLI.inl
similarity index 100%
rename from modules/dep/acelite/ace/OS_TLI.inl
rename to dep/acelite/ace/OS_TLI.inl
diff --git a/modules/dep/acelite/ace/OS_Thread_Adapter.cpp b/dep/acelite/ace/OS_Thread_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_Thread_Adapter.cpp
rename to dep/acelite/ace/OS_Thread_Adapter.cpp
diff --git a/modules/dep/acelite/ace/OS_Thread_Adapter.h b/dep/acelite/ace/OS_Thread_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_Thread_Adapter.h
rename to dep/acelite/ace/OS_Thread_Adapter.h
diff --git a/modules/dep/acelite/ace/OS_main.cpp b/dep/acelite/ace/OS_main.cpp
similarity index 100%
rename from modules/dep/acelite/ace/OS_main.cpp
rename to dep/acelite/ace/OS_main.cpp
diff --git a/modules/dep/acelite/ace/OS_main.h b/dep/acelite/ace/OS_main.h
similarity index 100%
rename from modules/dep/acelite/ace/OS_main.h
rename to dep/acelite/ace/OS_main.h
diff --git a/modules/dep/acelite/ace/Obchunk.cpp b/dep/acelite/ace/Obchunk.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Obchunk.cpp
rename to dep/acelite/ace/Obchunk.cpp
diff --git a/modules/dep/acelite/ace/Obchunk.h b/dep/acelite/ace/Obchunk.h
similarity index 100%
rename from modules/dep/acelite/ace/Obchunk.h
rename to dep/acelite/ace/Obchunk.h
diff --git a/modules/dep/acelite/ace/Obchunk.inl b/dep/acelite/ace/Obchunk.inl
similarity index 100%
rename from modules/dep/acelite/ace/Obchunk.inl
rename to dep/acelite/ace/Obchunk.inl
diff --git a/modules/dep/acelite/ace/Object_Manager.cpp b/dep/acelite/ace/Object_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager.cpp
rename to dep/acelite/ace/Object_Manager.cpp
diff --git a/modules/dep/acelite/ace/Object_Manager.h b/dep/acelite/ace/Object_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager.h
rename to dep/acelite/ace/Object_Manager.h
diff --git a/modules/dep/acelite/ace/Object_Manager.inl b/dep/acelite/ace/Object_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager.inl
rename to dep/acelite/ace/Object_Manager.inl
diff --git a/modules/dep/acelite/ace/Object_Manager_Base.cpp b/dep/acelite/ace/Object_Manager_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager_Base.cpp
rename to dep/acelite/ace/Object_Manager_Base.cpp
diff --git a/modules/dep/acelite/ace/Object_Manager_Base.h b/dep/acelite/ace/Object_Manager_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Object_Manager_Base.h
rename to dep/acelite/ace/Object_Manager_Base.h
diff --git a/modules/dep/acelite/ace/Obstack.cpp b/dep/acelite/ace/Obstack.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Obstack.cpp
rename to dep/acelite/ace/Obstack.cpp
diff --git a/modules/dep/acelite/ace/Obstack.h b/dep/acelite/ace/Obstack.h
similarity index 100%
rename from modules/dep/acelite/ace/Obstack.h
rename to dep/acelite/ace/Obstack.h
diff --git a/modules/dep/acelite/ace/Obstack_T.cpp b/dep/acelite/ace/Obstack_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Obstack_T.cpp
rename to dep/acelite/ace/Obstack_T.cpp
diff --git a/modules/dep/acelite/ace/Obstack_T.h b/dep/acelite/ace/Obstack_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Obstack_T.h
rename to dep/acelite/ace/Obstack_T.h
diff --git a/modules/dep/acelite/ace/Obstack_T.inl b/dep/acelite/ace/Obstack_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Obstack_T.inl
rename to dep/acelite/ace/Obstack_T.inl
diff --git a/modules/dep/acelite/ace/PI_Malloc.cpp b/dep/acelite/ace/PI_Malloc.cpp
similarity index 100%
rename from modules/dep/acelite/ace/PI_Malloc.cpp
rename to dep/acelite/ace/PI_Malloc.cpp
diff --git a/modules/dep/acelite/ace/PI_Malloc.h b/dep/acelite/ace/PI_Malloc.h
similarity index 100%
rename from modules/dep/acelite/ace/PI_Malloc.h
rename to dep/acelite/ace/PI_Malloc.h
diff --git a/modules/dep/acelite/ace/PI_Malloc.inl b/dep/acelite/ace/PI_Malloc.inl
similarity index 100%
rename from modules/dep/acelite/ace/PI_Malloc.inl
rename to dep/acelite/ace/PI_Malloc.inl
diff --git a/modules/dep/acelite/ace/POSIX_Asynch_IO.cpp b/dep/acelite/ace/POSIX_Asynch_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Asynch_IO.cpp
rename to dep/acelite/ace/POSIX_Asynch_IO.cpp
diff --git a/modules/dep/acelite/ace/POSIX_Asynch_IO.h b/dep/acelite/ace/POSIX_Asynch_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Asynch_IO.h
rename to dep/acelite/ace/POSIX_Asynch_IO.h
diff --git a/modules/dep/acelite/ace/POSIX_CB_Proactor.cpp b/dep/acelite/ace/POSIX_CB_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_CB_Proactor.cpp
rename to dep/acelite/ace/POSIX_CB_Proactor.cpp
diff --git a/modules/dep/acelite/ace/POSIX_CB_Proactor.h b/dep/acelite/ace/POSIX_CB_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_CB_Proactor.h
rename to dep/acelite/ace/POSIX_CB_Proactor.h
diff --git a/modules/dep/acelite/ace/POSIX_Proactor.cpp b/dep/acelite/ace/POSIX_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Proactor.cpp
rename to dep/acelite/ace/POSIX_Proactor.cpp
diff --git a/modules/dep/acelite/ace/POSIX_Proactor.h b/dep/acelite/ace/POSIX_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Proactor.h
rename to dep/acelite/ace/POSIX_Proactor.h
diff --git a/modules/dep/acelite/ace/POSIX_Proactor.inl b/dep/acelite/ace/POSIX_Proactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/POSIX_Proactor.inl
rename to dep/acelite/ace/POSIX_Proactor.inl
diff --git a/modules/dep/acelite/ace/Pagefile_Memory_Pool.cpp b/dep/acelite/ace/Pagefile_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Pagefile_Memory_Pool.cpp
rename to dep/acelite/ace/Pagefile_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Pagefile_Memory_Pool.h b/dep/acelite/ace/Pagefile_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Pagefile_Memory_Pool.h
rename to dep/acelite/ace/Pagefile_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Pagefile_Memory_Pool.inl b/dep/acelite/ace/Pagefile_Memory_Pool.inl
similarity index 100%
rename from modules/dep/acelite/ace/Pagefile_Memory_Pool.inl
rename to dep/acelite/ace/Pagefile_Memory_Pool.inl
diff --git a/modules/dep/acelite/ace/Pair_T.cpp b/dep/acelite/ace/Pair_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Pair_T.cpp
rename to dep/acelite/ace/Pair_T.cpp
diff --git a/modules/dep/acelite/ace/Pair_T.h b/dep/acelite/ace/Pair_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Pair_T.h
rename to dep/acelite/ace/Pair_T.h
diff --git a/modules/dep/acelite/ace/Pair_T.inl b/dep/acelite/ace/Pair_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Pair_T.inl
rename to dep/acelite/ace/Pair_T.inl
diff --git a/modules/dep/acelite/ace/Parse_Node.cpp b/dep/acelite/ace/Parse_Node.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Parse_Node.cpp
rename to dep/acelite/ace/Parse_Node.cpp
diff --git a/modules/dep/acelite/ace/Parse_Node.h b/dep/acelite/ace/Parse_Node.h
similarity index 100%
rename from modules/dep/acelite/ace/Parse_Node.h
rename to dep/acelite/ace/Parse_Node.h
diff --git a/modules/dep/acelite/ace/Ping_Socket.cpp b/dep/acelite/ace/Ping_Socket.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Ping_Socket.cpp
rename to dep/acelite/ace/Ping_Socket.cpp
diff --git a/modules/dep/acelite/ace/Ping_Socket.h b/dep/acelite/ace/Ping_Socket.h
similarity index 100%
rename from modules/dep/acelite/ace/Ping_Socket.h
rename to dep/acelite/ace/Ping_Socket.h
diff --git a/modules/dep/acelite/ace/Ping_Socket.inl b/dep/acelite/ace/Ping_Socket.inl
similarity index 100%
rename from modules/dep/acelite/ace/Ping_Socket.inl
rename to dep/acelite/ace/Ping_Socket.inl
diff --git a/modules/dep/acelite/ace/Pipe.cpp b/dep/acelite/ace/Pipe.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Pipe.cpp
rename to dep/acelite/ace/Pipe.cpp
diff --git a/modules/dep/acelite/ace/Pipe.h b/dep/acelite/ace/Pipe.h
similarity index 100%
rename from modules/dep/acelite/ace/Pipe.h
rename to dep/acelite/ace/Pipe.h
diff --git a/modules/dep/acelite/ace/Pipe.inl b/dep/acelite/ace/Pipe.inl
similarity index 100%
rename from modules/dep/acelite/ace/Pipe.inl
rename to dep/acelite/ace/Pipe.inl
diff --git a/modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
similarity index 100%
rename from modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
rename to dep/acelite/ace/PrecompiledHeaders/WinAcePCH.cpp
diff --git a/modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h b/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h
similarity index 100%
rename from modules/dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h
rename to dep/acelite/ace/PrecompiledHeaders/WinAcePCH.h
diff --git a/modules/dep/acelite/ace/Priority_Reactor.cpp b/dep/acelite/ace/Priority_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Priority_Reactor.cpp
rename to dep/acelite/ace/Priority_Reactor.cpp
diff --git a/modules/dep/acelite/ace/Priority_Reactor.h b/dep/acelite/ace/Priority_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Priority_Reactor.h
rename to dep/acelite/ace/Priority_Reactor.h
diff --git a/modules/dep/acelite/ace/Proactor.cpp b/dep/acelite/ace/Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Proactor.cpp
rename to dep/acelite/ace/Proactor.cpp
diff --git a/modules/dep/acelite/ace/Proactor.h b/dep/acelite/ace/Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Proactor.h
rename to dep/acelite/ace/Proactor.h
diff --git a/modules/dep/acelite/ace/Proactor.inl b/dep/acelite/ace/Proactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Proactor.inl
rename to dep/acelite/ace/Proactor.inl
diff --git a/modules/dep/acelite/ace/Proactor_Impl.cpp b/dep/acelite/ace/Proactor_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Proactor_Impl.cpp
rename to dep/acelite/ace/Proactor_Impl.cpp
diff --git a/modules/dep/acelite/ace/Proactor_Impl.h b/dep/acelite/ace/Proactor_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/Proactor_Impl.h
rename to dep/acelite/ace/Proactor_Impl.h
diff --git a/modules/dep/acelite/ace/Process.cpp b/dep/acelite/ace/Process.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process.cpp
rename to dep/acelite/ace/Process.cpp
diff --git a/modules/dep/acelite/ace/Process.h b/dep/acelite/ace/Process.h
similarity index 100%
rename from modules/dep/acelite/ace/Process.h
rename to dep/acelite/ace/Process.h
diff --git a/modules/dep/acelite/ace/Process.inl b/dep/acelite/ace/Process.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process.inl
rename to dep/acelite/ace/Process.inl
diff --git a/modules/dep/acelite/ace/Process_Manager.cpp b/dep/acelite/ace/Process_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process_Manager.cpp
rename to dep/acelite/ace/Process_Manager.cpp
diff --git a/modules/dep/acelite/ace/Process_Manager.h b/dep/acelite/ace/Process_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Process_Manager.h
rename to dep/acelite/ace/Process_Manager.h
diff --git a/modules/dep/acelite/ace/Process_Manager.inl b/dep/acelite/ace/Process_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process_Manager.inl
rename to dep/acelite/ace/Process_Manager.inl
diff --git a/modules/dep/acelite/ace/Process_Mutex.cpp b/dep/acelite/ace/Process_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process_Mutex.cpp
rename to dep/acelite/ace/Process_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Process_Mutex.h b/dep/acelite/ace/Process_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Process_Mutex.h
rename to dep/acelite/ace/Process_Mutex.h
diff --git a/modules/dep/acelite/ace/Process_Mutex.inl b/dep/acelite/ace/Process_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process_Mutex.inl
rename to dep/acelite/ace/Process_Mutex.inl
diff --git a/modules/dep/acelite/ace/Process_Semaphore.cpp b/dep/acelite/ace/Process_Semaphore.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Process_Semaphore.cpp
rename to dep/acelite/ace/Process_Semaphore.cpp
diff --git a/modules/dep/acelite/ace/Process_Semaphore.h b/dep/acelite/ace/Process_Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Process_Semaphore.h
rename to dep/acelite/ace/Process_Semaphore.h
diff --git a/modules/dep/acelite/ace/Process_Semaphore.inl b/dep/acelite/ace/Process_Semaphore.inl
similarity index 100%
rename from modules/dep/acelite/ace/Process_Semaphore.inl
rename to dep/acelite/ace/Process_Semaphore.inl
diff --git a/modules/dep/acelite/ace/Profile_Timer.cpp b/dep/acelite/ace/Profile_Timer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Profile_Timer.cpp
rename to dep/acelite/ace/Profile_Timer.cpp
diff --git a/modules/dep/acelite/ace/Profile_Timer.h b/dep/acelite/ace/Profile_Timer.h
similarity index 100%
rename from modules/dep/acelite/ace/Profile_Timer.h
rename to dep/acelite/ace/Profile_Timer.h
diff --git a/modules/dep/acelite/ace/Profile_Timer.inl b/dep/acelite/ace/Profile_Timer.inl
similarity index 100%
rename from modules/dep/acelite/ace/Profile_Timer.inl
rename to dep/acelite/ace/Profile_Timer.inl
diff --git a/modules/dep/acelite/ace/QoS/ACE_QoS.pc.in b/dep/acelite/ace/QoS/ACE_QoS.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/QoS/ACE_QoS.pc.in
rename to dep/acelite/ace/QoS/ACE_QoS.pc.in
diff --git a/modules/dep/acelite/ace/QoS/ACE_QoS_Export.h b/dep/acelite/ace/QoS/ACE_QoS_Export.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/ACE_QoS_Export.h
rename to dep/acelite/ace/QoS/ACE_QoS_Export.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Decorator.cpp b/dep/acelite/ace/QoS/QoS_Decorator.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Decorator.cpp
rename to dep/acelite/ace/QoS/QoS_Decorator.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Decorator.h b/dep/acelite/ace/QoS/QoS_Decorator.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Decorator.h
rename to dep/acelite/ace/QoS/QoS_Decorator.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Manager.cpp b/dep/acelite/ace/QoS/QoS_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Manager.cpp
rename to dep/acelite/ace/QoS/QoS_Manager.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Manager.h b/dep/acelite/ace/QoS/QoS_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Manager.h
rename to dep/acelite/ace/QoS/QoS_Manager.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session.h b/dep/acelite/ace/QoS/QoS_Session.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session.h
rename to dep/acelite/ace/QoS/QoS_Session.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Factory.cpp b/dep/acelite/ace/QoS/QoS_Session_Factory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Factory.cpp
rename to dep/acelite/ace/QoS/QoS_Session_Factory.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Factory.h b/dep/acelite/ace/QoS/QoS_Session_Factory.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Factory.h
rename to dep/acelite/ace/QoS/QoS_Session_Factory.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Impl.cpp b/dep/acelite/ace/QoS/QoS_Session_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Impl.cpp
rename to dep/acelite/ace/QoS/QoS_Session_Impl.cpp
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Impl.h b/dep/acelite/ace/QoS/QoS_Session_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Impl.h
rename to dep/acelite/ace/QoS/QoS_Session_Impl.h
diff --git a/modules/dep/acelite/ace/QoS/QoS_Session_Impl.inl b/dep/acelite/ace/QoS/QoS_Session_Impl.inl
similarity index 100%
rename from modules/dep/acelite/ace/QoS/QoS_Session_Impl.inl
rename to dep/acelite/ace/QoS/QoS_Session_Impl.inl
diff --git a/modules/dep/acelite/ace/QoS/README b/dep/acelite/ace/QoS/README
similarity index 100%
rename from modules/dep/acelite/ace/QoS/README
rename to dep/acelite/ace/QoS/README
diff --git a/modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/dep/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 dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
diff --git a/modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/dep/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 dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.h
diff --git a/modules/dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl b/dep/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 dep/acelite/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
diff --git a/modules/dep/acelite/ace/QoS/qos.mpc b/dep/acelite/ace/QoS/qos.mpc
similarity index 100%
rename from modules/dep/acelite/ace/QoS/qos.mpc
rename to dep/acelite/ace/QoS/qos.mpc
diff --git a/modules/dep/acelite/ace/QtReactor/.gitignore b/dep/acelite/ace/QtReactor/.gitignore
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/.gitignore
rename to dep/acelite/ace/QtReactor/.gitignore
diff --git a/modules/dep/acelite/ace/QtReactor/ACE_QtReactor.pc.in b/dep/acelite/ace/QtReactor/ACE_QtReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/ACE_QtReactor.pc.in
rename to dep/acelite/ace/QtReactor/ACE_QtReactor.pc.in
diff --git a/modules/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h b/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/ACE_QtReactor_export.h
rename to dep/acelite/ace/QtReactor/ACE_QtReactor_export.h
diff --git a/modules/dep/acelite/ace/QtReactor/QtReactor.cpp b/dep/acelite/ace/QtReactor/QtReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/QtReactor.cpp
rename to dep/acelite/ace/QtReactor/QtReactor.cpp
diff --git a/modules/dep/acelite/ace/QtReactor/QtReactor.h b/dep/acelite/ace/QtReactor/QtReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/QtReactor.h
rename to dep/acelite/ace/QtReactor/QtReactor.h
diff --git a/modules/dep/acelite/ace/QtReactor/ace_qt4reactor.mpc b/dep/acelite/ace/QtReactor/ace_qt4reactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/QtReactor/ace_qt4reactor.mpc
rename to dep/acelite/ace/QtReactor/ace_qt4reactor.mpc
diff --git a/modules/dep/acelite/ace/RB_Tree.cpp b/dep/acelite/ace/RB_Tree.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RB_Tree.cpp
rename to dep/acelite/ace/RB_Tree.cpp
diff --git a/modules/dep/acelite/ace/RB_Tree.h b/dep/acelite/ace/RB_Tree.h
similarity index 100%
rename from modules/dep/acelite/ace/RB_Tree.h
rename to dep/acelite/ace/RB_Tree.h
diff --git a/modules/dep/acelite/ace/RB_Tree.inl b/dep/acelite/ace/RB_Tree.inl
similarity index 100%
rename from modules/dep/acelite/ace/RB_Tree.inl
rename to dep/acelite/ace/RB_Tree.inl
diff --git a/modules/dep/acelite/ace/README b/dep/acelite/ace/README
similarity index 100%
rename from modules/dep/acelite/ace/README
rename to dep/acelite/ace/README
diff --git a/modules/dep/acelite/ace/RW_Mutex.cpp b/dep/acelite/ace/RW_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RW_Mutex.cpp
rename to dep/acelite/ace/RW_Mutex.cpp
diff --git a/modules/dep/acelite/ace/RW_Mutex.h b/dep/acelite/ace/RW_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/RW_Mutex.h
rename to dep/acelite/ace/RW_Mutex.h
diff --git a/modules/dep/acelite/ace/RW_Mutex.inl b/dep/acelite/ace/RW_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/RW_Mutex.inl
rename to dep/acelite/ace/RW_Mutex.inl
diff --git a/modules/dep/acelite/ace/RW_Process_Mutex.cpp b/dep/acelite/ace/RW_Process_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RW_Process_Mutex.cpp
rename to dep/acelite/ace/RW_Process_Mutex.cpp
diff --git a/modules/dep/acelite/ace/RW_Process_Mutex.h b/dep/acelite/ace/RW_Process_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/RW_Process_Mutex.h
rename to dep/acelite/ace/RW_Process_Mutex.h
diff --git a/modules/dep/acelite/ace/RW_Process_Mutex.inl b/dep/acelite/ace/RW_Process_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/RW_Process_Mutex.inl
rename to dep/acelite/ace/RW_Process_Mutex.inl
diff --git a/modules/dep/acelite/ace/RW_Thread_Mutex.cpp b/dep/acelite/ace/RW_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/RW_Thread_Mutex.cpp
rename to dep/acelite/ace/RW_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/RW_Thread_Mutex.h b/dep/acelite/ace/RW_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/RW_Thread_Mutex.h
rename to dep/acelite/ace/RW_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/RW_Thread_Mutex.inl b/dep/acelite/ace/RW_Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/RW_Thread_Mutex.inl
rename to dep/acelite/ace/RW_Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Reactor.cpp b/dep/acelite/ace/Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor.cpp
rename to dep/acelite/ace/Reactor.cpp
diff --git a/modules/dep/acelite/ace/Reactor.h b/dep/acelite/ace/Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor.h
rename to dep/acelite/ace/Reactor.h
diff --git a/modules/dep/acelite/ace/Reactor.inl b/dep/acelite/ace/Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/Reactor.inl
rename to dep/acelite/ace/Reactor.inl
diff --git a/modules/dep/acelite/ace/Reactor_Impl.cpp b/dep/acelite/ace/Reactor_Impl.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Impl.cpp
rename to dep/acelite/ace/Reactor_Impl.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Impl.h b/dep/acelite/ace/Reactor_Impl.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Impl.h
rename to dep/acelite/ace/Reactor_Impl.h
diff --git a/modules/dep/acelite/ace/Reactor_Notification_Strategy.cpp b/dep/acelite/ace/Reactor_Notification_Strategy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Notification_Strategy.cpp
rename to dep/acelite/ace/Reactor_Notification_Strategy.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Notification_Strategy.h b/dep/acelite/ace/Reactor_Notification_Strategy.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Notification_Strategy.h
rename to dep/acelite/ace/Reactor_Notification_Strategy.h
diff --git a/modules/dep/acelite/ace/Reactor_Notification_Strategy.inl b/dep/acelite/ace/Reactor_Notification_Strategy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Notification_Strategy.inl
rename to dep/acelite/ace/Reactor_Notification_Strategy.inl
diff --git a/modules/dep/acelite/ace/Reactor_Timer_Interface.cpp b/dep/acelite/ace/Reactor_Timer_Interface.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Timer_Interface.cpp
rename to dep/acelite/ace/Reactor_Timer_Interface.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Timer_Interface.h b/dep/acelite/ace/Reactor_Timer_Interface.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Timer_Interface.h
rename to dep/acelite/ace/Reactor_Timer_Interface.h
diff --git a/modules/dep/acelite/ace/Reactor_Token_T.cpp b/dep/acelite/ace/Reactor_Token_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Token_T.cpp
rename to dep/acelite/ace/Reactor_Token_T.cpp
diff --git a/modules/dep/acelite/ace/Reactor_Token_T.h b/dep/acelite/ace/Reactor_Token_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Reactor_Token_T.h
rename to dep/acelite/ace/Reactor_Token_T.h
diff --git a/modules/dep/acelite/ace/Read_Buffer.cpp b/dep/acelite/ace/Read_Buffer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Read_Buffer.cpp
rename to dep/acelite/ace/Read_Buffer.cpp
diff --git a/modules/dep/acelite/ace/Read_Buffer.h b/dep/acelite/ace/Read_Buffer.h
similarity index 100%
rename from modules/dep/acelite/ace/Read_Buffer.h
rename to dep/acelite/ace/Read_Buffer.h
diff --git a/modules/dep/acelite/ace/Read_Buffer.inl b/dep/acelite/ace/Read_Buffer.inl
similarity index 100%
rename from modules/dep/acelite/ace/Read_Buffer.inl
rename to dep/acelite/ace/Read_Buffer.inl
diff --git a/modules/dep/acelite/ace/Recursive_Thread_Mutex.cpp b/dep/acelite/ace/Recursive_Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Recursive_Thread_Mutex.cpp
rename to dep/acelite/ace/Recursive_Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Recursive_Thread_Mutex.h b/dep/acelite/ace/Recursive_Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Recursive_Thread_Mutex.h
rename to dep/acelite/ace/Recursive_Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Recursive_Thread_Mutex.inl b/dep/acelite/ace/Recursive_Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Recursive_Thread_Mutex.inl
rename to dep/acelite/ace/Recursive_Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Recyclable.cpp b/dep/acelite/ace/Recyclable.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Recyclable.cpp
rename to dep/acelite/ace/Recyclable.cpp
diff --git a/modules/dep/acelite/ace/Recyclable.h b/dep/acelite/ace/Recyclable.h
similarity index 100%
rename from modules/dep/acelite/ace/Recyclable.h
rename to dep/acelite/ace/Recyclable.h
diff --git a/modules/dep/acelite/ace/Recyclable.inl b/dep/acelite/ace/Recyclable.inl
similarity index 100%
rename from modules/dep/acelite/ace/Recyclable.inl
rename to dep/acelite/ace/Recyclable.inl
diff --git a/modules/dep/acelite/ace/Refcountable_T.cpp b/dep/acelite/ace/Refcountable_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Refcountable_T.cpp
rename to dep/acelite/ace/Refcountable_T.cpp
diff --git a/modules/dep/acelite/ace/Refcountable_T.h b/dep/acelite/ace/Refcountable_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Refcountable_T.h
rename to dep/acelite/ace/Refcountable_T.h
diff --git a/modules/dep/acelite/ace/Refcountable_T.inl b/dep/acelite/ace/Refcountable_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Refcountable_T.inl
rename to dep/acelite/ace/Refcountable_T.inl
diff --git a/modules/dep/acelite/ace/Refcounted_Auto_Ptr.cpp b/dep/acelite/ace/Refcounted_Auto_Ptr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Refcounted_Auto_Ptr.cpp
rename to dep/acelite/ace/Refcounted_Auto_Ptr.cpp
diff --git a/modules/dep/acelite/ace/Refcounted_Auto_Ptr.h b/dep/acelite/ace/Refcounted_Auto_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Refcounted_Auto_Ptr.h
rename to dep/acelite/ace/Refcounted_Auto_Ptr.h
diff --git a/modules/dep/acelite/ace/Refcounted_Auto_Ptr.inl b/dep/acelite/ace/Refcounted_Auto_Ptr.inl
similarity index 100%
rename from modules/dep/acelite/ace/Refcounted_Auto_Ptr.inl
rename to dep/acelite/ace/Refcounted_Auto_Ptr.inl
diff --git a/modules/dep/acelite/ace/Registry.cpp b/dep/acelite/ace/Registry.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Registry.cpp
rename to dep/acelite/ace/Registry.cpp
diff --git a/modules/dep/acelite/ace/Registry.h b/dep/acelite/ace/Registry.h
similarity index 100%
rename from modules/dep/acelite/ace/Registry.h
rename to dep/acelite/ace/Registry.h
diff --git a/modules/dep/acelite/ace/Registry_Name_Space.cpp b/dep/acelite/ace/Registry_Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Registry_Name_Space.cpp
rename to dep/acelite/ace/Registry_Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Registry_Name_Space.h b/dep/acelite/ace/Registry_Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Registry_Name_Space.h
rename to dep/acelite/ace/Registry_Name_Space.h
diff --git a/modules/dep/acelite/ace/Remote_Name_Space.cpp b/dep/acelite/ace/Remote_Name_Space.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Name_Space.cpp
rename to dep/acelite/ace/Remote_Name_Space.cpp
diff --git a/modules/dep/acelite/ace/Remote_Name_Space.h b/dep/acelite/ace/Remote_Name_Space.h
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Name_Space.h
rename to dep/acelite/ace/Remote_Name_Space.h
diff --git a/modules/dep/acelite/ace/Remote_Tokens.cpp b/dep/acelite/ace/Remote_Tokens.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Tokens.cpp
rename to dep/acelite/ace/Remote_Tokens.cpp
diff --git a/modules/dep/acelite/ace/Remote_Tokens.h b/dep/acelite/ace/Remote_Tokens.h
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Tokens.h
rename to dep/acelite/ace/Remote_Tokens.h
diff --git a/modules/dep/acelite/ace/Remote_Tokens.inl b/dep/acelite/ace/Remote_Tokens.inl
similarity index 100%
rename from modules/dep/acelite/ace/Remote_Tokens.inl
rename to dep/acelite/ace/Remote_Tokens.inl
diff --git a/modules/dep/acelite/ace/Reverse_Lock_T.cpp b/dep/acelite/ace/Reverse_Lock_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Reverse_Lock_T.cpp
rename to dep/acelite/ace/Reverse_Lock_T.cpp
diff --git a/modules/dep/acelite/ace/Reverse_Lock_T.h b/dep/acelite/ace/Reverse_Lock_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Reverse_Lock_T.h
rename to dep/acelite/ace/Reverse_Lock_T.h
diff --git a/modules/dep/acelite/ace/Reverse_Lock_T.inl b/dep/acelite/ace/Reverse_Lock_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Reverse_Lock_T.inl
rename to dep/acelite/ace/Reverse_Lock_T.inl
diff --git a/modules/dep/acelite/ace/Rtems_init.c b/dep/acelite/ace/Rtems_init.c
similarity index 100%
rename from modules/dep/acelite/ace/Rtems_init.c
rename to dep/acelite/ace/Rtems_init.c
diff --git a/modules/dep/acelite/ace/SOCK.cpp b/dep/acelite/ace/SOCK.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK.cpp
rename to dep/acelite/ace/SOCK.cpp
diff --git a/modules/dep/acelite/ace/SOCK.h b/dep/acelite/ace/SOCK.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK.h
rename to dep/acelite/ace/SOCK.h
diff --git a/modules/dep/acelite/ace/SOCK.inl b/dep/acelite/ace/SOCK.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK.inl
rename to dep/acelite/ace/SOCK.inl
diff --git a/modules/dep/acelite/ace/SOCK_Acceptor.cpp b/dep/acelite/ace/SOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Acceptor.cpp
rename to dep/acelite/ace/SOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Acceptor.h b/dep/acelite/ace/SOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Acceptor.h
rename to dep/acelite/ace/SOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/SOCK_Acceptor.inl b/dep/acelite/ace/SOCK_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Acceptor.inl
rename to dep/acelite/ace/SOCK_Acceptor.inl
diff --git a/modules/dep/acelite/ace/SOCK_CODgram.cpp b/dep/acelite/ace/SOCK_CODgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_CODgram.cpp
rename to dep/acelite/ace/SOCK_CODgram.cpp
diff --git a/modules/dep/acelite/ace/SOCK_CODgram.h b/dep/acelite/ace/SOCK_CODgram.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_CODgram.h
rename to dep/acelite/ace/SOCK_CODgram.h
diff --git a/modules/dep/acelite/ace/SOCK_CODgram.inl b/dep/acelite/ace/SOCK_CODgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_CODgram.inl
rename to dep/acelite/ace/SOCK_CODgram.inl
diff --git a/modules/dep/acelite/ace/SOCK_Connector.cpp b/dep/acelite/ace/SOCK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Connector.cpp
rename to dep/acelite/ace/SOCK_Connector.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Connector.h b/dep/acelite/ace/SOCK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Connector.h
rename to dep/acelite/ace/SOCK_Connector.h
diff --git a/modules/dep/acelite/ace/SOCK_Connector.inl b/dep/acelite/ace/SOCK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Connector.inl
rename to dep/acelite/ace/SOCK_Connector.inl
diff --git a/modules/dep/acelite/ace/SOCK_Dgram.cpp b/dep/acelite/ace/SOCK_Dgram.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram.cpp
rename to dep/acelite/ace/SOCK_Dgram.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Dgram.h b/dep/acelite/ace/SOCK_Dgram.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram.h
rename to dep/acelite/ace/SOCK_Dgram.h
diff --git a/modules/dep/acelite/ace/SOCK_Dgram.inl b/dep/acelite/ace/SOCK_Dgram.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram.inl
rename to dep/acelite/ace/SOCK_Dgram.inl
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Bcast.cpp b/dep/acelite/ace/SOCK_Dgram_Bcast.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Bcast.cpp
rename to dep/acelite/ace/SOCK_Dgram_Bcast.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Bcast.h b/dep/acelite/ace/SOCK_Dgram_Bcast.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Bcast.h
rename to dep/acelite/ace/SOCK_Dgram_Bcast.h
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Bcast.inl b/dep/acelite/ace/SOCK_Dgram_Bcast.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Bcast.inl
rename to dep/acelite/ace/SOCK_Dgram_Bcast.inl
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Mcast.cpp b/dep/acelite/ace/SOCK_Dgram_Mcast.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Mcast.cpp
rename to dep/acelite/ace/SOCK_Dgram_Mcast.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Mcast.h b/dep/acelite/ace/SOCK_Dgram_Mcast.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Mcast.h
rename to dep/acelite/ace/SOCK_Dgram_Mcast.h
diff --git a/modules/dep/acelite/ace/SOCK_Dgram_Mcast.inl b/dep/acelite/ace/SOCK_Dgram_Mcast.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Dgram_Mcast.inl
rename to dep/acelite/ace/SOCK_Dgram_Mcast.inl
diff --git a/modules/dep/acelite/ace/SOCK_IO.cpp b/dep/acelite/ace/SOCK_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_IO.cpp
rename to dep/acelite/ace/SOCK_IO.cpp
diff --git a/modules/dep/acelite/ace/SOCK_IO.h b/dep/acelite/ace/SOCK_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_IO.h
rename to dep/acelite/ace/SOCK_IO.h
diff --git a/modules/dep/acelite/ace/SOCK_IO.inl b/dep/acelite/ace/SOCK_IO.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_IO.inl
rename to dep/acelite/ace/SOCK_IO.inl
diff --git a/modules/dep/acelite/ace/SOCK_Netlink.cpp b/dep/acelite/ace/SOCK_Netlink.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Netlink.cpp
rename to dep/acelite/ace/SOCK_Netlink.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Netlink.h b/dep/acelite/ace/SOCK_Netlink.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Netlink.h
rename to dep/acelite/ace/SOCK_Netlink.h
diff --git a/modules/dep/acelite/ace/SOCK_Netlink.inl b/dep/acelite/ace/SOCK_Netlink.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Netlink.inl
rename to dep/acelite/ace/SOCK_Netlink.inl
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp b/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
rename to dep/acelite/ace/SOCK_SEQPACK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.h b/dep/acelite/ace/SOCK_SEQPACK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.h
rename to dep/acelite/ace/SOCK_SEQPACK_Acceptor.h
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.inl b/dep/acelite/ace/SOCK_SEQPACK_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Acceptor.inl
rename to dep/acelite/ace/SOCK_SEQPACK_Acceptor.inl
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Association.cpp b/dep/acelite/ace/SOCK_SEQPACK_Association.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Association.cpp
rename to dep/acelite/ace/SOCK_SEQPACK_Association.cpp
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Association.h b/dep/acelite/ace/SOCK_SEQPACK_Association.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Association.h
rename to dep/acelite/ace/SOCK_SEQPACK_Association.h
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Association.inl b/dep/acelite/ace/SOCK_SEQPACK_Association.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Association.inl
rename to dep/acelite/ace/SOCK_SEQPACK_Association.inl
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp b/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
rename to dep/acelite/ace/SOCK_SEQPACK_Connector.cpp
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Connector.h b/dep/acelite/ace/SOCK_SEQPACK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Connector.h
rename to dep/acelite/ace/SOCK_SEQPACK_Connector.h
diff --git a/modules/dep/acelite/ace/SOCK_SEQPACK_Connector.inl b/dep/acelite/ace/SOCK_SEQPACK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_SEQPACK_Connector.inl
rename to dep/acelite/ace/SOCK_SEQPACK_Connector.inl
diff --git a/modules/dep/acelite/ace/SOCK_Stream.cpp b/dep/acelite/ace/SOCK_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Stream.cpp
rename to dep/acelite/ace/SOCK_Stream.cpp
diff --git a/modules/dep/acelite/ace/SOCK_Stream.h b/dep/acelite/ace/SOCK_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Stream.h
rename to dep/acelite/ace/SOCK_Stream.h
diff --git a/modules/dep/acelite/ace/SOCK_Stream.inl b/dep/acelite/ace/SOCK_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SOCK_Stream.inl
rename to dep/acelite/ace/SOCK_Stream.inl
diff --git a/modules/dep/acelite/ace/SPIPE.cpp b/dep/acelite/ace/SPIPE.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE.cpp
rename to dep/acelite/ace/SPIPE.cpp
diff --git a/modules/dep/acelite/ace/SPIPE.h b/dep/acelite/ace/SPIPE.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE.h
rename to dep/acelite/ace/SPIPE.h
diff --git a/modules/dep/acelite/ace/SPIPE.inl b/dep/acelite/ace/SPIPE.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE.inl
rename to dep/acelite/ace/SPIPE.inl
diff --git a/modules/dep/acelite/ace/SPIPE_Acceptor.cpp b/dep/acelite/ace/SPIPE_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Acceptor.cpp
rename to dep/acelite/ace/SPIPE_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Acceptor.h b/dep/acelite/ace/SPIPE_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Acceptor.h
rename to dep/acelite/ace/SPIPE_Acceptor.h
diff --git a/modules/dep/acelite/ace/SPIPE_Addr.cpp b/dep/acelite/ace/SPIPE_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Addr.cpp
rename to dep/acelite/ace/SPIPE_Addr.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Addr.h b/dep/acelite/ace/SPIPE_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Addr.h
rename to dep/acelite/ace/SPIPE_Addr.h
diff --git a/modules/dep/acelite/ace/SPIPE_Addr.inl b/dep/acelite/ace/SPIPE_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Addr.inl
rename to dep/acelite/ace/SPIPE_Addr.inl
diff --git a/modules/dep/acelite/ace/SPIPE_Connector.cpp b/dep/acelite/ace/SPIPE_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Connector.cpp
rename to dep/acelite/ace/SPIPE_Connector.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Connector.h b/dep/acelite/ace/SPIPE_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Connector.h
rename to dep/acelite/ace/SPIPE_Connector.h
diff --git a/modules/dep/acelite/ace/SPIPE_Connector.inl b/dep/acelite/ace/SPIPE_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Connector.inl
rename to dep/acelite/ace/SPIPE_Connector.inl
diff --git a/modules/dep/acelite/ace/SPIPE_Stream.cpp b/dep/acelite/ace/SPIPE_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Stream.cpp
rename to dep/acelite/ace/SPIPE_Stream.cpp
diff --git a/modules/dep/acelite/ace/SPIPE_Stream.h b/dep/acelite/ace/SPIPE_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Stream.h
rename to dep/acelite/ace/SPIPE_Stream.h
diff --git a/modules/dep/acelite/ace/SPIPE_Stream.inl b/dep/acelite/ace/SPIPE_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SPIPE_Stream.inl
rename to dep/acelite/ace/SPIPE_Stream.inl
diff --git a/modules/dep/acelite/ace/SSL/ACE_SSL.pc.in b/dep/acelite/ace/SSL/ACE_SSL.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/SSL/ACE_SSL.pc.in
rename to dep/acelite/ace/SSL/ACE_SSL.pc.in
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp b/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp
rename to dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.h b/dep/acelite/ace/SSL/SSL_Asynch_BIO.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_BIO.h
rename to dep/acelite/ace/SSL/SSL_Asynch_BIO.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp b/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp
rename to dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.h b/dep/acelite/ace/SSL/SSL_Asynch_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.h
rename to dep/acelite/ace/SSL/SSL_Asynch_Stream.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl b/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Asynch_Stream.inl
rename to dep/acelite/ace/SSL/SSL_Asynch_Stream.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_Context.cpp b/dep/acelite/ace/SSL/SSL_Context.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Context.cpp
rename to dep/acelite/ace/SSL/SSL_Context.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Context.h b/dep/acelite/ace/SSL/SSL_Context.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Context.h
rename to dep/acelite/ace/SSL/SSL_Context.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Context.inl b/dep/acelite/ace/SSL/SSL_Context.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Context.inl
rename to dep/acelite/ace/SSL/SSL_Context.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_Export.h b/dep/acelite/ace/SSL/SSL_Export.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Export.h
rename to dep/acelite/ace/SSL/SSL_Export.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_Initializer.cpp b/dep/acelite/ace/SSL/SSL_Initializer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Initializer.cpp
rename to dep/acelite/ace/SSL/SSL_Initializer.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_Initializer.h b/dep/acelite/ace/SSL/SSL_Initializer.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_Initializer.h
rename to dep/acelite/ace/SSL/SSL_Initializer.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK.cpp b/dep/acelite/ace/SSL/SSL_SOCK.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK.cpp
rename to dep/acelite/ace/SSL/SSL_SOCK.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK.h b/dep/acelite/ace/SSL/SSL_SOCK.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK.h
rename to dep/acelite/ace/SSL/SSL_SOCK.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK.inl b/dep/acelite/ace/SSL/SSL_SOCK.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK.inl
rename to dep/acelite/ace/SSL/SSL_SOCK.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp b/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
rename to dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h b/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h
rename to dep/acelite/ace/SSL/SSL_SOCK_Acceptor.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl b/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
rename to dep/acelite/ace/SSL/SSL_SOCK_Acceptor.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp b/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp
rename to dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.h b/dep/acelite/ace/SSL/SSL_SOCK_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.h
rename to dep/acelite/ace/SSL/SSL_SOCK_Connector.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl b/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Connector.inl
rename to dep/acelite/ace/SSL/SSL_SOCK_Connector.inl
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp b/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp
rename to dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.h b/dep/acelite/ace/SSL/SSL_SOCK_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.h
rename to dep/acelite/ace/SSL/SSL_SOCK_Stream.h
diff --git a/modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl b/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/SSL/SSL_SOCK_Stream.inl
rename to dep/acelite/ace/SSL/SSL_SOCK_Stream.inl
diff --git a/modules/dep/acelite/ace/SSL/ssl.mpc b/dep/acelite/ace/SSL/ssl.mpc
similarity index 100%
rename from modules/dep/acelite/ace/SSL/ssl.mpc
rename to dep/acelite/ace/SSL/ssl.mpc
diff --git a/modules/dep/acelite/ace/SSL/ssl_for_tao.mpc b/dep/acelite/ace/SSL/ssl_for_tao.mpc
similarity index 100%
rename from modules/dep/acelite/ace/SSL/ssl_for_tao.mpc
rename to dep/acelite/ace/SSL/ssl_for_tao.mpc
diff --git a/modules/dep/acelite/ace/SSL/sslconf.h b/dep/acelite/ace/SSL/sslconf.h
similarity index 100%
rename from modules/dep/acelite/ace/SSL/sslconf.h
rename to dep/acelite/ace/SSL/sslconf.h
diff --git a/modules/dep/acelite/ace/SString.cpp b/dep/acelite/ace/SString.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SString.cpp
rename to dep/acelite/ace/SString.cpp
diff --git a/modules/dep/acelite/ace/SString.h b/dep/acelite/ace/SString.h
similarity index 100%
rename from modules/dep/acelite/ace/SString.h
rename to dep/acelite/ace/SString.h
diff --git a/modules/dep/acelite/ace/SString.inl b/dep/acelite/ace/SString.inl
similarity index 100%
rename from modules/dep/acelite/ace/SString.inl
rename to dep/acelite/ace/SString.inl
diff --git a/modules/dep/acelite/ace/SStringfwd.h b/dep/acelite/ace/SStringfwd.h
similarity index 100%
rename from modules/dep/acelite/ace/SStringfwd.h
rename to dep/acelite/ace/SStringfwd.h
diff --git a/modules/dep/acelite/ace/SUN_Proactor.cpp b/dep/acelite/ace/SUN_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SUN_Proactor.cpp
rename to dep/acelite/ace/SUN_Proactor.cpp
diff --git a/modules/dep/acelite/ace/SUN_Proactor.h b/dep/acelite/ace/SUN_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/SUN_Proactor.h
rename to dep/acelite/ace/SUN_Proactor.h
diff --git a/modules/dep/acelite/ace/SV_Message.cpp b/dep/acelite/ace/SV_Message.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message.cpp
rename to dep/acelite/ace/SV_Message.cpp
diff --git a/modules/dep/acelite/ace/SV_Message.h b/dep/acelite/ace/SV_Message.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message.h
rename to dep/acelite/ace/SV_Message.h
diff --git a/modules/dep/acelite/ace/SV_Message.inl b/dep/acelite/ace/SV_Message.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message.inl
rename to dep/acelite/ace/SV_Message.inl
diff --git a/modules/dep/acelite/ace/SV_Message_Queue.cpp b/dep/acelite/ace/SV_Message_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message_Queue.cpp
rename to dep/acelite/ace/SV_Message_Queue.cpp
diff --git a/modules/dep/acelite/ace/SV_Message_Queue.h b/dep/acelite/ace/SV_Message_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message_Queue.h
rename to dep/acelite/ace/SV_Message_Queue.h
diff --git a/modules/dep/acelite/ace/SV_Message_Queue.inl b/dep/acelite/ace/SV_Message_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Message_Queue.inl
rename to dep/acelite/ace/SV_Message_Queue.inl
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Complex.cpp b/dep/acelite/ace/SV_Semaphore_Complex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Complex.cpp
rename to dep/acelite/ace/SV_Semaphore_Complex.cpp
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Complex.h b/dep/acelite/ace/SV_Semaphore_Complex.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Complex.h
rename to dep/acelite/ace/SV_Semaphore_Complex.h
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Complex.inl b/dep/acelite/ace/SV_Semaphore_Complex.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Complex.inl
rename to dep/acelite/ace/SV_Semaphore_Complex.inl
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Simple.cpp b/dep/acelite/ace/SV_Semaphore_Simple.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Simple.cpp
rename to dep/acelite/ace/SV_Semaphore_Simple.cpp
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Simple.h b/dep/acelite/ace/SV_Semaphore_Simple.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Simple.h
rename to dep/acelite/ace/SV_Semaphore_Simple.h
diff --git a/modules/dep/acelite/ace/SV_Semaphore_Simple.inl b/dep/acelite/ace/SV_Semaphore_Simple.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Semaphore_Simple.inl
rename to dep/acelite/ace/SV_Semaphore_Simple.inl
diff --git a/modules/dep/acelite/ace/SV_Shared_Memory.cpp b/dep/acelite/ace/SV_Shared_Memory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/SV_Shared_Memory.cpp
rename to dep/acelite/ace/SV_Shared_Memory.cpp
diff --git a/modules/dep/acelite/ace/SV_Shared_Memory.h b/dep/acelite/ace/SV_Shared_Memory.h
similarity index 100%
rename from modules/dep/acelite/ace/SV_Shared_Memory.h
rename to dep/acelite/ace/SV_Shared_Memory.h
diff --git a/modules/dep/acelite/ace/SV_Shared_Memory.inl b/dep/acelite/ace/SV_Shared_Memory.inl
similarity index 100%
rename from modules/dep/acelite/ace/SV_Shared_Memory.inl
rename to dep/acelite/ace/SV_Shared_Memory.inl
diff --git a/modules/dep/acelite/ace/Sample_History.cpp b/dep/acelite/ace/Sample_History.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sample_History.cpp
rename to dep/acelite/ace/Sample_History.cpp
diff --git a/modules/dep/acelite/ace/Sample_History.h b/dep/acelite/ace/Sample_History.h
similarity index 100%
rename from modules/dep/acelite/ace/Sample_History.h
rename to dep/acelite/ace/Sample_History.h
diff --git a/modules/dep/acelite/ace/Sample_History.inl b/dep/acelite/ace/Sample_History.inl
similarity index 100%
rename from modules/dep/acelite/ace/Sample_History.inl
rename to dep/acelite/ace/Sample_History.inl
diff --git a/modules/dep/acelite/ace/Sbrk_Memory_Pool.cpp b/dep/acelite/ace/Sbrk_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sbrk_Memory_Pool.cpp
rename to dep/acelite/ace/Sbrk_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Sbrk_Memory_Pool.h b/dep/acelite/ace/Sbrk_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Sbrk_Memory_Pool.h
rename to dep/acelite/ace/Sbrk_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Sched_Params.cpp b/dep/acelite/ace/Sched_Params.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sched_Params.cpp
rename to dep/acelite/ace/Sched_Params.cpp
diff --git a/modules/dep/acelite/ace/Sched_Params.h b/dep/acelite/ace/Sched_Params.h
similarity index 100%
rename from modules/dep/acelite/ace/Sched_Params.h
rename to dep/acelite/ace/Sched_Params.h
diff --git a/modules/dep/acelite/ace/Sched_Params.inl b/dep/acelite/ace/Sched_Params.inl
similarity index 100%
rename from modules/dep/acelite/ace/Sched_Params.inl
rename to dep/acelite/ace/Sched_Params.inl
diff --git a/modules/dep/acelite/ace/Select_Reactor.h b/dep/acelite/ace/Select_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor.h
rename to dep/acelite/ace/Select_Reactor.h
diff --git a/modules/dep/acelite/ace/Select_Reactor_Base.cpp b/dep/acelite/ace/Select_Reactor_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_Base.cpp
rename to dep/acelite/ace/Select_Reactor_Base.cpp
diff --git a/modules/dep/acelite/ace/Select_Reactor_Base.h b/dep/acelite/ace/Select_Reactor_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_Base.h
rename to dep/acelite/ace/Select_Reactor_Base.h
diff --git a/modules/dep/acelite/ace/Select_Reactor_Base.inl b/dep/acelite/ace/Select_Reactor_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_Base.inl
rename to dep/acelite/ace/Select_Reactor_Base.inl
diff --git a/modules/dep/acelite/ace/Select_Reactor_T.cpp b/dep/acelite/ace/Select_Reactor_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_T.cpp
rename to dep/acelite/ace/Select_Reactor_T.cpp
diff --git a/modules/dep/acelite/ace/Select_Reactor_T.h b/dep/acelite/ace/Select_Reactor_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_T.h
rename to dep/acelite/ace/Select_Reactor_T.h
diff --git a/modules/dep/acelite/ace/Select_Reactor_T.inl b/dep/acelite/ace/Select_Reactor_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Select_Reactor_T.inl
rename to dep/acelite/ace/Select_Reactor_T.inl
diff --git a/modules/dep/acelite/ace/Semaphore.cpp b/dep/acelite/ace/Semaphore.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Semaphore.cpp
rename to dep/acelite/ace/Semaphore.cpp
diff --git a/modules/dep/acelite/ace/Semaphore.h b/dep/acelite/ace/Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Semaphore.h
rename to dep/acelite/ace/Semaphore.h
diff --git a/modules/dep/acelite/ace/Semaphore.inl b/dep/acelite/ace/Semaphore.inl
similarity index 100%
rename from modules/dep/acelite/ace/Semaphore.inl
rename to dep/acelite/ace/Semaphore.inl
diff --git a/modules/dep/acelite/ace/Service_Config.cpp b/dep/acelite/ace/Service_Config.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Config.cpp
rename to dep/acelite/ace/Service_Config.cpp
diff --git a/modules/dep/acelite/ace/Service_Config.h b/dep/acelite/ace/Service_Config.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Config.h
rename to dep/acelite/ace/Service_Config.h
diff --git a/modules/dep/acelite/ace/Service_Config.inl b/dep/acelite/ace/Service_Config.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Config.inl
rename to dep/acelite/ace/Service_Config.inl
diff --git a/modules/dep/acelite/ace/Service_Gestalt.cpp b/dep/acelite/ace/Service_Gestalt.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Gestalt.cpp
rename to dep/acelite/ace/Service_Gestalt.cpp
diff --git a/modules/dep/acelite/ace/Service_Gestalt.h b/dep/acelite/ace/Service_Gestalt.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Gestalt.h
rename to dep/acelite/ace/Service_Gestalt.h
diff --git a/modules/dep/acelite/ace/Service_Gestalt.inl b/dep/acelite/ace/Service_Gestalt.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Gestalt.inl
rename to dep/acelite/ace/Service_Gestalt.inl
diff --git a/modules/dep/acelite/ace/Service_Manager.cpp b/dep/acelite/ace/Service_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Manager.cpp
rename to dep/acelite/ace/Service_Manager.cpp
diff --git a/modules/dep/acelite/ace/Service_Manager.h b/dep/acelite/ace/Service_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Manager.h
rename to dep/acelite/ace/Service_Manager.h
diff --git a/modules/dep/acelite/ace/Service_Object.cpp b/dep/acelite/ace/Service_Object.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Object.cpp
rename to dep/acelite/ace/Service_Object.cpp
diff --git a/modules/dep/acelite/ace/Service_Object.h b/dep/acelite/ace/Service_Object.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Object.h
rename to dep/acelite/ace/Service_Object.h
diff --git a/modules/dep/acelite/ace/Service_Object.inl b/dep/acelite/ace/Service_Object.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Object.inl
rename to dep/acelite/ace/Service_Object.inl
diff --git a/modules/dep/acelite/ace/Service_Repository.cpp b/dep/acelite/ace/Service_Repository.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Repository.cpp
rename to dep/acelite/ace/Service_Repository.cpp
diff --git a/modules/dep/acelite/ace/Service_Repository.h b/dep/acelite/ace/Service_Repository.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Repository.h
rename to dep/acelite/ace/Service_Repository.h
diff --git a/modules/dep/acelite/ace/Service_Repository.inl b/dep/acelite/ace/Service_Repository.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Repository.inl
rename to dep/acelite/ace/Service_Repository.inl
diff --git a/modules/dep/acelite/ace/Service_Types.cpp b/dep/acelite/ace/Service_Types.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Service_Types.cpp
rename to dep/acelite/ace/Service_Types.cpp
diff --git a/modules/dep/acelite/ace/Service_Types.h b/dep/acelite/ace/Service_Types.h
similarity index 100%
rename from modules/dep/acelite/ace/Service_Types.h
rename to dep/acelite/ace/Service_Types.h
diff --git a/modules/dep/acelite/ace/Service_Types.inl b/dep/acelite/ace/Service_Types.inl
similarity index 100%
rename from modules/dep/acelite/ace/Service_Types.inl
rename to dep/acelite/ace/Service_Types.inl
diff --git a/modules/dep/acelite/ace/Shared_Memory.cpp b/dep/acelite/ace/Shared_Memory.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory.cpp
rename to dep/acelite/ace/Shared_Memory.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory.h b/dep/acelite/ace/Shared_Memory.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory.h
rename to dep/acelite/ace/Shared_Memory.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_MM.cpp b/dep/acelite/ace/Shared_Memory_MM.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_MM.cpp
rename to dep/acelite/ace/Shared_Memory_MM.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory_MM.h b/dep/acelite/ace/Shared_Memory_MM.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_MM.h
rename to dep/acelite/ace/Shared_Memory_MM.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_MM.inl b/dep/acelite/ace/Shared_Memory_MM.inl
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_MM.inl
rename to dep/acelite/ace/Shared_Memory_MM.inl
diff --git a/modules/dep/acelite/ace/Shared_Memory_Pool.cpp b/dep/acelite/ace/Shared_Memory_Pool.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_Pool.cpp
rename to dep/acelite/ace/Shared_Memory_Pool.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory_Pool.h b/dep/acelite/ace/Shared_Memory_Pool.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_Pool.h
rename to dep/acelite/ace/Shared_Memory_Pool.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_SV.cpp b/dep/acelite/ace/Shared_Memory_SV.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_SV.cpp
rename to dep/acelite/ace/Shared_Memory_SV.cpp
diff --git a/modules/dep/acelite/ace/Shared_Memory_SV.h b/dep/acelite/ace/Shared_Memory_SV.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_SV.h
rename to dep/acelite/ace/Shared_Memory_SV.h
diff --git a/modules/dep/acelite/ace/Shared_Memory_SV.inl b/dep/acelite/ace/Shared_Memory_SV.inl
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Memory_SV.inl
rename to dep/acelite/ace/Shared_Memory_SV.inl
diff --git a/modules/dep/acelite/ace/Shared_Object.cpp b/dep/acelite/ace/Shared_Object.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Object.cpp
rename to dep/acelite/ace/Shared_Object.cpp
diff --git a/modules/dep/acelite/ace/Shared_Object.h b/dep/acelite/ace/Shared_Object.h
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Object.h
rename to dep/acelite/ace/Shared_Object.h
diff --git a/modules/dep/acelite/ace/Shared_Object.inl b/dep/acelite/ace/Shared_Object.inl
similarity index 100%
rename from modules/dep/acelite/ace/Shared_Object.inl
rename to dep/acelite/ace/Shared_Object.inl
diff --git a/modules/dep/acelite/ace/Sig_Adapter.cpp b/dep/acelite/ace/Sig_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Adapter.cpp
rename to dep/acelite/ace/Sig_Adapter.cpp
diff --git a/modules/dep/acelite/ace/Sig_Adapter.h b/dep/acelite/ace/Sig_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Adapter.h
rename to dep/acelite/ace/Sig_Adapter.h
diff --git a/modules/dep/acelite/ace/Sig_Handler.cpp b/dep/acelite/ace/Sig_Handler.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Handler.cpp
rename to dep/acelite/ace/Sig_Handler.cpp
diff --git a/modules/dep/acelite/ace/Sig_Handler.h b/dep/acelite/ace/Sig_Handler.h
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Handler.h
rename to dep/acelite/ace/Sig_Handler.h
diff --git a/modules/dep/acelite/ace/Sig_Handler.inl b/dep/acelite/ace/Sig_Handler.inl
similarity index 100%
rename from modules/dep/acelite/ace/Sig_Handler.inl
rename to dep/acelite/ace/Sig_Handler.inl
diff --git a/modules/dep/acelite/ace/Signal.cpp b/dep/acelite/ace/Signal.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Signal.cpp
rename to dep/acelite/ace/Signal.cpp
diff --git a/modules/dep/acelite/ace/Signal.h b/dep/acelite/ace/Signal.h
similarity index 100%
rename from modules/dep/acelite/ace/Signal.h
rename to dep/acelite/ace/Signal.h
diff --git a/modules/dep/acelite/ace/Signal.inl b/dep/acelite/ace/Signal.inl
similarity index 100%
rename from modules/dep/acelite/ace/Signal.inl
rename to dep/acelite/ace/Signal.inl
diff --git a/modules/dep/acelite/ace/Singleton.cpp b/dep/acelite/ace/Singleton.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Singleton.cpp
rename to dep/acelite/ace/Singleton.cpp
diff --git a/modules/dep/acelite/ace/Singleton.h b/dep/acelite/ace/Singleton.h
similarity index 100%
rename from modules/dep/acelite/ace/Singleton.h
rename to dep/acelite/ace/Singleton.h
diff --git a/modules/dep/acelite/ace/Singleton.inl b/dep/acelite/ace/Singleton.inl
similarity index 100%
rename from modules/dep/acelite/ace/Singleton.inl
rename to dep/acelite/ace/Singleton.inl
diff --git a/modules/dep/acelite/ace/Sock_Connect.cpp b/dep/acelite/ace/Sock_Connect.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Sock_Connect.cpp
rename to dep/acelite/ace/Sock_Connect.cpp
diff --git a/modules/dep/acelite/ace/Sock_Connect.h b/dep/acelite/ace/Sock_Connect.h
similarity index 100%
rename from modules/dep/acelite/ace/Sock_Connect.h
rename to dep/acelite/ace/Sock_Connect.h
diff --git a/modules/dep/acelite/ace/Stack_Trace.cpp b/dep/acelite/ace/Stack_Trace.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stack_Trace.cpp
rename to dep/acelite/ace/Stack_Trace.cpp
diff --git a/modules/dep/acelite/ace/Stack_Trace.h b/dep/acelite/ace/Stack_Trace.h
similarity index 100%
rename from modules/dep/acelite/ace/Stack_Trace.h
rename to dep/acelite/ace/Stack_Trace.h
diff --git a/modules/dep/acelite/ace/Static_Object_Lock.h b/dep/acelite/ace/Static_Object_Lock.h
similarity index 100%
rename from modules/dep/acelite/ace/Static_Object_Lock.h
rename to dep/acelite/ace/Static_Object_Lock.h
diff --git a/modules/dep/acelite/ace/Stats.cpp b/dep/acelite/ace/Stats.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stats.cpp
rename to dep/acelite/ace/Stats.cpp
diff --git a/modules/dep/acelite/ace/Stats.h b/dep/acelite/ace/Stats.h
similarity index 100%
rename from modules/dep/acelite/ace/Stats.h
rename to dep/acelite/ace/Stats.h
diff --git a/modules/dep/acelite/ace/Stats.inl b/dep/acelite/ace/Stats.inl
similarity index 100%
rename from modules/dep/acelite/ace/Stats.inl
rename to dep/acelite/ace/Stats.inl
diff --git a/modules/dep/acelite/ace/Strategies_T.cpp b/dep/acelite/ace/Strategies_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Strategies_T.cpp
rename to dep/acelite/ace/Strategies_T.cpp
diff --git a/modules/dep/acelite/ace/Strategies_T.h b/dep/acelite/ace/Strategies_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Strategies_T.h
rename to dep/acelite/ace/Strategies_T.h
diff --git a/modules/dep/acelite/ace/Strategies_T.inl b/dep/acelite/ace/Strategies_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Strategies_T.inl
rename to dep/acelite/ace/Strategies_T.inl
diff --git a/modules/dep/acelite/ace/Stream.cpp b/dep/acelite/ace/Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stream.cpp
rename to dep/acelite/ace/Stream.cpp
diff --git a/modules/dep/acelite/ace/Stream.h b/dep/acelite/ace/Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/Stream.h
rename to dep/acelite/ace/Stream.h
diff --git a/modules/dep/acelite/ace/Stream.inl b/dep/acelite/ace/Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/Stream.inl
rename to dep/acelite/ace/Stream.inl
diff --git a/modules/dep/acelite/ace/Stream_Modules.cpp b/dep/acelite/ace/Stream_Modules.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Stream_Modules.cpp
rename to dep/acelite/ace/Stream_Modules.cpp
diff --git a/modules/dep/acelite/ace/Stream_Modules.h b/dep/acelite/ace/Stream_Modules.h
similarity index 100%
rename from modules/dep/acelite/ace/Stream_Modules.h
rename to dep/acelite/ace/Stream_Modules.h
diff --git a/modules/dep/acelite/ace/String_Base.cpp b/dep/acelite/ace/String_Base.cpp
similarity index 100%
rename from modules/dep/acelite/ace/String_Base.cpp
rename to dep/acelite/ace/String_Base.cpp
diff --git a/modules/dep/acelite/ace/String_Base.h b/dep/acelite/ace/String_Base.h
similarity index 100%
rename from modules/dep/acelite/ace/String_Base.h
rename to dep/acelite/ace/String_Base.h
diff --git a/modules/dep/acelite/ace/String_Base.inl b/dep/acelite/ace/String_Base.inl
similarity index 100%
rename from modules/dep/acelite/ace/String_Base.inl
rename to dep/acelite/ace/String_Base.inl
diff --git a/modules/dep/acelite/ace/String_Base_Const.cpp b/dep/acelite/ace/String_Base_Const.cpp
similarity index 100%
rename from modules/dep/acelite/ace/String_Base_Const.cpp
rename to dep/acelite/ace/String_Base_Const.cpp
diff --git a/modules/dep/acelite/ace/String_Base_Const.h b/dep/acelite/ace/String_Base_Const.h
similarity index 100%
rename from modules/dep/acelite/ace/String_Base_Const.h
rename to dep/acelite/ace/String_Base_Const.h
diff --git a/modules/dep/acelite/ace/Svc_Conf.h b/dep/acelite/ace/Svc_Conf.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf.h
rename to dep/acelite/ace/Svc_Conf.h
diff --git a/modules/dep/acelite/ace/Svc_Conf.y b/dep/acelite/ace/Svc_Conf.y
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf.y
rename to dep/acelite/ace/Svc_Conf.y
diff --git a/modules/dep/acelite/ace/Svc_Conf_Lexer.cpp b/dep/acelite/ace/Svc_Conf_Lexer.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Lexer.cpp
rename to dep/acelite/ace/Svc_Conf_Lexer.cpp
diff --git a/modules/dep/acelite/ace/Svc_Conf_Lexer.h b/dep/acelite/ace/Svc_Conf_Lexer.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Lexer.h
rename to dep/acelite/ace/Svc_Conf_Lexer.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_Param.h b/dep/acelite/ace/Svc_Conf_Param.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Param.h
rename to dep/acelite/ace/Svc_Conf_Param.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_Token_Table.h b/dep/acelite/ace/Svc_Conf_Token_Table.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Token_Table.h
rename to dep/acelite/ace/Svc_Conf_Token_Table.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_Tokens.h b/dep/acelite/ace/Svc_Conf_Tokens.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_Tokens.h
rename to dep/acelite/ace/Svc_Conf_Tokens.h
diff --git a/modules/dep/acelite/ace/Svc_Conf_y.cpp b/dep/acelite/ace/Svc_Conf_y.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Conf_y.cpp
rename to dep/acelite/ace/Svc_Conf_y.cpp
diff --git a/modules/dep/acelite/ace/Svc_Handler.cpp b/dep/acelite/ace/Svc_Handler.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Handler.cpp
rename to dep/acelite/ace/Svc_Handler.cpp
diff --git a/modules/dep/acelite/ace/Svc_Handler.h b/dep/acelite/ace/Svc_Handler.h
similarity index 100%
rename from modules/dep/acelite/ace/Svc_Handler.h
rename to dep/acelite/ace/Svc_Handler.h
diff --git a/modules/dep/acelite/ace/Synch.h b/dep/acelite/ace/Synch.h
similarity index 100%
rename from modules/dep/acelite/ace/Synch.h
rename to dep/acelite/ace/Synch.h
diff --git a/modules/dep/acelite/ace/Synch_Options.cpp b/dep/acelite/ace/Synch_Options.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Synch_Options.cpp
rename to dep/acelite/ace/Synch_Options.cpp
diff --git a/modules/dep/acelite/ace/Synch_Options.h b/dep/acelite/ace/Synch_Options.h
similarity index 100%
rename from modules/dep/acelite/ace/Synch_Options.h
rename to dep/acelite/ace/Synch_Options.h
diff --git a/modules/dep/acelite/ace/Synch_Traits.h b/dep/acelite/ace/Synch_Traits.h
similarity index 100%
rename from modules/dep/acelite/ace/Synch_Traits.h
rename to dep/acelite/ace/Synch_Traits.h
diff --git a/modules/dep/acelite/ace/System_Time.cpp b/dep/acelite/ace/System_Time.cpp
similarity index 100%
rename from modules/dep/acelite/ace/System_Time.cpp
rename to dep/acelite/ace/System_Time.cpp
diff --git a/modules/dep/acelite/ace/System_Time.h b/dep/acelite/ace/System_Time.h
similarity index 100%
rename from modules/dep/acelite/ace/System_Time.h
rename to dep/acelite/ace/System_Time.h
diff --git a/modules/dep/acelite/ace/TLI.cpp b/dep/acelite/ace/TLI.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI.cpp
rename to dep/acelite/ace/TLI.cpp
diff --git a/modules/dep/acelite/ace/TLI.h b/dep/acelite/ace/TLI.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI.h
rename to dep/acelite/ace/TLI.h
diff --git a/modules/dep/acelite/ace/TLI.inl b/dep/acelite/ace/TLI.inl
similarity index 100%
rename from modules/dep/acelite/ace/TLI.inl
rename to dep/acelite/ace/TLI.inl
diff --git a/modules/dep/acelite/ace/TLI_Acceptor.cpp b/dep/acelite/ace/TLI_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Acceptor.cpp
rename to dep/acelite/ace/TLI_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/TLI_Acceptor.h b/dep/acelite/ace/TLI_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Acceptor.h
rename to dep/acelite/ace/TLI_Acceptor.h
diff --git a/modules/dep/acelite/ace/TLI_Connector.cpp b/dep/acelite/ace/TLI_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Connector.cpp
rename to dep/acelite/ace/TLI_Connector.cpp
diff --git a/modules/dep/acelite/ace/TLI_Connector.h b/dep/acelite/ace/TLI_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Connector.h
rename to dep/acelite/ace/TLI_Connector.h
diff --git a/modules/dep/acelite/ace/TLI_Connector.inl b/dep/acelite/ace/TLI_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Connector.inl
rename to dep/acelite/ace/TLI_Connector.inl
diff --git a/modules/dep/acelite/ace/TLI_Stream.cpp b/dep/acelite/ace/TLI_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Stream.cpp
rename to dep/acelite/ace/TLI_Stream.cpp
diff --git a/modules/dep/acelite/ace/TLI_Stream.h b/dep/acelite/ace/TLI_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Stream.h
rename to dep/acelite/ace/TLI_Stream.h
diff --git a/modules/dep/acelite/ace/TLI_Stream.inl b/dep/acelite/ace/TLI_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/TLI_Stream.inl
rename to dep/acelite/ace/TLI_Stream.inl
diff --git a/modules/dep/acelite/ace/TP_Reactor.cpp b/dep/acelite/ace/TP_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TP_Reactor.cpp
rename to dep/acelite/ace/TP_Reactor.cpp
diff --git a/modules/dep/acelite/ace/TP_Reactor.h b/dep/acelite/ace/TP_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/TP_Reactor.h
rename to dep/acelite/ace/TP_Reactor.h
diff --git a/modules/dep/acelite/ace/TP_Reactor.inl b/dep/acelite/ace/TP_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/TP_Reactor.inl
rename to dep/acelite/ace/TP_Reactor.inl
diff --git a/modules/dep/acelite/ace/TSS_Adapter.cpp b/dep/acelite/ace/TSS_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TSS_Adapter.cpp
rename to dep/acelite/ace/TSS_Adapter.cpp
diff --git a/modules/dep/acelite/ace/TSS_Adapter.h b/dep/acelite/ace/TSS_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/TSS_Adapter.h
rename to dep/acelite/ace/TSS_Adapter.h
diff --git a/modules/dep/acelite/ace/TSS_T.cpp b/dep/acelite/ace/TSS_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TSS_T.cpp
rename to dep/acelite/ace/TSS_T.cpp
diff --git a/modules/dep/acelite/ace/TSS_T.h b/dep/acelite/ace/TSS_T.h
similarity index 100%
rename from modules/dep/acelite/ace/TSS_T.h
rename to dep/acelite/ace/TSS_T.h
diff --git a/modules/dep/acelite/ace/TSS_T.inl b/dep/acelite/ace/TSS_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/TSS_T.inl
rename to dep/acelite/ace/TSS_T.inl
diff --git a/modules/dep/acelite/ace/TTY_IO.cpp b/dep/acelite/ace/TTY_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TTY_IO.cpp
rename to dep/acelite/ace/TTY_IO.cpp
diff --git a/modules/dep/acelite/ace/TTY_IO.h b/dep/acelite/ace/TTY_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/TTY_IO.h
rename to dep/acelite/ace/TTY_IO.h
diff --git a/modules/dep/acelite/ace/Task.cpp b/dep/acelite/ace/Task.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Task.cpp
rename to dep/acelite/ace/Task.cpp
diff --git a/modules/dep/acelite/ace/Task.h b/dep/acelite/ace/Task.h
similarity index 100%
rename from modules/dep/acelite/ace/Task.h
rename to dep/acelite/ace/Task.h
diff --git a/modules/dep/acelite/ace/Task.inl b/dep/acelite/ace/Task.inl
similarity index 100%
rename from modules/dep/acelite/ace/Task.inl
rename to dep/acelite/ace/Task.inl
diff --git a/modules/dep/acelite/ace/Task_Ex_T.cpp b/dep/acelite/ace/Task_Ex_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Task_Ex_T.cpp
rename to dep/acelite/ace/Task_Ex_T.cpp
diff --git a/modules/dep/acelite/ace/Task_Ex_T.h b/dep/acelite/ace/Task_Ex_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Task_Ex_T.h
rename to dep/acelite/ace/Task_Ex_T.h
diff --git a/modules/dep/acelite/ace/Task_Ex_T.inl b/dep/acelite/ace/Task_Ex_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Task_Ex_T.inl
rename to dep/acelite/ace/Task_Ex_T.inl
diff --git a/modules/dep/acelite/ace/Task_T.cpp b/dep/acelite/ace/Task_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Task_T.cpp
rename to dep/acelite/ace/Task_T.cpp
diff --git a/modules/dep/acelite/ace/Task_T.h b/dep/acelite/ace/Task_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Task_T.h
rename to dep/acelite/ace/Task_T.h
diff --git a/modules/dep/acelite/ace/Task_T.inl b/dep/acelite/ace/Task_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Task_T.inl
rename to dep/acelite/ace/Task_T.inl
diff --git a/modules/dep/acelite/ace/Test_and_Set.cpp b/dep/acelite/ace/Test_and_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Test_and_Set.cpp
rename to dep/acelite/ace/Test_and_Set.cpp
diff --git a/modules/dep/acelite/ace/Test_and_Set.h b/dep/acelite/ace/Test_and_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Test_and_Set.h
rename to dep/acelite/ace/Test_and_Set.h
diff --git a/modules/dep/acelite/ace/Thread.cpp b/dep/acelite/ace/Thread.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread.cpp
rename to dep/acelite/ace/Thread.cpp
diff --git a/modules/dep/acelite/ace/Thread.h b/dep/acelite/ace/Thread.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread.h
rename to dep/acelite/ace/Thread.h
diff --git a/modules/dep/acelite/ace/Thread.inl b/dep/acelite/ace/Thread.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread.inl
rename to dep/acelite/ace/Thread.inl
diff --git a/modules/dep/acelite/ace/Thread_Adapter.cpp b/dep/acelite/ace/Thread_Adapter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Adapter.cpp
rename to dep/acelite/ace/Thread_Adapter.cpp
diff --git a/modules/dep/acelite/ace/Thread_Adapter.h b/dep/acelite/ace/Thread_Adapter.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Adapter.h
rename to dep/acelite/ace/Thread_Adapter.h
diff --git a/modules/dep/acelite/ace/Thread_Adapter.inl b/dep/acelite/ace/Thread_Adapter.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Adapter.inl
rename to dep/acelite/ace/Thread_Adapter.inl
diff --git a/modules/dep/acelite/ace/Thread_Control.cpp b/dep/acelite/ace/Thread_Control.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Control.cpp
rename to dep/acelite/ace/Thread_Control.cpp
diff --git a/modules/dep/acelite/ace/Thread_Control.h b/dep/acelite/ace/Thread_Control.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Control.h
rename to dep/acelite/ace/Thread_Control.h
diff --git a/modules/dep/acelite/ace/Thread_Control.inl b/dep/acelite/ace/Thread_Control.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Control.inl
rename to dep/acelite/ace/Thread_Control.inl
diff --git a/modules/dep/acelite/ace/Thread_Exit.cpp b/dep/acelite/ace/Thread_Exit.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Exit.cpp
rename to dep/acelite/ace/Thread_Exit.cpp
diff --git a/modules/dep/acelite/ace/Thread_Exit.h b/dep/acelite/ace/Thread_Exit.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Exit.h
rename to dep/acelite/ace/Thread_Exit.h
diff --git a/modules/dep/acelite/ace/Thread_Hook.cpp b/dep/acelite/ace/Thread_Hook.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Hook.cpp
rename to dep/acelite/ace/Thread_Hook.cpp
diff --git a/modules/dep/acelite/ace/Thread_Hook.h b/dep/acelite/ace/Thread_Hook.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Hook.h
rename to dep/acelite/ace/Thread_Hook.h
diff --git a/modules/dep/acelite/ace/Thread_Manager.cpp b/dep/acelite/ace/Thread_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Manager.cpp
rename to dep/acelite/ace/Thread_Manager.cpp
diff --git a/modules/dep/acelite/ace/Thread_Manager.h b/dep/acelite/ace/Thread_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Manager.h
rename to dep/acelite/ace/Thread_Manager.h
diff --git a/modules/dep/acelite/ace/Thread_Manager.inl b/dep/acelite/ace/Thread_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Manager.inl
rename to dep/acelite/ace/Thread_Manager.inl
diff --git a/modules/dep/acelite/ace/Thread_Mutex.cpp b/dep/acelite/ace/Thread_Mutex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Mutex.cpp
rename to dep/acelite/ace/Thread_Mutex.cpp
diff --git a/modules/dep/acelite/ace/Thread_Mutex.h b/dep/acelite/ace/Thread_Mutex.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Mutex.h
rename to dep/acelite/ace/Thread_Mutex.h
diff --git a/modules/dep/acelite/ace/Thread_Mutex.inl b/dep/acelite/ace/Thread_Mutex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Mutex.inl
rename to dep/acelite/ace/Thread_Mutex.inl
diff --git a/modules/dep/acelite/ace/Thread_Semaphore.cpp b/dep/acelite/ace/Thread_Semaphore.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Semaphore.cpp
rename to dep/acelite/ace/Thread_Semaphore.cpp
diff --git a/modules/dep/acelite/ace/Thread_Semaphore.h b/dep/acelite/ace/Thread_Semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Semaphore.h
rename to dep/acelite/ace/Thread_Semaphore.h
diff --git a/modules/dep/acelite/ace/Thread_Semaphore.inl b/dep/acelite/ace/Thread_Semaphore.inl
similarity index 100%
rename from modules/dep/acelite/ace/Thread_Semaphore.inl
rename to dep/acelite/ace/Thread_Semaphore.inl
diff --git a/modules/dep/acelite/ace/Throughput_Stats.cpp b/dep/acelite/ace/Throughput_Stats.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Throughput_Stats.cpp
rename to dep/acelite/ace/Throughput_Stats.cpp
diff --git a/modules/dep/acelite/ace/Throughput_Stats.h b/dep/acelite/ace/Throughput_Stats.h
similarity index 100%
rename from modules/dep/acelite/ace/Throughput_Stats.h
rename to dep/acelite/ace/Throughput_Stats.h
diff --git a/modules/dep/acelite/ace/Time_Policy.cpp b/dep/acelite/ace/Time_Policy.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy.cpp
rename to dep/acelite/ace/Time_Policy.cpp
diff --git a/modules/dep/acelite/ace/Time_Policy.h b/dep/acelite/ace/Time_Policy.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy.h
rename to dep/acelite/ace/Time_Policy.h
diff --git a/modules/dep/acelite/ace/Time_Policy.inl b/dep/acelite/ace/Time_Policy.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy.inl
rename to dep/acelite/ace/Time_Policy.inl
diff --git a/modules/dep/acelite/ace/Time_Policy_T.cpp b/dep/acelite/ace/Time_Policy_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy_T.cpp
rename to dep/acelite/ace/Time_Policy_T.cpp
diff --git a/modules/dep/acelite/ace/Time_Policy_T.h b/dep/acelite/ace/Time_Policy_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy_T.h
rename to dep/acelite/ace/Time_Policy_T.h
diff --git a/modules/dep/acelite/ace/Time_Policy_T.inl b/dep/acelite/ace/Time_Policy_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Policy_T.inl
rename to dep/acelite/ace/Time_Policy_T.inl
diff --git a/modules/dep/acelite/ace/Time_Value.cpp b/dep/acelite/ace/Time_Value.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value.cpp
rename to dep/acelite/ace/Time_Value.cpp
diff --git a/modules/dep/acelite/ace/Time_Value.h b/dep/acelite/ace/Time_Value.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value.h
rename to dep/acelite/ace/Time_Value.h
diff --git a/modules/dep/acelite/ace/Time_Value.inl b/dep/acelite/ace/Time_Value.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value.inl
rename to dep/acelite/ace/Time_Value.inl
diff --git a/modules/dep/acelite/ace/Time_Value_T.cpp b/dep/acelite/ace/Time_Value_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value_T.cpp
rename to dep/acelite/ace/Time_Value_T.cpp
diff --git a/modules/dep/acelite/ace/Time_Value_T.h b/dep/acelite/ace/Time_Value_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value_T.h
rename to dep/acelite/ace/Time_Value_T.h
diff --git a/modules/dep/acelite/ace/Time_Value_T.inl b/dep/acelite/ace/Time_Value_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Time_Value_T.inl
rename to dep/acelite/ace/Time_Value_T.inl
diff --git a/modules/dep/acelite/ace/Timeprobe.cpp b/dep/acelite/ace/Timeprobe.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe.cpp
rename to dep/acelite/ace/Timeprobe.cpp
diff --git a/modules/dep/acelite/ace/Timeprobe.h b/dep/acelite/ace/Timeprobe.h
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe.h
rename to dep/acelite/ace/Timeprobe.h
diff --git a/modules/dep/acelite/ace/Timeprobe.inl b/dep/acelite/ace/Timeprobe.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe.inl
rename to dep/acelite/ace/Timeprobe.inl
diff --git a/modules/dep/acelite/ace/Timeprobe_T.cpp b/dep/acelite/ace/Timeprobe_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe_T.cpp
rename to dep/acelite/ace/Timeprobe_T.cpp
diff --git a/modules/dep/acelite/ace/Timeprobe_T.h b/dep/acelite/ace/Timeprobe_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timeprobe_T.h
rename to dep/acelite/ace/Timeprobe_T.h
diff --git a/modules/dep/acelite/ace/Timer_Hash.h b/dep/acelite/ace/Timer_Hash.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Hash.h
rename to dep/acelite/ace/Timer_Hash.h
diff --git a/modules/dep/acelite/ace/Timer_Hash_T.cpp b/dep/acelite/ace/Timer_Hash_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Hash_T.cpp
rename to dep/acelite/ace/Timer_Hash_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Hash_T.h b/dep/acelite/ace/Timer_Hash_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Hash_T.h
rename to dep/acelite/ace/Timer_Hash_T.h
diff --git a/modules/dep/acelite/ace/Timer_Heap.h b/dep/acelite/ace/Timer_Heap.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Heap.h
rename to dep/acelite/ace/Timer_Heap.h
diff --git a/modules/dep/acelite/ace/Timer_Heap_T.cpp b/dep/acelite/ace/Timer_Heap_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Heap_T.cpp
rename to dep/acelite/ace/Timer_Heap_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Heap_T.h b/dep/acelite/ace/Timer_Heap_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Heap_T.h
rename to dep/acelite/ace/Timer_Heap_T.h
diff --git a/modules/dep/acelite/ace/Timer_List.h b/dep/acelite/ace/Timer_List.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_List.h
rename to dep/acelite/ace/Timer_List.h
diff --git a/modules/dep/acelite/ace/Timer_List_T.cpp b/dep/acelite/ace/Timer_List_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_List_T.cpp
rename to dep/acelite/ace/Timer_List_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_List_T.h b/dep/acelite/ace/Timer_List_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_List_T.h
rename to dep/acelite/ace/Timer_List_T.h
diff --git a/modules/dep/acelite/ace/Timer_Queue.h b/dep/acelite/ace/Timer_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue.h
rename to dep/acelite/ace/Timer_Queue.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_Adapters.cpp b/dep/acelite/ace/Timer_Queue_Adapters.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Adapters.cpp
rename to dep/acelite/ace/Timer_Queue_Adapters.cpp
diff --git a/modules/dep/acelite/ace/Timer_Queue_Adapters.h b/dep/acelite/ace/Timer_Queue_Adapters.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Adapters.h
rename to dep/acelite/ace/Timer_Queue_Adapters.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_Adapters.inl b/dep/acelite/ace/Timer_Queue_Adapters.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Adapters.inl
rename to dep/acelite/ace/Timer_Queue_Adapters.inl
diff --git a/modules/dep/acelite/ace/Timer_Queue_Iterator.cpp b/dep/acelite/ace/Timer_Queue_Iterator.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Iterator.cpp
rename to dep/acelite/ace/Timer_Queue_Iterator.cpp
diff --git a/modules/dep/acelite/ace/Timer_Queue_Iterator.h b/dep/acelite/ace/Timer_Queue_Iterator.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Iterator.h
rename to dep/acelite/ace/Timer_Queue_Iterator.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_Iterator.inl b/dep/acelite/ace/Timer_Queue_Iterator.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_Iterator.inl
rename to dep/acelite/ace/Timer_Queue_Iterator.inl
diff --git a/modules/dep/acelite/ace/Timer_Queue_T.cpp b/dep/acelite/ace/Timer_Queue_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_T.cpp
rename to dep/acelite/ace/Timer_Queue_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Queue_T.h b/dep/acelite/ace/Timer_Queue_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_T.h
rename to dep/acelite/ace/Timer_Queue_T.h
diff --git a/modules/dep/acelite/ace/Timer_Queue_T.inl b/dep/acelite/ace/Timer_Queue_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queue_T.inl
rename to dep/acelite/ace/Timer_Queue_T.inl
diff --git a/modules/dep/acelite/ace/Timer_Queuefwd.h b/dep/acelite/ace/Timer_Queuefwd.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Queuefwd.h
rename to dep/acelite/ace/Timer_Queuefwd.h
diff --git a/modules/dep/acelite/ace/Timer_Wheel.h b/dep/acelite/ace/Timer_Wheel.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Wheel.h
rename to dep/acelite/ace/Timer_Wheel.h
diff --git a/modules/dep/acelite/ace/Timer_Wheel_T.cpp b/dep/acelite/ace/Timer_Wheel_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Wheel_T.cpp
rename to dep/acelite/ace/Timer_Wheel_T.cpp
diff --git a/modules/dep/acelite/ace/Timer_Wheel_T.h b/dep/acelite/ace/Timer_Wheel_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Timer_Wheel_T.h
rename to dep/acelite/ace/Timer_Wheel_T.h
diff --git a/modules/dep/acelite/ace/TkReactor/ACE_TkReactor.pc.in b/dep/acelite/ace/TkReactor/ACE_TkReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/ACE_TkReactor.pc.in
rename to dep/acelite/ace/TkReactor/ACE_TkReactor.pc.in
diff --git a/modules/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h b/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/ACE_TkReactor_export.h
rename to dep/acelite/ace/TkReactor/ACE_TkReactor_export.h
diff --git a/modules/dep/acelite/ace/TkReactor/TkReactor.cpp b/dep/acelite/ace/TkReactor/TkReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/TkReactor.cpp
rename to dep/acelite/ace/TkReactor/TkReactor.cpp
diff --git a/modules/dep/acelite/ace/TkReactor/TkReactor.h b/dep/acelite/ace/TkReactor/TkReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/TkReactor.h
rename to dep/acelite/ace/TkReactor/TkReactor.h
diff --git a/modules/dep/acelite/ace/TkReactor/ace_tkreactor.mpc b/dep/acelite/ace/TkReactor/ace_tkreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/TkReactor/ace_tkreactor.mpc
rename to dep/acelite/ace/TkReactor/ace_tkreactor.mpc
diff --git a/modules/dep/acelite/ace/Token.cpp b/dep/acelite/ace/Token.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token.cpp
rename to dep/acelite/ace/Token.cpp
diff --git a/modules/dep/acelite/ace/Token.h b/dep/acelite/ace/Token.h
similarity index 100%
rename from modules/dep/acelite/ace/Token.h
rename to dep/acelite/ace/Token.h
diff --git a/modules/dep/acelite/ace/Token.inl b/dep/acelite/ace/Token.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token.inl
rename to dep/acelite/ace/Token.inl
diff --git a/modules/dep/acelite/ace/Token_Collection.cpp b/dep/acelite/ace/Token_Collection.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Collection.cpp
rename to dep/acelite/ace/Token_Collection.cpp
diff --git a/modules/dep/acelite/ace/Token_Collection.h b/dep/acelite/ace/Token_Collection.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Collection.h
rename to dep/acelite/ace/Token_Collection.h
diff --git a/modules/dep/acelite/ace/Token_Collection.inl b/dep/acelite/ace/Token_Collection.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token_Collection.inl
rename to dep/acelite/ace/Token_Collection.inl
diff --git a/modules/dep/acelite/ace/Token_Invariants.cpp b/dep/acelite/ace/Token_Invariants.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Invariants.cpp
rename to dep/acelite/ace/Token_Invariants.cpp
diff --git a/modules/dep/acelite/ace/Token_Invariants.h b/dep/acelite/ace/Token_Invariants.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Invariants.h
rename to dep/acelite/ace/Token_Invariants.h
diff --git a/modules/dep/acelite/ace/Token_Manager.cpp b/dep/acelite/ace/Token_Manager.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Manager.cpp
rename to dep/acelite/ace/Token_Manager.cpp
diff --git a/modules/dep/acelite/ace/Token_Manager.h b/dep/acelite/ace/Token_Manager.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Manager.h
rename to dep/acelite/ace/Token_Manager.h
diff --git a/modules/dep/acelite/ace/Token_Manager.inl b/dep/acelite/ace/Token_Manager.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token_Manager.inl
rename to dep/acelite/ace/Token_Manager.inl
diff --git a/modules/dep/acelite/ace/Token_Request_Reply.cpp b/dep/acelite/ace/Token_Request_Reply.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Token_Request_Reply.cpp
rename to dep/acelite/ace/Token_Request_Reply.cpp
diff --git a/modules/dep/acelite/ace/Token_Request_Reply.h b/dep/acelite/ace/Token_Request_Reply.h
similarity index 100%
rename from modules/dep/acelite/ace/Token_Request_Reply.h
rename to dep/acelite/ace/Token_Request_Reply.h
diff --git a/modules/dep/acelite/ace/Token_Request_Reply.inl b/dep/acelite/ace/Token_Request_Reply.inl
similarity index 100%
rename from modules/dep/acelite/ace/Token_Request_Reply.inl
rename to dep/acelite/ace/Token_Request_Reply.inl
diff --git a/modules/dep/acelite/ace/Tokenizer_T.cpp b/dep/acelite/ace/Tokenizer_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Tokenizer_T.cpp
rename to dep/acelite/ace/Tokenizer_T.cpp
diff --git a/modules/dep/acelite/ace/Tokenizer_T.h b/dep/acelite/ace/Tokenizer_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Tokenizer_T.h
rename to dep/acelite/ace/Tokenizer_T.h
diff --git a/modules/dep/acelite/ace/Trace.cpp b/dep/acelite/ace/Trace.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Trace.cpp
rename to dep/acelite/ace/Trace.cpp
diff --git a/modules/dep/acelite/ace/Trace.h b/dep/acelite/ace/Trace.h
similarity index 100%
rename from modules/dep/acelite/ace/Trace.h
rename to dep/acelite/ace/Trace.h
diff --git a/modules/dep/acelite/ace/Truncate.h b/dep/acelite/ace/Truncate.h
similarity index 100%
rename from modules/dep/acelite/ace/Truncate.h
rename to dep/acelite/ace/Truncate.h
diff --git a/modules/dep/acelite/ace/Typed_SV_Message.cpp b/dep/acelite/ace/Typed_SV_Message.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message.cpp
rename to dep/acelite/ace/Typed_SV_Message.cpp
diff --git a/modules/dep/acelite/ace/Typed_SV_Message.h b/dep/acelite/ace/Typed_SV_Message.h
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message.h
rename to dep/acelite/ace/Typed_SV_Message.h
diff --git a/modules/dep/acelite/ace/Typed_SV_Message.inl b/dep/acelite/ace/Typed_SV_Message.inl
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message.inl
rename to dep/acelite/ace/Typed_SV_Message.inl
diff --git a/modules/dep/acelite/ace/Typed_SV_Message_Queue.cpp b/dep/acelite/ace/Typed_SV_Message_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message_Queue.cpp
rename to dep/acelite/ace/Typed_SV_Message_Queue.cpp
diff --git a/modules/dep/acelite/ace/Typed_SV_Message_Queue.h b/dep/acelite/ace/Typed_SV_Message_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message_Queue.h
rename to dep/acelite/ace/Typed_SV_Message_Queue.h
diff --git a/modules/dep/acelite/ace/Typed_SV_Message_Queue.inl b/dep/acelite/ace/Typed_SV_Message_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Typed_SV_Message_Queue.inl
rename to dep/acelite/ace/Typed_SV_Message_Queue.inl
diff --git a/modules/dep/acelite/ace/UNIX_Addr.cpp b/dep/acelite/ace/UNIX_Addr.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UNIX_Addr.cpp
rename to dep/acelite/ace/UNIX_Addr.cpp
diff --git a/modules/dep/acelite/ace/UNIX_Addr.h b/dep/acelite/ace/UNIX_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/UNIX_Addr.h
rename to dep/acelite/ace/UNIX_Addr.h
diff --git a/modules/dep/acelite/ace/UNIX_Addr.inl b/dep/acelite/ace/UNIX_Addr.inl
similarity index 100%
rename from modules/dep/acelite/ace/UNIX_Addr.inl
rename to dep/acelite/ace/UNIX_Addr.inl
diff --git a/modules/dep/acelite/ace/UPIPE_Acceptor.cpp b/dep/acelite/ace/UPIPE_Acceptor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Acceptor.cpp
rename to dep/acelite/ace/UPIPE_Acceptor.cpp
diff --git a/modules/dep/acelite/ace/UPIPE_Acceptor.h b/dep/acelite/ace/UPIPE_Acceptor.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Acceptor.h
rename to dep/acelite/ace/UPIPE_Acceptor.h
diff --git a/modules/dep/acelite/ace/UPIPE_Acceptor.inl b/dep/acelite/ace/UPIPE_Acceptor.inl
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Acceptor.inl
rename to dep/acelite/ace/UPIPE_Acceptor.inl
diff --git a/modules/dep/acelite/ace/UPIPE_Addr.h b/dep/acelite/ace/UPIPE_Addr.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Addr.h
rename to dep/acelite/ace/UPIPE_Addr.h
diff --git a/modules/dep/acelite/ace/UPIPE_Connector.cpp b/dep/acelite/ace/UPIPE_Connector.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Connector.cpp
rename to dep/acelite/ace/UPIPE_Connector.cpp
diff --git a/modules/dep/acelite/ace/UPIPE_Connector.h b/dep/acelite/ace/UPIPE_Connector.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Connector.h
rename to dep/acelite/ace/UPIPE_Connector.h
diff --git a/modules/dep/acelite/ace/UPIPE_Connector.inl b/dep/acelite/ace/UPIPE_Connector.inl
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Connector.inl
rename to dep/acelite/ace/UPIPE_Connector.inl
diff --git a/modules/dep/acelite/ace/UPIPE_Stream.cpp b/dep/acelite/ace/UPIPE_Stream.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Stream.cpp
rename to dep/acelite/ace/UPIPE_Stream.cpp
diff --git a/modules/dep/acelite/ace/UPIPE_Stream.h b/dep/acelite/ace/UPIPE_Stream.h
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Stream.h
rename to dep/acelite/ace/UPIPE_Stream.h
diff --git a/modules/dep/acelite/ace/UPIPE_Stream.inl b/dep/acelite/ace/UPIPE_Stream.inl
similarity index 100%
rename from modules/dep/acelite/ace/UPIPE_Stream.inl
rename to dep/acelite/ace/UPIPE_Stream.inl
diff --git a/modules/dep/acelite/ace/UTF16_Encoding_Converter.cpp b/dep/acelite/ace/UTF16_Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UTF16_Encoding_Converter.cpp
rename to dep/acelite/ace/UTF16_Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/UTF16_Encoding_Converter.h b/dep/acelite/ace/UTF16_Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/UTF16_Encoding_Converter.h
rename to dep/acelite/ace/UTF16_Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/UTF16_Encoding_Converter.inl b/dep/acelite/ace/UTF16_Encoding_Converter.inl
similarity index 100%
rename from modules/dep/acelite/ace/UTF16_Encoding_Converter.inl
rename to dep/acelite/ace/UTF16_Encoding_Converter.inl
diff --git a/modules/dep/acelite/ace/UTF32_Encoding_Converter.cpp b/dep/acelite/ace/UTF32_Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UTF32_Encoding_Converter.cpp
rename to dep/acelite/ace/UTF32_Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/UTF32_Encoding_Converter.h b/dep/acelite/ace/UTF32_Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/UTF32_Encoding_Converter.h
rename to dep/acelite/ace/UTF32_Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/UTF8_Encoding_Converter.cpp b/dep/acelite/ace/UTF8_Encoding_Converter.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UTF8_Encoding_Converter.cpp
rename to dep/acelite/ace/UTF8_Encoding_Converter.cpp
diff --git a/modules/dep/acelite/ace/UTF8_Encoding_Converter.h b/dep/acelite/ace/UTF8_Encoding_Converter.h
similarity index 100%
rename from modules/dep/acelite/ace/UTF8_Encoding_Converter.h
rename to dep/acelite/ace/UTF8_Encoding_Converter.h
diff --git a/modules/dep/acelite/ace/UUID.cpp b/dep/acelite/ace/UUID.cpp
similarity index 100%
rename from modules/dep/acelite/ace/UUID.cpp
rename to dep/acelite/ace/UUID.cpp
diff --git a/modules/dep/acelite/ace/UUID.h b/dep/acelite/ace/UUID.h
similarity index 100%
rename from modules/dep/acelite/ace/UUID.h
rename to dep/acelite/ace/UUID.h
diff --git a/modules/dep/acelite/ace/UUID.inl b/dep/acelite/ace/UUID.inl
similarity index 100%
rename from modules/dep/acelite/ace/UUID.inl
rename to dep/acelite/ace/UUID.inl
diff --git a/modules/dep/acelite/ace/Unbounded_Queue.cpp b/dep/acelite/ace/Unbounded_Queue.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Queue.cpp
rename to dep/acelite/ace/Unbounded_Queue.cpp
diff --git a/modules/dep/acelite/ace/Unbounded_Queue.h b/dep/acelite/ace/Unbounded_Queue.h
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Queue.h
rename to dep/acelite/ace/Unbounded_Queue.h
diff --git a/modules/dep/acelite/ace/Unbounded_Queue.inl b/dep/acelite/ace/Unbounded_Queue.inl
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Queue.inl
rename to dep/acelite/ace/Unbounded_Queue.inl
diff --git a/modules/dep/acelite/ace/Unbounded_Set.cpp b/dep/acelite/ace/Unbounded_Set.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set.cpp
rename to dep/acelite/ace/Unbounded_Set.cpp
diff --git a/modules/dep/acelite/ace/Unbounded_Set.h b/dep/acelite/ace/Unbounded_Set.h
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set.h
rename to dep/acelite/ace/Unbounded_Set.h
diff --git a/modules/dep/acelite/ace/Unbounded_Set.inl b/dep/acelite/ace/Unbounded_Set.inl
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set.inl
rename to dep/acelite/ace/Unbounded_Set.inl
diff --git a/modules/dep/acelite/ace/Unbounded_Set_Ex.cpp b/dep/acelite/ace/Unbounded_Set_Ex.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set_Ex.cpp
rename to dep/acelite/ace/Unbounded_Set_Ex.cpp
diff --git a/modules/dep/acelite/ace/Unbounded_Set_Ex.h b/dep/acelite/ace/Unbounded_Set_Ex.h
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set_Ex.h
rename to dep/acelite/ace/Unbounded_Set_Ex.h
diff --git a/modules/dep/acelite/ace/Unbounded_Set_Ex.inl b/dep/acelite/ace/Unbounded_Set_Ex.inl
similarity index 100%
rename from modules/dep/acelite/ace/Unbounded_Set_Ex.inl
rename to dep/acelite/ace/Unbounded_Set_Ex.inl
diff --git a/modules/dep/acelite/ace/Value_Ptr.h b/dep/acelite/ace/Value_Ptr.h
similarity index 100%
rename from modules/dep/acelite/ace/Value_Ptr.h
rename to dep/acelite/ace/Value_Ptr.h
diff --git a/modules/dep/acelite/ace/Vector_T.cpp b/dep/acelite/ace/Vector_T.cpp
similarity index 100%
rename from modules/dep/acelite/ace/Vector_T.cpp
rename to dep/acelite/ace/Vector_T.cpp
diff --git a/modules/dep/acelite/ace/Vector_T.h b/dep/acelite/ace/Vector_T.h
similarity index 100%
rename from modules/dep/acelite/ace/Vector_T.h
rename to dep/acelite/ace/Vector_T.h
diff --git a/modules/dep/acelite/ace/Vector_T.inl b/dep/acelite/ace/Vector_T.inl
similarity index 100%
rename from modules/dep/acelite/ace/Vector_T.inl
rename to dep/acelite/ace/Vector_T.inl
diff --git a/modules/dep/acelite/ace/Version.h b/dep/acelite/ace/Version.h
similarity index 100%
rename from modules/dep/acelite/ace/Version.h
rename to dep/acelite/ace/Version.h
diff --git a/modules/dep/acelite/ace/Versioned_Namespace.h b/dep/acelite/ace/Versioned_Namespace.h
similarity index 100%
rename from modules/dep/acelite/ace/Versioned_Namespace.h
rename to dep/acelite/ace/Versioned_Namespace.h
diff --git a/modules/dep/acelite/ace/WFMO_Reactor.cpp b/dep/acelite/ace/WFMO_Reactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/WFMO_Reactor.cpp
rename to dep/acelite/ace/WFMO_Reactor.cpp
diff --git a/modules/dep/acelite/ace/WFMO_Reactor.h b/dep/acelite/ace/WFMO_Reactor.h
similarity index 100%
rename from modules/dep/acelite/ace/WFMO_Reactor.h
rename to dep/acelite/ace/WFMO_Reactor.h
diff --git a/modules/dep/acelite/ace/WFMO_Reactor.inl b/dep/acelite/ace/WFMO_Reactor.inl
similarity index 100%
rename from modules/dep/acelite/ace/WFMO_Reactor.inl
rename to dep/acelite/ace/WFMO_Reactor.inl
diff --git a/modules/dep/acelite/ace/WIN32_Asynch_IO.cpp b/dep/acelite/ace/WIN32_Asynch_IO.cpp
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Asynch_IO.cpp
rename to dep/acelite/ace/WIN32_Asynch_IO.cpp
diff --git a/modules/dep/acelite/ace/WIN32_Asynch_IO.h b/dep/acelite/ace/WIN32_Asynch_IO.h
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Asynch_IO.h
rename to dep/acelite/ace/WIN32_Asynch_IO.h
diff --git a/modules/dep/acelite/ace/WIN32_Proactor.cpp b/dep/acelite/ace/WIN32_Proactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Proactor.cpp
rename to dep/acelite/ace/WIN32_Proactor.cpp
diff --git a/modules/dep/acelite/ace/WIN32_Proactor.h b/dep/acelite/ace/WIN32_Proactor.h
similarity index 100%
rename from modules/dep/acelite/ace/WIN32_Proactor.h
rename to dep/acelite/ace/WIN32_Proactor.h
diff --git a/modules/dep/acelite/ace/XML_Svc_Conf.cpp b/dep/acelite/ace/XML_Svc_Conf.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Svc_Conf.cpp
rename to dep/acelite/ace/XML_Svc_Conf.cpp
diff --git a/modules/dep/acelite/ace/XML_Svc_Conf.h b/dep/acelite/ace/XML_Svc_Conf.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Svc_Conf.h
rename to dep/acelite/ace/XML_Svc_Conf.h
diff --git a/modules/dep/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in b/dep/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 dep/acelite/ace/XML_Utils/ACE_XML_Utils.pc.in
diff --git a/modules/dep/acelite/ace/XML_Utils/XML.mpc b/dep/acelite/ace/XML_Utils/XML.mpc
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML.mpc
rename to dep/acelite/ace/XML_Utils/XML.mpc
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
rename to dep/acelite/ace/XML_Utils/XMLSchema/Traversal.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
rename to dep/acelite/ace/XML_Utils/XMLSchema/Traversal.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
rename to dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
rename to dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp b/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
rename to dep/acelite/ace/XML_Utils/XMLSchema/TypeInfo.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp
rename to dep/acelite/ace/XML_Utils/XMLSchema/Types.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp
rename to dep/acelite/ace/XML_Utils/XMLSchema/Types.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp b/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
rename to dep/acelite/ace/XML_Utils/XMLSchema/Writer.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp b/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
rename to dep/acelite/ace/XML_Utils/XMLSchema/Writer.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XMLSchema/id_map.hpp b/dep/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 dep/acelite/ace/XML_Utils/XMLSchema/id_map.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Error_Handler.cpp b/dep/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 dep/acelite/ace/XML_Utils/XML_Error_Handler.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Error_Handler.h b/dep/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 dep/acelite/ace/XML_Utils/XML_Error_Handler.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Helper.h b/dep/acelite/ace/XML_Utils/XML_Helper.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Helper.h
rename to dep/acelite/ace/XML_Utils/XML_Helper.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Helper.tpp b/dep/acelite/ace/XML_Utils/XML_Helper.tpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Helper.tpp
rename to dep/acelite/ace/XML_Utils/XML_Helper.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp b/dep/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 dep/acelite/ace/XML_Utils/XML_Schema_Resolver.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.h b/dep/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 dep/acelite/ace/XML_Utils/XML_Schema_Resolver.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp b/dep/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 dep/acelite/ace/XML_Utils/XML_Schema_Resolver.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp b/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Typedefs.cpp
rename to dep/acelite/ace/XML_Utils/XML_Typedefs.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Typedefs.h b/dep/acelite/ace/XML_Utils/XML_Typedefs.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XML_Typedefs.h
rename to dep/acelite/ace/XML_Utils/XML_Typedefs.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XML_Utils_Export.h b/dep/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 dep/acelite/ace/XML_Utils/XML_Utils_Export.h
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp
rename to dep/acelite/ace/XML_Utils/XSCRT/Elements.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp b/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
rename to dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp b/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
rename to dep/acelite/ace/XML_Utils/XSCRT/ExtendedTypeInfo.ipp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp
rename to dep/acelite/ace/XML_Utils/XSCRT/Parser.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
rename to dep/acelite/ace/XML_Utils/XSCRT/Traversal.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp b/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
rename to dep/acelite/ace/XML_Utils/XSCRT/Traversal.tpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp b/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp
rename to dep/acelite/ace/XML_Utils/XSCRT/Writer.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp b/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/XML.hpp
rename to dep/acelite/ace/XML_Utils/XSCRT/XML.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp b/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
rename to dep/acelite/ace/XML_Utils/XSCRT/XMLSchema.hpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XercesString.cpp b/dep/acelite/ace/XML_Utils/XercesString.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XercesString.cpp
rename to dep/acelite/ace/XML_Utils/XercesString.cpp
diff --git a/modules/dep/acelite/ace/XML_Utils/XercesString.h b/dep/acelite/ace/XML_Utils/XercesString.h
similarity index 100%
rename from modules/dep/acelite/ace/XML_Utils/XercesString.h
rename to dep/acelite/ace/XML_Utils/XercesString.h
diff --git a/modules/dep/acelite/ace/XTI_ATM_Mcast.cpp b/dep/acelite/ace/XTI_ATM_Mcast.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XTI_ATM_Mcast.cpp
rename to dep/acelite/ace/XTI_ATM_Mcast.cpp
diff --git a/modules/dep/acelite/ace/XTI_ATM_Mcast.h b/dep/acelite/ace/XTI_ATM_Mcast.h
similarity index 100%
rename from modules/dep/acelite/ace/XTI_ATM_Mcast.h
rename to dep/acelite/ace/XTI_ATM_Mcast.h
diff --git a/modules/dep/acelite/ace/XTI_ATM_Mcast.inl b/dep/acelite/ace/XTI_ATM_Mcast.inl
similarity index 100%
rename from modules/dep/acelite/ace/XTI_ATM_Mcast.inl
rename to dep/acelite/ace/XTI_ATM_Mcast.inl
diff --git a/modules/dep/acelite/ace/XtReactor/ACE_XtReactor.pc.in b/dep/acelite/ace/XtReactor/ACE_XtReactor.pc.in
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/ACE_XtReactor.pc.in
rename to dep/acelite/ace/XtReactor/ACE_XtReactor.pc.in
diff --git a/modules/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h b/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/ACE_XtReactor_export.h
rename to dep/acelite/ace/XtReactor/ACE_XtReactor_export.h
diff --git a/modules/dep/acelite/ace/XtReactor/XtReactor.cpp b/dep/acelite/ace/XtReactor/XtReactor.cpp
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/XtReactor.cpp
rename to dep/acelite/ace/XtReactor/XtReactor.cpp
diff --git a/modules/dep/acelite/ace/XtReactor/XtReactor.h b/dep/acelite/ace/XtReactor/XtReactor.h
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/XtReactor.h
rename to dep/acelite/ace/XtReactor/XtReactor.h
diff --git a/modules/dep/acelite/ace/XtReactor/ace_xtreactor.mpc b/dep/acelite/ace/XtReactor/ace_xtreactor.mpc
similarity index 100%
rename from modules/dep/acelite/ace/XtReactor/ace_xtreactor.mpc
rename to dep/acelite/ace/XtReactor/ace_xtreactor.mpc
diff --git a/modules/dep/acelite/ace/ace.mpc b/dep/acelite/ace/ace.mpc
similarity index 100%
rename from modules/dep/acelite/ace/ace.mpc
rename to dep/acelite/ace/ace.mpc
diff --git a/modules/dep/acelite/ace/ace.mwc b/dep/acelite/ace/ace.mwc
similarity index 100%
rename from modules/dep/acelite/ace/ace.mwc
rename to dep/acelite/ace/ace.mwc
diff --git a/modules/dep/acelite/ace/ace.rc b/dep/acelite/ace/ace.rc
similarity index 100%
rename from modules/dep/acelite/ace/ace.rc
rename to dep/acelite/ace/ace.rc
diff --git a/modules/dep/acelite/ace/ace_for_tao.mpc b/dep/acelite/ace/ace_for_tao.mpc
similarity index 100%
rename from modules/dep/acelite/ace/ace_for_tao.mpc
rename to dep/acelite/ace/ace_for_tao.mpc
diff --git a/modules/dep/acelite/ace/ace_message_table.bin b/dep/acelite/ace/ace_message_table.bin
similarity index 100%
rename from modules/dep/acelite/ace/ace_message_table.bin
rename to dep/acelite/ace/ace_message_table.bin
diff --git a/modules/dep/acelite/ace/ace_wchar.cpp b/dep/acelite/ace/ace_wchar.cpp
similarity index 100%
rename from modules/dep/acelite/ace/ace_wchar.cpp
rename to dep/acelite/ace/ace_wchar.cpp
diff --git a/modules/dep/acelite/ace/ace_wchar.h b/dep/acelite/ace/ace_wchar.h
similarity index 100%
rename from modules/dep/acelite/ace/ace_wchar.h
rename to dep/acelite/ace/ace_wchar.h
diff --git a/modules/dep/acelite/ace/ace_wchar.inl b/dep/acelite/ace/ace_wchar.inl
similarity index 100%
rename from modules/dep/acelite/ace/ace_wchar.inl
rename to dep/acelite/ace/ace_wchar.inl
diff --git a/modules/dep/acelite/ace/checked_iterator.h b/dep/acelite/ace/checked_iterator.h
similarity index 100%
rename from modules/dep/acelite/ace/checked_iterator.h
rename to dep/acelite/ace/checked_iterator.h
diff --git a/modules/dep/acelite/ace/codecs.mpb b/dep/acelite/ace/codecs.mpb
similarity index 100%
rename from modules/dep/acelite/ace/codecs.mpb
rename to dep/acelite/ace/codecs.mpb
diff --git a/modules/dep/acelite/ace/config-WinCE.h b/dep/acelite/ace/config-WinCE.h
similarity index 100%
rename from modules/dep/acelite/ace/config-WinCE.h
rename to dep/acelite/ace/config-WinCE.h
diff --git a/modules/dep/acelite/ace/config-aix-5.x.h b/dep/acelite/ace/config-aix-5.x.h
similarity index 100%
rename from modules/dep/acelite/ace/config-aix-5.x.h
rename to dep/acelite/ace/config-aix-5.x.h
diff --git a/modules/dep/acelite/ace/config-aix-7.h b/dep/acelite/ace/config-aix-7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-aix-7.h
rename to dep/acelite/ace/config-aix-7.h
diff --git a/modules/dep/acelite/ace/config-all.h b/dep/acelite/ace/config-all.h
similarity index 100%
rename from modules/dep/acelite/ace/config-all.h
rename to dep/acelite/ace/config-all.h
diff --git a/modules/dep/acelite/ace/config-android.h b/dep/acelite/ace/config-android.h
similarity index 100%
rename from modules/dep/acelite/ace/config-android.h
rename to dep/acelite/ace/config-android.h
diff --git a/modules/dep/acelite/ace/config-cygwin32.h b/dep/acelite/ace/config-cygwin32.h
similarity index 100%
rename from modules/dep/acelite/ace/config-cygwin32.h
rename to dep/acelite/ace/config-cygwin32.h
diff --git a/modules/dep/acelite/ace/config-freebsd.h b/dep/acelite/ace/config-freebsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-freebsd.h
rename to dep/acelite/ace/config-freebsd.h
diff --git a/modules/dep/acelite/ace/config-g++-common.h b/dep/acelite/ace/config-g++-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-g++-common.h
rename to dep/acelite/ace/config-g++-common.h
diff --git a/modules/dep/acelite/ace/config-hpux-11.00.h b/dep/acelite/ace/config-hpux-11.00.h
similarity index 100%
rename from modules/dep/acelite/ace/config-hpux-11.00.h
rename to dep/acelite/ace/config-hpux-11.00.h
diff --git a/modules/dep/acelite/ace/config-icc-common.h b/dep/acelite/ace/config-icc-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-icc-common.h
rename to dep/acelite/ace/config-icc-common.h
diff --git a/modules/dep/acelite/ace/config-integritySCA.h b/dep/acelite/ace/config-integritySCA.h
similarity index 100%
rename from modules/dep/acelite/ace/config-integritySCA.h
rename to dep/acelite/ace/config-integritySCA.h
diff --git a/modules/dep/acelite/ace/config-kfreebsd.h b/dep/acelite/ace/config-kfreebsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-kfreebsd.h
rename to dep/acelite/ace/config-kfreebsd.h
diff --git a/modules/dep/acelite/ace/config-linux.h b/dep/acelite/ace/config-linux.h
similarity index 100%
rename from modules/dep/acelite/ace/config-linux.h
rename to dep/acelite/ace/config-linux.h
diff --git a/modules/dep/acelite/ace/config-lite.h b/dep/acelite/ace/config-lite.h
similarity index 100%
rename from modules/dep/acelite/ace/config-lite.h
rename to dep/acelite/ace/config-lite.h
diff --git a/modules/dep/acelite/ace/config-lynxos.h b/dep/acelite/ace/config-lynxos.h
similarity index 100%
rename from modules/dep/acelite/ace/config-lynxos.h
rename to dep/acelite/ace/config-lynxos.h
diff --git a/modules/dep/acelite/ace/config-macosx-iOS-hardware.h b/dep/acelite/ace/config-macosx-iOS-hardware.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-iOS-hardware.h
rename to dep/acelite/ace/config-macosx-iOS-hardware.h
diff --git a/modules/dep/acelite/ace/config-macosx-iOS-simulator.h b/dep/acelite/ace/config-macosx-iOS-simulator.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-iOS-simulator.h
rename to dep/acelite/ace/config-macosx-iOS-simulator.h
diff --git a/modules/dep/acelite/ace/config-macosx-leopard.h b/dep/acelite/ace/config-macosx-leopard.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-leopard.h
rename to dep/acelite/ace/config-macosx-leopard.h
diff --git a/modules/dep/acelite/ace/config-macosx-lion.h b/dep/acelite/ace/config-macosx-lion.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-lion.h
rename to dep/acelite/ace/config-macosx-lion.h
diff --git a/modules/dep/acelite/ace/config-macosx-mavericks.h b/dep/acelite/ace/config-macosx-mavericks.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-mavericks.h
rename to dep/acelite/ace/config-macosx-mavericks.h
diff --git a/modules/dep/acelite/ace/config-macosx-mountainlion.h b/dep/acelite/ace/config-macosx-mountainlion.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-mountainlion.h
rename to dep/acelite/ace/config-macosx-mountainlion.h
diff --git a/modules/dep/acelite/ace/config-macosx-panther.h b/dep/acelite/ace/config-macosx-panther.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-panther.h
rename to dep/acelite/ace/config-macosx-panther.h
diff --git a/modules/dep/acelite/ace/config-macosx-snowleopard.h b/dep/acelite/ace/config-macosx-snowleopard.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-snowleopard.h
rename to dep/acelite/ace/config-macosx-snowleopard.h
diff --git a/modules/dep/acelite/ace/config-macosx-tiger.h b/dep/acelite/ace/config-macosx-tiger.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-tiger.h
rename to dep/acelite/ace/config-macosx-tiger.h
diff --git a/modules/dep/acelite/ace/config-macosx-yosemite.h b/dep/acelite/ace/config-macosx-yosemite.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx-yosemite.h
rename to dep/acelite/ace/config-macosx-yosemite.h
diff --git a/modules/dep/acelite/ace/config-macosx.h b/dep/acelite/ace/config-macosx.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macosx.h
rename to dep/acelite/ace/config-macosx.h
diff --git a/modules/dep/acelite/ace/config-macros.h b/dep/acelite/ace/config-macros.h
similarity index 100%
rename from modules/dep/acelite/ace/config-macros.h
rename to dep/acelite/ace/config-macros.h
diff --git a/modules/dep/acelite/ace/config-netbsd.h b/dep/acelite/ace/config-netbsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-netbsd.h
rename to dep/acelite/ace/config-netbsd.h
diff --git a/modules/dep/acelite/ace/config-openbsd.h b/dep/acelite/ace/config-openbsd.h
similarity index 100%
rename from modules/dep/acelite/ace/config-openbsd.h
rename to dep/acelite/ace/config-openbsd.h
diff --git a/modules/dep/acelite/ace/config-openvms.h b/dep/acelite/ace/config-openvms.h
similarity index 100%
rename from modules/dep/acelite/ace/config-openvms.h
rename to dep/acelite/ace/config-openvms.h
diff --git a/modules/dep/acelite/ace/config-pharlap.h b/dep/acelite/ace/config-pharlap.h
similarity index 100%
rename from modules/dep/acelite/ace/config-pharlap.h
rename to dep/acelite/ace/config-pharlap.h
diff --git a/modules/dep/acelite/ace/config-posix-nonetworking.h b/dep/acelite/ace/config-posix-nonetworking.h
similarity index 100%
rename from modules/dep/acelite/ace/config-posix-nonetworking.h
rename to dep/acelite/ace/config-posix-nonetworking.h
diff --git a/modules/dep/acelite/ace/config-posix.h b/dep/acelite/ace/config-posix.h
similarity index 100%
rename from modules/dep/acelite/ace/config-posix.h
rename to dep/acelite/ace/config-posix.h
diff --git a/modules/dep/acelite/ace/config-qnx.h b/dep/acelite/ace/config-qnx.h
similarity index 100%
rename from modules/dep/acelite/ace/config-qnx.h
rename to dep/acelite/ace/config-qnx.h
diff --git a/modules/dep/acelite/ace/config-rtems.h b/dep/acelite/ace/config-rtems.h
similarity index 100%
rename from modules/dep/acelite/ace/config-rtems.h
rename to dep/acelite/ace/config-rtems.h
diff --git a/modules/dep/acelite/ace/config-suncc-common.h b/dep/acelite/ace/config-suncc-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-suncc-common.h
rename to dep/acelite/ace/config-suncc-common.h
diff --git a/modules/dep/acelite/ace/config-sunos5.10.h b/dep/acelite/ace/config-sunos5.10.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.10.h
rename to dep/acelite/ace/config-sunos5.10.h
diff --git a/modules/dep/acelite/ace/config-sunos5.11.h b/dep/acelite/ace/config-sunos5.11.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.11.h
rename to dep/acelite/ace/config-sunos5.11.h
diff --git a/modules/dep/acelite/ace/config-sunos5.4-g++.h b/dep/acelite/ace/config-sunos5.4-g++.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.4-g++.h
rename to dep/acelite/ace/config-sunos5.4-g++.h
diff --git a/modules/dep/acelite/ace/config-sunos5.4-sunc++-4.x.h b/dep/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 dep/acelite/ace/config-sunos5.4-sunc++-4.x.h
diff --git a/modules/dep/acelite/ace/config-sunos5.5.h b/dep/acelite/ace/config-sunos5.5.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.5.h
rename to dep/acelite/ace/config-sunos5.5.h
diff --git a/modules/dep/acelite/ace/config-sunos5.6.h b/dep/acelite/ace/config-sunos5.6.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.6.h
rename to dep/acelite/ace/config-sunos5.6.h
diff --git a/modules/dep/acelite/ace/config-sunos5.7.h b/dep/acelite/ace/config-sunos5.7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.7.h
rename to dep/acelite/ace/config-sunos5.7.h
diff --git a/modules/dep/acelite/ace/config-sunos5.8.h b/dep/acelite/ace/config-sunos5.8.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.8.h
rename to dep/acelite/ace/config-sunos5.8.h
diff --git a/modules/dep/acelite/ace/config-sunos5.9.h b/dep/acelite/ace/config-sunos5.9.h
similarity index 100%
rename from modules/dep/acelite/ace/config-sunos5.9.h
rename to dep/acelite/ace/config-sunos5.9.h
diff --git a/modules/dep/acelite/ace/config-vxworks.h b/dep/acelite/ace/config-vxworks.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks.h
rename to dep/acelite/ace/config-vxworks.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.4.h b/dep/acelite/ace/config-vxworks6.4.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.4.h
rename to dep/acelite/ace/config-vxworks6.4.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.5.h b/dep/acelite/ace/config-vxworks6.5.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.5.h
rename to dep/acelite/ace/config-vxworks6.5.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.6.h b/dep/acelite/ace/config-vxworks6.6.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.6.h
rename to dep/acelite/ace/config-vxworks6.6.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.7.h b/dep/acelite/ace/config-vxworks6.7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.7.h
rename to dep/acelite/ace/config-vxworks6.7.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.8.h b/dep/acelite/ace/config-vxworks6.8.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.8.h
rename to dep/acelite/ace/config-vxworks6.8.h
diff --git a/modules/dep/acelite/ace/config-vxworks6.9.h b/dep/acelite/ace/config-vxworks6.9.h
similarity index 100%
rename from modules/dep/acelite/ace/config-vxworks6.9.h
rename to dep/acelite/ace/config-vxworks6.9.h
diff --git a/modules/dep/acelite/ace/config-win32-borland.h b/dep/acelite/ace/config-win32-borland.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-borland.h
rename to dep/acelite/ace/config-win32-borland.h
diff --git a/modules/dep/acelite/ace/config-win32-cegcc.h b/dep/acelite/ace/config-win32-cegcc.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-cegcc.h
rename to dep/acelite/ace/config-win32-cegcc.h
diff --git a/modules/dep/acelite/ace/config-win32-common.h b/dep/acelite/ace/config-win32-common.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-common.h
rename to dep/acelite/ace/config-win32-common.h
diff --git a/modules/dep/acelite/ace/config-win32-dmc.h b/dep/acelite/ace/config-win32-dmc.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-dmc.h
rename to dep/acelite/ace/config-win32-dmc.h
diff --git a/modules/dep/acelite/ace/config-win32-interix.h b/dep/acelite/ace/config-win32-interix.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-interix.h
rename to dep/acelite/ace/config-win32-interix.h
diff --git a/modules/dep/acelite/ace/config-win32-mingw.h b/dep/acelite/ace/config-win32-mingw.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-mingw.h
rename to dep/acelite/ace/config-win32-mingw.h
diff --git a/modules/dep/acelite/ace/config-win32-mingw64.h b/dep/acelite/ace/config-win32-mingw64.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-mingw64.h
rename to dep/acelite/ace/config-win32-mingw64.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-10.h b/dep/acelite/ace/config-win32-msvc-10.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-10.h
rename to dep/acelite/ace/config-win32-msvc-10.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-11.h b/dep/acelite/ace/config-win32-msvc-11.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-11.h
rename to dep/acelite/ace/config-win32-msvc-11.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-12.h b/dep/acelite/ace/config-win32-msvc-12.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-12.h
rename to dep/acelite/ace/config-win32-msvc-12.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-14.h b/dep/acelite/ace/config-win32-msvc-14.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-14.h
rename to dep/acelite/ace/config-win32-msvc-14.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-7.h b/dep/acelite/ace/config-win32-msvc-7.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-7.h
rename to dep/acelite/ace/config-win32-msvc-7.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-8.h b/dep/acelite/ace/config-win32-msvc-8.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-8.h
rename to dep/acelite/ace/config-win32-msvc-8.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc-9.h b/dep/acelite/ace/config-win32-msvc-9.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc-9.h
rename to dep/acelite/ace/config-win32-msvc-9.h
diff --git a/modules/dep/acelite/ace/config-win32-msvc.h b/dep/acelite/ace/config-win32-msvc.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32-msvc.h
rename to dep/acelite/ace/config-win32-msvc.h
diff --git a/modules/dep/acelite/ace/config-win32.h b/dep/acelite/ace/config-win32.h
similarity index 100%
rename from modules/dep/acelite/ace/config-win32.h
rename to dep/acelite/ace/config-win32.h
diff --git a/modules/dep/acelite/ace/config-windows.h b/dep/acelite/ace/config-windows.h
similarity index 100%
rename from modules/dep/acelite/ace/config-windows.h
rename to dep/acelite/ace/config-windows.h
diff --git a/modules/dep/acelite/ace/filecache.mpb b/dep/acelite/ace/filecache.mpb
similarity index 100%
rename from modules/dep/acelite/ace/filecache.mpb
rename to dep/acelite/ace/filecache.mpb
diff --git a/modules/dep/acelite/ace/iosfwd.h b/dep/acelite/ace/iosfwd.h
similarity index 100%
rename from modules/dep/acelite/ace/iosfwd.h
rename to dep/acelite/ace/iosfwd.h
diff --git a/modules/dep/acelite/ace/os_include/arpa/os_inet.h b/dep/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 dep/acelite/ace/os_include/arpa/os_inet.h
diff --git a/modules/dep/acelite/ace/os_include/net/os_if.h b/dep/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 dep/acelite/ace/os_include/net/os_if.h
diff --git a/modules/dep/acelite/ace/os_include/netinet/os_in.h b/dep/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 dep/acelite/ace/os_include/netinet/os_in.h
diff --git a/modules/dep/acelite/ace/os_include/netinet/os_tcp.h b/dep/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 dep/acelite/ace/os_include/netinet/os_tcp.h
diff --git a/modules/dep/acelite/ace/os_include/os_aio.h b/dep/acelite/ace/os_include/os_aio.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_aio.h
rename to dep/acelite/ace/os_include/os_aio.h
diff --git a/modules/dep/acelite/ace/os_include/os_assert.h b/dep/acelite/ace/os_include/os_assert.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_assert.h
rename to dep/acelite/ace/os_include/os_assert.h
diff --git a/modules/dep/acelite/ace/os_include/os_byteswap.h b/dep/acelite/ace/os_include/os_byteswap.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_byteswap.h
rename to dep/acelite/ace/os_include/os_byteswap.h
diff --git a/modules/dep/acelite/ace/os_include/os_complex.h b/dep/acelite/ace/os_include/os_complex.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_complex.h
rename to dep/acelite/ace/os_include/os_complex.h
diff --git a/modules/dep/acelite/ace/os_include/os_cpio.h b/dep/acelite/ace/os_include/os_cpio.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_cpio.h
rename to dep/acelite/ace/os_include/os_cpio.h
diff --git a/modules/dep/acelite/ace/os_include/os_ctype.h b/dep/acelite/ace/os_include/os_ctype.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ctype.h
rename to dep/acelite/ace/os_include/os_ctype.h
diff --git a/modules/dep/acelite/ace/os_include/os_dirent.h b/dep/acelite/ace/os_include/os_dirent.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_dirent.h
rename to dep/acelite/ace/os_include/os_dirent.h
diff --git a/modules/dep/acelite/ace/os_include/os_dlfcn.h b/dep/acelite/ace/os_include/os_dlfcn.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_dlfcn.h
rename to dep/acelite/ace/os_include/os_dlfcn.h
diff --git a/modules/dep/acelite/ace/os_include/os_errno.h b/dep/acelite/ace/os_include/os_errno.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_errno.h
rename to dep/acelite/ace/os_include/os_errno.h
diff --git a/modules/dep/acelite/ace/os_include/os_fcntl.h b/dep/acelite/ace/os_include/os_fcntl.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fcntl.h
rename to dep/acelite/ace/os_include/os_fcntl.h
diff --git a/modules/dep/acelite/ace/os_include/os_fenv.h b/dep/acelite/ace/os_include/os_fenv.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fenv.h
rename to dep/acelite/ace/os_include/os_fenv.h
diff --git a/modules/dep/acelite/ace/os_include/os_float.h b/dep/acelite/ace/os_include/os_float.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_float.h
rename to dep/acelite/ace/os_include/os_float.h
diff --git a/modules/dep/acelite/ace/os_include/os_fmtmsg.h b/dep/acelite/ace/os_include/os_fmtmsg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fmtmsg.h
rename to dep/acelite/ace/os_include/os_fmtmsg.h
diff --git a/modules/dep/acelite/ace/os_include/os_fnmatch.h b/dep/acelite/ace/os_include/os_fnmatch.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_fnmatch.h
rename to dep/acelite/ace/os_include/os_fnmatch.h
diff --git a/modules/dep/acelite/ace/os_include/os_ftw.h b/dep/acelite/ace/os_include/os_ftw.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ftw.h
rename to dep/acelite/ace/os_include/os_ftw.h
diff --git a/modules/dep/acelite/ace/os_include/os_glob.h b/dep/acelite/ace/os_include/os_glob.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_glob.h
rename to dep/acelite/ace/os_include/os_glob.h
diff --git a/modules/dep/acelite/ace/os_include/os_grp.h b/dep/acelite/ace/os_include/os_grp.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_grp.h
rename to dep/acelite/ace/os_include/os_grp.h
diff --git a/modules/dep/acelite/ace/os_include/os_iconv.h b/dep/acelite/ace/os_include/os_iconv.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_iconv.h
rename to dep/acelite/ace/os_include/os_iconv.h
diff --git a/modules/dep/acelite/ace/os_include/os_ifaddrs.h b/dep/acelite/ace/os_include/os_ifaddrs.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ifaddrs.h
rename to dep/acelite/ace/os_include/os_ifaddrs.h
diff --git a/modules/dep/acelite/ace/os_include/os_intrin.h b/dep/acelite/ace/os_include/os_intrin.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_intrin.h
rename to dep/acelite/ace/os_include/os_intrin.h
diff --git a/modules/dep/acelite/ace/os_include/os_inttypes.h b/dep/acelite/ace/os_include/os_inttypes.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_inttypes.h
rename to dep/acelite/ace/os_include/os_inttypes.h
diff --git a/modules/dep/acelite/ace/os_include/os_iso646.h b/dep/acelite/ace/os_include/os_iso646.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_iso646.h
rename to dep/acelite/ace/os_include/os_iso646.h
diff --git a/modules/dep/acelite/ace/os_include/os_kstat.h b/dep/acelite/ace/os_include/os_kstat.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_kstat.h
rename to dep/acelite/ace/os_include/os_kstat.h
diff --git a/modules/dep/acelite/ace/os_include/os_langinfo.h b/dep/acelite/ace/os_include/os_langinfo.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_langinfo.h
rename to dep/acelite/ace/os_include/os_langinfo.h
diff --git a/modules/dep/acelite/ace/os_include/os_libgen.h b/dep/acelite/ace/os_include/os_libgen.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_libgen.h
rename to dep/acelite/ace/os_include/os_libgen.h
diff --git a/modules/dep/acelite/ace/os_include/os_limits.h b/dep/acelite/ace/os_include/os_limits.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_limits.h
rename to dep/acelite/ace/os_include/os_limits.h
diff --git a/modules/dep/acelite/ace/os_include/os_local.h b/dep/acelite/ace/os_include/os_local.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_local.h
rename to dep/acelite/ace/os_include/os_local.h
diff --git a/modules/dep/acelite/ace/os_include/os_math.h b/dep/acelite/ace/os_include/os_math.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_math.h
rename to dep/acelite/ace/os_include/os_math.h
diff --git a/modules/dep/acelite/ace/os_include/os_monetary.h b/dep/acelite/ace/os_include/os_monetary.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_monetary.h
rename to dep/acelite/ace/os_include/os_monetary.h
diff --git a/modules/dep/acelite/ace/os_include/os_mqueue.h b/dep/acelite/ace/os_include/os_mqueue.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_mqueue.h
rename to dep/acelite/ace/os_include/os_mqueue.h
diff --git a/modules/dep/acelite/ace/os_include/os_ndbm.h b/dep/acelite/ace/os_include/os_ndbm.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ndbm.h
rename to dep/acelite/ace/os_include/os_ndbm.h
diff --git a/modules/dep/acelite/ace/os_include/os_netdb.h b/dep/acelite/ace/os_include/os_netdb.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_netdb.h
rename to dep/acelite/ace/os_include/os_netdb.h
diff --git a/modules/dep/acelite/ace/os_include/os_nl_types.h b/dep/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 dep/acelite/ace/os_include/os_nl_types.h
diff --git a/modules/dep/acelite/ace/os_include/os_pdh.h b/dep/acelite/ace/os_include/os_pdh.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pdh.h
rename to dep/acelite/ace/os_include/os_pdh.h
diff --git a/modules/dep/acelite/ace/os_include/os_pdhmsg.h b/dep/acelite/ace/os_include/os_pdhmsg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pdhmsg.h
rename to dep/acelite/ace/os_include/os_pdhmsg.h
diff --git a/modules/dep/acelite/ace/os_include/os_poll.h b/dep/acelite/ace/os_include/os_poll.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_poll.h
rename to dep/acelite/ace/os_include/os_poll.h
diff --git a/modules/dep/acelite/ace/os_include/os_pthread.h b/dep/acelite/ace/os_include/os_pthread.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pthread.h
rename to dep/acelite/ace/os_include/os_pthread.h
diff --git a/modules/dep/acelite/ace/os_include/os_pwd.h b/dep/acelite/ace/os_include/os_pwd.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_pwd.h
rename to dep/acelite/ace/os_include/os_pwd.h
diff --git a/modules/dep/acelite/ace/os_include/os_regex.h b/dep/acelite/ace/os_include/os_regex.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_regex.h
rename to dep/acelite/ace/os_include/os_regex.h
diff --git a/modules/dep/acelite/ace/os_include/os_sched.h b/dep/acelite/ace/os_include/os_sched.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_sched.h
rename to dep/acelite/ace/os_include/os_sched.h
diff --git a/modules/dep/acelite/ace/os_include/os_search.h b/dep/acelite/ace/os_include/os_search.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_search.h
rename to dep/acelite/ace/os_include/os_search.h
diff --git a/modules/dep/acelite/ace/os_include/os_semaphore.h b/dep/acelite/ace/os_include/os_semaphore.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_semaphore.h
rename to dep/acelite/ace/os_include/os_semaphore.h
diff --git a/modules/dep/acelite/ace/os_include/os_setjmp.h b/dep/acelite/ace/os_include/os_setjmp.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_setjmp.h
rename to dep/acelite/ace/os_include/os_setjmp.h
diff --git a/modules/dep/acelite/ace/os_include/os_signal.h b/dep/acelite/ace/os_include/os_signal.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_signal.h
rename to dep/acelite/ace/os_include/os_signal.h
diff --git a/modules/dep/acelite/ace/os_include/os_spawn.h b/dep/acelite/ace/os_include/os_spawn.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_spawn.h
rename to dep/acelite/ace/os_include/os_spawn.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdarg.h b/dep/acelite/ace/os_include/os_stdarg.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdarg.h
rename to dep/acelite/ace/os_include/os_stdarg.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdbool.h b/dep/acelite/ace/os_include/os_stdbool.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdbool.h
rename to dep/acelite/ace/os_include/os_stdbool.h
diff --git a/modules/dep/acelite/ace/os_include/os_stddef.h b/dep/acelite/ace/os_include/os_stddef.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stddef.h
rename to dep/acelite/ace/os_include/os_stddef.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdint.h b/dep/acelite/ace/os_include/os_stdint.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdint.h
rename to dep/acelite/ace/os_include/os_stdint.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdio.h b/dep/acelite/ace/os_include/os_stdio.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdio.h
rename to dep/acelite/ace/os_include/os_stdio.h
diff --git a/modules/dep/acelite/ace/os_include/os_stdlib.h b/dep/acelite/ace/os_include/os_stdlib.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stdlib.h
rename to dep/acelite/ace/os_include/os_stdlib.h
diff --git a/modules/dep/acelite/ace/os_include/os_string.h b/dep/acelite/ace/os_include/os_string.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_string.h
rename to dep/acelite/ace/os_include/os_string.h
diff --git a/modules/dep/acelite/ace/os_include/os_strings.h b/dep/acelite/ace/os_include/os_strings.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_strings.h
rename to dep/acelite/ace/os_include/os_strings.h
diff --git a/modules/dep/acelite/ace/os_include/os_stropts.h b/dep/acelite/ace/os_include/os_stropts.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_stropts.h
rename to dep/acelite/ace/os_include/os_stropts.h
diff --git a/modules/dep/acelite/ace/os_include/os_syslog.h b/dep/acelite/ace/os_include/os_syslog.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_syslog.h
rename to dep/acelite/ace/os_include/os_syslog.h
diff --git a/modules/dep/acelite/ace/os_include/os_tar.h b/dep/acelite/ace/os_include/os_tar.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_tar.h
rename to dep/acelite/ace/os_include/os_tar.h
diff --git a/modules/dep/acelite/ace/os_include/os_termios.h b/dep/acelite/ace/os_include/os_termios.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_termios.h
rename to dep/acelite/ace/os_include/os_termios.h
diff --git a/modules/dep/acelite/ace/os_include/os_tgmath.h b/dep/acelite/ace/os_include/os_tgmath.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_tgmath.h
rename to dep/acelite/ace/os_include/os_tgmath.h
diff --git a/modules/dep/acelite/ace/os_include/os_time.h b/dep/acelite/ace/os_include/os_time.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_time.h
rename to dep/acelite/ace/os_include/os_time.h
diff --git a/modules/dep/acelite/ace/os_include/os_trace.h b/dep/acelite/ace/os_include/os_trace.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_trace.h
rename to dep/acelite/ace/os_include/os_trace.h
diff --git a/modules/dep/acelite/ace/os_include/os_typeinfo.h b/dep/acelite/ace/os_include/os_typeinfo.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_typeinfo.h
rename to dep/acelite/ace/os_include/os_typeinfo.h
diff --git a/modules/dep/acelite/ace/os_include/os_ucontext.h b/dep/acelite/ace/os_include/os_ucontext.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ucontext.h
rename to dep/acelite/ace/os_include/os_ucontext.h
diff --git a/modules/dep/acelite/ace/os_include/os_ulimit.h b/dep/acelite/ace/os_include/os_ulimit.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_ulimit.h
rename to dep/acelite/ace/os_include/os_ulimit.h
diff --git a/modules/dep/acelite/ace/os_include/os_unistd.h b/dep/acelite/ace/os_include/os_unistd.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_unistd.h
rename to dep/acelite/ace/os_include/os_unistd.h
diff --git a/modules/dep/acelite/ace/os_include/os_utime.h b/dep/acelite/ace/os_include/os_utime.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_utime.h
rename to dep/acelite/ace/os_include/os_utime.h
diff --git a/modules/dep/acelite/ace/os_include/os_utmpx.h b/dep/acelite/ace/os_include/os_utmpx.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_utmpx.h
rename to dep/acelite/ace/os_include/os_utmpx.h
diff --git a/modules/dep/acelite/ace/os_include/os_wchar.h b/dep/acelite/ace/os_include/os_wchar.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_wchar.h
rename to dep/acelite/ace/os_include/os_wchar.h
diff --git a/modules/dep/acelite/ace/os_include/os_wctype.h b/dep/acelite/ace/os_include/os_wctype.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_wctype.h
rename to dep/acelite/ace/os_include/os_wctype.h
diff --git a/modules/dep/acelite/ace/os_include/os_wordexp.h b/dep/acelite/ace/os_include/os_wordexp.h
similarity index 100%
rename from modules/dep/acelite/ace/os_include/os_wordexp.h
rename to dep/acelite/ace/os_include/os_wordexp.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_ipc.h b/dep/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 dep/acelite/ace/os_include/sys/os_ipc.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_loadavg.h b/dep/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 dep/acelite/ace/os_include/sys/os_loadavg.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_mman.h b/dep/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 dep/acelite/ace/os_include/sys/os_mman.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_msg.h b/dep/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 dep/acelite/ace/os_include/sys/os_msg.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_pstat.h b/dep/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 dep/acelite/ace/os_include/sys/os_pstat.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_resource.h b/dep/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 dep/acelite/ace/os_include/sys/os_resource.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_select.h b/dep/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 dep/acelite/ace/os_include/sys/os_select.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_sem.h b/dep/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 dep/acelite/ace/os_include/sys/os_sem.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_shm.h b/dep/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 dep/acelite/ace/os_include/sys/os_shm.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_socket.h b/dep/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 dep/acelite/ace/os_include/sys/os_socket.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_stat.h b/dep/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 dep/acelite/ace/os_include/sys/os_stat.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_statvfs.h b/dep/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 dep/acelite/ace/os_include/sys/os_statvfs.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_sysctl.h b/dep/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 dep/acelite/ace/os_include/sys/os_sysctl.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_sysinfo.h b/dep/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 dep/acelite/ace/os_include/sys/os_sysinfo.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_time.h b/dep/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 dep/acelite/ace/os_include/sys/os_time.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_timeb.h b/dep/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 dep/acelite/ace/os_include/sys/os_timeb.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_times.h b/dep/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 dep/acelite/ace/os_include/sys/os_times.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_types.h b/dep/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 dep/acelite/ace/os_include/sys/os_types.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_uio.h b/dep/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 dep/acelite/ace/os_include/sys/os_uio.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_un.h b/dep/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 dep/acelite/ace/os_include/sys/os_un.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_utsname.h b/dep/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 dep/acelite/ace/os_include/sys/os_utsname.h
diff --git a/modules/dep/acelite/ace/os_include/sys/os_wait.h b/dep/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 dep/acelite/ace/os_include/sys/os_wait.h
diff --git a/modules/dep/acelite/ace/other.mpb b/dep/acelite/ace/other.mpb
similarity index 100%
rename from modules/dep/acelite/ace/other.mpb
rename to dep/acelite/ace/other.mpb
diff --git a/modules/dep/acelite/ace/post.h b/dep/acelite/ace/post.h
similarity index 100%
rename from modules/dep/acelite/ace/post.h
rename to dep/acelite/ace/post.h
diff --git a/modules/dep/acelite/ace/pre.h b/dep/acelite/ace/pre.h
similarity index 100%
rename from modules/dep/acelite/ace/pre.h
rename to dep/acelite/ace/pre.h
diff --git a/modules/dep/acelite/ace/streams.h b/dep/acelite/ace/streams.h
similarity index 100%
rename from modules/dep/acelite/ace/streams.h
rename to dep/acelite/ace/streams.h
diff --git a/modules/dep/acelite/ace/svc_export.h b/dep/acelite/ace/svc_export.h
similarity index 100%
rename from modules/dep/acelite/ace/svc_export.h
rename to dep/acelite/ace/svc_export.h
diff --git a/modules/dep/acelite/ace/svcconf.mpb b/dep/acelite/ace/svcconf.mpb
similarity index 100%
rename from modules/dep/acelite/ace/svcconf.mpb
rename to dep/acelite/ace/svcconf.mpb
diff --git a/modules/dep/acelite/ace/svcconfgen.mpc b/dep/acelite/ace/svcconfgen.mpc
similarity index 100%
rename from modules/dep/acelite/ace/svcconfgen.mpc
rename to dep/acelite/ace/svcconfgen.mpc
diff --git a/modules/dep/acelite/ace/token.mpb b/dep/acelite/ace/token.mpb
similarity index 100%
rename from modules/dep/acelite/ace/token.mpb
rename to dep/acelite/ace/token.mpb
diff --git a/modules/dep/acelite/ace/uuid.mpb b/dep/acelite/ace/uuid.mpb
similarity index 100%
rename from modules/dep/acelite/ace/uuid.mpb
rename to dep/acelite/ace/uuid.mpb
diff --git a/modules/dep/bzip2/CMakeLists.txt b/dep/bzip2/CMakeLists.txt
similarity index 91%
rename from modules/dep/bzip2/CMakeLists.txt
rename to dep/bzip2/CMakeLists.txt
index 8ccc896968..51fa34dba2 100644
--- a/modules/dep/bzip2/CMakeLists.txt
+++ b/dep/bzip2/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -15,7 +15,7 @@ set(bzip2_STAT_SRCS
 )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+  ${CMAKE_SOURCE_DIR}/dep/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
diff --git a/modules/dep/bzip2/LICENSE b/dep/bzip2/LICENSE
similarity index 100%
rename from modules/dep/bzip2/LICENSE
rename to dep/bzip2/LICENSE
diff --git a/modules/dep/bzip2/README b/dep/bzip2/README
similarity index 100%
rename from modules/dep/bzip2/README
rename to dep/bzip2/README
diff --git a/modules/dep/bzip2/blocksort.c b/dep/bzip2/blocksort.c
similarity index 100%
rename from modules/dep/bzip2/blocksort.c
rename to dep/bzip2/blocksort.c
diff --git a/modules/dep/bzip2/bzlib.c b/dep/bzip2/bzlib.c
similarity index 100%
rename from modules/dep/bzip2/bzlib.c
rename to dep/bzip2/bzlib.c
diff --git a/modules/dep/bzip2/bzlib.h b/dep/bzip2/bzlib.h
similarity index 100%
rename from modules/dep/bzip2/bzlib.h
rename to dep/bzip2/bzlib.h
diff --git a/modules/dep/bzip2/bzlib_private.h b/dep/bzip2/bzlib_private.h
similarity index 100%
rename from modules/dep/bzip2/bzlib_private.h
rename to dep/bzip2/bzlib_private.h
diff --git a/modules/dep/bzip2/compress.c b/dep/bzip2/compress.c
similarity index 100%
rename from modules/dep/bzip2/compress.c
rename to dep/bzip2/compress.c
diff --git a/modules/dep/bzip2/crctable.c b/dep/bzip2/crctable.c
similarity index 100%
rename from modules/dep/bzip2/crctable.c
rename to dep/bzip2/crctable.c
diff --git a/modules/dep/bzip2/decompress.c b/dep/bzip2/decompress.c
similarity index 100%
rename from modules/dep/bzip2/decompress.c
rename to dep/bzip2/decompress.c
diff --git a/modules/dep/bzip2/huffman.c b/dep/bzip2/huffman.c
similarity index 100%
rename from modules/dep/bzip2/huffman.c
rename to dep/bzip2/huffman.c
diff --git a/modules/dep/bzip2/randtable.c b/dep/bzip2/randtable.c
similarity index 100%
rename from modules/dep/bzip2/randtable.c
rename to dep/bzip2/randtable.c
diff --git a/modules/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt
similarity index 96%
rename from modules/dep/g3dlite/CMakeLists.txt
rename to dep/g3dlite/CMakeLists.txt
index 3b20299b5a..a61b1c85cb 100644
--- a/modules/dep/g3dlite/CMakeLists.txt
+++ b/dep/g3dlite/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -57,7 +57,7 @@ set(g3dlib_STAT_SRCS
 if(WIN32)
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+    ${CMAKE_SOURCE_DIR}/dep/zlib
   )
 else()
   include_directories(
diff --git a/dep/g3dlite/G3D-v8.0_hotfix1.diff b/dep/g3dlite/G3D-v8.0_hotfix1.diff
new file mode 100644
index 0000000000..b325b16b08
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix1.diff
@@ -0,0 +1,520 @@
+diff -urN a/dep/g3dlite/include/G3D/debugAssert.h b/dep/g3dlite/include/G3D/debugAssert.h
+--- a/dep/g3dlite/include/G3D/debugAssert.h	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/include/G3D/debugAssert.h	2010-08-26 21:36:32.000000000 +0200
+@@ -39,10 +39,12 @@
+ #ifdef G3D_LINUX
+     // Needed so we can define a global display
+     // pointer for debugAssert.
++#if 0 /* G3DFIX: Disabled to avoid requirement for X11 libraries */
+     #include <X11/Xlib.h>
+     #include <X11/Xutil.h>
+     #include <X11/Xatom.h>
+ #endif
++#endif
+ 
+ 
+ /**
+@@ -178,6 +180,7 @@
+ namespace G3D {  namespace _internal {
+ 
+ #ifdef G3D_LINUX
++#if 0 /* G3DFIX: Disabled to avoid requirement for X11 libraries */
+     /**
+      A pointer to the X11 display.  Initially NULL.  If set to a
+      non-null value (e.g. by SDLWindow), debugAssert attempts to use
+@@ -194,6 +197,7 @@
+      */
+     extern Window        x11Window;
+ #endif
++#endif
+ 
+ /**
+  Pops up an assertion dialog or prints an assertion
+diff -urN a/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h
+--- a/dep/g3dlite/include/G3D/g3dmath.h	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/include/G3D/g3dmath.h	2010-08-26 21:36:32.000000000 +0200
+@@ -65,6 +65,8 @@
+     return ::rand() / double(RAND_MAX);
+ }
+ 
++#if !defined(_WIN64)
++
+ /**
+    Win32 implementation of the C99 fast rounding routines.
+    
+@@ -99,6 +101,19 @@
+ 
+     return intgr;
+ }
++
++#else
++
++    __inline long int lrint (double flt) {
++        return (long int)floor(flt+0.5f);
++    }
++
++    __inline long int lrintf(float flt) {
++        return (long int)floorf(flt+0.5f);
++    }
++
++#endif
++
+ #endif
+ 
+ 
+diff -urN a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
+--- a/dep/g3dlite/include/G3D/platform.h	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/include/G3D/platform.h	2010-08-26 21:36:32.000000000 +0200
+@@ -56,12 +57,15 @@
+    // pi as a constant, which creates a conflict with G3D
+ #define __FP__
+ #else
+-    #error Unknown platform 
++    #error Unknown platform
+ #endif
+ 
+ // Detect 64-bit under various compilers
+ #if (defined(_M_X64) || defined(_WIN64) || defined(__LP64__) || defined(_LP64))
+ #    define G3D_64BIT
++	#if defined(WIN32)
++        #include <intrin.h>
++    #endif
+ #else
+ #    define G3D_32BIT
+ #endif
+@@ -126,13 +130,11 @@
+ // TODO: remove
+ #   pragma warning (disable : 4244)
+ 
+-#   define ZLIB_WINAPI
+-
+ #   define restrict
+ 
+ /** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+     Enables printf parameter validation on gcc. */
+-#   define G3D_CHECK_PRINTF_ARGS 
++#   define G3D_CHECK_PRINTF_ARGS
+ 
+ /** @def G3D_CHECK_PRINTF_METHOD_ARGS()
+     Enables printf parameter validation on gcc. */
+diff -urN a/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h
+--- a/dep/g3dlite/include/G3D/System.h	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/include/G3D/System.h	2010-08-26 21:36:32.000000000 +0200
+@@ -375,10 +375,10 @@
+      // count now contains the cycle count for the intervening operation.
+      </PRE>
+      */
+-    static void beginCycleCount(uint64& cycleCount);
++    /* static void beginCycleCount(uint64& cycleCount);
+     static void endCycleCount(uint64& cycleCount);
+ 
+-    static uint64 getCycleCount();
++    static uint64 getCycleCount(); */
+ 
+     inline static void setOutOfMemoryCallback(OutOfMemoryCallback c) {
+         instance().m_outOfMemoryCallback = c;
+@@ -438,7 +438,7 @@
+ 
+ };
+ 
+-
++/* don't need that for Moongose, not portable to Win64...
+ #ifdef _MSC_VER
+     inline uint64 System::getCycleCount() {
+         uint32 timehi, timelo;
+@@ -493,14 +493,14 @@
+     cycleCount = getCycleCount() - cycleCount;
+ #else
+     AbsoluteTime end = UpTime();
+-    Nanoseconds diffNS = 
++    Nanoseconds diffNS =
+         AbsoluteDeltaToNanoseconds(end, UInt64ToUnsignedWide(cycleCount));
+-    cycleCount = 
+-        (uint64) ((double) (instance().m_OSXCPUSpeed) * 
++    cycleCount =
++        (uint64) ((double) (instance().m_OSXCPUSpeed) *
+                   (double) UnsignedWideToUInt64(diffNS) * instance().m_secondsPerNS);
+ #endif
+ }
+-
++ */
+ 
+ } // namespace
+ 
+diff -urN a/dep/g3dlite/source/BinaryInput.cpp b/dep/g3dlite/source/BinaryInput.cpp
+--- a/dep/g3dlite/source/BinaryInput.cpp	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/source/BinaryInput.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -39,7 +39,9 @@
+ #include "G3D/Log.h"
+ #include "G3D/FileSystem.h"
+ #include <zlib.h>
+-#include "zip.h"
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
++  #include "zip.h"
++#endif
+ #include <cstring>
+ 
+ namespace G3D {
+@@ -273,6 +275,7 @@ BinaryInput::BinaryInput(
+     _internal::currentFilesUsed.insert(m_filename);
+     
+ 
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+     std::string zipfile;
+     if (FileSystem::inZipfile(m_filename, zipfile)) {
+         // Load from zipfile
+@@ -304,6 +307,7 @@ BinaryInput::BinaryInput(
+         m_freeBuffer = true;
+         return;
+     }
++#endif
+ 
+     // Figure out how big the file is and verify that it exists.
+     m_length = FileSystem::size(m_filename);
+diff -urN a/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp
+--- a/dep/g3dlite/source/debugAssert.cpp	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/source/debugAssert.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -37,9 +37,11 @@
+ AssertionHook _failureHook = _handleErrorCheck_;
+ 
+ #ifdef G3D_LINUX
++#if 0 /* G3DFIX: Disabled to avoid requirement for X11 libraries */
+     Display*      x11Display = NULL;
+     Window        x11Window  = 0;
+ #endif
++#endif
+ 
+ 
+ #ifdef G3D_WIN32
+@@ -250,6 +252,7 @@
+         ClipCursor(NULL);
+         
+     #elif defined(G3D_LINUX)
++#if 0 /* G3DFIX: Disabled to avoid requirement for X11 libraries */
+         if (x11Display != NULL) {
+             XUngrabPointer(x11Display, CurrentTime);
+             XUngrabKeyboard(x11Display, CurrentTime);
+@@ -264,6 +267,7 @@
+             XAllowEvents(x11Display, AsyncPointer, CurrentTime);
+             XFlush(x11Display);
+         }
++#endif
+     #elif defined(G3D_OSX)
+         // TODO: OS X
+     #endif
+diff -urN a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp
+--- a/dep/g3dlite/source/FileSystem.cpp	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/source/FileSystem.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -12,7 +12,9 @@
+ #include "G3D/fileutils.h"
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include "zip.h"
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
++    #include "zip.h"
++#endif
+ #include "G3D/g3dfnmatch.h"
+ #include "G3D/BinaryInput.h"
+ #include "G3D/BinaryOutput.h"
+@@ -78,6 +80,7 @@ bool FileSystem::Dir::contains(const std
+ }
+     
+ void FileSystem::Dir::computeZipListing(const std::string& zipfile, const std::string& pathInsideZipfile) {
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+     struct zip* z = zip_open( FilePath::removeTrailingSlash(zipfile).c_str(), ZIP_CHECKCONS, NULL );
+     debugAssert(z);
+ 
+@@ -126,6 +129,7 @@ void FileSystem::Dir::computeZipListing(
+     
+     zip_close(z);
+     z = NULL;
++#endif
+ }
+ 
+ 
+@@ -522,6 +526,7 @@ int64 FileSystem::_size(const std::strin
+     int result = stat64(filename.c_str(), &st);
+     
+     if (result == -1) {
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+         std::string zip, contents;
+         if (zipfileExists(filename, zip, contents)) {
+             int64 requiredMem;
+@@ -538,8 +543,11 @@ int64 FileSystem::_size(const std::strin
+             zip_close(z);
+             return requiredMem;
+         } else {
++#endif
+             return -1;
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+         }
++#endif
+     }
+     
+     return st.st_size;
+diff -urN a/dep/g3dlite/source/fileutils.cpp b/dep/g3dlite/source/fileutils.cpp
+--- a/dep/g3dlite/source/fileutils.cpp	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/source/fileutils.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -20,7 +20,9 @@
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include "zip.h"
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
++    #include "zip.h"
++#endif
+ 
+ #ifdef G3D_WIN32
+    // Needed for _getcwd
+@@ -144,7 +146,7 @@
+              void*& data,
+              size_t& length) {
+     std::string zip, desiredFile;
+-    
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */    
+     if (zipfileExists(file, zip, desiredFile)) {
+         struct zip *z = zip_open( zip.c_str(), ZIP_CHECKCONS, NULL );
+         {
+@@ -167,6 +169,9 @@
+     } else {
+         data = NULL;
+     }
++#else
++    data = NULL;
++#endif
+ }
+ 
+ 
+@@ -180,6 +185,7 @@
+     int result = _stat(filename.c_str(), &st);
+     
+     if (result == -1) {
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+ 		std::string zip, contents;
+ 		if(zipfileExists(filename, zip, contents)){
+ 			int64 requiredMem;
+@@ -198,6 +204,9 @@
+ 		} else {
+         return -1;
+ 		}
++#else
++        return -1;
++#endif
+     }
+ 
+     return st.st_size;
+@@ -518,6 +527,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+ /* Helper methods for zipfileExists()*/
+ // Given a string (the drive) and an array (the path), computes the directory
+ static void _zip_resolveDirectory(std::string& completeDir, const std::string& drive, const Array<std::string>& path, const int length){
+@@ -551,12 +561,12 @@
+ 	}
+ 	return true;
+ }
+-
++#endif
+ 
+ // If no zipfile exists, outZipfile and outInternalFile are unchanged
+ bool zipfileExists(const std::string& filename, std::string& outZipfile,
+                    std::string& outInternalFile){
+-   
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+     Array<std::string> path;
+     std::string drive, base, ext, zipfile, infile;
+     parseFilename(filename, drive, path, base, ext);
+@@ -618,7 +628,7 @@
+         }
+         
+     }
+-    
++#endif
+     // not a valid directory structure ever, 
+     // obviously no .zip was found within the path 
+     return false;
+@@ -900,7 +910,7 @@
+ #   endif
+ }
+ 
+-
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+ /**
+  @param path   The zipfile name (no trailing slash)
+  @param prefix Directory inside the zipfile. No leading slash, must have trailing slash if non-empty.
+@@ -951,13 +961,14 @@
+         }
+     }
+ }
+-
++#endif
+ 
+ static void getFileOrDirListZip(const std::string& path,
+                                 const std::string& prefix,
+                                 Array<std::string>& files,
+                                 bool wantFiles,
+                                 bool includePath){
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+     struct zip *z = zip_open( path.c_str(), ZIP_CHECKCONS, NULL );
+ 
+     Set<std::string> fileSet;
+@@ -973,6 +984,7 @@
+     zip_close( z );
+     
+     fileSet.getMembers(files);
++#endif
+ }
+ 
+ 
+diff -urN a/dep/g3dlite/source/prompt.cpp b/dep/g3dlite/source/prompt.cpp
+--- a/dep/g3dlite/source/prompt.cpp	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/source/prompt.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -21,6 +21,7 @@
+ #    define _getch getchar
+ #endif
+ 
++#if 0 /* G3DFIX: exclude GUI prompt code */
+ #ifdef G3D_OSX
+ 
+ /*#ifdef __LP64__
+@@ -37,9 +38,11 @@
+ */
+ 
+ #endif
++#endif /* G3DFIX: exclude GUI prompt code */
+ 
+ namespace G3D {
+ 
++#if 0 /* G3DFIX: exclude GUI prompt code */
+ #ifdef G3D_WIN32
+ 
+ namespace _internal {
+@@ -469,6 +472,7 @@
+ }
+ 
+ #endif
++#endif /* G3DFIX: exclude GUI prompt code */
+ 
+ 
+ /**
+@@ -531,6 +535,8 @@
+     return c;
+ }
+ 
++#if 0 /* G3DFIX: exclude GUI prompt code */
++
+ #ifdef G3D_OSX
+ 
+ // See http://developer.apple.com/documentation/Carbon/Reference/Carbon_Event_Manager_Ref/index.html
+@@ -689,13 +695,15 @@
+ 
+ #endif
+ 
++#endif /* G3DFIX: exclude GUI prompt code */
++
+ int prompt(
+     const char*      windowTitle,
+     const char*      prompt, 
+     const char**     choice,
+     int              numChoices,
+     bool             useGui) {
+-
++#if 0 /* G3DFIX: exclude GUI prompt code */
+     #ifdef G3D_WIN32
+         if (useGui) {
+             // Build the message box
+@@ -709,6 +717,7 @@
+                         return guiPrompt(windowTitle, prompt, choice, numChoices);
+                 }
+         #endif
++#endif /* G3DFIX: exclude GUI prompt code */
+     return textPrompt(windowTitle, prompt, choice, numChoices);
+ }
+ 
+diff -urN a/dep/g3dlite/source/RegistryUtil.cpp b/dep/g3dlite/source/RegistryUtil.cpp
+--- a/dep/g3dlite/source/RegistryUtil.cpp	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/source/RegistryUtil.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -257,7 +257,7 @@
+ 
+ 
+ // static helpers
+-static HKEY getRootKeyFromString(const char* str, uint32 length) {
++static HKEY getRootKeyFromString(const char* str, size_t length) {
+     debugAssert(str);
+ 
+     if (str) {
+diff -urN a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
+--- a/dep/g3dlite/source/System.cpp	2010-02-07 23:39:20.000000000 +0100
++++ b/dep/g3dlite/source/System.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -80,8 +80,9 @@
+ #endif
+ 
+ // SIMM include
++#ifdef __SSE__
+ #include <xmmintrin.h>
+-
++#endif
+ 
+ namespace G3D {
+ 
+@@ -559,7 +560,7 @@
+ #endif
+ }
+ 
+-#if defined(G3D_WIN32)
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
+     #pragma message("Port System::memcpy SIMD to all platforms")
+ /** Michael Herf's fast memcpy */
+ void memcpyMMX(void* dst, const void* src, int nbytes) {
+@@ -610,7 +611,7 @@
+ #endif
+ 
+ void System::memcpy(void* dst, const void* src, size_t numBytes) {
+-#if defined(G3D_WIN32)
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
+     memcpyMMX(dst, src, numBytes);
+ #else
+     ::memcpy(dst, src, numBytes);
+@@ -620,7 +621,7 @@
+ 
+ /** Michael Herf's fastest memset. n32 must be filled with the same
+     character repeated. */
+-#if defined(G3D_WIN32)
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
+     #pragma message("Port System::memfill SIMD to all platforms")
+ 
+ // On x86 processors, use MMX
+@@ -659,7 +660,7 @@
+ 
+ 
+ void System::memset(void* dst, uint8 value, size_t numBytes) {
+-#if defined(G3D_WIN32)
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
+     uint32 v = value;
+     v = v + (v << 8) + (v << 16) + (v << 24); 
+     G3D::memfill(dst, v, numBytes);
+@@ -1676,6 +1677,7 @@
+ 
+ // VC on Intel
+ void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg, uint32& dreg) {
++#if !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit platform */
+     // Can't copy from assembler direct to a function argument (which is on the stack) in VC.
+     uint32 a,b,c,d;
+ 
+@@ -1693,6 +1695,14 @@
+     breg = b; 
+     creg = c;
+     dreg = d;
++#else
++    int CPUInfo[4];
++    __cpuid(CPUInfo, func);
++    memcpy(&areg, &CPUInfo[0], 4);
++    memcpy(&breg, &CPUInfo[1], 4);
++    memcpy(&creg, &CPUInfo[2], 4);
++    memcpy(&dreg, &CPUInfo[3], 4);
++#endif
+ }
+ 
+ #elif defined(G3D_OSX) && ! defined(G3D_OSX_INTEL)
diff --git a/dep/g3dlite/G3D-v8.0_hotfix2.diff b/dep/g3dlite/G3D-v8.0_hotfix2.diff
new file mode 100644
index 0000000000..bb66c4a6a2
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix2.diff
@@ -0,0 +1,14 @@
+diff --git a/dep/g3dlite/source/g3dmath.cpp b/dep/g3dlite/source/g3dmath.cpp
+index e846f8c..84e8345 100644
+--- a/dep/g3dlite/source/g3dmath.cpp
++++ b/dep/g3dlite/source/g3dmath.cpp
+@@ -41,7 +41,7 @@ double inf() {
+ }
+
+ bool isNaN(float x) {
+-    static const float n = nan();
++    static const float n = fnan();
+     return memcmp(&x, &n, sizeof(float)) == 0;
+ }
+
+
diff --git a/dep/g3dlite/G3D-v8.0_hotfix3.diff b/dep/g3dlite/G3D-v8.0_hotfix3.diff
new file mode 100644
index 0000000000..d556103c96
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix3.diff
@@ -0,0 +1,12 @@
+diff --git a/dep/g3dlite/include/G3D/GMutex.h b/dep/g3dlite/include/G3D/GMutex.h
+index 3469b81..9fe098d 100644
+--- a/dep/g3dlite/include/G3D/GMutex.h
++++ b/dep/g3dlite/include/G3D/GMutex.h
+@@ -16,6 +16,7 @@
+ #ifndef G3D_WIN32
+ #   include <pthread.h>
+ #   include <signal.h>
++#   include <unistd.h>
+ #endif
+ 
+ 
diff --git a/dep/g3dlite/G3D-v8.0_hotfix4.diff b/dep/g3dlite/G3D-v8.0_hotfix4.diff
new file mode 100644
index 0000000000..cae92747a9
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix4.diff
@@ -0,0 +1,13 @@
+diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
+index c8d2f0b..11093f4 100644
+--- a/dep/g3dlite/include/G3D/platform.h
++++ b/dep/g3dlite/include/G3D/platform.h
+@@ -57,7 +57,7 @@
+ #elif defined(__linux__)
+     #define G3D_LINUX
+ #elif defined(__APPLE__)
+-    #define G3D_OSX
++    #define G3D_LINUX
+ 
+    // Prevent OS X fp.h header from being included; it defines
+    // pi as a constant, which creates a conflict with G3D
diff --git a/dep/g3dlite/G3D-v8.0_hotfix5.diff b/dep/g3dlite/G3D-v8.0_hotfix5.diff
new file mode 100644
index 0000000000..fd02b329c4
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix5.diff
@@ -0,0 +1,73 @@
+diff --git a/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h
+index 1c0cf99..f160774 100644
+--- a/dep/g3dlite/include/G3D/System.h
++++ b/dep/g3dlite/include/G3D/System.h
+@@ -19,6 +19,9 @@
+ #include "G3D/G3DGameUnits.h"
+ #include "G3D/BinaryFormat.h"
+ #include <string>
++#ifdef G3D_LINUX
++#   include <sys/socket.h>
++#endif
+ 
+ #ifdef G3D_OSX
+ #   include <CoreServices/CoreServices.h>
+diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
+index 11093f4..614c0ed 100644
+--- a/dep/g3dlite/include/G3D/platform.h
++++ b/dep/g3dlite/include/G3D/platform.h
+@@ -56,6 +56,8 @@
+     #define G3D_LINUX
+ #elif defined(__linux__)
+     #define G3D_LINUX
++#elif defined(__CYGWIN__)
++    #define G3D_LINUX
+ #elif defined(__APPLE__)
+     #define G3D_LINUX
+ 
+diff --git a/dep/g3dlite/source/BinaryOutput.cpp b/dep/g3dlite/source/BinaryOutput.cpp
+index 054211d..81fa982 100644
+--- a/dep/g3dlite/source/BinaryOutput.cpp
++++ b/dep/g3dlite/source/BinaryOutput.cpp
+@@ -22,6 +22,10 @@
+ #    include <errno.h>
+ #endif
+ 
++#ifdef __CYGWIN__
++#    include <errno.h>
++#endif
++
+ // Largest memory buffer that the system will use for writing to
+ // disk.  After this (or if the system runs out of memory)
+ // chunks of the file will be dumped to disk.
+diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp
+index 2cf890a..76a3611 100644
+--- a/dep/g3dlite/source/FileSystem.cpp
++++ b/dep/g3dlite/source/FileSystem.cpp
+@@ -35,6 +35,10 @@
+ #   define _stat stat
+ #endif
+ 
++#ifdef __CYGWIN__
++#define stat64 stat
++#endif
++
+ namespace G3D {
+ 
+ static FileSystem* common = NULL;
+diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
+index 809f05c..f6b0e03 100644
+--- a/dep/g3dlite/source/System.cpp
++++ b/dep/g3dlite/source/System.cpp
+@@ -888,7 +888,11 @@ void System::initTime() {
+         
+         if (localTimeVals) {
+             // tm_gmtoff is already corrected for daylight savings.
++            #ifdef __CYGWIN__
++            local = local + _timezone;
++            #else
+             local = local + localTimeVals->tm_gmtoff;
++            #endif
+         }
+         
+         m_realWorldGetTickTime0 = local;
diff --git a/dep/g3dlite/G3D-v8.0_hotfix6.diff b/dep/g3dlite/G3D-v8.0_hotfix6.diff
new file mode 100644
index 0000000000..f22c26d4a7
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix6.diff
@@ -0,0 +1,103 @@
+diff --git a/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
+index 614c0ed..65616f0 100644
+--- a/dep/g3dlite/include/G3D/platform.h
++++ b/dep/g3dlite/include/G3D/platform.h
+@@ -51,6 +51,11 @@
+ 
+ #ifdef _MSC_VER 
+     #define G3D_WIN32
++#elif defined(__MINGW32__)
++    #define G3D_WIN32
++    #undef __MSVCRT_VERSION__
++    #define __MSVCRT_VERSION__ 0x0601
++    #include <windows.h>
+ #elif  defined(__FreeBSD__) || defined(__OpenBSD__)
+     #define G3D_FREEBSD
+     #define G3D_LINUX
+diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp
+index 76a3611..f082937 100644
+--- a/dep/g3dlite/source/FileSystem.cpp
++++ b/dep/g3dlite/source/FileSystem.cpp
+@@ -25,8 +25,11 @@
+ 
+     // Needed for _findfirst
+ #   include <io.h>
+-
+-#define stat64 _stat64
++#  ifdef __MINGW32__
++#    define stat64 stat
++#  else
++#    define stat64 _stat64
++#  endif
+ #else
+ #   include <dirent.h>
+ #   include <fnmatch.h>
+diff --git a/dep/g3dlite/source/RegistryUtil.cpp b/dep/g3dlite/source/RegistryUtil.cpp
+index fc4cebc..7c9e56f 100644
+--- a/dep/g3dlite/source/RegistryUtil.cpp
++++ b/dep/g3dlite/source/RegistryUtil.cpp
+@@ -16,6 +16,15 @@
+ #include "G3D/RegistryUtil.h"
+ #include "G3D/System.h"
+ 
++#ifdef __MINGW32__
++#  ifndef HKEY_PERFORMANCE_TEXT
++#    define HKEY_PERFORMANCE_TEXT ((HKEY)((LONG)0x80000050))
++#  endif
++#  ifndef HKEY_PERFORMANCE_NLSTEXT
++#    define HKEY_PERFORMANCE_NLSTEXT ((HKEY)((LONG)0x80000060))
++#  endif
++#endif
++
+ namespace G3D {
+ 
+ // static helpers
+diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
+index f6b0e03..281104d 100644
+--- a/dep/g3dlite/source/System.cpp
++++ b/dep/g3dlite/source/System.cpp
+@@ -564,7 +564,7 @@ void System::getStandardProcessorExtensions() {
+ #endif
+ }
+ 
+-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
+     #pragma message("Port System::memcpy SIMD to all platforms")
+ /** Michael Herf's fast memcpy */
+ void memcpyMMX(void* dst, const void* src, int nbytes) {
+@@ -615,7 +615,7 @@ void memcpyMMX(void* dst, const void* src, int nbytes) {
+ #endif
+ 
+ void System::memcpy(void* dst, const void* src, size_t numBytes) {
+-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
+     memcpyMMX(dst, src, numBytes);
+ #else
+     ::memcpy(dst, src, numBytes);
+@@ -625,7 +625,7 @@ void System::memcpy(void* dst, const void* src, size_t numBytes) {
+ 
+ /** Michael Herf's fastest memset. n32 must be filled with the same
+     character repeated. */
+-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
+     #pragma message("Port System::memfill SIMD to all platforms")
+ 
+ // On x86 processors, use MMX
+@@ -664,7 +664,7 @@ void memfill(void *dst, int n32, unsigned long i) {
+ 
+ 
+ void System::memset(void* dst, uint8 value, size_t numBytes) {
+-#if defined(G3D_WIN32) && !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit Windows platforms */
++#if defined(G3D_WIN32) && !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit Windows platforms or using MinGW */
+     uint32 v = value;
+     v = v + (v << 8) + (v << 16) + (v << 24); 
+     G3D::memfill(dst, v, numBytes);
+@@ -1696,7 +1696,7 @@ std::string System::currentDateString() {
+ 
+ // VC on Intel
+ void System::cpuid(CPUIDFunction func, uint32& areg, uint32& breg, uint32& creg, uint32& dreg) {
+-#if !defined(G3D_64BIT) /* G3DFIX: Don't check if on 64-bit platform */
++#if !defined(G3D_64BIT) && !defined(__MINGW32__) /* G3DFIX: Don't check if on 64-bit platforms or using MinGW */
+     // Can't copy from assembler direct to a function argument (which is on the stack) in VC.
+     uint32 a,b,c,d;
+ 
diff --git a/dep/g3dlite/G3D-v8.0_hotfix7.diff b/dep/g3dlite/G3D-v8.0_hotfix7.diff
new file mode 100644
index 0000000000..00ab78f5c7
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix7.diff
@@ -0,0 +1,13 @@
+diff --git a/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp
+index 2ce14f6..fbc918f 100644
+--- a/dep/g3dlite/source/Matrix4.cpp
++++ b/dep/g3dlite/source/Matrix4.cpp
+@@ -382,7 +382,7 @@ bool Matrix4::operator==(const Matrix4& other) const {
+     // If the bit patterns are identical, they must be
+     // the same matrix.  If not, they *might* still have
+     // equal elements due to floating point weirdness.
+-    if (memcmp(this, &other, sizeof(Matrix4) == 0)) {
++    if (memcmp(this, &other, sizeof(Matrix4)) == 0) {
+         return true;
+     } 
+ 
diff --git a/dep/g3dlite/G3D-v8.0_hotfix8.diff b/dep/g3dlite/G3D-v8.0_hotfix8.diff
new file mode 100644
index 0000000000..438fd95f77
--- /dev/null
+++ b/dep/g3dlite/G3D-v8.0_hotfix8.diff
@@ -0,0 +1,13 @@
+diff --git a/dep/g3dlite/include/G3D/Vector3int32.h b/dep/g3dlite/include/G3D/Vector3int32.h
+index 2f256ea..c1a6b21 100644
+--- a/dep/g3dlite/include/G3D/Vector3int32.h
++++ b/dep/g3dlite/include/G3D/Vector3int32.h
+@@ -74,7 +74,7 @@ public:
+     inline Vector3int32& operator+=(const Vector3int32& other) {
+         x += other.x;
+         y += other.y;
+-        z += other.y;
++        z += other.z;
+         return *this;
+     }
+ 
diff --git a/modules/dep/g3dlite/Readme.txt b/dep/g3dlite/Readme.txt
similarity index 100%
rename from modules/dep/g3dlite/Readme.txt
rename to dep/g3dlite/Readme.txt
diff --git a/modules/dep/g3dlite/include/G3D/AABox.h b/dep/g3dlite/include/G3D/AABox.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AABox.h
rename to dep/g3dlite/include/G3D/AABox.h
diff --git a/modules/dep/g3dlite/include/G3D/Any.h b/dep/g3dlite/include/G3D/Any.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Any.h
rename to dep/g3dlite/include/G3D/Any.h
diff --git a/modules/dep/g3dlite/include/G3D/AnyVal.h b/dep/g3dlite/include/G3D/AnyVal.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AnyVal.h
rename to dep/g3dlite/include/G3D/AnyVal.h
diff --git a/modules/dep/g3dlite/include/G3D/AreaMemoryManager.h b/dep/g3dlite/include/G3D/AreaMemoryManager.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AreaMemoryManager.h
rename to dep/g3dlite/include/G3D/AreaMemoryManager.h
diff --git a/modules/dep/g3dlite/include/G3D/Array.h b/dep/g3dlite/include/G3D/Array.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Array.h
rename to dep/g3dlite/include/G3D/Array.h
diff --git a/modules/dep/g3dlite/include/G3D/AtomicInt32.h b/dep/g3dlite/include/G3D/AtomicInt32.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/AtomicInt32.h
rename to dep/g3dlite/include/G3D/AtomicInt32.h
diff --git a/modules/dep/g3dlite/include/G3D/BinaryFormat.h b/dep/g3dlite/include/G3D/BinaryFormat.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BinaryFormat.h
rename to dep/g3dlite/include/G3D/BinaryFormat.h
diff --git a/modules/dep/g3dlite/include/G3D/BinaryInput.h b/dep/g3dlite/include/G3D/BinaryInput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BinaryInput.h
rename to dep/g3dlite/include/G3D/BinaryInput.h
diff --git a/modules/dep/g3dlite/include/G3D/BinaryOutput.h b/dep/g3dlite/include/G3D/BinaryOutput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BinaryOutput.h
rename to dep/g3dlite/include/G3D/BinaryOutput.h
diff --git a/modules/dep/g3dlite/include/G3D/BoundsTrait.h b/dep/g3dlite/include/G3D/BoundsTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BoundsTrait.h
rename to dep/g3dlite/include/G3D/BoundsTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/Box.h b/dep/g3dlite/include/G3D/Box.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Box.h
rename to dep/g3dlite/include/G3D/Box.h
diff --git a/modules/dep/g3dlite/include/G3D/Box2D.h b/dep/g3dlite/include/G3D/Box2D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Box2D.h
rename to dep/g3dlite/include/G3D/Box2D.h
diff --git a/modules/dep/g3dlite/include/G3D/BumpMapPreprocess.h b/dep/g3dlite/include/G3D/BumpMapPreprocess.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/BumpMapPreprocess.h
rename to dep/g3dlite/include/G3D/BumpMapPreprocess.h
diff --git a/modules/dep/g3dlite/include/G3D/Capsule.h b/dep/g3dlite/include/G3D/Capsule.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Capsule.h
rename to dep/g3dlite/include/G3D/Capsule.h
diff --git a/modules/dep/g3dlite/include/G3D/CollisionDetection.h b/dep/g3dlite/include/G3D/CollisionDetection.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/CollisionDetection.h
rename to dep/g3dlite/include/G3D/CollisionDetection.h
diff --git a/modules/dep/g3dlite/include/G3D/Color1.h b/dep/g3dlite/include/G3D/Color1.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color1.h
rename to dep/g3dlite/include/G3D/Color1.h
diff --git a/modules/dep/g3dlite/include/G3D/Color1uint8.h b/dep/g3dlite/include/G3D/Color1uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color1uint8.h
rename to dep/g3dlite/include/G3D/Color1uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Color3.h b/dep/g3dlite/include/G3D/Color3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color3.h
rename to dep/g3dlite/include/G3D/Color3.h
diff --git a/modules/dep/g3dlite/include/G3D/Color3uint8.h b/dep/g3dlite/include/G3D/Color3uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color3uint8.h
rename to dep/g3dlite/include/G3D/Color3uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Color4.h b/dep/g3dlite/include/G3D/Color4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color4.h
rename to dep/g3dlite/include/G3D/Color4.h
diff --git a/modules/dep/g3dlite/include/G3D/Color4uint8.h b/dep/g3dlite/include/G3D/Color4uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Color4uint8.h
rename to dep/g3dlite/include/G3D/Color4uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Cone.h b/dep/g3dlite/include/G3D/Cone.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Cone.h
rename to dep/g3dlite/include/G3D/Cone.h
diff --git a/modules/dep/g3dlite/include/G3D/ConvexPolyhedron.h b/dep/g3dlite/include/G3D/ConvexPolyhedron.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ConvexPolyhedron.h
rename to dep/g3dlite/include/G3D/ConvexPolyhedron.h
diff --git a/modules/dep/g3dlite/include/G3D/CoordinateFrame.h b/dep/g3dlite/include/G3D/CoordinateFrame.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/CoordinateFrame.h
rename to dep/g3dlite/include/G3D/CoordinateFrame.h
diff --git a/modules/dep/g3dlite/include/G3D/Crypto.h b/dep/g3dlite/include/G3D/Crypto.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Crypto.h
rename to dep/g3dlite/include/G3D/Crypto.h
diff --git a/modules/dep/g3dlite/include/G3D/Cylinder.h b/dep/g3dlite/include/G3D/Cylinder.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Cylinder.h
rename to dep/g3dlite/include/G3D/Cylinder.h
diff --git a/modules/dep/g3dlite/include/G3D/EqualsTrait.h b/dep/g3dlite/include/G3D/EqualsTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/EqualsTrait.h
rename to dep/g3dlite/include/G3D/EqualsTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/FileSystem.h b/dep/g3dlite/include/G3D/FileSystem.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/FileSystem.h
rename to dep/g3dlite/include/G3D/FileSystem.h
diff --git a/modules/dep/g3dlite/include/G3D/G3D.h b/dep/g3dlite/include/G3D/G3D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/G3D.h
rename to dep/g3dlite/include/G3D/G3D.h
diff --git a/modules/dep/g3dlite/include/G3D/G3DAll.h b/dep/g3dlite/include/G3D/G3DAll.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/G3DAll.h
rename to dep/g3dlite/include/G3D/G3DAll.h
diff --git a/modules/dep/g3dlite/include/G3D/G3DGameUnits.h b/dep/g3dlite/include/G3D/G3DGameUnits.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/G3DGameUnits.h
rename to dep/g3dlite/include/G3D/G3DGameUnits.h
diff --git a/modules/dep/g3dlite/include/G3D/GCamera.h b/dep/g3dlite/include/G3D/GCamera.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GCamera.h
rename to dep/g3dlite/include/G3D/GCamera.h
diff --git a/modules/dep/g3dlite/include/G3D/GImage.h b/dep/g3dlite/include/G3D/GImage.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GImage.h
rename to dep/g3dlite/include/G3D/GImage.h
diff --git a/modules/dep/g3dlite/include/G3D/GLight.h b/dep/g3dlite/include/G3D/GLight.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GLight.h
rename to dep/g3dlite/include/G3D/GLight.h
diff --git a/modules/dep/g3dlite/include/G3D/GMutex.h b/dep/g3dlite/include/G3D/GMutex.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GMutex.h
rename to dep/g3dlite/include/G3D/GMutex.h
diff --git a/modules/dep/g3dlite/include/G3D/GThread.h b/dep/g3dlite/include/G3D/GThread.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GThread.h
rename to dep/g3dlite/include/G3D/GThread.h
diff --git a/modules/dep/g3dlite/include/G3D/GUniqueID.h b/dep/g3dlite/include/G3D/GUniqueID.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/GUniqueID.h
rename to dep/g3dlite/include/G3D/GUniqueID.h
diff --git a/modules/dep/g3dlite/include/G3D/HashTrait.h b/dep/g3dlite/include/G3D/HashTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/HashTrait.h
rename to dep/g3dlite/include/G3D/HashTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/Image1.h b/dep/g3dlite/include/G3D/Image1.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image1.h
rename to dep/g3dlite/include/G3D/Image1.h
diff --git a/modules/dep/g3dlite/include/G3D/Image1uint8.h b/dep/g3dlite/include/G3D/Image1uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image1uint8.h
rename to dep/g3dlite/include/G3D/Image1uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Image3.h b/dep/g3dlite/include/G3D/Image3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image3.h
rename to dep/g3dlite/include/G3D/Image3.h
diff --git a/modules/dep/g3dlite/include/G3D/Image3uint8.h b/dep/g3dlite/include/G3D/Image3uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image3uint8.h
rename to dep/g3dlite/include/G3D/Image3uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/Image4.h b/dep/g3dlite/include/G3D/Image4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image4.h
rename to dep/g3dlite/include/G3D/Image4.h
diff --git a/modules/dep/g3dlite/include/G3D/Image4uint8.h b/dep/g3dlite/include/G3D/Image4uint8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Image4uint8.h
rename to dep/g3dlite/include/G3D/Image4uint8.h
diff --git a/modules/dep/g3dlite/include/G3D/ImageFormat.h b/dep/g3dlite/include/G3D/ImageFormat.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ImageFormat.h
rename to dep/g3dlite/include/G3D/ImageFormat.h
diff --git a/modules/dep/g3dlite/include/G3D/Intersect.h b/dep/g3dlite/include/G3D/Intersect.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Intersect.h
rename to dep/g3dlite/include/G3D/Intersect.h
diff --git a/modules/dep/g3dlite/include/G3D/KDTree.h b/dep/g3dlite/include/G3D/KDTree.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/KDTree.h
rename to dep/g3dlite/include/G3D/KDTree.h
diff --git a/modules/dep/g3dlite/include/G3D/Line.h b/dep/g3dlite/include/G3D/Line.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Line.h
rename to dep/g3dlite/include/G3D/Line.h
diff --git a/modules/dep/g3dlite/include/G3D/LineSegment.h b/dep/g3dlite/include/G3D/LineSegment.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/LineSegment.h
rename to dep/g3dlite/include/G3D/LineSegment.h
diff --git a/modules/dep/g3dlite/include/G3D/Log.h b/dep/g3dlite/include/G3D/Log.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Log.h
rename to dep/g3dlite/include/G3D/Log.h
diff --git a/modules/dep/g3dlite/include/G3D/Map2D.h b/dep/g3dlite/include/G3D/Map2D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Map2D.h
rename to dep/g3dlite/include/G3D/Map2D.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix.h b/dep/g3dlite/include/G3D/Matrix.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix.h
rename to dep/g3dlite/include/G3D/Matrix.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix2.h b/dep/g3dlite/include/G3D/Matrix2.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix2.h
rename to dep/g3dlite/include/G3D/Matrix2.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix3.h b/dep/g3dlite/include/G3D/Matrix3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix3.h
rename to dep/g3dlite/include/G3D/Matrix3.h
diff --git a/modules/dep/g3dlite/include/G3D/Matrix4.h b/dep/g3dlite/include/G3D/Matrix4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Matrix4.h
rename to dep/g3dlite/include/G3D/Matrix4.h
diff --git a/modules/dep/g3dlite/include/G3D/MemoryManager.h b/dep/g3dlite/include/G3D/MemoryManager.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/MemoryManager.h
rename to dep/g3dlite/include/G3D/MemoryManager.h
diff --git a/modules/dep/g3dlite/include/G3D/MeshAlg.h b/dep/g3dlite/include/G3D/MeshAlg.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/MeshAlg.h
rename to dep/g3dlite/include/G3D/MeshAlg.h
diff --git a/modules/dep/g3dlite/include/G3D/MeshBuilder.h b/dep/g3dlite/include/G3D/MeshBuilder.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/MeshBuilder.h
rename to dep/g3dlite/include/G3D/MeshBuilder.h
diff --git a/modules/dep/g3dlite/include/G3D/NetAddress.h b/dep/g3dlite/include/G3D/NetAddress.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/NetAddress.h
rename to dep/g3dlite/include/G3D/NetAddress.h
diff --git a/modules/dep/g3dlite/include/G3D/NetworkDevice.h b/dep/g3dlite/include/G3D/NetworkDevice.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/NetworkDevice.h
rename to dep/g3dlite/include/G3D/NetworkDevice.h
diff --git a/modules/dep/g3dlite/include/G3D/ParseError.h b/dep/g3dlite/include/G3D/ParseError.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ParseError.h
rename to dep/g3dlite/include/G3D/ParseError.h
diff --git a/modules/dep/g3dlite/include/G3D/PhysicsFrame.h b/dep/g3dlite/include/G3D/PhysicsFrame.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PhysicsFrame.h
rename to dep/g3dlite/include/G3D/PhysicsFrame.h
diff --git a/modules/dep/g3dlite/include/G3D/PhysicsFrameSpline.h b/dep/g3dlite/include/G3D/PhysicsFrameSpline.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PhysicsFrameSpline.h
rename to dep/g3dlite/include/G3D/PhysicsFrameSpline.h
diff --git a/modules/dep/g3dlite/include/G3D/Plane.h b/dep/g3dlite/include/G3D/Plane.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Plane.h
rename to dep/g3dlite/include/G3D/Plane.h
diff --git a/modules/dep/g3dlite/include/G3D/PointHashGrid.h b/dep/g3dlite/include/G3D/PointHashGrid.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PointHashGrid.h
rename to dep/g3dlite/include/G3D/PointHashGrid.h
diff --git a/modules/dep/g3dlite/include/G3D/PointKDTree.h b/dep/g3dlite/include/G3D/PointKDTree.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PointKDTree.h
rename to dep/g3dlite/include/G3D/PointKDTree.h
diff --git a/modules/dep/g3dlite/include/G3D/Pointer.h b/dep/g3dlite/include/G3D/Pointer.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Pointer.h
rename to dep/g3dlite/include/G3D/Pointer.h
diff --git a/modules/dep/g3dlite/include/G3D/PositionTrait.h b/dep/g3dlite/include/G3D/PositionTrait.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PositionTrait.h
rename to dep/g3dlite/include/G3D/PositionTrait.h
diff --git a/modules/dep/g3dlite/include/G3D/PrecomputedRandom.h b/dep/g3dlite/include/G3D/PrecomputedRandom.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/PrecomputedRandom.h
rename to dep/g3dlite/include/G3D/PrecomputedRandom.h
diff --git a/modules/dep/g3dlite/include/G3D/Quat.h b/dep/g3dlite/include/G3D/Quat.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Quat.h
rename to dep/g3dlite/include/G3D/Quat.h
diff --git a/modules/dep/g3dlite/include/G3D/Queue.h b/dep/g3dlite/include/G3D/Queue.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Queue.h
rename to dep/g3dlite/include/G3D/Queue.h
diff --git a/modules/dep/g3dlite/include/G3D/Random.h b/dep/g3dlite/include/G3D/Random.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Random.h
rename to dep/g3dlite/include/G3D/Random.h
diff --git a/modules/dep/g3dlite/include/G3D/Ray.h b/dep/g3dlite/include/G3D/Ray.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Ray.h
rename to dep/g3dlite/include/G3D/Ray.h
diff --git a/modules/dep/g3dlite/include/G3D/Rect2D.h b/dep/g3dlite/include/G3D/Rect2D.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Rect2D.h
rename to dep/g3dlite/include/G3D/Rect2D.h
diff --git a/modules/dep/g3dlite/include/G3D/ReferenceCount.h b/dep/g3dlite/include/G3D/ReferenceCount.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ReferenceCount.h
rename to dep/g3dlite/include/G3D/ReferenceCount.h
diff --git a/modules/dep/g3dlite/include/G3D/RegistryUtil.h b/dep/g3dlite/include/G3D/RegistryUtil.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/RegistryUtil.h
rename to dep/g3dlite/include/G3D/RegistryUtil.h
diff --git a/modules/dep/g3dlite/include/G3D/Set.h b/dep/g3dlite/include/G3D/Set.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Set.h
rename to dep/g3dlite/include/G3D/Set.h
diff --git a/modules/dep/g3dlite/include/G3D/SmallArray.h b/dep/g3dlite/include/G3D/SmallArray.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/SmallArray.h
rename to dep/g3dlite/include/G3D/SmallArray.h
diff --git a/modules/dep/g3dlite/include/G3D/Sphere.h b/dep/g3dlite/include/G3D/Sphere.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Sphere.h
rename to dep/g3dlite/include/G3D/Sphere.h
diff --git a/modules/dep/g3dlite/include/G3D/Spline.h b/dep/g3dlite/include/G3D/Spline.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Spline.h
rename to dep/g3dlite/include/G3D/Spline.h
diff --git a/modules/dep/g3dlite/include/G3D/Stopwatch.h b/dep/g3dlite/include/G3D/Stopwatch.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Stopwatch.h
rename to dep/g3dlite/include/G3D/Stopwatch.h
diff --git a/modules/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/System.h
rename to dep/g3dlite/include/G3D/System.h
diff --git a/modules/dep/g3dlite/include/G3D/Table.h b/dep/g3dlite/include/G3D/Table.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Table.h
rename to dep/g3dlite/include/G3D/Table.h
diff --git a/modules/dep/g3dlite/include/G3D/TextInput.h b/dep/g3dlite/include/G3D/TextInput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/TextInput.h
rename to dep/g3dlite/include/G3D/TextInput.h
diff --git a/modules/dep/g3dlite/include/G3D/TextOutput.h b/dep/g3dlite/include/G3D/TextOutput.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/TextOutput.h
rename to dep/g3dlite/include/G3D/TextOutput.h
diff --git a/modules/dep/g3dlite/include/G3D/ThreadSet.h b/dep/g3dlite/include/G3D/ThreadSet.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/ThreadSet.h
rename to dep/g3dlite/include/G3D/ThreadSet.h
diff --git a/modules/dep/g3dlite/include/G3D/Triangle.h b/dep/g3dlite/include/G3D/Triangle.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Triangle.h
rename to dep/g3dlite/include/G3D/Triangle.h
diff --git a/modules/dep/g3dlite/include/G3D/UprightFrame.h b/dep/g3dlite/include/G3D/UprightFrame.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/UprightFrame.h
rename to dep/g3dlite/include/G3D/UprightFrame.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector2.h b/dep/g3dlite/include/G3D/Vector2.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector2.h
rename to dep/g3dlite/include/G3D/Vector2.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector2int16.h b/dep/g3dlite/include/G3D/Vector2int16.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector2int16.h
rename to dep/g3dlite/include/G3D/Vector2int16.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector3.h b/dep/g3dlite/include/G3D/Vector3.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector3.h
rename to dep/g3dlite/include/G3D/Vector3.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector3int16.h b/dep/g3dlite/include/G3D/Vector3int16.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector3int16.h
rename to dep/g3dlite/include/G3D/Vector3int16.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector3int32.h b/dep/g3dlite/include/G3D/Vector3int32.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector3int32.h
rename to dep/g3dlite/include/G3D/Vector3int32.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector4.h b/dep/g3dlite/include/G3D/Vector4.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector4.h
rename to dep/g3dlite/include/G3D/Vector4.h
diff --git a/modules/dep/g3dlite/include/G3D/Vector4int8.h b/dep/g3dlite/include/G3D/Vector4int8.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Vector4int8.h
rename to dep/g3dlite/include/G3D/Vector4int8.h
diff --git a/modules/dep/g3dlite/include/G3D/WeakCache.h b/dep/g3dlite/include/G3D/WeakCache.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/WeakCache.h
rename to dep/g3dlite/include/G3D/WeakCache.h
diff --git a/modules/dep/g3dlite/include/G3D/Welder.h b/dep/g3dlite/include/G3D/Welder.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/Welder.h
rename to dep/g3dlite/include/G3D/Welder.h
diff --git a/modules/dep/g3dlite/include/G3D/WrapMode.h b/dep/g3dlite/include/G3D/WrapMode.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/WrapMode.h
rename to dep/g3dlite/include/G3D/WrapMode.h
diff --git a/modules/dep/g3dlite/include/G3D/XML.h b/dep/g3dlite/include/G3D/XML.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/XML.h
rename to dep/g3dlite/include/G3D/XML.h
diff --git a/modules/dep/g3dlite/include/G3D/constants.h b/dep/g3dlite/include/G3D/constants.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/constants.h
rename to dep/g3dlite/include/G3D/constants.h
diff --git a/modules/dep/g3dlite/include/G3D/debug.h b/dep/g3dlite/include/G3D/debug.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/debug.h
rename to dep/g3dlite/include/G3D/debug.h
diff --git a/modules/dep/g3dlite/include/G3D/debugAssert.h b/dep/g3dlite/include/G3D/debugAssert.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/debugAssert.h
rename to dep/g3dlite/include/G3D/debugAssert.h
diff --git a/modules/dep/g3dlite/include/G3D/debugPrintf.h b/dep/g3dlite/include/G3D/debugPrintf.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/debugPrintf.h
rename to dep/g3dlite/include/G3D/debugPrintf.h
diff --git a/modules/dep/g3dlite/include/G3D/enumclass.h b/dep/g3dlite/include/G3D/enumclass.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/enumclass.h
rename to dep/g3dlite/include/G3D/enumclass.h
diff --git a/modules/dep/g3dlite/include/G3D/fileutils.h b/dep/g3dlite/include/G3D/fileutils.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/fileutils.h
rename to dep/g3dlite/include/G3D/fileutils.h
diff --git a/modules/dep/g3dlite/include/G3D/filter.h b/dep/g3dlite/include/G3D/filter.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/filter.h
rename to dep/g3dlite/include/G3D/filter.h
diff --git a/modules/dep/g3dlite/include/G3D/format.h b/dep/g3dlite/include/G3D/format.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/format.h
rename to dep/g3dlite/include/G3D/format.h
diff --git a/modules/dep/g3dlite/include/G3D/g3dfnmatch.h b/dep/g3dlite/include/G3D/g3dfnmatch.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/g3dfnmatch.h
rename to dep/g3dlite/include/G3D/g3dfnmatch.h
diff --git a/modules/dep/g3dlite/include/G3D/g3dmath.h b/dep/g3dlite/include/G3D/g3dmath.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/g3dmath.h
rename to dep/g3dlite/include/G3D/g3dmath.h
diff --git a/modules/dep/g3dlite/include/G3D/netheaders.h b/dep/g3dlite/include/G3D/netheaders.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/netheaders.h
rename to dep/g3dlite/include/G3D/netheaders.h
diff --git a/modules/dep/g3dlite/include/G3D/networkHelpers.h b/dep/g3dlite/include/G3D/networkHelpers.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/networkHelpers.h
rename to dep/g3dlite/include/G3D/networkHelpers.h
diff --git a/modules/dep/g3dlite/include/G3D/platform.h b/dep/g3dlite/include/G3D/platform.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/platform.h
rename to dep/g3dlite/include/G3D/platform.h
diff --git a/modules/dep/g3dlite/include/G3D/prompt.h b/dep/g3dlite/include/G3D/prompt.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/prompt.h
rename to dep/g3dlite/include/G3D/prompt.h
diff --git a/modules/dep/g3dlite/include/G3D/serialize.h b/dep/g3dlite/include/G3D/serialize.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/serialize.h
rename to dep/g3dlite/include/G3D/serialize.h
diff --git a/modules/dep/g3dlite/include/G3D/splinefunc.h b/dep/g3dlite/include/G3D/splinefunc.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/splinefunc.h
rename to dep/g3dlite/include/G3D/splinefunc.h
diff --git a/modules/dep/g3dlite/include/G3D/stringutils.h b/dep/g3dlite/include/G3D/stringutils.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/stringutils.h
rename to dep/g3dlite/include/G3D/stringutils.h
diff --git a/modules/dep/g3dlite/include/G3D/uint128.h b/dep/g3dlite/include/G3D/uint128.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/uint128.h
rename to dep/g3dlite/include/G3D/uint128.h
diff --git a/modules/dep/g3dlite/include/G3D/units.h b/dep/g3dlite/include/G3D/units.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/units.h
rename to dep/g3dlite/include/G3D/units.h
diff --git a/modules/dep/g3dlite/include/G3D/vectorMath.h b/dep/g3dlite/include/G3D/vectorMath.h
similarity index 100%
rename from modules/dep/g3dlite/include/G3D/vectorMath.h
rename to dep/g3dlite/include/G3D/vectorMath.h
diff --git a/modules/dep/g3dlite/source/AABox.cpp b/dep/g3dlite/source/AABox.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/AABox.cpp
rename to dep/g3dlite/source/AABox.cpp
diff --git a/modules/dep/g3dlite/source/Any.cpp b/dep/g3dlite/source/Any.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Any.cpp
rename to dep/g3dlite/source/Any.cpp
diff --git a/modules/dep/g3dlite/source/AnyVal.cpp b/dep/g3dlite/source/AnyVal.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/AnyVal.cpp
rename to dep/g3dlite/source/AnyVal.cpp
diff --git a/modules/dep/g3dlite/source/AreaMemoryManager.cpp b/dep/g3dlite/source/AreaMemoryManager.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/AreaMemoryManager.cpp
rename to dep/g3dlite/source/AreaMemoryManager.cpp
diff --git a/modules/dep/g3dlite/source/BinaryFormat.cpp b/dep/g3dlite/source/BinaryFormat.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BinaryFormat.cpp
rename to dep/g3dlite/source/BinaryFormat.cpp
diff --git a/modules/dep/g3dlite/source/BinaryInput.cpp b/dep/g3dlite/source/BinaryInput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BinaryInput.cpp
rename to dep/g3dlite/source/BinaryInput.cpp
diff --git a/modules/dep/g3dlite/source/BinaryOutput.cpp b/dep/g3dlite/source/BinaryOutput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BinaryOutput.cpp
rename to dep/g3dlite/source/BinaryOutput.cpp
diff --git a/modules/dep/g3dlite/source/Box.cpp b/dep/g3dlite/source/Box.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Box.cpp
rename to dep/g3dlite/source/Box.cpp
diff --git a/modules/dep/g3dlite/source/Box2D.cpp b/dep/g3dlite/source/Box2D.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Box2D.cpp
rename to dep/g3dlite/source/Box2D.cpp
diff --git a/modules/dep/g3dlite/source/BumpMapPreprocess.cpp b/dep/g3dlite/source/BumpMapPreprocess.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/BumpMapPreprocess.cpp
rename to dep/g3dlite/source/BumpMapPreprocess.cpp
diff --git a/modules/dep/g3dlite/source/Capsule.cpp b/dep/g3dlite/source/Capsule.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Capsule.cpp
rename to dep/g3dlite/source/Capsule.cpp
diff --git a/modules/dep/g3dlite/source/CollisionDetection.cpp b/dep/g3dlite/source/CollisionDetection.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/CollisionDetection.cpp
rename to dep/g3dlite/source/CollisionDetection.cpp
diff --git a/modules/dep/g3dlite/source/Color1.cpp b/dep/g3dlite/source/Color1.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color1.cpp
rename to dep/g3dlite/source/Color1.cpp
diff --git a/modules/dep/g3dlite/source/Color1uint8.cpp b/dep/g3dlite/source/Color1uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color1uint8.cpp
rename to dep/g3dlite/source/Color1uint8.cpp
diff --git a/modules/dep/g3dlite/source/Color3.cpp b/dep/g3dlite/source/Color3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color3.cpp
rename to dep/g3dlite/source/Color3.cpp
diff --git a/modules/dep/g3dlite/source/Color3uint8.cpp b/dep/g3dlite/source/Color3uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color3uint8.cpp
rename to dep/g3dlite/source/Color3uint8.cpp
diff --git a/modules/dep/g3dlite/source/Color4.cpp b/dep/g3dlite/source/Color4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color4.cpp
rename to dep/g3dlite/source/Color4.cpp
diff --git a/modules/dep/g3dlite/source/Color4uint8.cpp b/dep/g3dlite/source/Color4uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Color4uint8.cpp
rename to dep/g3dlite/source/Color4uint8.cpp
diff --git a/modules/dep/g3dlite/source/Cone.cpp b/dep/g3dlite/source/Cone.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Cone.cpp
rename to dep/g3dlite/source/Cone.cpp
diff --git a/modules/dep/g3dlite/source/ConvexPolyhedron.cpp b/dep/g3dlite/source/ConvexPolyhedron.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ConvexPolyhedron.cpp
rename to dep/g3dlite/source/ConvexPolyhedron.cpp
diff --git a/modules/dep/g3dlite/source/CoordinateFrame.cpp b/dep/g3dlite/source/CoordinateFrame.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/CoordinateFrame.cpp
rename to dep/g3dlite/source/CoordinateFrame.cpp
diff --git a/modules/dep/g3dlite/source/Crypto.cpp b/dep/g3dlite/source/Crypto.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Crypto.cpp
rename to dep/g3dlite/source/Crypto.cpp
diff --git a/modules/dep/g3dlite/source/Crypto_md5.cpp b/dep/g3dlite/source/Crypto_md5.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Crypto_md5.cpp
rename to dep/g3dlite/source/Crypto_md5.cpp
diff --git a/modules/dep/g3dlite/source/Cylinder.cpp b/dep/g3dlite/source/Cylinder.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Cylinder.cpp
rename to dep/g3dlite/source/Cylinder.cpp
diff --git a/modules/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/FileSystem.cpp
rename to dep/g3dlite/source/FileSystem.cpp
diff --git a/modules/dep/g3dlite/source/GCamera.cpp b/dep/g3dlite/source/GCamera.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GCamera.cpp
rename to dep/g3dlite/source/GCamera.cpp
diff --git a/modules/dep/g3dlite/source/GImage.cpp b/dep/g3dlite/source/GImage.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage.cpp
rename to dep/g3dlite/source/GImage.cpp
diff --git a/modules/dep/g3dlite/source/GImage_bayer.cpp b/dep/g3dlite/source/GImage_bayer.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_bayer.cpp
rename to dep/g3dlite/source/GImage_bayer.cpp
diff --git a/modules/dep/g3dlite/source/GImage_bmp.cpp b/dep/g3dlite/source/GImage_bmp.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_bmp.cpp
rename to dep/g3dlite/source/GImage_bmp.cpp
diff --git a/modules/dep/g3dlite/source/GImage_jpeg.cpp b/dep/g3dlite/source/GImage_jpeg.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_jpeg.cpp
rename to dep/g3dlite/source/GImage_jpeg.cpp
diff --git a/modules/dep/g3dlite/source/GImage_png.cpp b/dep/g3dlite/source/GImage_png.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_png.cpp
rename to dep/g3dlite/source/GImage_png.cpp
diff --git a/modules/dep/g3dlite/source/GImage_ppm.cpp b/dep/g3dlite/source/GImage_ppm.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_ppm.cpp
rename to dep/g3dlite/source/GImage_ppm.cpp
diff --git a/modules/dep/g3dlite/source/GImage_tga.cpp b/dep/g3dlite/source/GImage_tga.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GImage_tga.cpp
rename to dep/g3dlite/source/GImage_tga.cpp
diff --git a/modules/dep/g3dlite/source/GLight.cpp b/dep/g3dlite/source/GLight.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GLight.cpp
rename to dep/g3dlite/source/GLight.cpp
diff --git a/modules/dep/g3dlite/source/GThread.cpp b/dep/g3dlite/source/GThread.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GThread.cpp
rename to dep/g3dlite/source/GThread.cpp
diff --git a/modules/dep/g3dlite/source/GUniqueID.cpp b/dep/g3dlite/source/GUniqueID.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/GUniqueID.cpp
rename to dep/g3dlite/source/GUniqueID.cpp
diff --git a/modules/dep/g3dlite/source/Image1.cpp b/dep/g3dlite/source/Image1.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image1.cpp
rename to dep/g3dlite/source/Image1.cpp
diff --git a/modules/dep/g3dlite/source/Image1uint8.cpp b/dep/g3dlite/source/Image1uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image1uint8.cpp
rename to dep/g3dlite/source/Image1uint8.cpp
diff --git a/modules/dep/g3dlite/source/Image3.cpp b/dep/g3dlite/source/Image3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image3.cpp
rename to dep/g3dlite/source/Image3.cpp
diff --git a/modules/dep/g3dlite/source/Image3uint8.cpp b/dep/g3dlite/source/Image3uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image3uint8.cpp
rename to dep/g3dlite/source/Image3uint8.cpp
diff --git a/modules/dep/g3dlite/source/Image4.cpp b/dep/g3dlite/source/Image4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image4.cpp
rename to dep/g3dlite/source/Image4.cpp
diff --git a/modules/dep/g3dlite/source/Image4uint8.cpp b/dep/g3dlite/source/Image4uint8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Image4uint8.cpp
rename to dep/g3dlite/source/Image4uint8.cpp
diff --git a/modules/dep/g3dlite/source/ImageFormat.cpp b/dep/g3dlite/source/ImageFormat.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ImageFormat.cpp
rename to dep/g3dlite/source/ImageFormat.cpp
diff --git a/modules/dep/g3dlite/source/ImageFormat_convert.cpp b/dep/g3dlite/source/ImageFormat_convert.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ImageFormat_convert.cpp
rename to dep/g3dlite/source/ImageFormat_convert.cpp
diff --git a/modules/dep/g3dlite/source/Intersect.cpp b/dep/g3dlite/source/Intersect.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Intersect.cpp
rename to dep/g3dlite/source/Intersect.cpp
diff --git a/modules/dep/g3dlite/source/Line.cpp b/dep/g3dlite/source/Line.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Line.cpp
rename to dep/g3dlite/source/Line.cpp
diff --git a/modules/dep/g3dlite/source/LineSegment.cpp b/dep/g3dlite/source/LineSegment.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/LineSegment.cpp
rename to dep/g3dlite/source/LineSegment.cpp
diff --git a/modules/dep/g3dlite/source/Log.cpp b/dep/g3dlite/source/Log.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Log.cpp
rename to dep/g3dlite/source/Log.cpp
diff --git a/modules/dep/g3dlite/source/Matrix.cpp b/dep/g3dlite/source/Matrix.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Matrix.cpp
rename to dep/g3dlite/source/Matrix.cpp
diff --git a/modules/dep/g3dlite/source/Matrix3.cpp b/dep/g3dlite/source/Matrix3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Matrix3.cpp
rename to dep/g3dlite/source/Matrix3.cpp
diff --git a/modules/dep/g3dlite/source/Matrix4.cpp b/dep/g3dlite/source/Matrix4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Matrix4.cpp
rename to dep/g3dlite/source/Matrix4.cpp
diff --git a/modules/dep/g3dlite/source/MemoryManager.cpp b/dep/g3dlite/source/MemoryManager.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MemoryManager.cpp
rename to dep/g3dlite/source/MemoryManager.cpp
diff --git a/modules/dep/g3dlite/source/MeshAlg.cpp b/dep/g3dlite/source/MeshAlg.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshAlg.cpp
rename to dep/g3dlite/source/MeshAlg.cpp
diff --git a/modules/dep/g3dlite/source/MeshAlgAdjacency.cpp b/dep/g3dlite/source/MeshAlgAdjacency.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshAlgAdjacency.cpp
rename to dep/g3dlite/source/MeshAlgAdjacency.cpp
diff --git a/modules/dep/g3dlite/source/MeshAlgWeld.cpp b/dep/g3dlite/source/MeshAlgWeld.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshAlgWeld.cpp
rename to dep/g3dlite/source/MeshAlgWeld.cpp
diff --git a/modules/dep/g3dlite/source/MeshBuilder.cpp b/dep/g3dlite/source/MeshBuilder.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/MeshBuilder.cpp
rename to dep/g3dlite/source/MeshBuilder.cpp
diff --git a/modules/dep/g3dlite/source/NetAddress.cpp b/dep/g3dlite/source/NetAddress.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/NetAddress.cpp
rename to dep/g3dlite/source/NetAddress.cpp
diff --git a/modules/dep/g3dlite/source/NetworkDevice.cpp b/dep/g3dlite/source/NetworkDevice.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/NetworkDevice.cpp
rename to dep/g3dlite/source/NetworkDevice.cpp
diff --git a/modules/dep/g3dlite/source/PhysicsFrame.cpp b/dep/g3dlite/source/PhysicsFrame.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/PhysicsFrame.cpp
rename to dep/g3dlite/source/PhysicsFrame.cpp
diff --git a/modules/dep/g3dlite/source/PhysicsFrameSpline.cpp b/dep/g3dlite/source/PhysicsFrameSpline.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/PhysicsFrameSpline.cpp
rename to dep/g3dlite/source/PhysicsFrameSpline.cpp
diff --git a/modules/dep/g3dlite/source/Plane.cpp b/dep/g3dlite/source/Plane.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Plane.cpp
rename to dep/g3dlite/source/Plane.cpp
diff --git a/modules/dep/g3dlite/source/PrecomputedRandom.cpp b/dep/g3dlite/source/PrecomputedRandom.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/PrecomputedRandom.cpp
rename to dep/g3dlite/source/PrecomputedRandom.cpp
diff --git a/modules/dep/g3dlite/source/Quat.cpp b/dep/g3dlite/source/Quat.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Quat.cpp
rename to dep/g3dlite/source/Quat.cpp
diff --git a/modules/dep/g3dlite/source/Random.cpp b/dep/g3dlite/source/Random.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Random.cpp
rename to dep/g3dlite/source/Random.cpp
diff --git a/modules/dep/g3dlite/source/Ray.cpp b/dep/g3dlite/source/Ray.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Ray.cpp
rename to dep/g3dlite/source/Ray.cpp
diff --git a/modules/dep/g3dlite/source/Rect2D.cpp b/dep/g3dlite/source/Rect2D.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Rect2D.cpp
rename to dep/g3dlite/source/Rect2D.cpp
diff --git a/modules/dep/g3dlite/source/ReferenceCount.cpp b/dep/g3dlite/source/ReferenceCount.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ReferenceCount.cpp
rename to dep/g3dlite/source/ReferenceCount.cpp
diff --git a/modules/dep/g3dlite/source/RegistryUtil.cpp b/dep/g3dlite/source/RegistryUtil.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/RegistryUtil.cpp
rename to dep/g3dlite/source/RegistryUtil.cpp
diff --git a/modules/dep/g3dlite/source/Sphere.cpp b/dep/g3dlite/source/Sphere.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Sphere.cpp
rename to dep/g3dlite/source/Sphere.cpp
diff --git a/modules/dep/g3dlite/source/SplineBase.cpp b/dep/g3dlite/source/SplineBase.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/SplineBase.cpp
rename to dep/g3dlite/source/SplineBase.cpp
diff --git a/modules/dep/g3dlite/source/Stopwatch.cpp b/dep/g3dlite/source/Stopwatch.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Stopwatch.cpp
rename to dep/g3dlite/source/Stopwatch.cpp
diff --git a/modules/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/System.cpp
rename to dep/g3dlite/source/System.cpp
diff --git a/modules/dep/g3dlite/source/TextInput.cpp b/dep/g3dlite/source/TextInput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/TextInput.cpp
rename to dep/g3dlite/source/TextInput.cpp
diff --git a/modules/dep/g3dlite/source/TextOutput.cpp b/dep/g3dlite/source/TextOutput.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/TextOutput.cpp
rename to dep/g3dlite/source/TextOutput.cpp
diff --git a/modules/dep/g3dlite/source/ThreadSet.cpp b/dep/g3dlite/source/ThreadSet.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/ThreadSet.cpp
rename to dep/g3dlite/source/ThreadSet.cpp
diff --git a/modules/dep/g3dlite/source/Triangle.cpp b/dep/g3dlite/source/Triangle.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Triangle.cpp
rename to dep/g3dlite/source/Triangle.cpp
diff --git a/modules/dep/g3dlite/source/UprightFrame.cpp b/dep/g3dlite/source/UprightFrame.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/UprightFrame.cpp
rename to dep/g3dlite/source/UprightFrame.cpp
diff --git a/modules/dep/g3dlite/source/Vector2.cpp b/dep/g3dlite/source/Vector2.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector2.cpp
rename to dep/g3dlite/source/Vector2.cpp
diff --git a/modules/dep/g3dlite/source/Vector2int16.cpp b/dep/g3dlite/source/Vector2int16.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector2int16.cpp
rename to dep/g3dlite/source/Vector2int16.cpp
diff --git a/modules/dep/g3dlite/source/Vector3.cpp b/dep/g3dlite/source/Vector3.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector3.cpp
rename to dep/g3dlite/source/Vector3.cpp
diff --git a/modules/dep/g3dlite/source/Vector3int16.cpp b/dep/g3dlite/source/Vector3int16.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector3int16.cpp
rename to dep/g3dlite/source/Vector3int16.cpp
diff --git a/modules/dep/g3dlite/source/Vector3int32.cpp b/dep/g3dlite/source/Vector3int32.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector3int32.cpp
rename to dep/g3dlite/source/Vector3int32.cpp
diff --git a/modules/dep/g3dlite/source/Vector4.cpp b/dep/g3dlite/source/Vector4.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector4.cpp
rename to dep/g3dlite/source/Vector4.cpp
diff --git a/modules/dep/g3dlite/source/Vector4int8.cpp b/dep/g3dlite/source/Vector4int8.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Vector4int8.cpp
rename to dep/g3dlite/source/Vector4int8.cpp
diff --git a/modules/dep/g3dlite/source/Welder.cpp b/dep/g3dlite/source/Welder.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/Welder.cpp
rename to dep/g3dlite/source/Welder.cpp
diff --git a/modules/dep/g3dlite/source/WinMain.cpp b/dep/g3dlite/source/WinMain.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/WinMain.cpp
rename to dep/g3dlite/source/WinMain.cpp
diff --git a/modules/dep/g3dlite/source/XML.cpp b/dep/g3dlite/source/XML.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/XML.cpp
rename to dep/g3dlite/source/XML.cpp
diff --git a/modules/dep/g3dlite/source/constants.cpp b/dep/g3dlite/source/constants.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/constants.cpp
rename to dep/g3dlite/source/constants.cpp
diff --git a/modules/dep/g3dlite/source/debugAssert.cpp b/dep/g3dlite/source/debugAssert.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/debugAssert.cpp
rename to dep/g3dlite/source/debugAssert.cpp
diff --git a/modules/dep/g3dlite/source/fileutils.cpp b/dep/g3dlite/source/fileutils.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/fileutils.cpp
rename to dep/g3dlite/source/fileutils.cpp
diff --git a/modules/dep/g3dlite/source/filter.cpp b/dep/g3dlite/source/filter.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/filter.cpp
rename to dep/g3dlite/source/filter.cpp
diff --git a/modules/dep/g3dlite/source/format.cpp b/dep/g3dlite/source/format.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/format.cpp
rename to dep/g3dlite/source/format.cpp
diff --git a/modules/dep/g3dlite/source/g3dfnmatch.cpp b/dep/g3dlite/source/g3dfnmatch.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/g3dfnmatch.cpp
rename to dep/g3dlite/source/g3dfnmatch.cpp
diff --git a/modules/dep/g3dlite/source/g3dmath.cpp b/dep/g3dlite/source/g3dmath.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/g3dmath.cpp
rename to dep/g3dlite/source/g3dmath.cpp
diff --git a/modules/dep/g3dlite/source/license.cpp b/dep/g3dlite/source/license.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/license.cpp
rename to dep/g3dlite/source/license.cpp
diff --git a/modules/dep/g3dlite/source/prompt.cpp b/dep/g3dlite/source/prompt.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/prompt.cpp
rename to dep/g3dlite/source/prompt.cpp
diff --git a/modules/dep/g3dlite/source/stringutils.cpp b/dep/g3dlite/source/stringutils.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/stringutils.cpp
rename to dep/g3dlite/source/stringutils.cpp
diff --git a/modules/dep/g3dlite/source/uint128.cpp b/dep/g3dlite/source/uint128.cpp
similarity index 100%
rename from modules/dep/g3dlite/source/uint128.cpp
rename to dep/g3dlite/source/uint128.cpp
diff --git a/modules/dep/gsoap/CMakeLists.txt b/dep/gsoap/CMakeLists.txt
similarity index 100%
rename from modules/dep/gsoap/CMakeLists.txt
rename to dep/gsoap/CMakeLists.txt
diff --git a/modules/dep/gsoap/gsoap.stub b/dep/gsoap/gsoap.stub
similarity index 100%
rename from modules/dep/gsoap/gsoap.stub
rename to dep/gsoap/gsoap.stub
diff --git a/modules/dep/gsoap/soapC.cpp b/dep/gsoap/soapC.cpp
similarity index 100%
rename from modules/dep/gsoap/soapC.cpp
rename to dep/gsoap/soapC.cpp
diff --git a/modules/dep/gsoap/soapH.h b/dep/gsoap/soapH.h
similarity index 100%
rename from modules/dep/gsoap/soapH.h
rename to dep/gsoap/soapH.h
diff --git a/modules/dep/gsoap/soapServer.cpp b/dep/gsoap/soapServer.cpp
similarity index 100%
rename from modules/dep/gsoap/soapServer.cpp
rename to dep/gsoap/soapServer.cpp
diff --git a/modules/dep/gsoap/soapStub.h b/dep/gsoap/soapStub.h
similarity index 100%
rename from modules/dep/gsoap/soapStub.h
rename to dep/gsoap/soapStub.h
diff --git a/modules/dep/gsoap/stdsoap2.cpp b/dep/gsoap/stdsoap2.cpp
similarity index 100%
rename from modules/dep/gsoap/stdsoap2.cpp
rename to dep/gsoap/stdsoap2.cpp
diff --git a/modules/dep/gsoap/stdsoap2.h b/dep/gsoap/stdsoap2.h
similarity index 100%
rename from modules/dep/gsoap/stdsoap2.h
rename to dep/gsoap/stdsoap2.h
diff --git a/dep/gsoap/tc_changes.diff b/dep/gsoap/tc_changes.diff
new file mode 100644
index 0000000000..e5c47c66b7
--- /dev/null
+++ b/dep/gsoap/tc_changes.diff
@@ -0,0 +1,16 @@
+diff -r 830b8f9ed332 dep/gsoap/stdsoap2.cpp
+--- a/dep/gsoap/stdsoap2.cpp    Tue Dec 21 10:07:43 2010 -0500
++++ b/dep/gsoap/stdsoap2.cpp    Tue Dec 21 10:07:55 2010 -0500
+@@ -15038,10 +15038,12 @@
+       }
+       s = soap->tmpbuf;
+     }
++/*
+     else if (status == SOAP_OK && soap->action && strlen(soap->action) < sizeof(soap->tmpbuf) - 80)
+     { sprintf(soap->tmpbuf, "%s; action=\"%s\"", s, soap->action);
+       s = soap->tmpbuf;
+     }
++*/
+ #endif
+     if (s && (err = soap->fposthdr(soap, "Content-Type", s)))
+       return err;
diff --git a/modules/dep/gsoap/tc_upgrades.txt b/dep/gsoap/tc_upgrades.txt
similarity index 100%
rename from modules/dep/gsoap/tc_upgrades.txt
rename to dep/gsoap/tc_upgrades.txt
diff --git a/modules/dep/jemalloc/CMakeLists.txt b/dep/jemalloc/CMakeLists.txt
similarity index 95%
rename from modules/dep/jemalloc/CMakeLists.txt
rename to dep/jemalloc/CMakeLists.txt
index 9d10346884..7899030835 100644
--- a/modules/dep/jemalloc/CMakeLists.txt
+++ b/dep/jemalloc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -19,7 +19,7 @@ endif()
 
 # Create the header, so we can use it
 configure_file(
-  "${CMAKE_SOURCE_DIR}/modules/dep/jemalloc/jemalloc_defs.h.in.cmake"
+  "${CMAKE_SOURCE_DIR}/dep/jemalloc/jemalloc_defs.h.in.cmake"
   "${BUILDDIR}/jemalloc_defs.h"
   @ONLY
 )
diff --git a/modules/dep/jemalloc/COPYING b/dep/jemalloc/COPYING
similarity index 100%
rename from modules/dep/jemalloc/COPYING
rename to dep/jemalloc/COPYING
diff --git a/modules/dep/jemalloc/ChangeLog b/dep/jemalloc/ChangeLog
similarity index 100%
rename from modules/dep/jemalloc/ChangeLog
rename to dep/jemalloc/ChangeLog
diff --git a/modules/dep/jemalloc/README b/dep/jemalloc/README
similarity index 100%
rename from modules/dep/jemalloc/README
rename to dep/jemalloc/README
diff --git a/modules/dep/jemalloc/TC_NOTE.txt b/dep/jemalloc/TC_NOTE.txt
similarity index 100%
rename from modules/dep/jemalloc/TC_NOTE.txt
rename to dep/jemalloc/TC_NOTE.txt
diff --git a/modules/dep/jemalloc/VERSION b/dep/jemalloc/VERSION
similarity index 100%
rename from modules/dep/jemalloc/VERSION
rename to dep/jemalloc/VERSION
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/arena.h b/dep/jemalloc/include/jemalloc/internal/arena.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/arena.h
rename to dep/jemalloc/include/jemalloc/internal/arena.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/atomic.h b/dep/jemalloc/include/jemalloc/internal/atomic.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/atomic.h
rename to dep/jemalloc/include/jemalloc/internal/atomic.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/base.h b/dep/jemalloc/include/jemalloc/internal/base.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/base.h
rename to dep/jemalloc/include/jemalloc/internal/base.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/bitmap.h b/dep/jemalloc/include/jemalloc/internal/bitmap.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/bitmap.h
rename to dep/jemalloc/include/jemalloc/internal/bitmap.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/chunk.h b/dep/jemalloc/include/jemalloc/internal/chunk.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/chunk.h
rename to dep/jemalloc/include/jemalloc/internal/chunk.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/chunk_dss.h b/dep/jemalloc/include/jemalloc/internal/chunk_dss.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/chunk_dss.h
rename to dep/jemalloc/include/jemalloc/internal/chunk_dss.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/chunk_mmap.h b/dep/jemalloc/include/jemalloc/internal/chunk_mmap.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/chunk_mmap.h
rename to dep/jemalloc/include/jemalloc/internal/chunk_mmap.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/ckh.h b/dep/jemalloc/include/jemalloc/internal/ckh.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/ckh.h
rename to dep/jemalloc/include/jemalloc/internal/ckh.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/ctl.h b/dep/jemalloc/include/jemalloc/internal/ctl.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/ctl.h
rename to dep/jemalloc/include/jemalloc/internal/ctl.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/extent.h b/dep/jemalloc/include/jemalloc/internal/extent.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/extent.h
rename to dep/jemalloc/include/jemalloc/internal/extent.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/hash.h b/dep/jemalloc/include/jemalloc/internal/hash.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/hash.h
rename to dep/jemalloc/include/jemalloc/internal/hash.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/huge.h b/dep/jemalloc/include/jemalloc/internal/huge.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/huge.h
rename to dep/jemalloc/include/jemalloc/internal/huge.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/jemalloc_internal.h b/dep/jemalloc/include/jemalloc/internal/jemalloc_internal.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/jemalloc_internal.h
rename to dep/jemalloc/include/jemalloc/internal/jemalloc_internal.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/mb.h b/dep/jemalloc/include/jemalloc/internal/mb.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/mb.h
rename to dep/jemalloc/include/jemalloc/internal/mb.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/mutex.h b/dep/jemalloc/include/jemalloc/internal/mutex.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/mutex.h
rename to dep/jemalloc/include/jemalloc/internal/mutex.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/private_namespace.h b/dep/jemalloc/include/jemalloc/internal/private_namespace.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/private_namespace.h
rename to dep/jemalloc/include/jemalloc/internal/private_namespace.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/prng.h b/dep/jemalloc/include/jemalloc/internal/prng.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/prng.h
rename to dep/jemalloc/include/jemalloc/internal/prng.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/prof.h b/dep/jemalloc/include/jemalloc/internal/prof.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/prof.h
rename to dep/jemalloc/include/jemalloc/internal/prof.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/ql.h b/dep/jemalloc/include/jemalloc/internal/ql.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/ql.h
rename to dep/jemalloc/include/jemalloc/internal/ql.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/qr.h b/dep/jemalloc/include/jemalloc/internal/qr.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/qr.h
rename to dep/jemalloc/include/jemalloc/internal/qr.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/quarantine.h b/dep/jemalloc/include/jemalloc/internal/quarantine.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/quarantine.h
rename to dep/jemalloc/include/jemalloc/internal/quarantine.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/rb.h b/dep/jemalloc/include/jemalloc/internal/rb.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/rb.h
rename to dep/jemalloc/include/jemalloc/internal/rb.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/rtree.h b/dep/jemalloc/include/jemalloc/internal/rtree.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/rtree.h
rename to dep/jemalloc/include/jemalloc/internal/rtree.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/size_classes.h b/dep/jemalloc/include/jemalloc/internal/size_classes.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/size_classes.h
rename to dep/jemalloc/include/jemalloc/internal/size_classes.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/stats.h b/dep/jemalloc/include/jemalloc/internal/stats.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/stats.h
rename to dep/jemalloc/include/jemalloc/internal/stats.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/tcache.h b/dep/jemalloc/include/jemalloc/internal/tcache.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/tcache.h
rename to dep/jemalloc/include/jemalloc/internal/tcache.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/tsd.h b/dep/jemalloc/include/jemalloc/internal/tsd.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/tsd.h
rename to dep/jemalloc/include/jemalloc/internal/tsd.h
diff --git a/modules/dep/jemalloc/include/jemalloc/internal/util.h b/dep/jemalloc/include/jemalloc/internal/util.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/internal/util.h
rename to dep/jemalloc/include/jemalloc/internal/util.h
diff --git a/modules/dep/jemalloc/include/jemalloc/jemalloc.h b/dep/jemalloc/include/jemalloc/jemalloc.h
similarity index 100%
rename from modules/dep/jemalloc/include/jemalloc/jemalloc.h
rename to dep/jemalloc/include/jemalloc/jemalloc.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/inttypes.h b/dep/jemalloc/include/msvc_compat/inttypes.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/inttypes.h
rename to dep/jemalloc/include/msvc_compat/inttypes.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/stdbool.h b/dep/jemalloc/include/msvc_compat/stdbool.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/stdbool.h
rename to dep/jemalloc/include/msvc_compat/stdbool.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/stdint.h b/dep/jemalloc/include/msvc_compat/stdint.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/stdint.h
rename to dep/jemalloc/include/msvc_compat/stdint.h
diff --git a/modules/dep/jemalloc/include/msvc_compat/strings.h b/dep/jemalloc/include/msvc_compat/strings.h
similarity index 100%
rename from modules/dep/jemalloc/include/msvc_compat/strings.h
rename to dep/jemalloc/include/msvc_compat/strings.h
diff --git a/modules/dep/jemalloc/jemalloc_defs.h.in.cmake b/dep/jemalloc/jemalloc_defs.h.in.cmake
similarity index 100%
rename from modules/dep/jemalloc/jemalloc_defs.h.in.cmake
rename to dep/jemalloc/jemalloc_defs.h.in.cmake
diff --git a/modules/dep/jemalloc/src/arena.c b/dep/jemalloc/src/arena.c
similarity index 100%
rename from modules/dep/jemalloc/src/arena.c
rename to dep/jemalloc/src/arena.c
diff --git a/modules/dep/jemalloc/src/atomic.c b/dep/jemalloc/src/atomic.c
similarity index 100%
rename from modules/dep/jemalloc/src/atomic.c
rename to dep/jemalloc/src/atomic.c
diff --git a/modules/dep/jemalloc/src/base.c b/dep/jemalloc/src/base.c
similarity index 100%
rename from modules/dep/jemalloc/src/base.c
rename to dep/jemalloc/src/base.c
diff --git a/modules/dep/jemalloc/src/bitmap.c b/dep/jemalloc/src/bitmap.c
similarity index 100%
rename from modules/dep/jemalloc/src/bitmap.c
rename to dep/jemalloc/src/bitmap.c
diff --git a/modules/dep/jemalloc/src/chunk.c b/dep/jemalloc/src/chunk.c
similarity index 100%
rename from modules/dep/jemalloc/src/chunk.c
rename to dep/jemalloc/src/chunk.c
diff --git a/modules/dep/jemalloc/src/chunk_dss.c b/dep/jemalloc/src/chunk_dss.c
similarity index 100%
rename from modules/dep/jemalloc/src/chunk_dss.c
rename to dep/jemalloc/src/chunk_dss.c
diff --git a/modules/dep/jemalloc/src/chunk_mmap.c b/dep/jemalloc/src/chunk_mmap.c
similarity index 100%
rename from modules/dep/jemalloc/src/chunk_mmap.c
rename to dep/jemalloc/src/chunk_mmap.c
diff --git a/modules/dep/jemalloc/src/ckh.c b/dep/jemalloc/src/ckh.c
similarity index 100%
rename from modules/dep/jemalloc/src/ckh.c
rename to dep/jemalloc/src/ckh.c
diff --git a/modules/dep/jemalloc/src/ctl.c b/dep/jemalloc/src/ctl.c
similarity index 100%
rename from modules/dep/jemalloc/src/ctl.c
rename to dep/jemalloc/src/ctl.c
diff --git a/modules/dep/jemalloc/src/extent.c b/dep/jemalloc/src/extent.c
similarity index 100%
rename from modules/dep/jemalloc/src/extent.c
rename to dep/jemalloc/src/extent.c
diff --git a/modules/dep/jemalloc/src/hash.c b/dep/jemalloc/src/hash.c
similarity index 100%
rename from modules/dep/jemalloc/src/hash.c
rename to dep/jemalloc/src/hash.c
diff --git a/modules/dep/jemalloc/src/huge.c b/dep/jemalloc/src/huge.c
similarity index 100%
rename from modules/dep/jemalloc/src/huge.c
rename to dep/jemalloc/src/huge.c
diff --git a/modules/dep/jemalloc/src/jemalloc.c b/dep/jemalloc/src/jemalloc.c
similarity index 100%
rename from modules/dep/jemalloc/src/jemalloc.c
rename to dep/jemalloc/src/jemalloc.c
diff --git a/modules/dep/jemalloc/src/mb.c b/dep/jemalloc/src/mb.c
similarity index 100%
rename from modules/dep/jemalloc/src/mb.c
rename to dep/jemalloc/src/mb.c
diff --git a/modules/dep/jemalloc/src/mutex.c b/dep/jemalloc/src/mutex.c
similarity index 100%
rename from modules/dep/jemalloc/src/mutex.c
rename to dep/jemalloc/src/mutex.c
diff --git a/modules/dep/jemalloc/src/prof.c b/dep/jemalloc/src/prof.c
similarity index 100%
rename from modules/dep/jemalloc/src/prof.c
rename to dep/jemalloc/src/prof.c
diff --git a/modules/dep/jemalloc/src/quarantine.c b/dep/jemalloc/src/quarantine.c
similarity index 100%
rename from modules/dep/jemalloc/src/quarantine.c
rename to dep/jemalloc/src/quarantine.c
diff --git a/modules/dep/jemalloc/src/rtree.c b/dep/jemalloc/src/rtree.c
similarity index 100%
rename from modules/dep/jemalloc/src/rtree.c
rename to dep/jemalloc/src/rtree.c
diff --git a/modules/dep/jemalloc/src/stats.c b/dep/jemalloc/src/stats.c
similarity index 100%
rename from modules/dep/jemalloc/src/stats.c
rename to dep/jemalloc/src/stats.c
diff --git a/modules/dep/jemalloc/src/tcache.c b/dep/jemalloc/src/tcache.c
similarity index 100%
rename from modules/dep/jemalloc/src/tcache.c
rename to dep/jemalloc/src/tcache.c
diff --git a/modules/dep/jemalloc/src/tsd.c b/dep/jemalloc/src/tsd.c
similarity index 100%
rename from modules/dep/jemalloc/src/tsd.c
rename to dep/jemalloc/src/tsd.c
diff --git a/modules/dep/jemalloc/src/util.c b/dep/jemalloc/src/util.c
similarity index 100%
rename from modules/dep/jemalloc/src/util.c
rename to dep/jemalloc/src/util.c
diff --git a/modules/dep/jemalloc/src/zone.c b/dep/jemalloc/src/zone.c
similarity index 100%
rename from modules/dep/jemalloc/src/zone.c
rename to dep/jemalloc/src/zone.c
diff --git a/modules/dep/libmpq/AUTHORS b/dep/libmpq/AUTHORS
similarity index 100%
rename from modules/dep/libmpq/AUTHORS
rename to dep/libmpq/AUTHORS
diff --git a/modules/dep/libmpq/CMakeLists.txt b/dep/libmpq/CMakeLists.txt
similarity index 81%
rename from modules/dep/libmpq/CMakeLists.txt
rename to dep/libmpq/CMakeLists.txt
index f6b5c8a28f..c978bdc789 100644
--- a/modules/dep/libmpq/CMakeLists.txt
+++ b/dep/libmpq/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -17,15 +17,15 @@ set(mpq_STAT_SRCS
 if( UNIX )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/modules/dep/zlib
-    ${CMAKE_SOURCE_DIR}/modules/dep/bzip2
+    ${CMAKE_SOURCE_DIR}/dep/zlib
+    ${CMAKE_SOURCE_DIR}/dep/bzip2
   )
 elseif( WIN32 )
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/win
-    ${CMAKE_SOURCE_DIR}/modules/dep/zlib
-    ${CMAKE_SOURCE_DIR}/modules/dep/bzip2
+    ${CMAKE_SOURCE_DIR}/dep/zlib
+    ${CMAKE_SOURCE_DIR}/dep/bzip2
   )
 endif()
 
diff --git a/modules/dep/libmpq/COPYING b/dep/libmpq/COPYING
similarity index 100%
rename from modules/dep/libmpq/COPYING
rename to dep/libmpq/COPYING
diff --git a/modules/dep/libmpq/FAQ b/dep/libmpq/FAQ
similarity index 100%
rename from modules/dep/libmpq/FAQ
rename to dep/libmpq/FAQ
diff --git a/modules/dep/libmpq/INSTALL b/dep/libmpq/INSTALL
similarity index 100%
rename from modules/dep/libmpq/INSTALL
rename to dep/libmpq/INSTALL
diff --git a/modules/dep/libmpq/Makefile.am b/dep/libmpq/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/Makefile.am
rename to dep/libmpq/Makefile.am
diff --git a/modules/dep/libmpq/NEWS b/dep/libmpq/NEWS
similarity index 100%
rename from modules/dep/libmpq/NEWS
rename to dep/libmpq/NEWS
diff --git a/modules/dep/libmpq/README b/dep/libmpq/README
similarity index 100%
rename from modules/dep/libmpq/README
rename to dep/libmpq/README
diff --git a/modules/dep/libmpq/THANKS b/dep/libmpq/THANKS
similarity index 100%
rename from modules/dep/libmpq/THANKS
rename to dep/libmpq/THANKS
diff --git a/modules/dep/libmpq/TODO b/dep/libmpq/TODO
similarity index 100%
rename from modules/dep/libmpq/TODO
rename to dep/libmpq/TODO
diff --git a/modules/dep/libmpq/autogen.sh b/dep/libmpq/autogen.sh
similarity index 100%
rename from modules/dep/libmpq/autogen.sh
rename to dep/libmpq/autogen.sh
diff --git a/modules/dep/libmpq/bindings/Makefile.am b/dep/libmpq/bindings/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/bindings/Makefile.am
rename to dep/libmpq/bindings/Makefile.am
diff --git a/modules/dep/libmpq/bindings/d/Makefile.am b/dep/libmpq/bindings/d/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/bindings/d/Makefile.am
rename to dep/libmpq/bindings/d/Makefile.am
diff --git a/modules/dep/libmpq/bindings/d/dsss.conf b/dep/libmpq/bindings/d/dsss.conf
similarity index 100%
rename from modules/dep/libmpq/bindings/d/dsss.conf
rename to dep/libmpq/bindings/d/dsss.conf
diff --git a/modules/dep/libmpq/bindings/d/mpq.d b/dep/libmpq/bindings/d/mpq.d
similarity index 100%
rename from modules/dep/libmpq/bindings/d/mpq.d
rename to dep/libmpq/bindings/d/mpq.d
diff --git a/modules/dep/libmpq/bindings/python/Makefile.am b/dep/libmpq/bindings/python/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/bindings/python/Makefile.am
rename to dep/libmpq/bindings/python/Makefile.am
diff --git a/modules/dep/libmpq/bindings/python/mpq-info b/dep/libmpq/bindings/python/mpq-info
similarity index 100%
rename from modules/dep/libmpq/bindings/python/mpq-info
rename to dep/libmpq/bindings/python/mpq-info
diff --git a/modules/dep/libmpq/bindings/python/mpq.py b/dep/libmpq/bindings/python/mpq.py
similarity index 100%
rename from modules/dep/libmpq/bindings/python/mpq.py
rename to dep/libmpq/bindings/python/mpq.py
diff --git a/modules/dep/libmpq/config.h b/dep/libmpq/config.h
similarity index 100%
rename from modules/dep/libmpq/config.h
rename to dep/libmpq/config.h
diff --git a/modules/dep/libmpq/configure.ac b/dep/libmpq/configure.ac
similarity index 100%
rename from modules/dep/libmpq/configure.ac
rename to dep/libmpq/configure.ac
diff --git a/modules/dep/libmpq/debian/changelog b/dep/libmpq/debian/changelog
similarity index 100%
rename from modules/dep/libmpq/debian/changelog
rename to dep/libmpq/debian/changelog
diff --git a/modules/dep/libmpq/debian/compat b/dep/libmpq/debian/compat
similarity index 100%
rename from modules/dep/libmpq/debian/compat
rename to dep/libmpq/debian/compat
diff --git a/modules/dep/libmpq/debian/control b/dep/libmpq/debian/control
similarity index 100%
rename from modules/dep/libmpq/debian/control
rename to dep/libmpq/debian/control
diff --git a/modules/dep/libmpq/debian/copyright b/dep/libmpq/debian/copyright
similarity index 100%
rename from modules/dep/libmpq/debian/copyright
rename to dep/libmpq/debian/copyright
diff --git a/modules/dep/libmpq/debian/libmpq-dev.dirs b/dep/libmpq/debian/libmpq-dev.dirs
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq-dev.dirs
rename to dep/libmpq/debian/libmpq-dev.dirs
diff --git a/modules/dep/libmpq/debian/libmpq-dev.install b/dep/libmpq/debian/libmpq-dev.install
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq-dev.install
rename to dep/libmpq/debian/libmpq-dev.install
diff --git a/modules/dep/libmpq/debian/libmpq0.dirs b/dep/libmpq/debian/libmpq0.dirs
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq0.dirs
rename to dep/libmpq/debian/libmpq0.dirs
diff --git a/modules/dep/libmpq/debian/libmpq0.docs b/dep/libmpq/debian/libmpq0.docs
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq0.docs
rename to dep/libmpq/debian/libmpq0.docs
diff --git a/modules/dep/libmpq/debian/libmpq0.install b/dep/libmpq/debian/libmpq0.install
similarity index 100%
rename from modules/dep/libmpq/debian/libmpq0.install
rename to dep/libmpq/debian/libmpq0.install
diff --git a/modules/dep/libmpq/debian/python-mpq.install b/dep/libmpq/debian/python-mpq.install
similarity index 100%
rename from modules/dep/libmpq/debian/python-mpq.install
rename to dep/libmpq/debian/python-mpq.install
diff --git a/modules/dep/libmpq/debian/rules b/dep/libmpq/debian/rules
similarity index 100%
rename from modules/dep/libmpq/debian/rules
rename to dep/libmpq/debian/rules
diff --git a/modules/dep/libmpq/doc/Makefile.am b/dep/libmpq/doc/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/doc/Makefile.am
rename to dep/libmpq/doc/Makefile.am
diff --git a/modules/dep/libmpq/doc/man1/Makefile.am b/dep/libmpq/doc/man1/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/doc/man1/Makefile.am
rename to dep/libmpq/doc/man1/Makefile.am
diff --git a/modules/dep/libmpq/doc/man1/libmpq-config.1 b/dep/libmpq/doc/man1/libmpq-config.1
similarity index 100%
rename from modules/dep/libmpq/doc/man1/libmpq-config.1
rename to dep/libmpq/doc/man1/libmpq-config.1
diff --git a/modules/dep/libmpq/doc/man3/Makefile.am b/dep/libmpq/doc/man3/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/doc/man3/Makefile.am
rename to dep/libmpq/doc/man3/Makefile.am
diff --git a/modules/dep/libmpq/doc/man3/libmpq.3 b/dep/libmpq/doc/man3/libmpq.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq.3
rename to dep/libmpq/doc/man3/libmpq.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_close.3 b/dep/libmpq/doc/man3/libmpq__archive_close.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_close.3
rename to dep/libmpq/doc/man3/libmpq__archive_close.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_files.3 b/dep/libmpq/doc/man3/libmpq__archive_files.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_files.3
rename to dep/libmpq/doc/man3/libmpq__archive_files.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_offset.3 b/dep/libmpq/doc/man3/libmpq__archive_offset.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_offset.3
rename to dep/libmpq/doc/man3/libmpq__archive_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_open.3 b/dep/libmpq/doc/man3/libmpq__archive_open.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_open.3
rename to dep/libmpq/doc/man3/libmpq__archive_open.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_packed_size.3 b/dep/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 dep/libmpq/doc/man3/libmpq__archive_packed_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3 b/dep/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 dep/libmpq/doc/man3/libmpq__archive_unpacked_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__archive_version.3 b/dep/libmpq/doc/man3/libmpq__archive_version.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__archive_version.3
rename to dep/libmpq/doc/man3/libmpq__archive_version.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_close_offset.3 b/dep/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 dep/libmpq/doc/man3/libmpq__block_close_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_open_offset.3 b/dep/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 dep/libmpq/doc/man3/libmpq__block_open_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_read.3 b/dep/libmpq/doc/man3/libmpq__block_read.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__block_read.3
rename to dep/libmpq/doc/man3/libmpq__block_read.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__block_unpacked_size.3 b/dep/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 dep/libmpq/doc/man3/libmpq__block_unpacked_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_blocks.3 b/dep/libmpq/doc/man3/libmpq__file_blocks.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_blocks.3
rename to dep/libmpq/doc/man3/libmpq__file_blocks.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_compressed.3 b/dep/libmpq/doc/man3/libmpq__file_compressed.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_compressed.3
rename to dep/libmpq/doc/man3/libmpq__file_compressed.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_encrypted.3 b/dep/libmpq/doc/man3/libmpq__file_encrypted.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_encrypted.3
rename to dep/libmpq/doc/man3/libmpq__file_encrypted.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_imploded.3 b/dep/libmpq/doc/man3/libmpq__file_imploded.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_imploded.3
rename to dep/libmpq/doc/man3/libmpq__file_imploded.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_number.3 b/dep/libmpq/doc/man3/libmpq__file_number.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_number.3
rename to dep/libmpq/doc/man3/libmpq__file_number.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_offset.3 b/dep/libmpq/doc/man3/libmpq__file_offset.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_offset.3
rename to dep/libmpq/doc/man3/libmpq__file_offset.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_packed_size.3 b/dep/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 dep/libmpq/doc/man3/libmpq__file_packed_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_read.3 b/dep/libmpq/doc/man3/libmpq__file_read.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__file_read.3
rename to dep/libmpq/doc/man3/libmpq__file_read.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__file_unpacked_size.3 b/dep/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 dep/libmpq/doc/man3/libmpq__file_unpacked_size.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__strerror.3 b/dep/libmpq/doc/man3/libmpq__strerror.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__strerror.3
rename to dep/libmpq/doc/man3/libmpq__strerror.3
diff --git a/modules/dep/libmpq/doc/man3/libmpq__version.3 b/dep/libmpq/doc/man3/libmpq__version.3
similarity index 100%
rename from modules/dep/libmpq/doc/man3/libmpq__version.3
rename to dep/libmpq/doc/man3/libmpq__version.3
diff --git a/modules/dep/libmpq/libmpq-config.in b/dep/libmpq/libmpq-config.in
similarity index 100%
rename from modules/dep/libmpq/libmpq-config.in
rename to dep/libmpq/libmpq-config.in
diff --git a/modules/dep/libmpq/libmpq.pc.in b/dep/libmpq/libmpq.pc.in
similarity index 100%
rename from modules/dep/libmpq/libmpq.pc.in
rename to dep/libmpq/libmpq.pc.in
diff --git a/modules/dep/libmpq/libmpq/Makefile.am b/dep/libmpq/libmpq/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/libmpq/Makefile.am
rename to dep/libmpq/libmpq/Makefile.am
diff --git a/modules/dep/libmpq/libmpq/common.c b/dep/libmpq/libmpq/common.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/common.c
rename to dep/libmpq/libmpq/common.c
diff --git a/modules/dep/libmpq/libmpq/common.h b/dep/libmpq/libmpq/common.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/common.h
rename to dep/libmpq/libmpq/common.h
diff --git a/modules/dep/libmpq/libmpq/crypt_buf.h b/dep/libmpq/libmpq/crypt_buf.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/crypt_buf.h
rename to dep/libmpq/libmpq/crypt_buf.h
diff --git a/modules/dep/libmpq/libmpq/explode.c b/dep/libmpq/libmpq/explode.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/explode.c
rename to dep/libmpq/libmpq/explode.c
diff --git a/modules/dep/libmpq/libmpq/explode.h b/dep/libmpq/libmpq/explode.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/explode.h
rename to dep/libmpq/libmpq/explode.h
diff --git a/modules/dep/libmpq/libmpq/extract.c b/dep/libmpq/libmpq/extract.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/extract.c
rename to dep/libmpq/libmpq/extract.c
diff --git a/modules/dep/libmpq/libmpq/extract.h b/dep/libmpq/libmpq/extract.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/extract.h
rename to dep/libmpq/libmpq/extract.h
diff --git a/modules/dep/libmpq/libmpq/huffman.c b/dep/libmpq/libmpq/huffman.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/huffman.c
rename to dep/libmpq/libmpq/huffman.c
diff --git a/modules/dep/libmpq/libmpq/huffman.h b/dep/libmpq/libmpq/huffman.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/huffman.h
rename to dep/libmpq/libmpq/huffman.h
diff --git a/modules/dep/libmpq/libmpq/mpq-internal.h b/dep/libmpq/libmpq/mpq-internal.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/mpq-internal.h
rename to dep/libmpq/libmpq/mpq-internal.h
diff --git a/modules/dep/libmpq/libmpq/mpq.c b/dep/libmpq/libmpq/mpq.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/mpq.c
rename to dep/libmpq/libmpq/mpq.c
diff --git a/modules/dep/libmpq/libmpq/mpq.h b/dep/libmpq/libmpq/mpq.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/mpq.h
rename to dep/libmpq/libmpq/mpq.h
diff --git a/modules/dep/libmpq/libmpq/pack_begin.h b/dep/libmpq/libmpq/pack_begin.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/pack_begin.h
rename to dep/libmpq/libmpq/pack_begin.h
diff --git a/modules/dep/libmpq/libmpq/pack_end.h b/dep/libmpq/libmpq/pack_end.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/pack_end.h
rename to dep/libmpq/libmpq/pack_end.h
diff --git a/modules/dep/libmpq/libmpq/platform.h b/dep/libmpq/libmpq/platform.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/platform.h
rename to dep/libmpq/libmpq/platform.h
diff --git a/modules/dep/libmpq/libmpq/wave.c b/dep/libmpq/libmpq/wave.c
similarity index 100%
rename from modules/dep/libmpq/libmpq/wave.c
rename to dep/libmpq/libmpq/wave.c
diff --git a/modules/dep/libmpq/libmpq/wave.h b/dep/libmpq/libmpq/wave.h
similarity index 100%
rename from modules/dep/libmpq/libmpq/wave.h
rename to dep/libmpq/libmpq/wave.h
diff --git a/modules/dep/libmpq/tools/Makefile.am b/dep/libmpq/tools/Makefile.am
similarity index 100%
rename from modules/dep/libmpq/tools/Makefile.am
rename to dep/libmpq/tools/Makefile.am
diff --git a/modules/dep/libmpq/tools/crypt_buf_gen.c b/dep/libmpq/tools/crypt_buf_gen.c
similarity index 100%
rename from modules/dep/libmpq/tools/crypt_buf_gen.c
rename to dep/libmpq/tools/crypt_buf_gen.c
diff --git a/modules/dep/libmpq/win/config.h b/dep/libmpq/win/config.h
similarity index 100%
rename from modules/dep/libmpq/win/config.h
rename to dep/libmpq/win/config.h
diff --git a/modules/dep/libmpq/win/dirent.h b/dep/libmpq/win/dirent.h
similarity index 100%
rename from modules/dep/libmpq/win/dirent.h
rename to dep/libmpq/win/dirent.h
diff --git a/modules/dep/libmpq/win/stdint.h b/dep/libmpq/win/stdint.h
similarity index 100%
rename from modules/dep/libmpq/win/stdint.h
rename to dep/libmpq/win/stdint.h
diff --git a/modules/dep/mysqllite/CMakeLists.txt b/dep/mysqllite/CMakeLists.txt
similarity index 94%
rename from modules/dep/mysqllite/CMakeLists.txt
rename to dep/mysqllite/CMakeLists.txt
index 19a1f0519c..43bd82463e 100644
--- a/modules/dep/mysqllite/CMakeLists.txt
+++ b/dep/mysqllite/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright (C) 2006 MySQL AB
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,11 +10,11 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # Include the platform-specific file.
-include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/os/Windows.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/os/Windows.cmake)
 
 # Add macros
-include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/character_sets.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/mysql_version.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/character_sets.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/mysql_version.cmake)
 
 # Advanced options (mostly useless, but usually still in config.h, so they need to be set...)
 set(CYBOZU OFF)
@@ -25,7 +25,7 @@ set(WITH_FAST_MUTEXES OFF)
 # Handle useful options - hardcode to ON/OFF
 set(ENABLED_PROFILING OFF)
 set_directory_properties(PROPERTIES COMPILE_DEFINITIONS $<$<CONFIG:Debug>:ENABLED_DEBUG_SYNC)
-
+ 
 # Set DBUG_OFF and other optional release-only flags for non-debug project types
 foreach(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
   set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_<CONFIG> DBUG_OFF)
@@ -54,7 +54,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+  ${CMAKE_SOURCE_DIR}/dep/zlib
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/include/internal
   ${CMAKE_CURRENT_SOURCE_DIR}/dbug
@@ -163,7 +163,7 @@ set(MYSYS_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_bitmap.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_chsize.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_compress.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_copy.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_copy.c 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_create.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_delete.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_div.c
@@ -239,14 +239,14 @@ if(HAVE_MLOCK)
 endif()
 
 set(CLIENT_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/libmysql/get_password.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/libmysql/get_password.c 
   ${CMAKE_CURRENT_SOURCE_DIR}/libmysql/libmysql.c
   ${CMAKE_CURRENT_SOURCE_DIR}/libmysql/errmsg.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/client.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/my_time.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/client_plugin.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/client.c 
+  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/my_time.c 
+  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/client_plugin.c 
   ${CMAKE_CURRENT_SOURCE_DIR}/sql/net_serv.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/pack.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sql-common/pack.c 
   ${CMAKE_CURRENT_SOURCE_DIR}/sql/password.c
 )
 
diff --git a/modules/dep/mysqllite/COPYING b/dep/mysqllite/COPYING
similarity index 100%
rename from modules/dep/mysqllite/COPYING
rename to dep/mysqllite/COPYING
diff --git a/modules/dep/mysqllite/README b/dep/mysqllite/README
similarity index 100%
rename from modules/dep/mysqllite/README
rename to dep/mysqllite/README
diff --git a/modules/dep/mysqllite/VERSION b/dep/mysqllite/VERSION
similarity index 100%
rename from modules/dep/mysqllite/VERSION
rename to dep/mysqllite/VERSION
diff --git a/modules/dep/mysqllite/cmake/character_sets.cmake b/dep/mysqllite/cmake/character_sets.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/character_sets.cmake
rename to dep/mysqllite/cmake/character_sets.cmake
diff --git a/modules/dep/mysqllite/cmake/mysql_version.cmake b/dep/mysqllite/cmake/mysql_version.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/mysql_version.cmake
rename to dep/mysqllite/cmake/mysql_version.cmake
diff --git a/modules/dep/mysqllite/cmake/os/Windows.cmake b/dep/mysqllite/cmake/os/Windows.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/os/Windows.cmake
rename to dep/mysqllite/cmake/os/Windows.cmake
diff --git a/modules/dep/mysqllite/cmake/os/WindowsCache.cmake b/dep/mysqllite/cmake/os/WindowsCache.cmake
similarity index 100%
rename from modules/dep/mysqllite/cmake/os/WindowsCache.cmake
rename to dep/mysqllite/cmake/os/WindowsCache.cmake
diff --git a/src/cmake/stack_direction.c b/dep/mysqllite/cmake/stack_direction.c
similarity index 100%
rename from src/cmake/stack_direction.c
rename to dep/mysqllite/cmake/stack_direction.c
diff --git a/modules/dep/mysqllite/cmake/versioninfo.rc.in b/dep/mysqllite/cmake/versioninfo.rc.in
similarity index 100%
rename from modules/dep/mysqllite/cmake/versioninfo.rc.in
rename to dep/mysqllite/cmake/versioninfo.rc.in
diff --git a/modules/dep/mysqllite/config.h.cmake b/dep/mysqllite/config.h.cmake
similarity index 100%
rename from modules/dep/mysqllite/config.h.cmake
rename to dep/mysqllite/config.h.cmake
diff --git a/modules/dep/mysqllite/configure.cmake b/dep/mysqllite/configure.cmake
similarity index 96%
rename from modules/dep/mysqllite/configure.cmake
rename to dep/mysqllite/configure.cmake
index 36de1101b4..954b60a45f 100644
--- a/modules/dep/mysqllite/configure.cmake
+++ b/dep/mysqllite/configure.cmake
@@ -1,15 +1,15 @@
 
 # Copyright (C) 2009 Sun Microsystems,Inc
-#
+# 
 # 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; version 2 of the License.
-#
+# 
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -28,15 +28,15 @@ INCLUDE (CheckSymbolExists)
 # WITH_PIC options.Not of much use, PIC is taken care of on platforms
 # where it makes sense anyway.
 IF(UNIX)
-  IF(APPLE)
+  IF(APPLE)  
     # OSX  executable are always PIC
     SET(WITH_PIC ON)
   ELSE()
     OPTION(WITH_PIC "Generate PIC objects" OFF)
     IF(WITH_PIC)
-      SET(CMAKE_C_FLAGS
+      SET(CMAKE_C_FLAGS 
         "${CMAKE_C_FLAGS} ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
-      SET(CMAKE_CXX_FLAGS
+      SET(CMAKE_CXX_FLAGS 
         "${CMAKE_CXX_FLAGS} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}")
     ENDIF()
   ENDIF()
@@ -44,7 +44,7 @@ ENDIF()
 
 
 
-# System type affects version_compile_os variable
+# System type affects version_compile_os variable 
 IF(NOT SYSTEM_TYPE)
   IF(PLATFORM)
     SET(SYSTEM_TYPE ${PLATFORM})
@@ -65,8 +65,8 @@ ENDIF()
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
   # MySQL "canonical" GCC flags. At least -fno-rtti flag affects
-  # ABI and cannot be simply removed.
-  SET(CMAKE_CXX_FLAGS
+  # ABI and cannot be simply removed. 
+  SET(CMAKE_CXX_FLAGS 
     "${CMAKE_CXX_FLAGS} -fno-implicit-templates -fno-exceptions -fno-rtti")
   IF(CMAKE_CXX_FLAGS)
     STRING(REGEX MATCH "fno-implicit-templates" NO_IMPLICIT_TEMPLATES
@@ -76,7 +76,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
     ENDIF()
   ENDIF()
 
-  IF (CMAKE_EXE_LINKER_FLAGS MATCHES " -static "
+  IF (CMAKE_EXE_LINKER_FLAGS MATCHES " -static " 
      OR CMAKE_EXE_LINKER_FLAGS MATCHES " -static$")
      SET(HAVE_DLOPEN FALSE CACHE "Disable dlopen due to -static flag" FORCE)
      SET(WITHOUT_DYNAMIC_PLUGINS TRUE)
@@ -108,7 +108,7 @@ ENDFUNCTION()
 
 # Searches function in libraries
 # if function is found, sets output parameter result to the name of the library
-# if function is found in libc, result will be empty
+# if function is found in libc, result will be empty 
 FUNCTION(MY_SEARCH_LIBS func libs result)
   IF(${${result}})
     # Library is already found or was predefined
@@ -120,7 +120,7 @@ FUNCTION(MY_SEARCH_LIBS func libs result)
     RETURN()
   ENDIF()
   FOREACH(lib  ${libs})
-    CHECK_LIBRARY_EXISTS(${lib} ${func} "" HAVE_${func}_IN_${lib})
+    CHECK_LIBRARY_EXISTS(${lib} ${func} "" HAVE_${func}_IN_${lib}) 
     IF(HAVE_${func}_IN_${lib})
       SET(${result} ${lib} PARENT_SCOPE)
       SET(HAVE_${result} 1 PARENT_SCOPE)
@@ -146,12 +146,12 @@ IF(UNIX)
   ENDIF()
   FIND_PACKAGE(Threads)
 
-  SET(CMAKE_REQUIRED_LIBRARIES
+  SET(CMAKE_REQUIRED_LIBRARIES 
     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
 
   LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
   LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
-
+  
   OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
   IF(WITH_LIBWRAP)
     SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
@@ -410,7 +410,7 @@ CHECK_FUNCTION_EXISTS (sigthreadmask HAVE_SIGTHREADMASK)
 CHECK_FUNCTION_EXISTS (sigwait HAVE_SIGWAIT)
 CHECK_FUNCTION_EXISTS (sigaddset HAVE_SIGADDSET)
 CHECK_FUNCTION_EXISTS (sigemptyset HAVE_SIGEMPTYSET)
-CHECK_FUNCTION_EXISTS (sighold HAVE_SIGHOLD)
+CHECK_FUNCTION_EXISTS (sighold HAVE_SIGHOLD) 
 CHECK_FUNCTION_EXISTS (sigset HAVE_SIGSET)
 CHECK_FUNCTION_EXISTS (sleep HAVE_SLEEP)
 CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
@@ -433,7 +433,7 @@ CHECK_FUNCTION_EXISTS (strtoull HAVE_STRTOULL)
 CHECK_FUNCTION_EXISTS (strcasecmp HAVE_STRCASECMP)
 CHECK_FUNCTION_EXISTS (strncasecmp HAVE_STRNCASECMP)
 CHECK_FUNCTION_EXISTS (strdup HAVE_STRDUP)
-CHECK_FUNCTION_EXISTS (shmat HAVE_SHMAT)
+CHECK_FUNCTION_EXISTS (shmat HAVE_SHMAT) 
 CHECK_FUNCTION_EXISTS (shmctl HAVE_SHMCTL)
 CHECK_FUNCTION_EXISTS (shmdt HAVE_SHMDT)
 CHECK_FUNCTION_EXISTS (shmget HAVE_SHMGET)
@@ -503,8 +503,8 @@ CHECK_SYMBOL_EXISTS(rint  math.h HAVE_RINT)
 # isinf() prototype not found on Solaris
 CHECK_CXX_SOURCE_COMPILES(
 "#include  <math.h>
-int main() {
-  isinf(0.0);
+int main() { 
+  isinf(0.0); 
   return 0;
 }" HAVE_ISINF)
 
@@ -515,7 +515,7 @@ int main() {
 #
 INCLUDE(TestBigEndian)
 IF(APPLE)
-  # Cannot run endian test on universal PPC/Intel binaries
+  # Cannot run endian test on universal PPC/Intel binaries 
   # would return inconsistent result.
   # config.h.cmake includes a special #ifdef for Darwin
 ELSE()
@@ -667,7 +667,7 @@ CHECK_CXX_SOURCE_COMPILES("
 int main(int argc, char **argv)
 {
   getsockname(0,0,(socklen_t *) 0);
-  return 0;
+  return 0; 
 }"
 HAVE_SOCKET_SIZE_T_AS_socklen_t)
 
@@ -679,7 +679,7 @@ ELSE()
   int main(int argc, char **argv)
   {
     getsockname(0,0,(int *) 0);
-    return 0;
+    return 0; 
   }"
   HAVE_SOCKET_SIZE_T_AS_int)
   IF(HAVE_SOCKET_SIZE_T_AS_int)
@@ -690,7 +690,7 @@ ELSE()
     int main(int argc, char **argv)
     {
       getsockname(0,0,(size_t *) 0);
-      return 0;
+      return 0; 
     }"
     HAVE_SOCKET_SIZE_T_AS_size_t)
     IF(HAVE_SOCKET_SIZE_T_AS_size_t)
@@ -713,13 +713,13 @@ int main()
 
 IF(NOT STACK_DIRECTION)
   IF(CMAKE_CROSSCOMPILING)
-   MESSAGE(FATAL_ERROR
+   MESSAGE(FATAL_ERROR 
    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
    "or -DSTACK_DIRECTION=-1 when calling cmake.")
   ELSE()
-    TRY_RUN(STACKDIR_RUN_RESULT STACKDIR_COMPILE_RESULT
-     ${CMAKE_BINARY_DIR}
-     ${CMAKE_SOURCE_DIR}/src/cmake/stack_direction.c
+    TRY_RUN(STACKDIR_RUN_RESULT STACKDIR_COMPILE_RESULT    
+     ${CMAKE_BINARY_DIR} 
+     ${CMAKE_SOURCE_DIR}/cmake/stack_direction.c
      )
      # Test program returns 0 (down) or 1 (up).
      # Convert to -1 or 1
@@ -786,8 +786,8 @@ IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
   # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684
   CHECK_C_SOURCE_RUNS("
   int main()
-  {
-    __asm__ __volatile__ (\"pause\");
+  { 
+    __asm__ __volatile__ (\"pause\"); 
     return 0;
   }"  HAVE_PAUSE_INSTRUCTION)
   ENDIF()
@@ -801,7 +801,7 @@ IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
    " HAVE_FAKE_PAUSE_INSTRUCTION)
   ENDIF()
 ENDIF()
-
+  
 CHECK_SYMBOL_EXISTS(tcgetattr "termios.h" HAVE_TCGETATTR 1)
 
 #
@@ -838,7 +838,7 @@ IF(NOT HAVE_POSIX_SIGNALS)
       sigset(SIGINT, foo); sigrelse(SIGINT);
       sighold(SIGINT); sigpause(SIGINT);
     }"
-   HAVE_SVR3_SIGNALS)
+   HAVE_SVR3_SIGNALS)  
    IF (NOT HAVE_SVR3_SIGNALS)
     SET(HAVE_V7_SIGNALS 1)
    ENDIF(NOT HAVE_SVR3_SIGNALS)
@@ -851,7 +851,7 @@ SET(SPRINTFS_RETURNS_INT 1)
 IF(CMAKE_COMPILER_IS_GNUCXX AND HAVE_CXXABI_H)
 CHECK_CXX_SOURCE_COMPILES("
  #include <cxxabi.h>
- int main(int argc, char **argv)
+ int main(int argc, char **argv) 
   {
     char *foo= 0; int bar= 0;
     foo= abi::__cxa_demangle(foo, foo, 0, &bar);
@@ -861,7 +861,7 @@ CHECK_CXX_SOURCE_COMPILES("
 ENDIF()
 
 CHECK_C_SOURCE_COMPILES("
-  int main(int argc, char **argv)
+  int main(int argc, char **argv) 
   {
     extern char *__bss_start;
     return __bss_start ? 1 : 0;
@@ -967,15 +967,15 @@ ELSEIF(CMAKE_SYSTEM MATCHES "HP-UX")
 ELSEIF(CMAKE_CROSSCOMPILING)
   SET(HAVE_SOCKET_TIMEOUT 0)
 ELSE()
-SET(CMAKE_REQUIRED_LIBRARIES ${LIBNSL} ${LIBSOCKET})
+SET(CMAKE_REQUIRED_LIBRARIES ${LIBNSL} ${LIBSOCKET}) 
 CHECK_C_SOURCE_RUNS(
 "
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/time.h>
-
+ 
  int main()
- {
+ {    
    int fd = socket(AF_INET, SOCK_STREAM, 0);
    struct timeval tv;
    int ret= 0;
@@ -988,7 +988,7 @@ CHECK_C_SOURCE_RUNS(
 " HAVE_SOCKET_TIMEOUT)
 ENDIF()
 
-SET(NO_ALARM "${HAVE_SOCKET_TIMEOUT}" CACHE BOOL
+SET(NO_ALARM "${HAVE_SOCKET_TIMEOUT}" CACHE BOOL 
    "No need to use alarm to implement socket timeout")
 SET(SIGNAL_WITH_VIO_CLOSE "${HAVE_SOCKET_TIMEOUT}")
 MARK_AS_ADVANCED(NO_ALARM)
@@ -1038,7 +1038,7 @@ if available and 'smp' configuration otherwise.")
 MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY)
 
 IF(WITH_VALGRIND)
-  CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
+  CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 
     HAVE_VALGRIND_HEADERS)
   IF(HAVE_VALGRIND_HEADERS)
     SET(HAVE_VALGRIND 1)
@@ -1094,7 +1094,7 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in" sin_len
 CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_len
   "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_SOCKADDR_IN6_SIN6_LEN)
 
-SET(CMAKE_EXTRA_INCLUDE_FILES)
+SET(CMAKE_EXTRA_INCLUDE_FILES) 
 
 CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h"  STRUCT_DIRENT_HAS_D_INO)
 CHECK_STRUCT_HAS_MEMBER("struct dirent" d_namlen "dirent.h"  STRUCT_DIRENT_HAS_D_NAMLEN)
diff --git a/modules/dep/mysqllite/dbug/dbug.c b/dep/mysqllite/dbug/dbug.c
similarity index 100%
rename from modules/dep/mysqllite/dbug/dbug.c
rename to dep/mysqllite/dbug/dbug.c
diff --git a/modules/dep/mysqllite/dbug/dbug_long.h b/dep/mysqllite/dbug/dbug_long.h
similarity index 100%
rename from modules/dep/mysqllite/dbug/dbug_long.h
rename to dep/mysqllite/dbug/dbug_long.h
diff --git a/modules/dep/mysqllite/dbug/monty.doc b/dep/mysqllite/dbug/monty.doc
similarity index 100%
rename from modules/dep/mysqllite/dbug/monty.doc
rename to dep/mysqllite/dbug/monty.doc
diff --git a/modules/dep/mysqllite/dbug/user.r b/dep/mysqllite/dbug/user.r
similarity index 100%
rename from modules/dep/mysqllite/dbug/user.r
rename to dep/mysqllite/dbug/user.r
diff --git a/modules/dep/mysqllite/include/decimal.h b/dep/mysqllite/include/decimal.h
similarity index 100%
rename from modules/dep/mysqllite/include/decimal.h
rename to dep/mysqllite/include/decimal.h
diff --git a/modules/dep/mysqllite/include/errmsg.h b/dep/mysqllite/include/errmsg.h
similarity index 100%
rename from modules/dep/mysqllite/include/errmsg.h
rename to dep/mysqllite/include/errmsg.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/gcc_builtins.h b/dep/mysqllite/include/internal/atomic/gcc_builtins.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/gcc_builtins.h
rename to dep/mysqllite/include/internal/atomic/gcc_builtins.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/generic-msvc.h b/dep/mysqllite/include/internal/atomic/generic-msvc.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/generic-msvc.h
rename to dep/mysqllite/include/internal/atomic/generic-msvc.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/nolock.h b/dep/mysqllite/include/internal/atomic/nolock.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/nolock.h
rename to dep/mysqllite/include/internal/atomic/nolock.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/rwlock.h b/dep/mysqllite/include/internal/atomic/rwlock.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/rwlock.h
rename to dep/mysqllite/include/internal/atomic/rwlock.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/solaris.h b/dep/mysqllite/include/internal/atomic/solaris.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/solaris.h
rename to dep/mysqllite/include/internal/atomic/solaris.h
diff --git a/modules/dep/mysqllite/include/internal/atomic/x86-gcc.h b/dep/mysqllite/include/internal/atomic/x86-gcc.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/atomic/x86-gcc.h
rename to dep/mysqllite/include/internal/atomic/x86-gcc.h
diff --git a/modules/dep/mysqllite/include/internal/base64.h b/dep/mysqllite/include/internal/base64.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/base64.h
rename to dep/mysqllite/include/internal/base64.h
diff --git a/modules/dep/mysqllite/include/internal/hash.h b/dep/mysqllite/include/internal/hash.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/hash.h
rename to dep/mysqllite/include/internal/hash.h
diff --git a/modules/dep/mysqllite/include/internal/lf.h b/dep/mysqllite/include/internal/lf.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/lf.h
rename to dep/mysqllite/include/internal/lf.h
diff --git a/modules/dep/mysqllite/include/internal/my_aes.h b/dep/mysqllite/include/internal/my_aes.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_aes.h
rename to dep/mysqllite/include/internal/my_aes.h
diff --git a/modules/dep/mysqllite/include/internal/my_alarm.h b/dep/mysqllite/include/internal/my_alarm.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_alarm.h
rename to dep/mysqllite/include/internal/my_alarm.h
diff --git a/modules/dep/mysqllite/include/internal/my_atomic.h b/dep/mysqllite/include/internal/my_atomic.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_atomic.h
rename to dep/mysqllite/include/internal/my_atomic.h
diff --git a/modules/dep/mysqllite/include/internal/my_base.h b/dep/mysqllite/include/internal/my_base.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_base.h
rename to dep/mysqllite/include/internal/my_base.h
diff --git a/modules/dep/mysqllite/include/internal/my_bit.h b/dep/mysqllite/include/internal/my_bit.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_bit.h
rename to dep/mysqllite/include/internal/my_bit.h
diff --git a/modules/dep/mysqllite/include/internal/my_bitmap.h b/dep/mysqllite/include/internal/my_bitmap.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_bitmap.h
rename to dep/mysqllite/include/internal/my_bitmap.h
diff --git a/modules/dep/mysqllite/include/internal/my_handler.h b/dep/mysqllite/include/internal/my_handler.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_handler.h
rename to dep/mysqllite/include/internal/my_handler.h
diff --git a/modules/dep/mysqllite/include/internal/my_libwrap.h b/dep/mysqllite/include/internal/my_libwrap.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_libwrap.h
rename to dep/mysqllite/include/internal/my_libwrap.h
diff --git a/modules/dep/mysqllite/include/internal/my_md5.h b/dep/mysqllite/include/internal/my_md5.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_md5.h
rename to dep/mysqllite/include/internal/my_md5.h
diff --git a/modules/dep/mysqllite/include/internal/my_nosys.h b/dep/mysqllite/include/internal/my_nosys.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_nosys.h
rename to dep/mysqllite/include/internal/my_nosys.h
diff --git a/modules/dep/mysqllite/include/internal/my_rdtsc.h b/dep/mysqllite/include/internal/my_rdtsc.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_rdtsc.h
rename to dep/mysqllite/include/internal/my_rdtsc.h
diff --git a/modules/dep/mysqllite/include/internal/my_stacktrace.h b/dep/mysqllite/include/internal/my_stacktrace.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_stacktrace.h
rename to dep/mysqllite/include/internal/my_stacktrace.h
diff --git a/modules/dep/mysqllite/include/internal/my_time.h b/dep/mysqllite/include/internal/my_time.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_time.h
rename to dep/mysqllite/include/internal/my_time.h
diff --git a/modules/dep/mysqllite/include/internal/my_tree.h b/dep/mysqllite/include/internal/my_tree.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_tree.h
rename to dep/mysqllite/include/internal/my_tree.h
diff --git a/modules/dep/mysqllite/include/internal/my_uctype.h b/dep/mysqllite/include/internal/my_uctype.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/my_uctype.h
rename to dep/mysqllite/include/internal/my_uctype.h
diff --git a/modules/dep/mysqllite/include/internal/myisampack.h b/dep/mysqllite/include/internal/myisampack.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/myisampack.h
rename to dep/mysqllite/include/internal/myisampack.h
diff --git a/modules/dep/mysqllite/include/internal/mysql_version.h.in b/dep/mysqllite/include/internal/mysql_version.h.in
similarity index 100%
rename from modules/dep/mysqllite/include/internal/mysql_version.h.in
rename to dep/mysqllite/include/internal/mysql_version.h.in
diff --git a/modules/dep/mysqllite/include/internal/mysys_err.h b/dep/mysqllite/include/internal/mysys_err.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/mysys_err.h
rename to dep/mysqllite/include/internal/mysys_err.h
diff --git a/modules/dep/mysqllite/include/internal/password.h b/dep/mysqllite/include/internal/password.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/password.h
rename to dep/mysqllite/include/internal/password.h
diff --git a/modules/dep/mysqllite/include/internal/probes_mysql.h b/dep/mysqllite/include/internal/probes_mysql.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/probes_mysql.h
rename to dep/mysqllite/include/internal/probes_mysql.h
diff --git a/modules/dep/mysqllite/include/internal/probes_mysql_nodtrace.h b/dep/mysqllite/include/internal/probes_mysql_nodtrace.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/probes_mysql_nodtrace.h
rename to dep/mysqllite/include/internal/probes_mysql_nodtrace.h
diff --git a/modules/dep/mysqllite/include/internal/queues.h b/dep/mysqllite/include/internal/queues.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/queues.h
rename to dep/mysqllite/include/internal/queues.h
diff --git a/modules/dep/mysqllite/include/internal/rijndael.h b/dep/mysqllite/include/internal/rijndael.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/rijndael.h
rename to dep/mysqllite/include/internal/rijndael.h
diff --git a/modules/dep/mysqllite/include/internal/sha1.h b/dep/mysqllite/include/internal/sha1.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/sha1.h
rename to dep/mysqllite/include/internal/sha1.h
diff --git a/modules/dep/mysqllite/include/internal/t_ctype.h b/dep/mysqllite/include/internal/t_ctype.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/t_ctype.h
rename to dep/mysqllite/include/internal/t_ctype.h
diff --git a/modules/dep/mysqllite/include/internal/thr_alarm.h b/dep/mysqllite/include/internal/thr_alarm.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/thr_alarm.h
rename to dep/mysqllite/include/internal/thr_alarm.h
diff --git a/modules/dep/mysqllite/include/internal/thr_lock.h b/dep/mysqllite/include/internal/thr_lock.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/thr_lock.h
rename to dep/mysqllite/include/internal/thr_lock.h
diff --git a/modules/dep/mysqllite/include/internal/violite.h b/dep/mysqllite/include/internal/violite.h
similarity index 100%
rename from modules/dep/mysqllite/include/internal/violite.h
rename to dep/mysqllite/include/internal/violite.h
diff --git a/modules/dep/mysqllite/include/keycache.h b/dep/mysqllite/include/keycache.h
similarity index 100%
rename from modules/dep/mysqllite/include/keycache.h
rename to dep/mysqllite/include/keycache.h
diff --git a/modules/dep/mysqllite/include/m_ctype.h b/dep/mysqllite/include/m_ctype.h
similarity index 100%
rename from modules/dep/mysqllite/include/m_ctype.h
rename to dep/mysqllite/include/m_ctype.h
diff --git a/modules/dep/mysqllite/include/m_string.h b/dep/mysqllite/include/m_string.h
similarity index 100%
rename from modules/dep/mysqllite/include/m_string.h
rename to dep/mysqllite/include/m_string.h
diff --git a/modules/dep/mysqllite/include/my_alloc.h b/dep/mysqllite/include/my_alloc.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_alloc.h
rename to dep/mysqllite/include/my_alloc.h
diff --git a/modules/dep/mysqllite/include/my_attribute.h b/dep/mysqllite/include/my_attribute.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_attribute.h
rename to dep/mysqllite/include/my_attribute.h
diff --git a/modules/dep/mysqllite/include/my_compiler.h b/dep/mysqllite/include/my_compiler.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_compiler.h
rename to dep/mysqllite/include/my_compiler.h
diff --git a/modules/dep/mysqllite/include/my_dbug.h b/dep/mysqllite/include/my_dbug.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_dbug.h
rename to dep/mysqllite/include/my_dbug.h
diff --git a/modules/dep/mysqllite/include/my_dir.h b/dep/mysqllite/include/my_dir.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_dir.h
rename to dep/mysqllite/include/my_dir.h
diff --git a/modules/dep/mysqllite/include/my_getopt.h b/dep/mysqllite/include/my_getopt.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_getopt.h
rename to dep/mysqllite/include/my_getopt.h
diff --git a/modules/dep/mysqllite/include/my_global.h b/dep/mysqllite/include/my_global.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_global.h
rename to dep/mysqllite/include/my_global.h
diff --git a/modules/dep/mysqllite/include/my_list.h b/dep/mysqllite/include/my_list.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_list.h
rename to dep/mysqllite/include/my_list.h
diff --git a/modules/dep/mysqllite/include/my_net.h b/dep/mysqllite/include/my_net.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_net.h
rename to dep/mysqllite/include/my_net.h
diff --git a/modules/dep/mysqllite/include/my_pthread.h b/dep/mysqllite/include/my_pthread.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_pthread.h
rename to dep/mysqllite/include/my_pthread.h
diff --git a/modules/dep/mysqllite/include/my_sys.h b/dep/mysqllite/include/my_sys.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_sys.h
rename to dep/mysqllite/include/my_sys.h
diff --git a/modules/dep/mysqllite/include/my_xml.h b/dep/mysqllite/include/my_xml.h
similarity index 100%
rename from modules/dep/mysqllite/include/my_xml.h
rename to dep/mysqllite/include/my_xml.h
diff --git a/modules/dep/mysqllite/include/mysql.h b/dep/mysqllite/include/mysql.h
similarity index 97%
rename from modules/dep/mysqllite/include/mysql.h
rename to dep/mysqllite/include/mysql.h
index dd507063c4..d3b24f0198 100644
--- a/modules/dep/mysqllite/include/mysql.h
+++ b/dep/mysqllite/include/mysql.h
@@ -20,7 +20,7 @@
   The ABI should never be changed in a released product of MySQL,
   thus you need to take great care when changing the file. In case
   the file is changed so the ABI is broken, you must also update
-  the SHARED_LIB_MAJOR_VERSION in src/cmake/mysql_version.cmake
+  the SHARED_LIB_MAJOR_VERSION in cmake/mysql_version.cmake
 */
 
 #ifndef _mysql_h
@@ -156,7 +156,7 @@ typedef struct st_mysql_data {
   void *extension;
 } MYSQL_DATA;
 
-enum mysql_option
+enum mysql_option 
 {
   MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE,
   MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
@@ -173,7 +173,7 @@ enum mysql_option
   @todo remove the "extension", move st_mysql_options completely
   out of mysql.h
 */
-struct st_mysql_options_extention;
+struct st_mysql_options_extention; 
 
 struct st_mysql_options {
   unsigned int connect_timeout, read_timeout, write_timeout;
@@ -211,13 +211,13 @@ struct st_mysql_options {
   struct st_mysql_options_extention *extension;
 };
 
-enum mysql_status
+enum mysql_status 
 {
   MYSQL_STATUS_READY, MYSQL_STATUS_GET_RESULT, MYSQL_STATUS_USE_RESULT,
   MYSQL_STATUS_STATEMENT_GET_RESULT
 };
 
-enum mysql_protocol_type
+enum mysql_protocol_type 
 {
   MYSQL_PROTOCOL_DEFAULT, MYSQL_PROTOCOL_TCP, MYSQL_PROTOCOL_SOCKET,
   MYSQL_PROTOCOL_PIPE, MYSQL_PROTOCOL_MEMORY
@@ -273,7 +273,7 @@ typedef struct st_mysql
   const struct st_mysql_methods *methods;
   void *thd;
   /*
-    Points to boolean flag in MYSQL_RES  or MYSQL_STMT. We set this flag
+    Points to boolean flag in MYSQL_RES  or MYSQL_STMT. We set this flag 
     from mysql_stmt_close if close had to cancel result set of this object.
   */
   my_bool *unbuffered_fetch_owner;
@@ -297,7 +297,7 @@ typedef struct st_mysql_res {
   unsigned int	field_count, current_field;
   my_bool	eof;			/* Used by mysql_fetch_row */
   /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;
+  my_bool       unbuffered_fetch_cancelled;  
   void *extension;
 } MYSQL_RES;
 
@@ -381,7 +381,7 @@ my_bool		STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
 				      const char *cert, const char *ca,
 				      const char *capath, const char *cipher);
 const char *    STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
-my_bool		STDCALL mysql_change_user(MYSQL *mysql, const char *user,
+my_bool		STDCALL mysql_change_user(MYSQL *mysql, const char *user, 
 					  const char *passwd, const char *db);
 MYSQL *		STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
 					   const char *user,
@@ -470,7 +470,7 @@ my_bool         STDCALL mysql_read_query_result(MYSQL *mysql);
 
 
 /*
-  The following definitions are added for the enhanced
+  The following definitions are added for the enhanced 
   client-server protocol
 */
 
@@ -588,7 +588,7 @@ typedef struct st_mysql_stmt
     mysql_stmt_fetch() calls this function to fetch one row (it's different
     for buffered, unbuffered and cursor fetch).
   */
-  int            (*read_row_func)(struct st_mysql_stmt *stmt,
+  int            (*read_row_func)(struct st_mysql_stmt *stmt, 
                                   unsigned char **row);
   /* copy of mysql->affected_rows after statement execution */
   my_ulonglong   affected_rows;
@@ -612,12 +612,12 @@ typedef struct st_mysql_stmt
   my_bool        bind_param_done;      /* input buffers were supplied */
   unsigned char  bind_result_done;     /* output buffers were supplied */
   /* mysql_stmt_close() had to cancel this result */
-  my_bool       unbuffered_fetch_cancelled;
+  my_bool       unbuffered_fetch_cancelled;  
   /*
-    Is set to true if we need to calculate field->max_length for
+    Is set to true if we need to calculate field->max_length for 
     metadata fields when doing mysql_stmt_store_result.
   */
-  my_bool       update_max_length;
+  my_bool       update_max_length;     
   void *extension;
 } MYSQL_STMT;
 
@@ -625,7 +625,7 @@ enum enum_stmt_attr_type
 {
   /*
     When doing mysql_stmt_store_result calculate max_length attribute
-    of statement metadata. This is to be consistent with the old API,
+    of statement metadata. This is to be consistent with the old API, 
     where this was done automatically.
     In the new API we do that only by request because it slows down
     mysql_stmt_store_result sufficiently.
@@ -649,7 +649,7 @@ int STDCALL mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query,
                                unsigned long length);
 int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt);
 int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg,
+int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg, 
                                     unsigned int column,
                                     unsigned long offset);
 int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
@@ -665,16 +665,16 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT * stmt, MYSQL_BIND * bnd);
 my_bool STDCALL mysql_stmt_close(MYSQL_STMT * stmt);
 my_bool STDCALL mysql_stmt_reset(MYSQL_STMT * stmt);
 my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt);
-my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt,
+my_bool STDCALL mysql_stmt_send_long_data(MYSQL_STMT *stmt, 
                                           unsigned int param_number,
-                                          const char *data,
+                                          const char *data, 
                                           unsigned long length);
 MYSQL_RES *STDCALL mysql_stmt_result_metadata(MYSQL_STMT *stmt);
 MYSQL_RES *STDCALL mysql_stmt_param_metadata(MYSQL_STMT *stmt);
 unsigned int STDCALL mysql_stmt_errno(MYSQL_STMT * stmt);
 const char *STDCALL mysql_stmt_error(MYSQL_STMT * stmt);
 const char *STDCALL mysql_stmt_sqlstate(MYSQL_STMT * stmt);
-MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_seek(MYSQL_STMT *stmt,
+MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_seek(MYSQL_STMT *stmt, 
                                              MYSQL_ROW_OFFSET offset);
 MYSQL_ROW_OFFSET STDCALL mysql_stmt_row_tell(MYSQL_STMT *stmt);
 void STDCALL mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong offset);
diff --git a/modules/dep/mysqllite/include/mysql/client_plugin.h b/dep/mysqllite/include/mysql/client_plugin.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/client_plugin.h
rename to dep/mysqllite/include/mysql/client_plugin.h
diff --git a/modules/dep/mysqllite/include/mysql/innodb_priv.h b/dep/mysqllite/include/mysql/innodb_priv.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/innodb_priv.h
rename to dep/mysqllite/include/mysql/innodb_priv.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin.h b/dep/mysqllite/include/mysql/plugin.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin.h
rename to dep/mysqllite/include/mysql/plugin.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_audit.h b/dep/mysqllite/include/mysql/plugin_audit.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_audit.h
rename to dep/mysqllite/include/mysql/plugin_audit.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_auth.h b/dep/mysqllite/include/mysql/plugin_auth.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_auth.h
rename to dep/mysqllite/include/mysql/plugin_auth.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_auth_common.h b/dep/mysqllite/include/mysql/plugin_auth_common.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_auth_common.h
rename to dep/mysqllite/include/mysql/plugin_auth_common.h
diff --git a/modules/dep/mysqllite/include/mysql/plugin_ftparser.h b/dep/mysqllite/include/mysql/plugin_ftparser.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/plugin_ftparser.h
rename to dep/mysqllite/include/mysql/plugin_ftparser.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/mysql_file.h b/dep/mysqllite/include/mysql/psi/mysql_file.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/mysql_file.h
rename to dep/mysqllite/include/mysql/psi/mysql_file.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/mysql_thread.h b/dep/mysqllite/include/mysql/psi/mysql_thread.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/mysql_thread.h
rename to dep/mysqllite/include/mysql/psi/mysql_thread.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/psi.h b/dep/mysqllite/include/mysql/psi/psi.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/psi/psi.h
rename to dep/mysqllite/include/mysql/psi/psi.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/psi_abi_v1.h b/dep/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 dep/mysqllite/include/mysql/psi/psi_abi_v1.h
diff --git a/modules/dep/mysqllite/include/mysql/psi/psi_abi_v2.h b/dep/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 dep/mysqllite/include/mysql/psi/psi_abi_v2.h
diff --git a/modules/dep/mysqllite/include/mysql/service_my_snprintf.h b/dep/mysqllite/include/mysql/service_my_snprintf.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_my_snprintf.h
rename to dep/mysqllite/include/mysql/service_my_snprintf.h
diff --git a/modules/dep/mysqllite/include/mysql/service_thd_alloc.h b/dep/mysqllite/include/mysql/service_thd_alloc.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_thd_alloc.h
rename to dep/mysqllite/include/mysql/service_thd_alloc.h
diff --git a/modules/dep/mysqllite/include/mysql/service_thd_wait.h b/dep/mysqllite/include/mysql/service_thd_wait.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_thd_wait.h
rename to dep/mysqllite/include/mysql/service_thd_wait.h
diff --git a/modules/dep/mysqllite/include/mysql/service_thread_scheduler.h b/dep/mysqllite/include/mysql/service_thread_scheduler.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/service_thread_scheduler.h
rename to dep/mysqllite/include/mysql/service_thread_scheduler.h
diff --git a/modules/dep/mysqllite/include/mysql/services.h b/dep/mysqllite/include/mysql/services.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql/services.h
rename to dep/mysqllite/include/mysql/services.h
diff --git a/modules/dep/mysqllite/include/mysql_com.h b/dep/mysqllite/include/mysql_com.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql_com.h
rename to dep/mysqllite/include/mysql_com.h
diff --git a/modules/dep/mysqllite/include/mysql_embed.h b/dep/mysqllite/include/mysql_embed.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql_embed.h
rename to dep/mysqllite/include/mysql_embed.h
diff --git a/modules/dep/mysqllite/include/mysql_time.h b/dep/mysqllite/include/mysql_time.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysql_time.h
rename to dep/mysqllite/include/mysql_time.h
diff --git a/modules/dep/mysqllite/include/mysqld_ername.h b/dep/mysqllite/include/mysqld_ername.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysqld_ername.h
rename to dep/mysqllite/include/mysqld_ername.h
diff --git a/modules/dep/mysqllite/include/mysqld_error.h b/dep/mysqllite/include/mysqld_error.h
similarity index 100%
rename from modules/dep/mysqllite/include/mysqld_error.h
rename to dep/mysqllite/include/mysqld_error.h
diff --git a/modules/dep/mysqllite/include/plugin.h b/dep/mysqllite/include/plugin.h
similarity index 100%
rename from modules/dep/mysqllite/include/plugin.h
rename to dep/mysqllite/include/plugin.h
diff --git a/modules/dep/mysqllite/include/plugin_audit.h b/dep/mysqllite/include/plugin_audit.h
similarity index 100%
rename from modules/dep/mysqllite/include/plugin_audit.h
rename to dep/mysqllite/include/plugin_audit.h
diff --git a/modules/dep/mysqllite/include/plugin_ftparser.h b/dep/mysqllite/include/plugin_ftparser.h
similarity index 100%
rename from modules/dep/mysqllite/include/plugin_ftparser.h
rename to dep/mysqllite/include/plugin_ftparser.h
diff --git a/modules/dep/mysqllite/include/sql_common.h b/dep/mysqllite/include/sql_common.h
similarity index 100%
rename from modules/dep/mysqllite/include/sql_common.h
rename to dep/mysqllite/include/sql_common.h
diff --git a/modules/dep/mysqllite/include/sql_state.h b/dep/mysqllite/include/sql_state.h
similarity index 100%
rename from modules/dep/mysqllite/include/sql_state.h
rename to dep/mysqllite/include/sql_state.h
diff --git a/modules/dep/mysqllite/include/sslopt-case.h b/dep/mysqllite/include/sslopt-case.h
similarity index 100%
rename from modules/dep/mysqllite/include/sslopt-case.h
rename to dep/mysqllite/include/sslopt-case.h
diff --git a/modules/dep/mysqllite/include/sslopt-longopts.h b/dep/mysqllite/include/sslopt-longopts.h
similarity index 100%
rename from modules/dep/mysqllite/include/sslopt-longopts.h
rename to dep/mysqllite/include/sslopt-longopts.h
diff --git a/modules/dep/mysqllite/include/sslopt-vars.h b/dep/mysqllite/include/sslopt-vars.h
similarity index 100%
rename from modules/dep/mysqllite/include/sslopt-vars.h
rename to dep/mysqllite/include/sslopt-vars.h
diff --git a/modules/dep/mysqllite/include/typelib.h b/dep/mysqllite/include/typelib.h
similarity index 100%
rename from modules/dep/mysqllite/include/typelib.h
rename to dep/mysqllite/include/typelib.h
diff --git a/modules/dep/mysqllite/libmysql/client_settings.h b/dep/mysqllite/libmysql/client_settings.h
similarity index 100%
rename from modules/dep/mysqllite/libmysql/client_settings.h
rename to dep/mysqllite/libmysql/client_settings.h
diff --git a/modules/dep/mysqllite/libmysql/errmsg.c b/dep/mysqllite/libmysql/errmsg.c
similarity index 100%
rename from modules/dep/mysqllite/libmysql/errmsg.c
rename to dep/mysqllite/libmysql/errmsg.c
diff --git a/modules/dep/mysqllite/libmysql/get_password.c b/dep/mysqllite/libmysql/get_password.c
similarity index 100%
rename from modules/dep/mysqllite/libmysql/get_password.c
rename to dep/mysqllite/libmysql/get_password.c
diff --git a/modules/dep/mysqllite/libmysql/libmysql.c b/dep/mysqllite/libmysql/libmysql.c
similarity index 100%
rename from modules/dep/mysqllite/libmysql/libmysql.c
rename to dep/mysqllite/libmysql/libmysql.c
diff --git a/modules/dep/mysqllite/libmysql/libmysql_exports.def b/dep/mysqllite/libmysql/libmysql_exports.def
similarity index 100%
rename from modules/dep/mysqllite/libmysql/libmysql_exports.def
rename to dep/mysqllite/libmysql/libmysql_exports.def
diff --git a/modules/dep/mysqllite/mysys/ChangeLog b/dep/mysqllite/mysys/ChangeLog
similarity index 100%
rename from modules/dep/mysqllite/mysys/ChangeLog
rename to dep/mysqllite/mysys/ChangeLog
diff --git a/modules/dep/mysqllite/mysys/array.c b/dep/mysqllite/mysys/array.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/array.c
rename to dep/mysqllite/mysys/array.c
diff --git a/modules/dep/mysqllite/mysys/base64.c b/dep/mysqllite/mysys/base64.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/base64.c
rename to dep/mysqllite/mysys/base64.c
diff --git a/modules/dep/mysqllite/mysys/charset-def.c b/dep/mysqllite/mysys/charset-def.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/charset-def.c
rename to dep/mysqllite/mysys/charset-def.c
diff --git a/modules/dep/mysqllite/mysys/charset.c b/dep/mysqllite/mysys/charset.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/charset.c
rename to dep/mysqllite/mysys/charset.c
diff --git a/modules/dep/mysqllite/mysys/checksum.c b/dep/mysqllite/mysys/checksum.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/checksum.c
rename to dep/mysqllite/mysys/checksum.c
diff --git a/modules/dep/mysqllite/mysys/default.c b/dep/mysqllite/mysys/default.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/default.c
rename to dep/mysqllite/mysys/default.c
diff --git a/modules/dep/mysqllite/mysys/errors.c b/dep/mysqllite/mysys/errors.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/errors.c
rename to dep/mysqllite/mysys/errors.c
diff --git a/modules/dep/mysqllite/mysys/hash.c b/dep/mysqllite/mysys/hash.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/hash.c
rename to dep/mysqllite/mysys/hash.c
diff --git a/modules/dep/mysqllite/mysys/lf_alloc-pin.c b/dep/mysqllite/mysys/lf_alloc-pin.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/lf_alloc-pin.c
rename to dep/mysqllite/mysys/lf_alloc-pin.c
diff --git a/modules/dep/mysqllite/mysys/lf_dynarray.c b/dep/mysqllite/mysys/lf_dynarray.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/lf_dynarray.c
rename to dep/mysqllite/mysys/lf_dynarray.c
diff --git a/modules/dep/mysqllite/mysys/lf_hash.c b/dep/mysqllite/mysys/lf_hash.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/lf_hash.c
rename to dep/mysqllite/mysys/lf_hash.c
diff --git a/modules/dep/mysqllite/mysys/list.c b/dep/mysqllite/mysys/list.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/list.c
rename to dep/mysqllite/mysys/list.c
diff --git a/modules/dep/mysqllite/mysys/md5.c b/dep/mysqllite/mysys/md5.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/md5.c
rename to dep/mysqllite/mysys/md5.c
diff --git a/modules/dep/mysqllite/mysys/mf_arr_appstr.c b/dep/mysqllite/mysys/mf_arr_appstr.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_arr_appstr.c
rename to dep/mysqllite/mysys/mf_arr_appstr.c
diff --git a/modules/dep/mysqllite/mysys/mf_cache.c b/dep/mysqllite/mysys/mf_cache.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_cache.c
rename to dep/mysqllite/mysys/mf_cache.c
diff --git a/modules/dep/mysqllite/mysys/mf_dirname.c b/dep/mysqllite/mysys/mf_dirname.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_dirname.c
rename to dep/mysqllite/mysys/mf_dirname.c
diff --git a/modules/dep/mysqllite/mysys/mf_fn_ext.c b/dep/mysqllite/mysys/mf_fn_ext.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_fn_ext.c
rename to dep/mysqllite/mysys/mf_fn_ext.c
diff --git a/modules/dep/mysqllite/mysys/mf_format.c b/dep/mysqllite/mysys/mf_format.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_format.c
rename to dep/mysqllite/mysys/mf_format.c
diff --git a/modules/dep/mysqllite/mysys/mf_getdate.c b/dep/mysqllite/mysys/mf_getdate.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_getdate.c
rename to dep/mysqllite/mysys/mf_getdate.c
diff --git a/modules/dep/mysqllite/mysys/mf_iocache.c b/dep/mysqllite/mysys/mf_iocache.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_iocache.c
rename to dep/mysqllite/mysys/mf_iocache.c
diff --git a/modules/dep/mysqllite/mysys/mf_iocache2.c b/dep/mysqllite/mysys/mf_iocache2.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_iocache2.c
rename to dep/mysqllite/mysys/mf_iocache2.c
diff --git a/modules/dep/mysqllite/mysys/mf_keycache.c b/dep/mysqllite/mysys/mf_keycache.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_keycache.c
rename to dep/mysqllite/mysys/mf_keycache.c
diff --git a/modules/dep/mysqllite/mysys/mf_keycaches.c b/dep/mysqllite/mysys/mf_keycaches.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_keycaches.c
rename to dep/mysqllite/mysys/mf_keycaches.c
diff --git a/modules/dep/mysqllite/mysys/mf_loadpath.c b/dep/mysqllite/mysys/mf_loadpath.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_loadpath.c
rename to dep/mysqllite/mysys/mf_loadpath.c
diff --git a/modules/dep/mysqllite/mysys/mf_pack.c b/dep/mysqllite/mysys/mf_pack.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_pack.c
rename to dep/mysqllite/mysys/mf_pack.c
diff --git a/modules/dep/mysqllite/mysys/mf_path.c b/dep/mysqllite/mysys/mf_path.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_path.c
rename to dep/mysqllite/mysys/mf_path.c
diff --git a/modules/dep/mysqllite/mysys/mf_qsort.c b/dep/mysqllite/mysys/mf_qsort.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_qsort.c
rename to dep/mysqllite/mysys/mf_qsort.c
diff --git a/modules/dep/mysqllite/mysys/mf_qsort2.c b/dep/mysqllite/mysys/mf_qsort2.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_qsort2.c
rename to dep/mysqllite/mysys/mf_qsort2.c
diff --git a/modules/dep/mysqllite/mysys/mf_radix.c b/dep/mysqllite/mysys/mf_radix.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_radix.c
rename to dep/mysqllite/mysys/mf_radix.c
diff --git a/modules/dep/mysqllite/mysys/mf_same.c b/dep/mysqllite/mysys/mf_same.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_same.c
rename to dep/mysqllite/mysys/mf_same.c
diff --git a/modules/dep/mysqllite/mysys/mf_sort.c b/dep/mysqllite/mysys/mf_sort.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_sort.c
rename to dep/mysqllite/mysys/mf_sort.c
diff --git a/modules/dep/mysqllite/mysys/mf_soundex.c b/dep/mysqllite/mysys/mf_soundex.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_soundex.c
rename to dep/mysqllite/mysys/mf_soundex.c
diff --git a/modules/dep/mysqllite/mysys/mf_tempdir.c b/dep/mysqllite/mysys/mf_tempdir.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_tempdir.c
rename to dep/mysqllite/mysys/mf_tempdir.c
diff --git a/modules/dep/mysqllite/mysys/mf_tempfile.c b/dep/mysqllite/mysys/mf_tempfile.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_tempfile.c
rename to dep/mysqllite/mysys/mf_tempfile.c
diff --git a/modules/dep/mysqllite/mysys/mf_unixpath.c b/dep/mysqllite/mysys/mf_unixpath.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_unixpath.c
rename to dep/mysqllite/mysys/mf_unixpath.c
diff --git a/modules/dep/mysqllite/mysys/mf_wcomp.c b/dep/mysqllite/mysys/mf_wcomp.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mf_wcomp.c
rename to dep/mysqllite/mysys/mf_wcomp.c
diff --git a/modules/dep/mysqllite/mysys/mulalloc.c b/dep/mysqllite/mysys/mulalloc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/mulalloc.c
rename to dep/mysqllite/mysys/mulalloc.c
diff --git a/modules/dep/mysqllite/mysys/my_access.c b/dep/mysqllite/mysys/my_access.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_access.c
rename to dep/mysqllite/mysys/my_access.c
diff --git a/modules/dep/mysqllite/mysys/my_aes.c b/dep/mysqllite/mysys/my_aes.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_aes.c
rename to dep/mysqllite/mysys/my_aes.c
diff --git a/modules/dep/mysqllite/mysys/my_alarm.c b/dep/mysqllite/mysys/my_alarm.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_alarm.c
rename to dep/mysqllite/mysys/my_alarm.c
diff --git a/modules/dep/mysqllite/mysys/my_alloc.c b/dep/mysqllite/mysys/my_alloc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_alloc.c
rename to dep/mysqllite/mysys/my_alloc.c
diff --git a/modules/dep/mysqllite/mysys/my_atomic.c b/dep/mysqllite/mysys/my_atomic.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_atomic.c
rename to dep/mysqllite/mysys/my_atomic.c
diff --git a/modules/dep/mysqllite/mysys/my_bit.c b/dep/mysqllite/mysys/my_bit.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_bit.c
rename to dep/mysqllite/mysys/my_bit.c
diff --git a/modules/dep/mysqllite/mysys/my_bitmap.c b/dep/mysqllite/mysys/my_bitmap.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_bitmap.c
rename to dep/mysqllite/mysys/my_bitmap.c
diff --git a/modules/dep/mysqllite/mysys/my_chsize.c b/dep/mysqllite/mysys/my_chsize.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_chsize.c
rename to dep/mysqllite/mysys/my_chsize.c
diff --git a/modules/dep/mysqllite/mysys/my_compress.c b/dep/mysqllite/mysys/my_compress.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_compress.c
rename to dep/mysqllite/mysys/my_compress.c
diff --git a/modules/dep/mysqllite/mysys/my_conio.c b/dep/mysqllite/mysys/my_conio.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_conio.c
rename to dep/mysqllite/mysys/my_conio.c
diff --git a/modules/dep/mysqllite/mysys/my_copy.c b/dep/mysqllite/mysys/my_copy.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_copy.c
rename to dep/mysqllite/mysys/my_copy.c
diff --git a/modules/dep/mysqllite/mysys/my_create.c b/dep/mysqllite/mysys/my_create.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_create.c
rename to dep/mysqllite/mysys/my_create.c
diff --git a/modules/dep/mysqllite/mysys/my_delete.c b/dep/mysqllite/mysys/my_delete.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_delete.c
rename to dep/mysqllite/mysys/my_delete.c
diff --git a/modules/dep/mysqllite/mysys/my_div.c b/dep/mysqllite/mysys/my_div.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_div.c
rename to dep/mysqllite/mysys/my_div.c
diff --git a/modules/dep/mysqllite/mysys/my_error.c b/dep/mysqllite/mysys/my_error.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_error.c
rename to dep/mysqllite/mysys/my_error.c
diff --git a/modules/dep/mysqllite/mysys/my_file.c b/dep/mysqllite/mysys/my_file.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_file.c
rename to dep/mysqllite/mysys/my_file.c
diff --git a/modules/dep/mysqllite/mysys/my_fopen.c b/dep/mysqllite/mysys/my_fopen.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_fopen.c
rename to dep/mysqllite/mysys/my_fopen.c
diff --git a/modules/dep/mysqllite/mysys/my_fstream.c b/dep/mysqllite/mysys/my_fstream.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_fstream.c
rename to dep/mysqllite/mysys/my_fstream.c
diff --git a/modules/dep/mysqllite/mysys/my_gethostbyname.c b/dep/mysqllite/mysys/my_gethostbyname.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_gethostbyname.c
rename to dep/mysqllite/mysys/my_gethostbyname.c
diff --git a/modules/dep/mysqllite/mysys/my_gethwaddr.c b/dep/mysqllite/mysys/my_gethwaddr.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_gethwaddr.c
rename to dep/mysqllite/mysys/my_gethwaddr.c
diff --git a/modules/dep/mysqllite/mysys/my_getncpus.c b/dep/mysqllite/mysys/my_getncpus.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getncpus.c
rename to dep/mysqllite/mysys/my_getncpus.c
diff --git a/modules/dep/mysqllite/mysys/my_getopt.c b/dep/mysqllite/mysys/my_getopt.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getopt.c
rename to dep/mysqllite/mysys/my_getopt.c
diff --git a/modules/dep/mysqllite/mysys/my_getpagesize.c b/dep/mysqllite/mysys/my_getpagesize.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getpagesize.c
rename to dep/mysqllite/mysys/my_getpagesize.c
diff --git a/modules/dep/mysqllite/mysys/my_getsystime.c b/dep/mysqllite/mysys/my_getsystime.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getsystime.c
rename to dep/mysqllite/mysys/my_getsystime.c
diff --git a/modules/dep/mysqllite/mysys/my_getwd.c b/dep/mysqllite/mysys/my_getwd.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_getwd.c
rename to dep/mysqllite/mysys/my_getwd.c
diff --git a/modules/dep/mysqllite/mysys/my_handler.c b/dep/mysqllite/mysys/my_handler.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_handler.c
rename to dep/mysqllite/mysys/my_handler.c
diff --git a/modules/dep/mysqllite/mysys/my_handler_errors.h b/dep/mysqllite/mysys/my_handler_errors.h
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_handler_errors.h
rename to dep/mysqllite/mysys/my_handler_errors.h
diff --git a/modules/dep/mysqllite/mysys/my_init.c b/dep/mysqllite/mysys/my_init.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_init.c
rename to dep/mysqllite/mysys/my_init.c
diff --git a/modules/dep/mysqllite/mysys/my_largepage.c b/dep/mysqllite/mysys/my_largepage.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_largepage.c
rename to dep/mysqllite/mysys/my_largepage.c
diff --git a/modules/dep/mysqllite/mysys/my_lib.c b/dep/mysqllite/mysys/my_lib.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_lib.c
rename to dep/mysqllite/mysys/my_lib.c
diff --git a/modules/dep/mysqllite/mysys/my_libwrap.c b/dep/mysqllite/mysys/my_libwrap.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_libwrap.c
rename to dep/mysqllite/mysys/my_libwrap.c
diff --git a/modules/dep/mysqllite/mysys/my_lock.c b/dep/mysqllite/mysys/my_lock.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_lock.c
rename to dep/mysqllite/mysys/my_lock.c
diff --git a/modules/dep/mysqllite/mysys/my_lockmem.c b/dep/mysqllite/mysys/my_lockmem.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_lockmem.c
rename to dep/mysqllite/mysys/my_lockmem.c
diff --git a/modules/dep/mysqllite/mysys/my_malloc.c b/dep/mysqllite/mysys/my_malloc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_malloc.c
rename to dep/mysqllite/mysys/my_malloc.c
diff --git a/modules/dep/mysqllite/mysys/my_memmem.c b/dep/mysqllite/mysys/my_memmem.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_memmem.c
rename to dep/mysqllite/mysys/my_memmem.c
diff --git a/modules/dep/mysqllite/mysys/my_mess.c b/dep/mysqllite/mysys/my_mess.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_mess.c
rename to dep/mysqllite/mysys/my_mess.c
diff --git a/modules/dep/mysqllite/mysys/my_mkdir.c b/dep/mysqllite/mysys/my_mkdir.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_mkdir.c
rename to dep/mysqllite/mysys/my_mkdir.c
diff --git a/modules/dep/mysqllite/mysys/my_mmap.c b/dep/mysqllite/mysys/my_mmap.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_mmap.c
rename to dep/mysqllite/mysys/my_mmap.c
diff --git a/modules/dep/mysqllite/mysys/my_new.cc b/dep/mysqllite/mysys/my_new.cc
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_new.cc
rename to dep/mysqllite/mysys/my_new.cc
diff --git a/modules/dep/mysqllite/mysys/my_once.c b/dep/mysqllite/mysys/my_once.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_once.c
rename to dep/mysqllite/mysys/my_once.c
diff --git a/modules/dep/mysqllite/mysys/my_open.c b/dep/mysqllite/mysys/my_open.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_open.c
rename to dep/mysqllite/mysys/my_open.c
diff --git a/modules/dep/mysqllite/mysys/my_port.c b/dep/mysqllite/mysys/my_port.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_port.c
rename to dep/mysqllite/mysys/my_port.c
diff --git a/modules/dep/mysqllite/mysys/my_pread.c b/dep/mysqllite/mysys/my_pread.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_pread.c
rename to dep/mysqllite/mysys/my_pread.c
diff --git a/modules/dep/mysqllite/mysys/my_pthread.c b/dep/mysqllite/mysys/my_pthread.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_pthread.c
rename to dep/mysqllite/mysys/my_pthread.c
diff --git a/modules/dep/mysqllite/mysys/my_quick.c b/dep/mysqllite/mysys/my_quick.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_quick.c
rename to dep/mysqllite/mysys/my_quick.c
diff --git a/modules/dep/mysqllite/mysys/my_rdtsc.c b/dep/mysqllite/mysys/my_rdtsc.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_rdtsc.c
rename to dep/mysqllite/mysys/my_rdtsc.c
diff --git a/modules/dep/mysqllite/mysys/my_read.c b/dep/mysqllite/mysys/my_read.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_read.c
rename to dep/mysqllite/mysys/my_read.c
diff --git a/modules/dep/mysqllite/mysys/my_redel.c b/dep/mysqllite/mysys/my_redel.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_redel.c
rename to dep/mysqllite/mysys/my_redel.c
diff --git a/modules/dep/mysqllite/mysys/my_rename.c b/dep/mysqllite/mysys/my_rename.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_rename.c
rename to dep/mysqllite/mysys/my_rename.c
diff --git a/modules/dep/mysqllite/mysys/my_seek.c b/dep/mysqllite/mysys/my_seek.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_seek.c
rename to dep/mysqllite/mysys/my_seek.c
diff --git a/modules/dep/mysqllite/mysys/my_sleep.c b/dep/mysqllite/mysys/my_sleep.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_sleep.c
rename to dep/mysqllite/mysys/my_sleep.c
diff --git a/modules/dep/mysqllite/mysys/my_static.c b/dep/mysqllite/mysys/my_static.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_static.c
rename to dep/mysqllite/mysys/my_static.c
diff --git a/modules/dep/mysqllite/mysys/my_static.h b/dep/mysqllite/mysys/my_static.h
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_static.h
rename to dep/mysqllite/mysys/my_static.h
diff --git a/modules/dep/mysqllite/mysys/my_symlink.c b/dep/mysqllite/mysys/my_symlink.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_symlink.c
rename to dep/mysqllite/mysys/my_symlink.c
diff --git a/modules/dep/mysqllite/mysys/my_symlink2.c b/dep/mysqllite/mysys/my_symlink2.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_symlink2.c
rename to dep/mysqllite/mysys/my_symlink2.c
diff --git a/modules/dep/mysqllite/mysys/my_sync.c b/dep/mysqllite/mysys/my_sync.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_sync.c
rename to dep/mysqllite/mysys/my_sync.c
diff --git a/modules/dep/mysqllite/mysys/my_thr_init.c b/dep/mysqllite/mysys/my_thr_init.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_thr_init.c
rename to dep/mysqllite/mysys/my_thr_init.c
diff --git a/modules/dep/mysqllite/mysys/my_wincond.c b/dep/mysqllite/mysys/my_wincond.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_wincond.c
rename to dep/mysqllite/mysys/my_wincond.c
diff --git a/modules/dep/mysqllite/mysys/my_windac.c b/dep/mysqllite/mysys/my_windac.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_windac.c
rename to dep/mysqllite/mysys/my_windac.c
diff --git a/modules/dep/mysqllite/mysys/my_winerr.c b/dep/mysqllite/mysys/my_winerr.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_winerr.c
rename to dep/mysqllite/mysys/my_winerr.c
diff --git a/modules/dep/mysqllite/mysys/my_winfile.c b/dep/mysqllite/mysys/my_winfile.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_winfile.c
rename to dep/mysqllite/mysys/my_winfile.c
diff --git a/modules/dep/mysqllite/mysys/my_winthread.c b/dep/mysqllite/mysys/my_winthread.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_winthread.c
rename to dep/mysqllite/mysys/my_winthread.c
diff --git a/modules/dep/mysqllite/mysys/my_write.c b/dep/mysqllite/mysys/my_write.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/my_write.c
rename to dep/mysqllite/mysys/my_write.c
diff --git a/modules/dep/mysqllite/mysys/mysys_priv.h b/dep/mysqllite/mysys/mysys_priv.h
similarity index 100%
rename from modules/dep/mysqllite/mysys/mysys_priv.h
rename to dep/mysqllite/mysys/mysys_priv.h
diff --git a/modules/dep/mysqllite/mysys/ptr_cmp.c b/dep/mysqllite/mysys/ptr_cmp.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/ptr_cmp.c
rename to dep/mysqllite/mysys/ptr_cmp.c
diff --git a/modules/dep/mysqllite/mysys/queues.c b/dep/mysqllite/mysys/queues.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/queues.c
rename to dep/mysqllite/mysys/queues.c
diff --git a/modules/dep/mysqllite/mysys/rijndael.c b/dep/mysqllite/mysys/rijndael.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/rijndael.c
rename to dep/mysqllite/mysys/rijndael.c
diff --git a/modules/dep/mysqllite/mysys/sha1.c b/dep/mysqllite/mysys/sha1.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/sha1.c
rename to dep/mysqllite/mysys/sha1.c
diff --git a/modules/dep/mysqllite/mysys/stacktrace.c b/dep/mysqllite/mysys/stacktrace.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/stacktrace.c
rename to dep/mysqllite/mysys/stacktrace.c
diff --git a/modules/dep/mysqllite/mysys/string.c b/dep/mysqllite/mysys/string.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/string.c
rename to dep/mysqllite/mysys/string.c
diff --git a/modules/dep/mysqllite/mysys/thr_alarm.c b/dep/mysqllite/mysys/thr_alarm.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_alarm.c
rename to dep/mysqllite/mysys/thr_alarm.c
diff --git a/modules/dep/mysqllite/mysys/thr_lock.c b/dep/mysqllite/mysys/thr_lock.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_lock.c
rename to dep/mysqllite/mysys/thr_lock.c
diff --git a/modules/dep/mysqllite/mysys/thr_mutex.c b/dep/mysqllite/mysys/thr_mutex.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_mutex.c
rename to dep/mysqllite/mysys/thr_mutex.c
diff --git a/modules/dep/mysqllite/mysys/thr_rwlock.c b/dep/mysqllite/mysys/thr_rwlock.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/thr_rwlock.c
rename to dep/mysqllite/mysys/thr_rwlock.c
diff --git a/modules/dep/mysqllite/mysys/tree.c b/dep/mysqllite/mysys/tree.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/tree.c
rename to dep/mysqllite/mysys/tree.c
diff --git a/modules/dep/mysqllite/mysys/typelib.c b/dep/mysqllite/mysys/typelib.c
similarity index 100%
rename from modules/dep/mysqllite/mysys/typelib.c
rename to dep/mysqllite/mysys/typelib.c
diff --git a/modules/dep/mysqllite/sql-common/client.c b/dep/mysqllite/sql-common/client.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/client.c
rename to dep/mysqllite/sql-common/client.c
diff --git a/modules/dep/mysqllite/sql-common/client_plugin.c b/dep/mysqllite/sql-common/client_plugin.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/client_plugin.c
rename to dep/mysqllite/sql-common/client_plugin.c
diff --git a/modules/dep/mysqllite/sql-common/my_time.c b/dep/mysqllite/sql-common/my_time.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/my_time.c
rename to dep/mysqllite/sql-common/my_time.c
diff --git a/modules/dep/mysqllite/sql-common/pack.c b/dep/mysqllite/sql-common/pack.c
similarity index 100%
rename from modules/dep/mysqllite/sql-common/pack.c
rename to dep/mysqllite/sql-common/pack.c
diff --git a/modules/dep/mysqllite/sql/net_serv.cc b/dep/mysqllite/sql/net_serv.cc
similarity index 100%
rename from modules/dep/mysqllite/sql/net_serv.cc
rename to dep/mysqllite/sql/net_serv.cc
diff --git a/modules/dep/mysqllite/sql/password.c b/dep/mysqllite/sql/password.c
similarity index 100%
rename from modules/dep/mysqllite/sql/password.c
rename to dep/mysqllite/sql/password.c
diff --git a/modules/dep/mysqllite/strings/CHARSET_INFO.txt b/dep/mysqllite/strings/CHARSET_INFO.txt
similarity index 100%
rename from modules/dep/mysqllite/strings/CHARSET_INFO.txt
rename to dep/mysqllite/strings/CHARSET_INFO.txt
diff --git a/modules/dep/mysqllite/strings/README b/dep/mysqllite/strings/README
similarity index 100%
rename from modules/dep/mysqllite/strings/README
rename to dep/mysqllite/strings/README
diff --git a/modules/dep/mysqllite/strings/bchange.c b/dep/mysqllite/strings/bchange.c
similarity index 100%
rename from modules/dep/mysqllite/strings/bchange.c
rename to dep/mysqllite/strings/bchange.c
diff --git a/modules/dep/mysqllite/strings/bmove_upp.c b/dep/mysqllite/strings/bmove_upp.c
similarity index 100%
rename from modules/dep/mysqllite/strings/bmove_upp.c
rename to dep/mysqllite/strings/bmove_upp.c
diff --git a/modules/dep/mysqllite/strings/ctype-big5.c b/dep/mysqllite/strings/ctype-big5.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-big5.c
rename to dep/mysqllite/strings/ctype-big5.c
diff --git a/modules/dep/mysqllite/strings/ctype-bin.c b/dep/mysqllite/strings/ctype-bin.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-bin.c
rename to dep/mysqllite/strings/ctype-bin.c
diff --git a/modules/dep/mysqllite/strings/ctype-cp932.c b/dep/mysqllite/strings/ctype-cp932.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-cp932.c
rename to dep/mysqllite/strings/ctype-cp932.c
diff --git a/modules/dep/mysqllite/strings/ctype-czech.c b/dep/mysqllite/strings/ctype-czech.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-czech.c
rename to dep/mysqllite/strings/ctype-czech.c
diff --git a/modules/dep/mysqllite/strings/ctype-euc_kr.c b/dep/mysqllite/strings/ctype-euc_kr.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-euc_kr.c
rename to dep/mysqllite/strings/ctype-euc_kr.c
diff --git a/modules/dep/mysqllite/strings/ctype-extra.c b/dep/mysqllite/strings/ctype-extra.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-extra.c
rename to dep/mysqllite/strings/ctype-extra.c
diff --git a/modules/dep/mysqllite/strings/ctype-gb2312.c b/dep/mysqllite/strings/ctype-gb2312.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-gb2312.c
rename to dep/mysqllite/strings/ctype-gb2312.c
diff --git a/modules/dep/mysqllite/strings/ctype-gbk.c b/dep/mysqllite/strings/ctype-gbk.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-gbk.c
rename to dep/mysqllite/strings/ctype-gbk.c
diff --git a/modules/dep/mysqllite/strings/ctype-latin1.c b/dep/mysqllite/strings/ctype-latin1.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-latin1.c
rename to dep/mysqllite/strings/ctype-latin1.c
diff --git a/modules/dep/mysqllite/strings/ctype-mb.c b/dep/mysqllite/strings/ctype-mb.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-mb.c
rename to dep/mysqllite/strings/ctype-mb.c
diff --git a/modules/dep/mysqllite/strings/ctype-simple.c b/dep/mysqllite/strings/ctype-simple.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-simple.c
rename to dep/mysqllite/strings/ctype-simple.c
diff --git a/modules/dep/mysqllite/strings/ctype-tis620.c b/dep/mysqllite/strings/ctype-tis620.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-tis620.c
rename to dep/mysqllite/strings/ctype-tis620.c
diff --git a/modules/dep/mysqllite/strings/ctype-uca.c b/dep/mysqllite/strings/ctype-uca.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-uca.c
rename to dep/mysqllite/strings/ctype-uca.c
diff --git a/modules/dep/mysqllite/strings/ctype-ucs2.c b/dep/mysqllite/strings/ctype-ucs2.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-ucs2.c
rename to dep/mysqllite/strings/ctype-ucs2.c
diff --git a/modules/dep/mysqllite/strings/ctype-utf8.c b/dep/mysqllite/strings/ctype-utf8.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-utf8.c
rename to dep/mysqllite/strings/ctype-utf8.c
diff --git a/modules/dep/mysqllite/strings/ctype-win1250ch.c b/dep/mysqllite/strings/ctype-win1250ch.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype-win1250ch.c
rename to dep/mysqllite/strings/ctype-win1250ch.c
diff --git a/modules/dep/mysqllite/strings/ctype.c b/dep/mysqllite/strings/ctype.c
similarity index 100%
rename from modules/dep/mysqllite/strings/ctype.c
rename to dep/mysqllite/strings/ctype.c
diff --git a/modules/dep/mysqllite/strings/decimal.c b/dep/mysqllite/strings/decimal.c
similarity index 100%
rename from modules/dep/mysqllite/strings/decimal.c
rename to dep/mysqllite/strings/decimal.c
diff --git a/modules/dep/mysqllite/strings/dtoa.c b/dep/mysqllite/strings/dtoa.c
similarity index 100%
rename from modules/dep/mysqllite/strings/dtoa.c
rename to dep/mysqllite/strings/dtoa.c
diff --git a/modules/dep/mysqllite/strings/int2str.c b/dep/mysqllite/strings/int2str.c
similarity index 100%
rename from modules/dep/mysqllite/strings/int2str.c
rename to dep/mysqllite/strings/int2str.c
diff --git a/modules/dep/mysqllite/strings/is_prefix.c b/dep/mysqllite/strings/is_prefix.c
similarity index 100%
rename from modules/dep/mysqllite/strings/is_prefix.c
rename to dep/mysqllite/strings/is_prefix.c
diff --git a/modules/dep/mysqllite/strings/latin2.def b/dep/mysqllite/strings/latin2.def
similarity index 100%
rename from modules/dep/mysqllite/strings/latin2.def
rename to dep/mysqllite/strings/latin2.def
diff --git a/modules/dep/mysqllite/strings/llstr.c b/dep/mysqllite/strings/llstr.c
similarity index 100%
rename from modules/dep/mysqllite/strings/llstr.c
rename to dep/mysqllite/strings/llstr.c
diff --git a/modules/dep/mysqllite/strings/longlong2str.c b/dep/mysqllite/strings/longlong2str.c
similarity index 100%
rename from modules/dep/mysqllite/strings/longlong2str.c
rename to dep/mysqllite/strings/longlong2str.c
diff --git a/modules/dep/mysqllite/strings/my_strchr.c b/dep/mysqllite/strings/my_strchr.c
similarity index 100%
rename from modules/dep/mysqllite/strings/my_strchr.c
rename to dep/mysqllite/strings/my_strchr.c
diff --git a/modules/dep/mysqllite/strings/my_strtoll10.c b/dep/mysqllite/strings/my_strtoll10.c
similarity index 100%
rename from modules/dep/mysqllite/strings/my_strtoll10.c
rename to dep/mysqllite/strings/my_strtoll10.c
diff --git a/modules/dep/mysqllite/strings/my_vsnprintf.c b/dep/mysqllite/strings/my_vsnprintf.c
similarity index 100%
rename from modules/dep/mysqllite/strings/my_vsnprintf.c
rename to dep/mysqllite/strings/my_vsnprintf.c
diff --git a/modules/dep/mysqllite/strings/str2int.c b/dep/mysqllite/strings/str2int.c
similarity index 100%
rename from modules/dep/mysqllite/strings/str2int.c
rename to dep/mysqllite/strings/str2int.c
diff --git a/modules/dep/mysqllite/strings/str_alloc.c b/dep/mysqllite/strings/str_alloc.c
similarity index 100%
rename from modules/dep/mysqllite/strings/str_alloc.c
rename to dep/mysqllite/strings/str_alloc.c
diff --git a/modules/dep/mysqllite/strings/strappend.c b/dep/mysqllite/strings/strappend.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strappend.c
rename to dep/mysqllite/strings/strappend.c
diff --git a/modules/dep/mysqllite/strings/strcend.c b/dep/mysqllite/strings/strcend.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strcend.c
rename to dep/mysqllite/strings/strcend.c
diff --git a/modules/dep/mysqllite/strings/strcont.c b/dep/mysqllite/strings/strcont.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strcont.c
rename to dep/mysqllite/strings/strcont.c
diff --git a/modules/dep/mysqllite/strings/strend.c b/dep/mysqllite/strings/strend.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strend.c
rename to dep/mysqllite/strings/strend.c
diff --git a/modules/dep/mysqllite/strings/strfill.c b/dep/mysqllite/strings/strfill.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strfill.c
rename to dep/mysqllite/strings/strfill.c
diff --git a/modules/dep/mysqllite/strings/strmake.c b/dep/mysqllite/strings/strmake.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strmake.c
rename to dep/mysqllite/strings/strmake.c
diff --git a/modules/dep/mysqllite/strings/strmov.c b/dep/mysqllite/strings/strmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strmov.c
rename to dep/mysqllite/strings/strmov.c
diff --git a/modules/dep/mysqllite/strings/strnlen.c b/dep/mysqllite/strings/strnlen.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strnlen.c
rename to dep/mysqllite/strings/strnlen.c
diff --git a/modules/dep/mysqllite/strings/strnmov.c b/dep/mysqllite/strings/strnmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strnmov.c
rename to dep/mysqllite/strings/strnmov.c
diff --git a/modules/dep/mysqllite/strings/strxmov.c b/dep/mysqllite/strings/strxmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strxmov.c
rename to dep/mysqllite/strings/strxmov.c
diff --git a/modules/dep/mysqllite/strings/strxnmov.c b/dep/mysqllite/strings/strxnmov.c
similarity index 100%
rename from modules/dep/mysqllite/strings/strxnmov.c
rename to dep/mysqllite/strings/strxnmov.c
diff --git a/modules/dep/mysqllite/strings/t_ctype.h b/dep/mysqllite/strings/t_ctype.h
similarity index 100%
rename from modules/dep/mysqllite/strings/t_ctype.h
rename to dep/mysqllite/strings/t_ctype.h
diff --git a/modules/dep/mysqllite/strings/xml.c b/dep/mysqllite/strings/xml.c
similarity index 100%
rename from modules/dep/mysqllite/strings/xml.c
rename to dep/mysqllite/strings/xml.c
diff --git a/modules/dep/mysqllite/vio/vio.c b/dep/mysqllite/vio/vio.c
similarity index 100%
rename from modules/dep/mysqllite/vio/vio.c
rename to dep/mysqllite/vio/vio.c
diff --git a/modules/dep/mysqllite/vio/vio_priv.h b/dep/mysqllite/vio/vio_priv.h
similarity index 100%
rename from modules/dep/mysqllite/vio/vio_priv.h
rename to dep/mysqllite/vio/vio_priv.h
diff --git a/modules/dep/mysqllite/vio/viosocket.c b/dep/mysqllite/vio/viosocket.c
similarity index 100%
rename from modules/dep/mysqllite/vio/viosocket.c
rename to dep/mysqllite/vio/viosocket.c
diff --git a/modules/dep/mysqllite/vio/viossl.c b/dep/mysqllite/vio/viossl.c
similarity index 100%
rename from modules/dep/mysqllite/vio/viossl.c
rename to dep/mysqllite/vio/viossl.c
diff --git a/modules/dep/mysqllite/vio/viosslfactories.c b/dep/mysqllite/vio/viosslfactories.c
similarity index 100%
rename from modules/dep/mysqllite/vio/viosslfactories.c
rename to dep/mysqllite/vio/viosslfactories.c
diff --git a/modules/dep/recastnavigation/CMakeLists.txt b/dep/recastnavigation/CMakeLists.txt
similarity index 100%
rename from modules/dep/recastnavigation/CMakeLists.txt
rename to dep/recastnavigation/CMakeLists.txt
diff --git a/modules/dep/recastnavigation/Detour/CMakeLists.txt b/dep/recastnavigation/Detour/CMakeLists.txt
similarity index 74%
rename from modules/dep/recastnavigation/Detour/CMakeLists.txt
rename to dep/recastnavigation/Detour/CMakeLists.txt
index 95fdea4947..4c8df7f431 100644
--- a/modules/dep/recastnavigation/Detour/CMakeLists.txt
+++ b/dep/recastnavigation/Detour/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,17 +9,17 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 set(Detour_STAT_SRCS
-    DetourAlloc.cpp
-    DetourCommon.cpp
-    DetourNavMesh.cpp
-    DetourNavMeshBuilder.cpp
-    DetourNavMeshQuery.cpp
-    DetourNode.cpp
+    DetourAlloc.cpp 
+    DetourCommon.cpp 
+    DetourNavMesh.cpp 
+    DetourNavMeshBuilder.cpp 
+    DetourNavMeshQuery.cpp 
+    DetourNode.cpp 
 )
 
 if(WIN32)
   include_directories(
-    ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+    ${CMAKE_SOURCE_DIR}/dep/zlib
   )
 endif()
 
diff --git a/modules/dep/recastnavigation/Detour/DetourAlloc.cpp b/dep/recastnavigation/Detour/DetourAlloc.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourAlloc.cpp
rename to dep/recastnavigation/Detour/DetourAlloc.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourAlloc.h b/dep/recastnavigation/Detour/DetourAlloc.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourAlloc.h
rename to dep/recastnavigation/Detour/DetourAlloc.h
diff --git a/modules/dep/recastnavigation/Detour/DetourAssert.h b/dep/recastnavigation/Detour/DetourAssert.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourAssert.h
rename to dep/recastnavigation/Detour/DetourAssert.h
diff --git a/modules/dep/recastnavigation/Detour/DetourCommon.cpp b/dep/recastnavigation/Detour/DetourCommon.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourCommon.cpp
rename to dep/recastnavigation/Detour/DetourCommon.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourCommon.h b/dep/recastnavigation/Detour/DetourCommon.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourCommon.h
rename to dep/recastnavigation/Detour/DetourCommon.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMesh.cpp b/dep/recastnavigation/Detour/DetourNavMesh.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMesh.cpp
rename to dep/recastnavigation/Detour/DetourNavMesh.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMesh.h b/dep/recastnavigation/Detour/DetourNavMesh.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMesh.h
rename to dep/recastnavigation/Detour/DetourNavMesh.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.cpp b/dep/recastnavigation/Detour/DetourNavMeshBuilder.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.cpp
rename to dep/recastnavigation/Detour/DetourNavMeshBuilder.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.h b/dep/recastnavigation/Detour/DetourNavMeshBuilder.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshBuilder.h
rename to dep/recastnavigation/Detour/DetourNavMeshBuilder.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshQuery.cpp b/dep/recastnavigation/Detour/DetourNavMeshQuery.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshQuery.cpp
rename to dep/recastnavigation/Detour/DetourNavMeshQuery.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNavMeshQuery.h b/dep/recastnavigation/Detour/DetourNavMeshQuery.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNavMeshQuery.h
rename to dep/recastnavigation/Detour/DetourNavMeshQuery.h
diff --git a/modules/dep/recastnavigation/Detour/DetourNode.cpp b/dep/recastnavigation/Detour/DetourNode.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNode.cpp
rename to dep/recastnavigation/Detour/DetourNode.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourNode.h b/dep/recastnavigation/Detour/DetourNode.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourNode.h
rename to dep/recastnavigation/Detour/DetourNode.h
diff --git a/modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.cpp b/dep/recastnavigation/Detour/DetourObstacleAvoidance.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.cpp
rename to dep/recastnavigation/Detour/DetourObstacleAvoidance.cpp
diff --git a/modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.h b/dep/recastnavigation/Detour/DetourObstacleAvoidance.h
similarity index 100%
rename from modules/dep/recastnavigation/Detour/DetourObstacleAvoidance.h
rename to dep/recastnavigation/Detour/DetourObstacleAvoidance.h
diff --git a/modules/dep/recastnavigation/License.txt b/dep/recastnavigation/License.txt
similarity index 100%
rename from modules/dep/recastnavigation/License.txt
rename to dep/recastnavigation/License.txt
diff --git a/modules/dep/recastnavigation/Readme.txt b/dep/recastnavigation/Readme.txt
similarity index 100%
rename from modules/dep/recastnavigation/Readme.txt
rename to dep/recastnavigation/Readme.txt
diff --git a/modules/dep/recastnavigation/Recast/CMakeLists.txt b/dep/recastnavigation/Recast/CMakeLists.txt
similarity index 64%
rename from modules/dep/recastnavigation/Recast/CMakeLists.txt
rename to dep/recastnavigation/Recast/CMakeLists.txt
index a497f7875f..6b5fb22543 100644
--- a/modules/dep/recastnavigation/Recast/CMakeLists.txt
+++ b/dep/recastnavigation/Recast/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,23 +9,23 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 set(Recast_STAT_SRCS
-    Recast.cpp
-    RecastAlloc.cpp
-    RecastArea.cpp
-    RecastContour.cpp
-    RecastFilter.cpp
-    RecastMesh.cpp
-    RecastMeshDetail.cpp
-    RecastRasterization.cpp
-    RecastRegion.cpp
+    Recast.cpp 
+    RecastAlloc.cpp 
+    RecastArea.cpp 
+    RecastContour.cpp 
+    RecastFilter.cpp 
+    RecastMesh.cpp 
+    RecastMeshDetail.cpp 
+    RecastRasterization.cpp 
+    RecastRegion.cpp 
 )
 
 if(WIN32)
   include_directories(
-    ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+    ${CMAKE_SOURCE_DIR}/dep/zlib
   )
 endif()
 
 add_library(Recast STATIC ${Recast_STAT_SRCS})
 
-target_link_libraries(Recast ${ZLIB_LIBRARIES})
+target_link_libraries(Recast ${ZLIB_LIBRARIES})
\ No newline at end of file
diff --git a/modules/dep/recastnavigation/Recast/Recast.cpp b/dep/recastnavigation/Recast/Recast.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/Recast.cpp
rename to dep/recastnavigation/Recast/Recast.cpp
diff --git a/modules/dep/recastnavigation/Recast/Recast.h b/dep/recastnavigation/Recast/Recast.h
similarity index 100%
rename from modules/dep/recastnavigation/Recast/Recast.h
rename to dep/recastnavigation/Recast/Recast.h
diff --git a/modules/dep/recastnavigation/Recast/RecastAlloc.cpp b/dep/recastnavigation/Recast/RecastAlloc.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastAlloc.cpp
rename to dep/recastnavigation/Recast/RecastAlloc.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastAlloc.h b/dep/recastnavigation/Recast/RecastAlloc.h
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastAlloc.h
rename to dep/recastnavigation/Recast/RecastAlloc.h
diff --git a/modules/dep/recastnavigation/Recast/RecastArea.cpp b/dep/recastnavigation/Recast/RecastArea.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastArea.cpp
rename to dep/recastnavigation/Recast/RecastArea.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastAssert.h b/dep/recastnavigation/Recast/RecastAssert.h
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastAssert.h
rename to dep/recastnavigation/Recast/RecastAssert.h
diff --git a/modules/dep/recastnavigation/Recast/RecastContour.cpp b/dep/recastnavigation/Recast/RecastContour.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastContour.cpp
rename to dep/recastnavigation/Recast/RecastContour.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastFilter.cpp b/dep/recastnavigation/Recast/RecastFilter.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastFilter.cpp
rename to dep/recastnavigation/Recast/RecastFilter.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastMesh.cpp b/dep/recastnavigation/Recast/RecastMesh.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastMesh.cpp
rename to dep/recastnavigation/Recast/RecastMesh.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastMeshDetail.cpp b/dep/recastnavigation/Recast/RecastMeshDetail.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastMeshDetail.cpp
rename to dep/recastnavigation/Recast/RecastMeshDetail.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastRasterization.cpp b/dep/recastnavigation/Recast/RecastRasterization.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastRasterization.cpp
rename to dep/recastnavigation/Recast/RecastRasterization.cpp
diff --git a/modules/dep/recastnavigation/Recast/RecastRegion.cpp b/dep/recastnavigation/Recast/RecastRegion.cpp
similarity index 100%
rename from modules/dep/recastnavigation/Recast/RecastRegion.cpp
rename to dep/recastnavigation/Recast/RecastRegion.cpp
diff --git a/modules/dep/recastnavigation/TODO.txt b/dep/recastnavigation/TODO.txt
similarity index 100%
rename from modules/dep/recastnavigation/TODO.txt
rename to dep/recastnavigation/TODO.txt
diff --git a/modules/dep/utf8cpp/utf8.h b/dep/utf8cpp/utf8.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8.h
rename to dep/utf8cpp/utf8.h
diff --git a/modules/dep/utf8cpp/utf8/checked.h b/dep/utf8cpp/utf8/checked.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8/checked.h
rename to dep/utf8cpp/utf8/checked.h
diff --git a/modules/dep/utf8cpp/utf8/core.h b/dep/utf8cpp/utf8/core.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8/core.h
rename to dep/utf8cpp/utf8/core.h
diff --git a/modules/dep/utf8cpp/utf8/unchecked.h b/dep/utf8cpp/utf8/unchecked.h
similarity index 100%
rename from modules/dep/utf8cpp/utf8/unchecked.h
rename to dep/utf8cpp/utf8/unchecked.h
diff --git a/modules/dep/zlib/CMakeLists.txt b/dep/zlib/CMakeLists.txt
similarity index 100%
rename from modules/dep/zlib/CMakeLists.txt
rename to dep/zlib/CMakeLists.txt
diff --git a/modules/dep/zlib/adler32.c b/dep/zlib/adler32.c
similarity index 100%
rename from modules/dep/zlib/adler32.c
rename to dep/zlib/adler32.c
diff --git a/modules/dep/zlib/compress.c b/dep/zlib/compress.c
similarity index 100%
rename from modules/dep/zlib/compress.c
rename to dep/zlib/compress.c
diff --git a/modules/dep/zlib/crc32.c b/dep/zlib/crc32.c
similarity index 100%
rename from modules/dep/zlib/crc32.c
rename to dep/zlib/crc32.c
diff --git a/modules/dep/zlib/crc32.h b/dep/zlib/crc32.h
similarity index 100%
rename from modules/dep/zlib/crc32.h
rename to dep/zlib/crc32.h
diff --git a/modules/dep/zlib/deflate.c b/dep/zlib/deflate.c
similarity index 100%
rename from modules/dep/zlib/deflate.c
rename to dep/zlib/deflate.c
diff --git a/modules/dep/zlib/deflate.h b/dep/zlib/deflate.h
similarity index 100%
rename from modules/dep/zlib/deflate.h
rename to dep/zlib/deflate.h
diff --git a/modules/dep/zlib/example.c b/dep/zlib/example.c
similarity index 100%
rename from modules/dep/zlib/example.c
rename to dep/zlib/example.c
diff --git a/modules/dep/zlib/gzclose.c b/dep/zlib/gzclose.c
similarity index 100%
rename from modules/dep/zlib/gzclose.c
rename to dep/zlib/gzclose.c
diff --git a/modules/dep/zlib/gzguts.h b/dep/zlib/gzguts.h
similarity index 100%
rename from modules/dep/zlib/gzguts.h
rename to dep/zlib/gzguts.h
diff --git a/modules/dep/zlib/gzlib.c b/dep/zlib/gzlib.c
similarity index 100%
rename from modules/dep/zlib/gzlib.c
rename to dep/zlib/gzlib.c
diff --git a/modules/dep/zlib/gzread.c b/dep/zlib/gzread.c
similarity index 100%
rename from modules/dep/zlib/gzread.c
rename to dep/zlib/gzread.c
diff --git a/modules/dep/zlib/gzwrite.c b/dep/zlib/gzwrite.c
similarity index 100%
rename from modules/dep/zlib/gzwrite.c
rename to dep/zlib/gzwrite.c
diff --git a/modules/dep/zlib/infback.c b/dep/zlib/infback.c
similarity index 100%
rename from modules/dep/zlib/infback.c
rename to dep/zlib/infback.c
diff --git a/modules/dep/zlib/inffast.c b/dep/zlib/inffast.c
similarity index 100%
rename from modules/dep/zlib/inffast.c
rename to dep/zlib/inffast.c
diff --git a/modules/dep/zlib/inffast.h b/dep/zlib/inffast.h
similarity index 100%
rename from modules/dep/zlib/inffast.h
rename to dep/zlib/inffast.h
diff --git a/modules/dep/zlib/inffixed.h b/dep/zlib/inffixed.h
similarity index 100%
rename from modules/dep/zlib/inffixed.h
rename to dep/zlib/inffixed.h
diff --git a/modules/dep/zlib/inflate.c b/dep/zlib/inflate.c
similarity index 100%
rename from modules/dep/zlib/inflate.c
rename to dep/zlib/inflate.c
diff --git a/modules/dep/zlib/inflate.h b/dep/zlib/inflate.h
similarity index 100%
rename from modules/dep/zlib/inflate.h
rename to dep/zlib/inflate.h
diff --git a/modules/dep/zlib/inftrees.c b/dep/zlib/inftrees.c
similarity index 100%
rename from modules/dep/zlib/inftrees.c
rename to dep/zlib/inftrees.c
diff --git a/modules/dep/zlib/inftrees.h b/dep/zlib/inftrees.h
similarity index 100%
rename from modules/dep/zlib/inftrees.h
rename to dep/zlib/inftrees.h
diff --git a/modules/dep/zlib/minigzip.c b/dep/zlib/minigzip.c
similarity index 100%
rename from modules/dep/zlib/minigzip.c
rename to dep/zlib/minigzip.c
diff --git a/modules/dep/zlib/trees.c b/dep/zlib/trees.c
similarity index 100%
rename from modules/dep/zlib/trees.c
rename to dep/zlib/trees.c
diff --git a/modules/dep/zlib/trees.h b/dep/zlib/trees.h
similarity index 100%
rename from modules/dep/zlib/trees.h
rename to dep/zlib/trees.h
diff --git a/modules/dep/zlib/uncompr.c b/dep/zlib/uncompr.c
similarity index 100%
rename from modules/dep/zlib/uncompr.c
rename to dep/zlib/uncompr.c
diff --git a/modules/dep/zlib/zconf.h b/dep/zlib/zconf.h
similarity index 100%
rename from modules/dep/zlib/zconf.h
rename to dep/zlib/zconf.h
diff --git a/modules/dep/zlib/zlib.h b/dep/zlib/zlib.h
similarity index 100%
rename from modules/dep/zlib/zlib.h
rename to dep/zlib/zlib.h
diff --git a/modules/dep/zlib/zutil.c b/dep/zlib/zutil.c
similarity index 100%
rename from modules/dep/zlib/zutil.c
rename to dep/zlib/zutil.c
diff --git a/modules/dep/zlib/zutil.h b/dep/zlib/zutil.h
similarity index 100%
rename from modules/dep/zlib/zutil.h
rename to dep/zlib/zutil.h
diff --git a/data/extras/ACE-6.3.2.tar.gz b/extras/ACE-6.3.2.tar.gz
similarity index 100%
rename from data/extras/ACE-6.3.2.tar.gz
rename to extras/ACE-6.3.2.tar.gz
diff --git a/data/extras/addons/SunwellAS.rar b/extras/addons/SunwellAS.rar
similarity index 100%
rename from data/extras/addons/SunwellAS.rar
rename to extras/addons/SunwellAS.rar
diff --git a/data/extras/addons/SunwellRB.rar b/extras/addons/SunwellRB.rar
similarity index 100%
rename from data/extras/addons/SunwellRB.rar
rename to extras/addons/SunwellRB.rar
diff --git a/data/extras/authserver.conf b/extras/authserver.conf
similarity index 100%
rename from data/extras/authserver.conf
rename to extras/authserver.conf
diff --git a/data/extras/mysql.cnf b/extras/mysql.cnf
similarity index 100%
rename from data/extras/mysql.cnf
rename to extras/mysql.cnf
diff --git a/data/extras/sunwell.pl/img/addons/RB_group.jpg b/extras/sunwell.pl/img/addons/RB_group.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/addons/RB_group.jpg
rename to extras/sunwell.pl/img/addons/RB_group.jpg
diff --git a/data/extras/sunwell.pl/img/addons/RB_solo.jpg b/extras/sunwell.pl/img/addons/RB_solo.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/addons/RB_solo.jpg
rename to extras/sunwell.pl/img/addons/RB_solo.jpg
diff --git a/data/extras/sunwell.pl/img/diff/diff_2014-01-06.jpg b/extras/sunwell.pl/img/diff/diff_2014-01-06.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/diff/diff_2014-01-06.jpg
rename to extras/sunwell.pl/img/diff/diff_2014-01-06.jpg
diff --git a/data/extras/sunwell.pl/img/diff/diff_2015-11-08.jpg b/extras/sunwell.pl/img/diff/diff_2015-11-08.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/diff/diff_2015-11-08.jpg
rename to extras/sunwell.pl/img/diff/diff_2015-11-08.jpg
diff --git a/data/extras/sunwell.pl/img/lay/bg.jpg b/extras/sunwell.pl/img/lay/bg.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/lay/bg.jpg
rename to extras/sunwell.pl/img/lay/bg.jpg
diff --git a/data/extras/sunwell.pl/img/lay/content-bg.jpg b/extras/sunwell.pl/img/lay/content-bg.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/lay/content-bg.jpg
rename to extras/sunwell.pl/img/lay/content-bg.jpg
diff --git a/data/extras/sunwell.pl/img/lay/content-bottom.png b/extras/sunwell.pl/img/lay/content-bottom.png
similarity index 100%
rename from data/extras/sunwell.pl/img/lay/content-bottom.png
rename to extras/sunwell.pl/img/lay/content-bottom.png
diff --git a/data/extras/sunwell.pl/img/lay/content-leftborder.jpg b/extras/sunwell.pl/img/lay/content-leftborder.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/lay/content-leftborder.jpg
rename to extras/sunwell.pl/img/lay/content-leftborder.jpg
diff --git a/data/extras/sunwell.pl/img/lay/content-rightborder.jpg b/extras/sunwell.pl/img/lay/content-rightborder.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/lay/content-rightborder.jpg
rename to extras/sunwell.pl/img/lay/content-rightborder.jpg
diff --git a/data/extras/sunwell.pl/img/lay/content-top.jpg b/extras/sunwell.pl/img/lay/content-top.jpg
similarity index 100%
rename from data/extras/sunwell.pl/img/lay/content-top.jpg
rename to extras/sunwell.pl/img/lay/content-top.jpg
diff --git a/data/extras/sunwell.pl/img/lay/pagetitle_bg.png b/extras/sunwell.pl/img/lay/pagetitle_bg.png
similarity index 100%
rename from data/extras/sunwell.pl/img/lay/pagetitle_bg.png
rename to extras/sunwell.pl/img/lay/pagetitle_bg.png
diff --git a/data/extras/sunwell.pl/index.html b/extras/sunwell.pl/index.html
similarity index 100%
rename from data/extras/sunwell.pl/index.html
rename to extras/sunwell.pl/index.html
diff --git a/data/extras/sunwell.pl/style.css b/extras/sunwell.pl/style.css
similarity index 100%
rename from data/extras/sunwell.pl/style.css
rename to extras/sunwell.pl/style.css
diff --git a/data/extras/worldserver.conf b/extras/worldserver.conf
similarity index 100%
rename from data/extras/worldserver.conf
rename to extras/worldserver.conf
diff --git a/data/sql/databases/characters.sql b/sql/databases/characters.sql
similarity index 100%
rename from data/sql/databases/characters.sql
rename to sql/databases/characters.sql
diff --git a/data/sql/databases/logon.sql b/sql/databases/logon.sql
similarity index 100%
rename from data/sql/databases/logon.sql
rename to sql/databases/logon.sql
diff --git a/data/sql/databases/world.sql b/sql/databases/world.sql
similarity index 100%
rename from data/sql/databases/world.sql
rename to sql/databases/world.sql
diff --git a/data/sql/events/ahune.sql b/sql/events/ahune.sql
similarity index 100%
rename from data/sql/events/ahune.sql
rename to sql/events/ahune.sql
diff --git a/data/sql/events/brewfest.sql b/sql/events/brewfest.sql
similarity index 100%
rename from data/sql/events/brewfest.sql
rename to sql/events/brewfest.sql
diff --git a/data/sql/events/childrens_week.sql b/sql/events/childrens_week.sql
similarity index 100%
rename from data/sql/events/childrens_week.sql
rename to sql/events/childrens_week.sql
diff --git a/data/sql/events/commoners.sql b/sql/events/commoners.sql
similarity index 100%
rename from data/sql/events/commoners.sql
rename to sql/events/commoners.sql
diff --git a/data/sql/events/darkmoon_faire.sql b/sql/events/darkmoon_faire.sql
similarity index 100%
rename from data/sql/events/darkmoon_faire.sql
rename to sql/events/darkmoon_faire.sql
diff --git a/data/sql/events/day_of_the_dead.sql b/sql/events/day_of_the_dead.sql
similarity index 100%
rename from data/sql/events/day_of_the_dead.sql
rename to sql/events/day_of_the_dead.sql
diff --git a/data/sql/events/elemental_invasion.sql b/sql/events/elemental_invasion.sql
similarity index 100%
rename from data/sql/events/elemental_invasion.sql
rename to sql/events/elemental_invasion.sql
diff --git a/data/sql/events/hallow_end.sql b/sql/events/hallow_end.sql
similarity index 100%
rename from data/sql/events/hallow_end.sql
rename to sql/events/hallow_end.sql
diff --git a/data/sql/events/kalu_ak_fishing_derby.sql b/sql/events/kalu_ak_fishing_derby.sql
similarity index 100%
rename from data/sql/events/kalu_ak_fishing_derby.sql
rename to sql/events/kalu_ak_fishing_derby.sql
diff --git a/data/sql/events/love_is_in_the_air.sql b/sql/events/love_is_in_the_air.sql
similarity index 100%
rename from data/sql/events/love_is_in_the_air.sql
rename to sql/events/love_is_in_the_air.sql
diff --git a/data/sql/events/lunar_festival.sql b/sql/events/lunar_festival.sql
similarity index 100%
rename from data/sql/events/lunar_festival.sql
rename to sql/events/lunar_festival.sql
diff --git a/data/sql/events/midsummer.sql b/sql/events/midsummer.sql
similarity index 100%
rename from data/sql/events/midsummer.sql
rename to sql/events/midsummer.sql
diff --git a/data/sql/events/noblegarden.sql b/sql/events/noblegarden.sql
similarity index 100%
rename from data/sql/events/noblegarden.sql
rename to sql/events/noblegarden.sql
diff --git a/data/sql/events/pilgrims_bounty.sql b/sql/events/pilgrims_bounty.sql
similarity index 100%
rename from data/sql/events/pilgrims_bounty.sql
rename to sql/events/pilgrims_bounty.sql
diff --git a/data/sql/events/stair_of_destiny.sql b/sql/events/stair_of_destiny.sql
similarity index 100%
rename from data/sql/events/stair_of_destiny.sql
rename to sql/events/stair_of_destiny.sql
diff --git a/data/sql/events/stranglethorn_fishing_extravaganza.sql b/sql/events/stranglethorn_fishing_extravaganza.sql
similarity index 100%
rename from data/sql/events/stranglethorn_fishing_extravaganza.sql
rename to sql/events/stranglethorn_fishing_extravaganza.sql
diff --git a/data/sql/events/stranglethorn_gurubashi_arena.sql b/sql/events/stranglethorn_gurubashi_arena.sql
similarity index 100%
rename from data/sql/events/stranglethorn_gurubashi_arena.sql
rename to sql/events/stranglethorn_gurubashi_arena.sql
diff --git a/data/sql/events/winter_veil.sql b/sql/events/winter_veil.sql
similarity index 100%
rename from data/sql/events/winter_veil.sql
rename to sql/events/winter_veil.sql
diff --git a/data/sql/logon fixes/logon.autobroadcast.sql b/sql/logon fixes/logon.autobroadcast.sql
similarity index 100%
rename from data/sql/logon fixes/logon.autobroadcast.sql
rename to sql/logon fixes/logon.autobroadcast.sql
diff --git a/data/sql/misc fixes/WORLD_ACCESS_REQ.sql b/sql/misc fixes/WORLD_ACCESS_REQ.sql
similarity index 100%
rename from data/sql/misc fixes/WORLD_ACCESS_REQ.sql
rename to sql/misc fixes/WORLD_ACCESS_REQ.sql
diff --git a/data/sql/misc fixes/WORLD_COMMANDS.sql b/sql/misc fixes/WORLD_COMMANDS.sql
similarity index 100%
rename from data/sql/misc fixes/WORLD_COMMANDS.sql
rename to sql/misc fixes/WORLD_COMMANDS.sql
diff --git a/data/sql/misc fixes/WORLD_CREATURE_CLASSLEVELSTATS.sql b/sql/misc fixes/WORLD_CREATURE_CLASSLEVELSTATS.sql
similarity index 100%
rename from data/sql/misc fixes/WORLD_CREATURE_CLASSLEVELSTATS.sql
rename to sql/misc fixes/WORLD_CREATURE_CLASSLEVELSTATS.sql
diff --git a/data/sql/misc fixes/WORLD_factionchange_general.sql b/sql/misc fixes/WORLD_factionchange_general.sql
similarity index 100%
rename from data/sql/misc fixes/WORLD_factionchange_general.sql
rename to sql/misc fixes/WORLD_factionchange_general.sql
diff --git a/data/sql/misc fixes/WORLD_factionchange_items.sql b/sql/misc fixes/WORLD_factionchange_items.sql
similarity index 100%
rename from data/sql/misc fixes/WORLD_factionchange_items.sql
rename to sql/misc fixes/WORLD_factionchange_items.sql
diff --git a/data/sql/misc fixes/WORLD_factionchange_spells.sql b/sql/misc fixes/WORLD_factionchange_spells.sql
similarity index 100%
rename from data/sql/misc fixes/WORLD_factionchange_spells.sql
rename to sql/misc fixes/WORLD_factionchange_spells.sql
diff --git a/data/sql/misc fixes/WORLD_player_classlevelstats.sql b/sql/misc fixes/WORLD_player_classlevelstats.sql
similarity index 100%
rename from data/sql/misc fixes/WORLD_player_classlevelstats.sql
rename to sql/misc fixes/WORLD_player_classlevelstats.sql
diff --git a/data/sql/misc fixes/world_warden.sql b/sql/misc fixes/world_warden.sql
similarity index 100%
rename from data/sql/misc fixes/world_warden.sql
rename to sql/misc fixes/world_warden.sql
diff --git a/data/sql/pvpstats patch/pvpstats_char.sql b/sql/pvpstats patch/pvpstats_char.sql
similarity index 100%
rename from data/sql/pvpstats patch/pvpstats_char.sql
rename to sql/pvpstats patch/pvpstats_char.sql
diff --git a/data/sql/quest fixes/lost_item.sql b/sql/quest fixes/lost_item.sql
similarity index 100%
rename from data/sql/quest fixes/lost_item.sql
rename to sql/quest fixes/lost_item.sql
diff --git a/data/sql/quest fixes/quest_texts.sql b/sql/quest fixes/quest_texts.sql
similarity index 100%
rename from data/sql/quest fixes/quest_texts.sql
rename to sql/quest fixes/quest_texts.sql
diff --git a/data/sql/quest fixes/quests.sql b/sql/quest fixes/quests.sql
similarity index 100%
rename from data/sql/quest fixes/quests.sql
rename to sql/quest fixes/quests.sql
diff --git a/data/sql/quest fixes/reputation.sql b/sql/quest fixes/reputation.sql
similarity index 100%
rename from data/sql/quest fixes/reputation.sql
rename to sql/quest fixes/reputation.sql
diff --git a/data/sql/quest fixes/zones/Eastern Kingdom/darkshore.sql b/sql/quest fixes/zones/Eastern Kingdom/darkshore.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Eastern Kingdom/darkshore.sql
rename to sql/quest fixes/zones/Eastern Kingdom/darkshore.sql
diff --git a/data/sql/quest fixes/zones/Eastern Kingdom/dun_morogh.sql b/sql/quest fixes/zones/Eastern Kingdom/dun_morogh.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Eastern Kingdom/dun_morogh.sql
rename to sql/quest fixes/zones/Eastern Kingdom/dun_morogh.sql
diff --git a/data/sql/quest fixes/zones/Northrend/borean_tundra.sql b/sql/quest fixes/zones/Northrend/borean_tundra.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/borean_tundra.sql
rename to sql/quest fixes/zones/Northrend/borean_tundra.sql
diff --git a/data/sql/quest fixes/zones/Northrend/dragonblight.sql b/sql/quest fixes/zones/Northrend/dragonblight.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/dragonblight.sql
rename to sql/quest fixes/zones/Northrend/dragonblight.sql
diff --git a/data/sql/quest fixes/zones/Northrend/grizzly_hills.sql b/sql/quest fixes/zones/Northrend/grizzly_hills.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/grizzly_hills.sql
rename to sql/quest fixes/zones/Northrend/grizzly_hills.sql
diff --git a/data/sql/quest fixes/zones/Northrend/howling_fjord.sql b/sql/quest fixes/zones/Northrend/howling_fjord.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/howling_fjord.sql
rename to sql/quest fixes/zones/Northrend/howling_fjord.sql
diff --git a/data/sql/quest fixes/zones/Northrend/icecrown.sql b/sql/quest fixes/zones/Northrend/icecrown.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/icecrown.sql
rename to sql/quest fixes/zones/Northrend/icecrown.sql
diff --git a/data/sql/quest fixes/zones/Northrend/sholazar_basin.sql b/sql/quest fixes/zones/Northrend/sholazar_basin.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/sholazar_basin.sql
rename to sql/quest fixes/zones/Northrend/sholazar_basin.sql
diff --git a/data/sql/quest fixes/zones/Northrend/storm_peaks.sql b/sql/quest fixes/zones/Northrend/storm_peaks.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/storm_peaks.sql
rename to sql/quest fixes/zones/Northrend/storm_peaks.sql
diff --git a/data/sql/quest fixes/zones/Northrend/zuldrak.sql b/sql/quest fixes/zones/Northrend/zuldrak.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Northrend/zuldrak.sql
rename to sql/quest fixes/zones/Northrend/zuldrak.sql
diff --git a/data/sql/quest fixes/zones/Outlands/blades_edge_mountains.sql b/sql/quest fixes/zones/Outlands/blades_edge_mountains.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Outlands/blades_edge_mountains.sql
rename to sql/quest fixes/zones/Outlands/blades_edge_mountains.sql
diff --git a/data/sql/quest fixes/zones/Outlands/bloodmyst_isle.sql b/sql/quest fixes/zones/Outlands/bloodmyst_isle.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Outlands/bloodmyst_isle.sql
rename to sql/quest fixes/zones/Outlands/bloodmyst_isle.sql
diff --git a/data/sql/quest fixes/zones/Outlands/hellfire_peninsula.sql b/sql/quest fixes/zones/Outlands/hellfire_peninsula.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Outlands/hellfire_peninsula.sql
rename to sql/quest fixes/zones/Outlands/hellfire_peninsula.sql
diff --git a/data/sql/quest fixes/zones/Outlands/netherstorm.sql b/sql/quest fixes/zones/Outlands/netherstorm.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Outlands/netherstorm.sql
rename to sql/quest fixes/zones/Outlands/netherstorm.sql
diff --git a/data/sql/quest fixes/zones/Outlands/outlands.sql b/sql/quest fixes/zones/Outlands/outlands.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Outlands/outlands.sql
rename to sql/quest fixes/zones/Outlands/outlands.sql
diff --git a/data/sql/quest fixes/zones/Outlands/shadowmoon_valley.sql b/sql/quest fixes/zones/Outlands/shadowmoon_valley.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Outlands/shadowmoon_valley.sql
rename to sql/quest fixes/zones/Outlands/shadowmoon_valley.sql
diff --git a/data/sql/quest fixes/zones/Outlands/terokkar_forest.sql b/sql/quest fixes/zones/Outlands/terokkar_forest.sql
similarity index 100%
rename from data/sql/quest fixes/zones/Outlands/terokkar_forest.sql
rename to sql/quest fixes/zones/Outlands/terokkar_forest.sql
diff --git a/data/sql/quest fixes/zones/ek_kalimdor.sql b/sql/quest fixes/zones/ek_kalimdor.sql
similarity index 100%
rename from data/sql/quest fixes/zones/ek_kalimdor.sql
rename to sql/quest fixes/zones/ek_kalimdor.sql
diff --git a/data/sql/quest fixes/zones/special.sql b/sql/quest fixes/zones/special.sql
similarity index 100%
rename from data/sql/quest fixes/zones/special.sql
rename to sql/quest fixes/zones/special.sql
diff --git a/data/sql/spell fixes/SPELLS_JOINED.sql b/sql/spell fixes/SPELLS_JOINED.sql
similarity index 100%
rename from data/sql/spell fixes/SPELLS_JOINED.sql
rename to sql/spell fixes/SPELLS_JOINED.sql
diff --git a/data/sql/spell fixes/playercreateinfo_spell_custom.sql b/sql/spell fixes/playercreateinfo_spell_custom.sql
similarity index 100%
rename from data/sql/spell fixes/playercreateinfo_spell_custom.sql
rename to sql/spell fixes/playercreateinfo_spell_custom.sql
diff --git a/data/sql/spell fixes/spell_bonus.sql b/sql/spell fixes/spell_bonus.sql
similarity index 100%
rename from data/sql/spell fixes/spell_bonus.sql
rename to sql/spell fixes/spell_bonus.sql
diff --git a/data/sql/spell fixes/spell_dbc.sql b/sql/spell fixes/spell_dbc.sql
similarity index 100%
rename from data/sql/spell fixes/spell_dbc.sql
rename to sql/spell fixes/spell_dbc.sql
diff --git a/data/sql/spell fixes/spell_group.sql b/sql/spell fixes/spell_group.sql
similarity index 100%
rename from data/sql/spell fixes/spell_group.sql
rename to sql/spell fixes/spell_group.sql
diff --git a/data/sql/spell fixes/spell_group_stack_rules.sql b/sql/spell fixes/spell_group_stack_rules.sql
similarity index 100%
rename from data/sql/spell fixes/spell_group_stack_rules.sql
rename to sql/spell fixes/spell_group_stack_rules.sql
diff --git a/data/sql/spell fixes/spell_learn_spell.sql b/sql/spell fixes/spell_learn_spell.sql
similarity index 100%
rename from data/sql/spell fixes/spell_learn_spell.sql
rename to sql/spell fixes/spell_learn_spell.sql
diff --git a/data/sql/spell fixes/spell_required.sql b/sql/spell fixes/spell_required.sql
similarity index 100%
rename from data/sql/spell fixes/spell_required.sql
rename to sql/spell fixes/spell_required.sql
diff --git a/data/sql/structure/CHARACTERS_BREW_OF_THE_MONTH.sql b/sql/structure/CHARACTERS_BREW_OF_THE_MONTH.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_BREW_OF_THE_MONTH.sql
rename to sql/structure/CHARACTERS_BREW_OF_THE_MONTH.sql
diff --git a/data/sql/structure/CHARACTERS_CHANNELS.sql b/sql/structure/CHARACTERS_CHANNELS.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_CHANNELS.sql
rename to sql/structure/CHARACTERS_CHANNELS.sql
diff --git a/data/sql/structure/CHARACTERS_CHANNELS_BANS.sql b/sql/structure/CHARACTERS_CHANNELS_BANS.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_CHANNELS_BANS.sql
rename to sql/structure/CHARACTERS_CHANNELS_BANS.sql
diff --git a/data/sql/structure/CHARACTERS_CHANNELS_RIGHTS.sql b/sql/structure/CHARACTERS_CHANNELS_RIGHTS.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_CHANNELS_RIGHTS.sql
rename to sql/structure/CHARACTERS_CHANNELS_RIGHTS.sql
diff --git a/data/sql/structure/CHARACTERS_CHARACTER_ARENA_STATS.sql b/sql/structure/CHARACTERS_CHARACTER_ARENA_STATS.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_CHARACTER_ARENA_STATS.sql
rename to sql/structure/CHARACTERS_CHARACTER_ARENA_STATS.sql
diff --git a/data/sql/structure/CHARACTERS_CHARACTER_ENTRY_POINT.sql b/sql/structure/CHARACTERS_CHARACTER_ENTRY_POINT.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_CHARACTER_ENTRY_POINT.sql
rename to sql/structure/CHARACTERS_CHARACTER_ENTRY_POINT.sql
diff --git a/data/sql/structure/CHARACTERS_CHARACTER_PET.sql b/sql/structure/CHARACTERS_CHARACTER_PET.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_CHARACTER_PET.sql
rename to sql/structure/CHARACTERS_CHARACTER_PET.sql
diff --git a/data/sql/structure/CHARACTERS_CHARACTER_SPELL_COOLDOWN.sql b/sql/structure/CHARACTERS_CHARACTER_SPELL_COOLDOWN.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_CHARACTER_SPELL_COOLDOWN.sql
rename to sql/structure/CHARACTERS_CHARACTER_SPELL_COOLDOWN.sql
diff --git a/data/sql/structure/CHARACTERS_INSTANCE_ID.sql b/sql/structure/CHARACTERS_INSTANCE_ID.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_INSTANCE_ID.sql
rename to sql/structure/CHARACTERS_INSTANCE_ID.sql
diff --git a/data/sql/structure/CHARACTERS_ITEM_LOOT_STORAGE.sql b/sql/structure/CHARACTERS_ITEM_LOOT_STORAGE.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_ITEM_LOOT_STORAGE.sql
rename to sql/structure/CHARACTERS_ITEM_LOOT_STORAGE.sql
diff --git a/data/sql/structure/CHARACTERS_LOG_ARENA_FIGHTS.sql b/sql/structure/CHARACTERS_LOG_ARENA_FIGHTS.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_LOG_ARENA_FIGHTS.sql
rename to sql/structure/CHARACTERS_LOG_ARENA_FIGHTS.sql
diff --git a/data/sql/structure/CHARACTERS_LOG_ARENA_MEMBERSTATS.sql b/sql/structure/CHARACTERS_LOG_ARENA_MEMBERSTATS.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_LOG_ARENA_MEMBERSTATS.sql
rename to sql/structure/CHARACTERS_LOG_ARENA_MEMBERSTATS.sql
diff --git a/data/sql/structure/CHARACTERS_LOG_ENCOUNTER.sql b/sql/structure/CHARACTERS_LOG_ENCOUNTER.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_LOG_ENCOUNTER.sql
rename to sql/structure/CHARACTERS_LOG_ENCOUNTER.sql
diff --git a/data/sql/structure/CHARACTERS_LOG_MONEY.sql b/sql/structure/CHARACTERS_LOG_MONEY.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_LOG_MONEY.sql
rename to sql/structure/CHARACTERS_LOG_MONEY.sql
diff --git a/data/sql/structure/CHARACTERS_SPELLS_RUN_ONCE.sql b/sql/structure/CHARACTERS_SPELLS_RUN_ONCE.sql
similarity index 100%
rename from data/sql/structure/CHARACTERS_SPELLS_RUN_ONCE.sql
rename to sql/structure/CHARACTERS_SPELLS_RUN_ONCE.sql
diff --git a/data/sql/structure/WORLD_SKILL_EXTRA_ITEM_TEMPLATE.sql b/sql/structure/WORLD_SKILL_EXTRA_ITEM_TEMPLATE.sql
similarity index 100%
rename from data/sql/structure/WORLD_SKILL_EXTRA_ITEM_TEMPLATE.sql
rename to sql/structure/WORLD_SKILL_EXTRA_ITEM_TEMPLATE.sql
diff --git a/data/sql/structure/WORLD_SMART_SCRIPTS.sql b/sql/structure/WORLD_SMART_SCRIPTS.sql
similarity index 100%
rename from data/sql/structure/WORLD_SMART_SCRIPTS.sql
rename to sql/structure/WORLD_SMART_SCRIPTS.sql
diff --git a/data/sql/structure/convert_tc_spells/1_CREATE_CLEANUP_TABLES.sql b/sql/structure/convert_tc_spells/1_CREATE_CLEANUP_TABLES.sql
similarity index 100%
rename from data/sql/structure/convert_tc_spells/1_CREATE_CLEANUP_TABLES.sql
rename to sql/structure/convert_tc_spells/1_CREATE_CLEANUP_TABLES.sql
diff --git a/data/sql/structure/convert_tc_spells/2_CLEANUP_AND_CONVERT_SPELLS.sql b/sql/structure/convert_tc_spells/2_CLEANUP_AND_CONVERT_SPELLS.sql
similarity index 100%
rename from data/sql/structure/convert_tc_spells/2_CLEANUP_AND_CONVERT_SPELLS.sql
rename to sql/structure/convert_tc_spells/2_CLEANUP_AND_CONVERT_SPELLS.sql
diff --git a/data/sql/transmogrifier patch/char/transmogrifier_char.sql b/sql/transmogrifier patch/char/transmogrifier_char.sql
similarity index 100%
rename from data/sql/transmogrifier patch/char/transmogrifier_char.sql
rename to sql/transmogrifier patch/char/transmogrifier_char.sql
diff --git a/data/sql/transmogrifier patch/world/transmogrifier_world_NPC.sql b/sql/transmogrifier patch/world/transmogrifier_world_NPC.sql
similarity index 100%
rename from data/sql/transmogrifier patch/world/transmogrifier_world_NPC.sql
rename to sql/transmogrifier patch/world/transmogrifier_world_NPC.sql
diff --git a/data/sql/transmogrifier patch/world/transmogrifier_world_texts.sql b/sql/transmogrifier patch/world/transmogrifier_world_texts.sql
similarity index 100%
rename from data/sql/transmogrifier patch/world/transmogrifier_world_texts.sql
rename to sql/transmogrifier patch/world/transmogrifier_world_texts.sql
diff --git a/data/sql/world fixes/achievements.sql b/sql/world fixes/achievements.sql
similarity index 100%
rename from data/sql/world fixes/achievements.sql
rename to sql/world fixes/achievements.sql
diff --git a/data/sql/world fixes/df.sql b/sql/world fixes/df.sql
similarity index 100%
rename from data/sql/world fixes/df.sql
rename to sql/world fixes/df.sql
diff --git a/data/sql/world fixes/disables.sql b/sql/world fixes/disables.sql
similarity index 100%
rename from data/sql/world fixes/disables.sql
rename to sql/world fixes/disables.sql
diff --git a/data/sql/world fixes/events.sql b/sql/world fixes/events.sql
similarity index 100%
rename from data/sql/world fixes/events.sql
rename to sql/world fixes/events.sql
diff --git a/data/sql/world fixes/gameobjectfixes.sql b/sql/world fixes/gameobjectfixes.sql
similarity index 100%
rename from data/sql/world fixes/gameobjectfixes.sql
rename to sql/world fixes/gameobjectfixes.sql
diff --git a/data/sql/world fixes/instances/Battlegrounds/arathi_basin.sql b/sql/world fixes/instances/Battlegrounds/arathi_basin.sql
similarity index 100%
rename from data/sql/world fixes/instances/Battlegrounds/arathi_basin.sql
rename to sql/world fixes/instances/Battlegrounds/arathi_basin.sql
diff --git a/data/sql/world fixes/instances/Battlegrounds/battlegrounds.sql b/sql/world fixes/instances/Battlegrounds/battlegrounds.sql
similarity index 100%
rename from data/sql/world fixes/instances/Battlegrounds/battlegrounds.sql
rename to sql/world fixes/instances/Battlegrounds/battlegrounds.sql
diff --git a/data/sql/world fixes/instances/Battlegrounds/wg.sql b/sql/world fixes/instances/Battlegrounds/wg.sql
similarity index 100%
rename from data/sql/world fixes/instances/Battlegrounds/wg.sql
rename to sql/world fixes/instances/Battlegrounds/wg.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/EK_instances.sql b/sql/world fixes/instances/EasternKingdom/EK_instances.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/EK_instances.sql
rename to sql/world fixes/instances/EasternKingdom/EK_instances.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/Raids/blackwing_lair.sql b/sql/world fixes/instances/EasternKingdom/Raids/blackwing_lair.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/Raids/blackwing_lair.sql
rename to sql/world fixes/instances/EasternKingdom/Raids/blackwing_lair.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/Raids/karazhan.sql b/sql/world fixes/instances/EasternKingdom/Raids/karazhan.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/Raids/karazhan.sql
rename to sql/world fixes/instances/EasternKingdom/Raids/karazhan.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/blackrock_depths.sql b/sql/world fixes/instances/EasternKingdom/blackrock_depths.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/blackrock_depths.sql
rename to sql/world fixes/instances/EasternKingdom/blackrock_depths.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/blackrock_spire.sql b/sql/world fixes/instances/EasternKingdom/blackrock_spire.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/blackrock_spire.sql
rename to sql/world fixes/instances/EasternKingdom/blackrock_spire.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/deadmines.sql b/sql/world fixes/instances/EasternKingdom/deadmines.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/deadmines.sql
rename to sql/world fixes/instances/EasternKingdom/deadmines.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/gnomeregan.sql b/sql/world fixes/instances/EasternKingdom/gnomeregan.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/gnomeregan.sql
rename to sql/world fixes/instances/EasternKingdom/gnomeregan.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/scarlet_monastery.sql b/sql/world fixes/instances/EasternKingdom/scarlet_monastery.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/scarlet_monastery.sql
rename to sql/world fixes/instances/EasternKingdom/scarlet_monastery.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/scholomance.sql b/sql/world fixes/instances/EasternKingdom/scholomance.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/scholomance.sql
rename to sql/world fixes/instances/EasternKingdom/scholomance.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/shadowfang_keep.sql b/sql/world fixes/instances/EasternKingdom/shadowfang_keep.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/shadowfang_keep.sql
rename to sql/world fixes/instances/EasternKingdom/shadowfang_keep.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/stockades.sql b/sql/world fixes/instances/EasternKingdom/stockades.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/stockades.sql
rename to sql/world fixes/instances/EasternKingdom/stockades.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/stratholme.sql b/sql/world fixes/instances/EasternKingdom/stratholme.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/stratholme.sql
rename to sql/world fixes/instances/EasternKingdom/stratholme.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/temple_of_atal_hakkar.sql b/sql/world fixes/instances/EasternKingdom/temple_of_atal_hakkar.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/temple_of_atal_hakkar.sql
rename to sql/world fixes/instances/EasternKingdom/temple_of_atal_hakkar.sql
diff --git a/data/sql/world fixes/instances/EasternKingdom/uldaman.sql b/sql/world fixes/instances/EasternKingdom/uldaman.sql
similarity index 100%
rename from data/sql/world fixes/instances/EasternKingdom/uldaman.sql
rename to sql/world fixes/instances/EasternKingdom/uldaman.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/blackfathom_deeps.sql b/sql/world fixes/instances/Kalimdor/blackfathom_deeps.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/blackfathom_deeps.sql
rename to sql/world fixes/instances/Kalimdor/blackfathom_deeps.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/dire_maul.sql b/sql/world fixes/instances/Kalimdor/dire_maul.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/dire_maul.sql
rename to sql/world fixes/instances/Kalimdor/dire_maul.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/maraudon.sql b/sql/world fixes/instances/Kalimdor/maraudon.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/maraudon.sql
rename to sql/world fixes/instances/Kalimdor/maraudon.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/ragefire_chasm.sql b/sql/world fixes/instances/Kalimdor/ragefire_chasm.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/ragefire_chasm.sql
rename to sql/world fixes/instances/Kalimdor/ragefire_chasm.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/raids/temple_of_ahnqiraj.sql b/sql/world fixes/instances/Kalimdor/raids/temple_of_ahnqiraj.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/raids/temple_of_ahnqiraj.sql
rename to sql/world fixes/instances/Kalimdor/raids/temple_of_ahnqiraj.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/razorfen_downs.sql b/sql/world fixes/instances/Kalimdor/razorfen_downs.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/razorfen_downs.sql
rename to sql/world fixes/instances/Kalimdor/razorfen_downs.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/razorfen_kraul.sql b/sql/world fixes/instances/Kalimdor/razorfen_kraul.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/razorfen_kraul.sql
rename to sql/world fixes/instances/Kalimdor/razorfen_kraul.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/wailing_caverns.sql b/sql/world fixes/instances/Kalimdor/wailing_caverns.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/wailing_caverns.sql
rename to sql/world fixes/instances/Kalimdor/wailing_caverns.sql
diff --git a/data/sql/world fixes/instances/Kalimdor/zul'farrak.sql b/sql/world fixes/instances/Kalimdor/zul'farrak.sql
similarity index 100%
rename from data/sql/world fixes/instances/Kalimdor/zul'farrak.sql
rename to sql/world fixes/instances/Kalimdor/zul'farrak.sql
diff --git a/data/sql/world fixes/instances/Northrend/ahn_kahet.sql b/sql/world fixes/instances/Northrend/ahn_kahet.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/ahn_kahet.sql
rename to sql/world fixes/instances/Northrend/ahn_kahet.sql
diff --git a/data/sql/world fixes/instances/Northrend/azjol_nerub.sql b/sql/world fixes/instances/Northrend/azjol_nerub.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/azjol_nerub.sql
rename to sql/world fixes/instances/Northrend/azjol_nerub.sql
diff --git a/data/sql/world fixes/instances/Northrend/culling_of_stratholme.sql b/sql/world fixes/instances/Northrend/culling_of_stratholme.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/culling_of_stratholme.sql
rename to sql/world fixes/instances/Northrend/culling_of_stratholme.sql
diff --git a/data/sql/world fixes/instances/Northrend/draktharonkeep.sql b/sql/world fixes/instances/Northrend/draktharonkeep.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/draktharonkeep.sql
rename to sql/world fixes/instances/Northrend/draktharonkeep.sql
diff --git a/data/sql/world fixes/instances/Northrend/gundrak.sql b/sql/world fixes/instances/Northrend/gundrak.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/gundrak.sql
rename to sql/world fixes/instances/Northrend/gundrak.sql
diff --git a/data/sql/world fixes/instances/Northrend/halls_of_lightning.sql b/sql/world fixes/instances/Northrend/halls_of_lightning.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/halls_of_lightning.sql
rename to sql/world fixes/instances/Northrend/halls_of_lightning.sql
diff --git a/data/sql/world fixes/instances/Northrend/halls_of_stone.sql b/sql/world fixes/instances/Northrend/halls_of_stone.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/halls_of_stone.sql
rename to sql/world fixes/instances/Northrend/halls_of_stone.sql
diff --git a/data/sql/world fixes/instances/Northrend/icc_halls_of_reflection.sql b/sql/world fixes/instances/Northrend/icc_halls_of_reflection.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/icc_halls_of_reflection.sql
rename to sql/world fixes/instances/Northrend/icc_halls_of_reflection.sql
diff --git a/data/sql/world fixes/instances/Northrend/icc_pit_of_saron.sql b/sql/world fixes/instances/Northrend/icc_pit_of_saron.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/icc_pit_of_saron.sql
rename to sql/world fixes/instances/Northrend/icc_pit_of_saron.sql
diff --git a/data/sql/world fixes/instances/Northrend/icc_the_forge_of_souls.sql b/sql/world fixes/instances/Northrend/icc_the_forge_of_souls.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/icc_the_forge_of_souls.sql
rename to sql/world fixes/instances/Northrend/icc_the_forge_of_souls.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/eye_of_eternity_malygos.sql b/sql/world fixes/instances/Northrend/raids/eye_of_eternity_malygos.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/eye_of_eternity_malygos.sql
rename to sql/world fixes/instances/Northrend/raids/eye_of_eternity_malygos.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/icc_icecrown_citadel.sql b/sql/world fixes/instances/Northrend/raids/icc_icecrown_citadel.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/icc_icecrown_citadel.sql
rename to sql/world fixes/instances/Northrend/raids/icc_icecrown_citadel.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/naxxramas.sql b/sql/world fixes/instances/Northrend/raids/naxxramas.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/naxxramas.sql
rename to sql/world fixes/instances/Northrend/raids/naxxramas.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/obsidian_sanctum.sql b/sql/world fixes/instances/Northrend/raids/obsidian_sanctum.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/obsidian_sanctum.sql
rename to sql/world fixes/instances/Northrend/raids/obsidian_sanctum.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/onyxiaslair.sql b/sql/world fixes/instances/Northrend/raids/onyxiaslair.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/onyxiaslair.sql
rename to sql/world fixes/instances/Northrend/raids/onyxiaslair.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/ruby_sanctum.sql b/sql/world fixes/instances/Northrend/raids/ruby_sanctum.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/ruby_sanctum.sql
rename to sql/world fixes/instances/Northrend/raids/ruby_sanctum.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/trial_of_the_crusader.sql b/sql/world fixes/instances/Northrend/raids/trial_of_the_crusader.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/trial_of_the_crusader.sql
rename to sql/world fixes/instances/Northrend/raids/trial_of_the_crusader.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/ulduar.sql b/sql/world fixes/instances/Northrend/raids/ulduar.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/ulduar.sql
rename to sql/world fixes/instances/Northrend/raids/ulduar.sql
diff --git a/data/sql/world fixes/instances/Northrend/raids/valut_of_archavon.sql b/sql/world fixes/instances/Northrend/raids/valut_of_archavon.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/raids/valut_of_archavon.sql
rename to sql/world fixes/instances/Northrend/raids/valut_of_archavon.sql
diff --git a/data/sql/world fixes/instances/Northrend/the_nexus.sql b/sql/world fixes/instances/Northrend/the_nexus.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/the_nexus.sql
rename to sql/world fixes/instances/Northrend/the_nexus.sql
diff --git a/data/sql/world fixes/instances/Northrend/the_nexus_oculus.sql b/sql/world fixes/instances/Northrend/the_nexus_oculus.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/the_nexus_oculus.sql
rename to sql/world fixes/instances/Northrend/the_nexus_oculus.sql
diff --git a/data/sql/world fixes/instances/Northrend/trial_of_the_champion.sql b/sql/world fixes/instances/Northrend/trial_of_the_champion.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/trial_of_the_champion.sql
rename to sql/world fixes/instances/Northrend/trial_of_the_champion.sql
diff --git a/data/sql/world fixes/instances/Northrend/utgarde_keep.sql b/sql/world fixes/instances/Northrend/utgarde_keep.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/utgarde_keep.sql
rename to sql/world fixes/instances/Northrend/utgarde_keep.sql
diff --git a/data/sql/world fixes/instances/Northrend/utgarde_pinnacle.sql b/sql/world fixes/instances/Northrend/utgarde_pinnacle.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/utgarde_pinnacle.sql
rename to sql/world fixes/instances/Northrend/utgarde_pinnacle.sql
diff --git a/data/sql/world fixes/instances/Northrend/violethold.sql b/sql/world fixes/instances/Northrend/violethold.sql
similarity index 100%
rename from data/sql/world fixes/instances/Northrend/violethold.sql
rename to sql/world fixes/instances/Northrend/violethold.sql
diff --git a/data/sql/world fixes/instances/Outlands/auchenai_crypts.sql b/sql/world fixes/instances/Outlands/auchenai_crypts.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/auchenai_crypts.sql
rename to sql/world fixes/instances/Outlands/auchenai_crypts.sql
diff --git a/data/sql/world fixes/instances/Outlands/hellfire_ramparts.sql b/sql/world fixes/instances/Outlands/hellfire_ramparts.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/hellfire_ramparts.sql
rename to sql/world fixes/instances/Outlands/hellfire_ramparts.sql
diff --git a/data/sql/world fixes/instances/Outlands/magisters_terrace.sql b/sql/world fixes/instances/Outlands/magisters_terrace.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/magisters_terrace.sql
rename to sql/world fixes/instances/Outlands/magisters_terrace.sql
diff --git a/data/sql/world fixes/instances/Outlands/mana-tombs.sql b/sql/world fixes/instances/Outlands/mana-tombs.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/mana-tombs.sql
rename to sql/world fixes/instances/Outlands/mana-tombs.sql
diff --git a/data/sql/world fixes/instances/Outlands/old_hillsbrad_foothills.sql b/sql/world fixes/instances/Outlands/old_hillsbrad_foothills.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/old_hillsbrad_foothills.sql
rename to sql/world fixes/instances/Outlands/old_hillsbrad_foothills.sql
diff --git a/data/sql/world fixes/instances/Outlands/raids/black_template.sql b/sql/world fixes/instances/Outlands/raids/black_template.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/raids/black_template.sql
rename to sql/world fixes/instances/Outlands/raids/black_template.sql
diff --git a/data/sql/world fixes/instances/Outlands/raids/gruuls_lair.sql b/sql/world fixes/instances/Outlands/raids/gruuls_lair.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/raids/gruuls_lair.sql
rename to sql/world fixes/instances/Outlands/raids/gruuls_lair.sql
diff --git a/data/sql/world fixes/instances/Outlands/raids/magtheridons_lair.sql b/sql/world fixes/instances/Outlands/raids/magtheridons_lair.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/raids/magtheridons_lair.sql
rename to sql/world fixes/instances/Outlands/raids/magtheridons_lair.sql
diff --git a/data/sql/world fixes/instances/Outlands/raids/serpentshrine_cavern.sql b/sql/world fixes/instances/Outlands/raids/serpentshrine_cavern.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/raids/serpentshrine_cavern.sql
rename to sql/world fixes/instances/Outlands/raids/serpentshrine_cavern.sql
diff --git a/data/sql/world fixes/instances/Outlands/raids/sunwell_plateau.sql b/sql/world fixes/instances/Outlands/raids/sunwell_plateau.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/raids/sunwell_plateau.sql
rename to sql/world fixes/instances/Outlands/raids/sunwell_plateau.sql
diff --git a/data/sql/world fixes/instances/Outlands/raids/the_eye.sql b/sql/world fixes/instances/Outlands/raids/the_eye.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/raids/the_eye.sql
rename to sql/world fixes/instances/Outlands/raids/the_eye.sql
diff --git a/data/sql/world fixes/instances/Outlands/raids/zul_aman.sql b/sql/world fixes/instances/Outlands/raids/zul_aman.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/raids/zul_aman.sql
rename to sql/world fixes/instances/Outlands/raids/zul_aman.sql
diff --git a/data/sql/world fixes/instances/Outlands/sethekk_halls.sql b/sql/world fixes/instances/Outlands/sethekk_halls.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/sethekk_halls.sql
rename to sql/world fixes/instances/Outlands/sethekk_halls.sql
diff --git a/data/sql/world fixes/instances/Outlands/shadow_labirynth.sql b/sql/world fixes/instances/Outlands/shadow_labirynth.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/shadow_labirynth.sql
rename to sql/world fixes/instances/Outlands/shadow_labirynth.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_arcatraz.sql b/sql/world fixes/instances/Outlands/the_arcatraz.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_arcatraz.sql
rename to sql/world fixes/instances/Outlands/the_arcatraz.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_black_morass.sql b/sql/world fixes/instances/Outlands/the_black_morass.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_black_morass.sql
rename to sql/world fixes/instances/Outlands/the_black_morass.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_blood_furnace.sql b/sql/world fixes/instances/Outlands/the_blood_furnace.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_blood_furnace.sql
rename to sql/world fixes/instances/Outlands/the_blood_furnace.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_botanica.sql b/sql/world fixes/instances/Outlands/the_botanica.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_botanica.sql
rename to sql/world fixes/instances/Outlands/the_botanica.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_mechanar.sql b/sql/world fixes/instances/Outlands/the_mechanar.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_mechanar.sql
rename to sql/world fixes/instances/Outlands/the_mechanar.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_shattered_halls.sql b/sql/world fixes/instances/Outlands/the_shattered_halls.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_shattered_halls.sql
rename to sql/world fixes/instances/Outlands/the_shattered_halls.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_slave_pens.sql b/sql/world fixes/instances/Outlands/the_slave_pens.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_slave_pens.sql
rename to sql/world fixes/instances/Outlands/the_slave_pens.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_steamvault.sql b/sql/world fixes/instances/Outlands/the_steamvault.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_steamvault.sql
rename to sql/world fixes/instances/Outlands/the_steamvault.sql
diff --git a/data/sql/world fixes/instances/Outlands/the_underbog.sql b/sql/world fixes/instances/Outlands/the_underbog.sql
similarity index 100%
rename from data/sql/world fixes/instances/Outlands/the_underbog.sql
rename to sql/world fixes/instances/Outlands/the_underbog.sql
diff --git a/data/sql/world fixes/item.sql b/sql/world fixes/item.sql
similarity index 100%
rename from data/sql/world fixes/item.sql
rename to sql/world fixes/item.sql
diff --git a/data/sql/world fixes/loot/Eastern Kingdom/arathi_highlands.sql b/sql/world fixes/loot/Eastern Kingdom/arathi_highlands.sql
similarity index 100%
rename from data/sql/world fixes/loot/Eastern Kingdom/arathi_highlands.sql
rename to sql/world fixes/loot/Eastern Kingdom/arathi_highlands.sql
diff --git a/data/sql/world fixes/loot/Eastern Kingdom/blasted_lands.sql b/sql/world fixes/loot/Eastern Kingdom/blasted_lands.sql
similarity index 100%
rename from data/sql/world fixes/loot/Eastern Kingdom/blasted_lands.sql
rename to sql/world fixes/loot/Eastern Kingdom/blasted_lands.sql
diff --git a/data/sql/world fixes/loot/Eastern Kingdom/molten_core.sql b/sql/world fixes/loot/Eastern Kingdom/molten_core.sql
similarity index 100%
rename from data/sql/world fixes/loot/Eastern Kingdom/molten_core.sql
rename to sql/world fixes/loot/Eastern Kingdom/molten_core.sql
diff --git a/data/sql/world fixes/loot/Eastern Kingdom/ungoro_crater.sql b/sql/world fixes/loot/Eastern Kingdom/ungoro_crater.sql
similarity index 100%
rename from data/sql/world fixes/loot/Eastern Kingdom/ungoro_crater.sql
rename to sql/world fixes/loot/Eastern Kingdom/ungoro_crater.sql
diff --git a/data/sql/world fixes/loot/Kalimdor/silithus.sql b/sql/world fixes/loot/Kalimdor/silithus.sql
similarity index 100%
rename from data/sql/world fixes/loot/Kalimdor/silithus.sql
rename to sql/world fixes/loot/Kalimdor/silithus.sql
diff --git a/data/sql/world fixes/loot/Kalimdor/the_barrens.sql b/sql/world fixes/loot/Kalimdor/the_barrens.sql
similarity index 100%
rename from data/sql/world fixes/loot/Kalimdor/the_barrens.sql
rename to sql/world fixes/loot/Kalimdor/the_barrens.sql
diff --git a/data/sql/world fixes/loot/Northrend/storm_peaks.sql b/sql/world fixes/loot/Northrend/storm_peaks.sql
similarity index 100%
rename from data/sql/world fixes/loot/Northrend/storm_peaks.sql
rename to sql/world fixes/loot/Northrend/storm_peaks.sql
diff --git a/data/sql/world fixes/loot/Outlands/serpentshrine_cavern.sql b/sql/world fixes/loot/Outlands/serpentshrine_cavern.sql
similarity index 100%
rename from data/sql/world fixes/loot/Outlands/serpentshrine_cavern.sql
rename to sql/world fixes/loot/Outlands/serpentshrine_cavern.sql
diff --git a/data/sql/world fixes/loot/Outlands/shadowmoon_valley.sql b/sql/world fixes/loot/Outlands/shadowmoon_valley.sql
similarity index 100%
rename from data/sql/world fixes/loot/Outlands/shadowmoon_valley.sql
rename to sql/world fixes/loot/Outlands/shadowmoon_valley.sql
diff --git a/data/sql/world fixes/loot/Outlands/sunwell.sql b/sql/world fixes/loot/Outlands/sunwell.sql
similarity index 100%
rename from data/sql/world fixes/loot/Outlands/sunwell.sql
rename to sql/world fixes/loot/Outlands/sunwell.sql
diff --git a/data/sql/world fixes/loot/Outlands/the_eye.sql b/sql/world fixes/loot/Outlands/the_eye.sql
similarity index 100%
rename from data/sql/world fixes/loot/Outlands/the_eye.sql
rename to sql/world fixes/loot/Outlands/the_eye.sql
diff --git a/data/sql/world fixes/loot/Outlands/zangarmarsh.sql b/sql/world fixes/loot/Outlands/zangarmarsh.sql
similarity index 100%
rename from data/sql/world fixes/loot/Outlands/zangarmarsh.sql
rename to sql/world fixes/loot/Outlands/zangarmarsh.sql
diff --git a/data/sql/world fixes/loot/generic.sql b/sql/world fixes/loot/generic.sql
similarity index 100%
rename from data/sql/world fixes/loot/generic.sql
rename to sql/world fixes/loot/generic.sql
diff --git a/data/sql/world fixes/loot/go_loot.sql b/sql/world fixes/loot/go_loot.sql
similarity index 100%
rename from data/sql/world fixes/loot/go_loot.sql
rename to sql/world fixes/loot/go_loot.sql
diff --git a/data/sql/world fixes/loot/heroic_loot.sql b/sql/world fixes/loot/heroic_loot.sql
similarity index 100%
rename from data/sql/world fixes/loot/heroic_loot.sql
rename to sql/world fixes/loot/heroic_loot.sql
diff --git a/data/sql/world fixes/loot/item_loot.sql b/sql/world fixes/loot/item_loot.sql
similarity index 100%
rename from data/sql/world fixes/loot/item_loot.sql
rename to sql/world fixes/loot/item_loot.sql
diff --git a/data/sql/world fixes/loot/npc_loot.sql b/sql/world fixes/loot/npc_loot.sql
similarity index 100%
rename from data/sql/world fixes/loot/npc_loot.sql
rename to sql/world fixes/loot/npc_loot.sql
diff --git a/data/sql/world fixes/loot/pickpocket_loot.sql b/sql/world fixes/loot/pickpocket_loot.sql
similarity index 100%
rename from data/sql/world fixes/loot/pickpocket_loot.sql
rename to sql/world fixes/loot/pickpocket_loot.sql
diff --git a/data/sql/world fixes/loot/recipe.sql b/sql/world fixes/loot/recipe.sql
similarity index 100%
rename from data/sql/world fixes/loot/recipe.sql
rename to sql/world fixes/loot/recipe.sql
diff --git a/data/sql/world fixes/loot/skinning_loot.sql b/sql/world fixes/loot/skinning_loot.sql
similarity index 100%
rename from data/sql/world fixes/loot/skinning_loot.sql
rename to sql/world fixes/loot/skinning_loot.sql
diff --git a/data/sql/world fixes/loot/trial_of_crusader.sql b/sql/world fixes/loot/trial_of_crusader.sql
similarity index 100%
rename from data/sql/world fixes/loot/trial_of_crusader.sql
rename to sql/world fixes/loot/trial_of_crusader.sql
diff --git a/data/sql/world fixes/loot/ulduar_descend_into_madness.sql b/sql/world fixes/loot/ulduar_descend_into_madness.sql
similarity index 100%
rename from data/sql/world fixes/loot/ulduar_descend_into_madness.sql
rename to sql/world fixes/loot/ulduar_descend_into_madness.sql
diff --git a/data/sql/world fixes/npc_fixes/Eastern Kingdom/ashenvale.sql b/sql/world fixes/npc_fixes/Eastern Kingdom/ashenvale.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Eastern Kingdom/ashenvale.sql
rename to sql/world fixes/npc_fixes/Eastern Kingdom/ashenvale.sql
diff --git a/data/sql/world fixes/npc_fixes/Eastern Kingdom/duskwood.sql b/sql/world fixes/npc_fixes/Eastern Kingdom/duskwood.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Eastern Kingdom/duskwood.sql
rename to sql/world fixes/npc_fixes/Eastern Kingdom/duskwood.sql
diff --git a/data/sql/world fixes/npc_fixes/Eastern Kingdom/elwynn_forest.sql b/sql/world fixes/npc_fixes/Eastern Kingdom/elwynn_forest.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Eastern Kingdom/elwynn_forest.sql
rename to sql/world fixes/npc_fixes/Eastern Kingdom/elwynn_forest.sql
diff --git a/data/sql/world fixes/npc_fixes/Eastern Kingdom/loch_modan.sql b/sql/world fixes/npc_fixes/Eastern Kingdom/loch_modan.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Eastern Kingdom/loch_modan.sql
rename to sql/world fixes/npc_fixes/Eastern Kingdom/loch_modan.sql
diff --git a/data/sql/world fixes/npc_fixes/Eastern Kingdom/silverpine_forest.sql b/sql/world fixes/npc_fixes/Eastern Kingdom/silverpine_forest.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Eastern Kingdom/silverpine_forest.sql
rename to sql/world fixes/npc_fixes/Eastern Kingdom/silverpine_forest.sql
diff --git a/data/sql/world fixes/npc_fixes/Eastern Kingdom/stranglethorn_valley.sql b/sql/world fixes/npc_fixes/Eastern Kingdom/stranglethorn_valley.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Eastern Kingdom/stranglethorn_valley.sql
rename to sql/world fixes/npc_fixes/Eastern Kingdom/stranglethorn_valley.sql
diff --git a/data/sql/world fixes/npc_fixes/Kalimdor/durotar.sql b/sql/world fixes/npc_fixes/Kalimdor/durotar.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Kalimdor/durotar.sql
rename to sql/world fixes/npc_fixes/Kalimdor/durotar.sql
diff --git a/data/sql/world fixes/npc_fixes/Kalimdor/mulgore.sql b/sql/world fixes/npc_fixes/Kalimdor/mulgore.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Kalimdor/mulgore.sql
rename to sql/world fixes/npc_fixes/Kalimdor/mulgore.sql
diff --git a/data/sql/world fixes/npc_fixes/Kalimdor/silithus.sql b/sql/world fixes/npc_fixes/Kalimdor/silithus.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Kalimdor/silithus.sql
rename to sql/world fixes/npc_fixes/Kalimdor/silithus.sql
diff --git a/data/sql/world fixes/npc_fixes/Kalimdor/tanaris.sql b/sql/world fixes/npc_fixes/Kalimdor/tanaris.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Kalimdor/tanaris.sql
rename to sql/world fixes/npc_fixes/Kalimdor/tanaris.sql
diff --git a/data/sql/world fixes/npc_fixes/Kalimdor/the_barrens.sql b/sql/world fixes/npc_fixes/Kalimdor/the_barrens.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Kalimdor/the_barrens.sql
rename to sql/world fixes/npc_fixes/Kalimdor/the_barrens.sql
diff --git a/data/sql/world fixes/npc_fixes/Kalimdor/ungoro_crater.sql b/sql/world fixes/npc_fixes/Kalimdor/ungoro_crater.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Kalimdor/ungoro_crater.sql
rename to sql/world fixes/npc_fixes/Kalimdor/ungoro_crater.sql
diff --git a/data/sql/world fixes/npc_fixes/Kalimdor/winterspring.sql b/sql/world fixes/npc_fixes/Kalimdor/winterspring.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Kalimdor/winterspring.sql
rename to sql/world fixes/npc_fixes/Kalimdor/winterspring.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/borean_tundra.sql b/sql/world fixes/npc_fixes/Northrend/borean_tundra.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/borean_tundra.sql
rename to sql/world fixes/npc_fixes/Northrend/borean_tundra.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/crystalsong_forest.sql b/sql/world fixes/npc_fixes/Northrend/crystalsong_forest.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/crystalsong_forest.sql
rename to sql/world fixes/npc_fixes/Northrend/crystalsong_forest.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/dalaran.sql b/sql/world fixes/npc_fixes/Northrend/dalaran.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/dalaran.sql
rename to sql/world fixes/npc_fixes/Northrend/dalaran.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/dragonblight.sql b/sql/world fixes/npc_fixes/Northrend/dragonblight.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/dragonblight.sql
rename to sql/world fixes/npc_fixes/Northrend/dragonblight.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/grizzly_hills.sql b/sql/world fixes/npc_fixes/Northrend/grizzly_hills.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/grizzly_hills.sql
rename to sql/world fixes/npc_fixes/Northrend/grizzly_hills.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/icecrown.sql b/sql/world fixes/npc_fixes/Northrend/icecrown.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/icecrown.sql
rename to sql/world fixes/npc_fixes/Northrend/icecrown.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/scarlet_enclave.sql b/sql/world fixes/npc_fixes/Northrend/scarlet_enclave.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/scarlet_enclave.sql
rename to sql/world fixes/npc_fixes/Northrend/scarlet_enclave.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/sholazar_basin.sql b/sql/world fixes/npc_fixes/Northrend/sholazar_basin.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/sholazar_basin.sql
rename to sql/world fixes/npc_fixes/Northrend/sholazar_basin.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/storm_peaks.sql b/sql/world fixes/npc_fixes/Northrend/storm_peaks.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/storm_peaks.sql
rename to sql/world fixes/npc_fixes/Northrend/storm_peaks.sql
diff --git a/data/sql/world fixes/npc_fixes/Northrend/zul_drak.sql b/sql/world fixes/npc_fixes/Northrend/zul_drak.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Northrend/zul_drak.sql
rename to sql/world fixes/npc_fixes/Northrend/zul_drak.sql
diff --git a/data/sql/world fixes/npc_fixes/Outlands/blades_edge_mountains.sql b/sql/world fixes/npc_fixes/Outlands/blades_edge_mountains.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Outlands/blades_edge_mountains.sql
rename to sql/world fixes/npc_fixes/Outlands/blades_edge_mountains.sql
diff --git a/data/sql/world fixes/npc_fixes/Outlands/hellfire_peninsula.sql b/sql/world fixes/npc_fixes/Outlands/hellfire_peninsula.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Outlands/hellfire_peninsula.sql
rename to sql/world fixes/npc_fixes/Outlands/hellfire_peninsula.sql
diff --git a/data/sql/world fixes/npc_fixes/Outlands/netherstorm.sql b/sql/world fixes/npc_fixes/Outlands/netherstorm.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Outlands/netherstorm.sql
rename to sql/world fixes/npc_fixes/Outlands/netherstorm.sql
diff --git a/data/sql/world fixes/npc_fixes/Outlands/shadowmoon_valley.sql b/sql/world fixes/npc_fixes/Outlands/shadowmoon_valley.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Outlands/shadowmoon_valley.sql
rename to sql/world fixes/npc_fixes/Outlands/shadowmoon_valley.sql
diff --git a/data/sql/world fixes/npc_fixes/Outlands/terokkar_forest.sql b/sql/world fixes/npc_fixes/Outlands/terokkar_forest.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/Outlands/terokkar_forest.sql
rename to sql/world fixes/npc_fixes/Outlands/terokkar_forest.sql
diff --git a/data/sql/world fixes/npc_fixes/creaturefixes.sql b/sql/world fixes/npc_fixes/creaturefixes.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/creaturefixes.sql
rename to sql/world fixes/npc_fixes/creaturefixes.sql
diff --git a/data/sql/world fixes/npc_fixes/non_combat_pets.sql b/sql/world fixes/npc_fixes/non_combat_pets.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/non_combat_pets.sql
rename to sql/world fixes/npc_fixes/non_combat_pets.sql
diff --git a/data/sql/world fixes/npc_fixes/pet_level_stats.sql b/sql/world fixes/npc_fixes/pet_level_stats.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/pet_level_stats.sql
rename to sql/world fixes/npc_fixes/pet_level_stats.sql
diff --git a/data/sql/world fixes/npc_fixes/shared.sql b/sql/world fixes/npc_fixes/shared.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/shared.sql
rename to sql/world fixes/npc_fixes/shared.sql
diff --git a/data/sql/world fixes/npc_fixes/trainer.sql b/sql/world fixes/npc_fixes/trainer.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/trainer.sql
rename to sql/world fixes/npc_fixes/trainer.sql
diff --git a/data/sql/world fixes/npc_fixes/vendor.sql b/sql/world fixes/npc_fixes/vendor.sql
similarity index 100%
rename from data/sql/world fixes/npc_fixes/vendor.sql
rename to sql/world fixes/npc_fixes/vendor.sql
diff --git a/data/sql/world fixes/other_world_fixes.sql b/sql/world fixes/other_world_fixes.sql
similarity index 100%
rename from data/sql/world fixes/other_world_fixes.sql
rename to sql/world fixes/other_world_fixes.sql
diff --git a/data/sql/world fixes/spawns/Eastern Kingdom/silverpine_forest.sql b/sql/world fixes/spawns/Eastern Kingdom/silverpine_forest.sql
similarity index 100%
rename from data/sql/world fixes/spawns/Eastern Kingdom/silverpine_forest.sql
rename to sql/world fixes/spawns/Eastern Kingdom/silverpine_forest.sql
diff --git a/data/sql/world fixes/spawns/Northrend/borean_trundra.sql b/sql/world fixes/spawns/Northrend/borean_trundra.sql
similarity index 100%
rename from data/sql/world fixes/spawns/Northrend/borean_trundra.sql
rename to sql/world fixes/spawns/Northrend/borean_trundra.sql
diff --git a/data/sql/world fixes/spawns/Northrend/crystalsong_forest.sql b/sql/world fixes/spawns/Northrend/crystalsong_forest.sql
similarity index 100%
rename from data/sql/world fixes/spawns/Northrend/crystalsong_forest.sql
rename to sql/world fixes/spawns/Northrend/crystalsong_forest.sql
diff --git a/data/sql/world fixes/spawns/Northrend/sholazar_basin.sql b/sql/world fixes/spawns/Northrend/sholazar_basin.sql
similarity index 100%
rename from data/sql/world fixes/spawns/Northrend/sholazar_basin.sql
rename to sql/world fixes/spawns/Northrend/sholazar_basin.sql
diff --git a/data/sql/world fixes/spawns/Northrend/storm_peaks.sql b/sql/world fixes/spawns/Northrend/storm_peaks.sql
similarity index 100%
rename from data/sql/world fixes/spawns/Northrend/storm_peaks.sql
rename to sql/world fixes/spawns/Northrend/storm_peaks.sql
diff --git a/data/sql/world fixes/spawns/Outlands/blades_edge_mountains.sql b/sql/world fixes/spawns/Outlands/blades_edge_mountains.sql
similarity index 100%
rename from data/sql/world fixes/spawns/Outlands/blades_edge_mountains.sql
rename to sql/world fixes/spawns/Outlands/blades_edge_mountains.sql
diff --git a/data/sql/world fixes/spawns/Outlands/terokkar_forest.sql b/sql/world fixes/spawns/Outlands/terokkar_forest.sql
similarity index 100%
rename from data/sql/world fixes/spawns/Outlands/terokkar_forest.sql
rename to sql/world fixes/spawns/Outlands/terokkar_forest.sql
diff --git a/data/sql/world fixes/spawns/custom.sql b/sql/world fixes/spawns/custom.sql
similarity index 100%
rename from data/sql/world fixes/spawns/custom.sql
rename to sql/world fixes/spawns/custom.sql
diff --git a/data/sql/world fixes/spawns/spawns.sql b/sql/world fixes/spawns/spawns.sql
similarity index 100%
rename from data/sql/world fixes/spawns/spawns.sql
rename to sql/world fixes/spawns/spawns.sql
diff --git a/data/sql/world updates/creature_text_dalaran_citizen.sql b/sql/world updates/creature_text_dalaran_citizen.sql
similarity index 100%
rename from data/sql/world updates/creature_text_dalaran_citizen.sql
rename to sql/world updates/creature_text_dalaran_citizen.sql
diff --git a/data/sql/world updates/invisible_stalker.sql b/sql/world updates/invisible_stalker.sql
similarity index 100%
rename from data/sql/world updates/invisible_stalker.sql
rename to sql/world updates/invisible_stalker.sql
diff --git a/data/sql/world updates/say_text_linda_alec.sql b/sql/world updates/say_text_linda_alec.sql
similarity index 100%
rename from data/sql/world updates/say_text_linda_alec.sql
rename to sql/world updates/say_text_linda_alec.sql
diff --git a/src/genrev/CMakeLists.txt b/src/genrev/CMakeLists.txt
index 64b2abdf74..a953fa5939 100644
--- a/src/genrev/CMakeLists.txt
+++ b/src/genrev/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,6 +10,6 @@
 
 # Need to pass old ${CMAKE_BINARY_DIR} as param because its different at build stage
 add_custom_target(revision.h ALL
-  COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/src/cmake/genrev.cmake
+  COMMAND ${CMAKE_COMMAND} -DBUILDDIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/genrev.cmake
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index b65442d11f..887337a036 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -32,8 +32,8 @@ set(collision_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index afb685512c..b05dc56cd3 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -110,11 +110,11 @@ set(game_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/dep/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/dep/SFMT
+  ${CMAKE_SOURCE_DIR}/dep/zlib
   ${CMAKE_SOURCE_DIR}/src/server/collision
   ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 77e147b49d..6b30331c84 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -44,11 +44,11 @@ message("")
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/dep/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/dep/zlib
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/dep/SFMT
+  ${CMAKE_SOURCE_DIR}/dep/zlib
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
   ${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 5bd1dd2212..aa97e8e3b1 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -43,11 +43,11 @@ endif()
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/dep/gsoap
-  ${CMAKE_SOURCE_DIR}/modules/dep/sockets/include
-  ${CMAKE_SOURCE_DIR}/modules/dep/SFMT
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/dep/gsoap
+  ${CMAKE_SOURCE_DIR}/dep/sockets/include
+  ${CMAKE_SOURCE_DIR}/dep/SFMT
   ${CMAKE_SOURCE_DIR}/src/server/collision
   ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/collision/Models
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index af3f79a910..46b132614c 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Copyright (C)
-# Copyright (C)
+# Copyright (C) 
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -13,7 +13,7 @@ file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
     ${CMAKE_SOURCE_DIR}/src/server/shared
-    ${CMAKE_SOURCE_DIR}/modules/dep/libmpq
+    ${CMAKE_SOURCE_DIR}/dep/libmpq
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
 )
@@ -21,7 +21,7 @@ set(include_Dirs
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
+    ${CMAKE_SOURCE_DIR}/dep/libmpq/win
   )
 endif()
 
diff --git a/src/tools/mesh_extractor/CMakeLists.txt b/src/tools/mesh_extractor/CMakeLists.txt
index 922548319b..b76a99b765 100644
--- a/src/tools/mesh_extractor/CMakeLists.txt
+++ b/src/tools/mesh_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Copyright (C)
-# Copyright (C)
+# Copyright (C) 
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -14,10 +14,10 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h)
 set(include_Base
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/dep/libmpq
-  ${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/dep/libmpq
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
   ${ACE_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -25,7 +25,7 @@ set(include_Base
 if( WIN32 )
   set(include_Base
     ${include_Base}
-    ${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
+    ${CMAKE_SOURCE_DIR}/dep/libmpq/win
     )
 endif()
 
diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
index 3fa480f962..8f58dccb56 100644
--- a/src/tools/mmaps_generator/CMakeLists.txt
+++ b/src/tools/mmaps_generator/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C)
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -15,12 +15,12 @@ set(mmap_gen_Includes
   ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/dep/libmpq
-  ${CMAKE_SOURCE_DIR}/modules/dep/zlib
-  ${CMAKE_SOURCE_DIR}/modules/dep/bzip2
-  ${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Recast
-  ${CMAKE_SOURCE_DIR}/modules/dep/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/dep/libmpq
+  ${CMAKE_SOURCE_DIR}/dep/zlib
+  ${CMAKE_SOURCE_DIR}/dep/bzip2
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Recast
+  ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
   ${CMAKE_SOURCE_DIR}/src/server/collision
   ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index 42895a15d9..5d59faca7a 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Copyright (C)
-# Copyright (C)
+# Copyright (C) 
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,7 +10,7 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/modules/dep/g3dlite/include
+  ${CMAKE_SOURCE_DIR}/dep/g3dlite/include
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
   ${CMAKE_SOURCE_DIR}/src/server/collision
diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
index 974505caaf..136fdac5e4 100644
--- a/src/tools/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Copyright (C)
-# Copyright (C)
+# Copyright (C) 
+# Copyright (C) 
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -12,13 +12,13 @@
 file(GLOB_RECURSE sources *.cpp *.h)
 
 set(include_Dirs
-    ${CMAKE_SOURCE_DIR}/modules/dep/libmpq
+    ${CMAKE_SOURCE_DIR}/dep/libmpq
 )
 
 if( WIN32 )
   set(include_Dirs
     ${include_Dirs}
-    ${CMAKE_SOURCE_DIR}/modules/dep/libmpq/win
+    ${CMAKE_SOURCE_DIR}/dep/libmpq/win
   )
 endif()