diff --git a/.gitignore b/.gitignore
index c1d99acd9..57b2b70b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ conf/*
 !conf/*.dist
 modules/*
 
-!modules/drassil/*
+!modules/drassil
 modules/drassil/joiner
 !modules/hw-core
 !modules/acore
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 518ec718a..02568ba10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
 
 # some utils for cmake
-include(modules/uwd/cmake-utils/utils.cmake)
+include(modules/drassil/cmake-utils/utils.cmake)
 
 include(src/cmake/ac_macros.cmake)
 
diff --git a/bin/db_exporter/db_export.sh b/bin/db_exporter/db_export.sh
index 22d73f728..dc321f90a 100755
--- a/bin/db_exporter/db_export.sh
+++ b/bin/db_exporter/db_export.sh
@@ -34,7 +34,7 @@ function export() {
     base_name=${!var_base_name}
 
 
-    bash $AC_PATH_MODULES"/uwd/mysql-tools/mysql-tools" dump "" $base_name "" "$base_conf"
+    bash $AC_PATH_MODULES"/drassil/mysql-tools/mysql-tools" dump "" $base_name "" "$base_conf"
 }
 
 for db in ${DATABASES[@]}
diff --git a/modules/uwd/cmake-utils/.gitignore b/modules/drassil/cmake-utils/.gitignore
similarity index 100%
rename from modules/uwd/cmake-utils/.gitignore
rename to modules/drassil/cmake-utils/.gitignore
diff --git a/modules/uwd/cmake-utils/utils.cmake b/modules/drassil/cmake-utils/utils.cmake
similarity index 100%
rename from modules/uwd/cmake-utils/utils.cmake
rename to modules/drassil/cmake-utils/utils.cmake
diff --git a/modules/uwd/mysql-tools/.gitignore b/modules/drassil/mysql-tools/.gitignore
similarity index 100%
rename from modules/uwd/mysql-tools/.gitignore
rename to modules/drassil/mysql-tools/.gitignore
diff --git a/modules/uwd/mysql-tools/README b/modules/drassil/mysql-tools/README
similarity index 100%
rename from modules/uwd/mysql-tools/README
rename to modules/drassil/mysql-tools/README
diff --git a/modules/uwd/mysql-tools/bin/dump-parser b/modules/drassil/mysql-tools/bin/dump-parser
old mode 100755
new mode 100644
similarity index 100%
rename from modules/uwd/mysql-tools/bin/dump-parser
rename to modules/drassil/mysql-tools/bin/dump-parser
diff --git a/modules/uwd/mysql-tools/bin/mysql.exe b/modules/drassil/mysql-tools/bin/mysql.exe
similarity index 100%
rename from modules/uwd/mysql-tools/bin/mysql.exe
rename to modules/drassil/mysql-tools/bin/mysql.exe
diff --git a/modules/uwd/mysql-tools/bin/mysqldump.exe b/modules/drassil/mysql-tools/bin/mysqldump.exe
similarity index 100%
rename from modules/uwd/mysql-tools/bin/mysqldump.exe
rename to modules/drassil/mysql-tools/bin/mysqldump.exe
diff --git a/modules/uwd/mysql-tools/bin/mysqlimport.exe b/modules/drassil/mysql-tools/bin/mysqlimport.exe
similarity index 100%
rename from modules/uwd/mysql-tools/bin/mysqlimport.exe
rename to modules/drassil/mysql-tools/bin/mysqlimport.exe
diff --git a/modules/uwd/mysql-tools/build-dump-parser.sh b/modules/drassil/mysql-tools/build-dump-parser.sh
similarity index 100%
rename from modules/uwd/mysql-tools/build-dump-parser.sh
rename to modules/drassil/mysql-tools/build-dump-parser.sh
diff --git a/modules/uwd/mysql-tools/dump-parser.c b/modules/drassil/mysql-tools/dump-parser.c
similarity index 100%
rename from modules/uwd/mysql-tools/dump-parser.c
rename to modules/drassil/mysql-tools/dump-parser.c
diff --git a/modules/uwd/mysql-tools/mysql-config.dist b/modules/drassil/mysql-tools/mysql-config.dist
similarity index 100%
rename from modules/uwd/mysql-tools/mysql-config.dist
rename to modules/drassil/mysql-tools/mysql-config.dist
diff --git a/modules/uwd/mysql-tools/mysql-dump b/modules/drassil/mysql-tools/mysql-dump
similarity index 100%
rename from modules/uwd/mysql-tools/mysql-dump
rename to modules/drassil/mysql-tools/mysql-dump
diff --git a/modules/uwd/mysql-tools/mysql-import b/modules/drassil/mysql-tools/mysql-import
similarity index 100%
rename from modules/uwd/mysql-tools/mysql-import
rename to modules/drassil/mysql-tools/mysql-import
diff --git a/modules/uwd/mysql-tools/mysql-tools b/modules/drassil/mysql-tools/mysql-tools
similarity index 100%
rename from modules/uwd/mysql-tools/mysql-tools
rename to modules/drassil/mysql-tools/mysql-tools
diff --git a/modules/uwd/mysql-tools/shared-def b/modules/drassil/mysql-tools/shared-def
similarity index 100%
rename from modules/uwd/mysql-tools/shared-def
rename to modules/drassil/mysql-tools/shared-def