diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index e662e2fe07d..3899cd62bcd 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(updates)
-add_subdirectory(full)
+add_subdirectory(scripts)
+add_subdirectory(base)
 
 ########### install files ###############
 
diff --git a/sql/auth_database.sql b/sql/base/auth_database.sql
similarity index 100%
rename from sql/auth_database.sql
rename to sql/base/auth_database.sql
diff --git a/sql/character_database.sql b/sql/base/character_database.sql
similarity index 100%
rename from sql/character_database.sql
rename to sql/base/character_database.sql
diff --git a/sql/world_database.sql b/sql/base/world_database.sql
similarity index 100%
rename from sql/world_database.sql
rename to sql/base/world_database.sql
diff --git a/sql/tools/CMakeLists.txt b/sql/create/CMakeLists.txt
similarity index 100%
rename from sql/tools/CMakeLists.txt
rename to sql/create/CMakeLists.txt
diff --git a/sql/tools/create_mysql.sql b/sql/create/create_mysql.sql
similarity index 100%
rename from sql/tools/create_mysql.sql
rename to sql/create/create_mysql.sql
diff --git a/sql/tools/drop_mysql.sql b/sql/create/drop_mysql.sql
similarity index 100%
rename from sql/tools/drop_mysql.sql
rename to sql/create/drop_mysql.sql
diff --git a/sql/full/CMakeLists.txt b/sql/scripts/CMakeLists.txt
similarity index 100%
rename from sql/full/CMakeLists.txt
rename to sql/scripts/CMakeLists.txt
diff --git a/sql/full/world_script_texts.sql b/sql/scripts/world_script_texts.sql
similarity index 100%
rename from sql/full/world_script_texts.sql
rename to sql/scripts/world_script_texts.sql
diff --git a/sql/full/world_script_waypoints.sql b/sql/scripts/world_script_waypoints.sql
similarity index 100%
rename from sql/full/world_script_waypoints.sql
rename to sql/scripts/world_script_waypoints.sql
diff --git a/sql/full/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
similarity index 100%
rename from sql/full/world_scripts_full.sql
rename to sql/scripts/world_scripts_full.sql