diff --git a/cmake/cppbessot/CppBeSSOT.cmake b/cmake/CppBeSSOT.cmake
similarity index 100%
rename from cmake/cppbessot/CppBeSSOT.cmake
rename to cmake/CppBeSSOT.cmake
diff --git a/cmake/cppbessot/dbDependencyCheck.cmake b/cmake/dbDependencyCheck.cmake
similarity index 100%
rename from cmake/cppbessot/dbDependencyCheck.cmake
rename to cmake/dbDependencyCheck.cmake
diff --git a/cmake/cppbessot/dbGenCpp.cmake b/cmake/dbGenCpp.cmake
similarity index 100%
rename from cmake/cppbessot/dbGenCpp.cmake
rename to cmake/dbGenCpp.cmake
diff --git a/cmake/cppbessot/dbGenMigrations.cmake b/cmake/dbGenMigrations.cmake
similarity index 85%
rename from cmake/cppbessot/dbGenMigrations.cmake
rename to cmake/dbGenMigrations.cmake
index 5043b7f..3ea9be9 100644
--- a/cmake/cppbessot/dbGenMigrations.cmake
+++ b/cmake/dbGenMigrations.cmake
@@ -25,10 +25,10 @@ function(cppbessot_add_db_gen_migrations_target from_version to_version)
 
   add_custom_target(db_gen_migrations
     COMMAND "${CMAKE_COMMAND}"
-            -DCPPBESSOT_ODB_EXECUTABLE="${CPPBESSOT_ODB_EXECUTABLE}"
-            -DCPPBESSOT_FROM_VERSION_DIR="${_from_dir}"
-            -DCPPBESSOT_TO_VERSION_DIR="${_to_dir}"
-            -DCPPBESSOT_MIGRATION_DIR="${_migration_dir}"
+            -DCPPBESSOT_ODB_EXECUTABLE=${CPPBESSOT_ODB_EXECUTABLE}
+            -DCPPBESSOT_FROM_VERSION_DIR=${_from_dir}
+            -DCPPBESSOT_TO_VERSION_DIR=${_to_dir}
+            -DCPPBESSOT_MIGRATION_DIR=${_migration_dir}
             -P "${CMAKE_CURRENT_LIST_DIR}/scripts/run_odb_migrations.cmake"
     COMMENT "Generating DB migrations: ${from_version} -> ${to_version}"
     VERBATIM
diff --git a/cmake/cppbessot/dbGenODB.cmake b/cmake/dbGenODB.cmake
similarity index 88%
rename from cmake/cppbessot/dbGenODB.cmake
rename to cmake/dbGenODB.cmake
index 572a45a..bf9d055 100644
--- a/cmake/cppbessot/dbGenODB.cmake
+++ b/cmake/dbGenODB.cmake
@@ -15,8 +15,8 @@ function(cppbessot_add_db_gen_odb_target version)
 
   add_custom_target(db_gen_odb_logic
     COMMAND "${CMAKE_COMMAND}"
-            -DCPPBESSOT_ODB_EXECUTABLE="${CPPBESSOT_ODB_EXECUTABLE}"
-            -DCPPBESSOT_VERSION_DIR="${_version_dir}"
+            -DCPPBESSOT_ODB_EXECUTABLE=${CPPBESSOT_ODB_EXECUTABLE}
+            -DCPPBESSOT_VERSION_DIR=${_version_dir}
             -P "${CMAKE_CURRENT_LIST_DIR}/scripts/run_odb_logic.cmake"
     DEPENDS db_gen_cpp_headers
     COMMENT "Generating ODB ORM sources for ${version} (sqlite + postgre)"
diff --git a/cmake/cppbessot/dbGenSqlDDL.cmake b/cmake/dbGenSqlDDL.cmake
similarity index 88%
rename from cmake/cppbessot/dbGenSqlDDL.cmake
rename to cmake/dbGenSqlDDL.cmake
index 72ab554..106f9d4 100644
--- a/cmake/cppbessot/dbGenSqlDDL.cmake
+++ b/cmake/dbGenSqlDDL.cmake
@@ -15,8 +15,8 @@ function(cppbessot_add_db_gen_sql_ddl_target version)
 
   add_custom_target(db_gen_sql_ddl
     COMMAND "${CMAKE_COMMAND}"
-            -DCPPBESSOT_ODB_EXECUTABLE="${CPPBESSOT_ODB_EXECUTABLE}"
-            -DCPPBESSOT_VERSION_DIR="${_version_dir}"
+            -DCPPBESSOT_ODB_EXECUTABLE=${CPPBESSOT_ODB_EXECUTABLE}
+            -DCPPBESSOT_VERSION_DIR=${_version_dir}
             -P "${CMAKE_CURRENT_LIST_DIR}/scripts/run_odb_sql_ddl.cmake"
     DEPENDS db_gen_cpp_headers
     COMMENT "Generating SQL DDL snapshots for ${version} (sqlite + postgre)"
diff --git a/cmake/cppbessot/dbGenTS.cmake b/cmake/dbGenTS.cmake
similarity index 100%
rename from cmake/cppbessot/dbGenTS.cmake
rename to cmake/dbGenTS.cmake
diff --git a/cmake/cppbessot/dbGenZod.cmake b/cmake/dbGenZod.cmake
similarity index 100%
rename from cmake/cppbessot/dbGenZod.cmake
rename to cmake/dbGenZod.cmake
diff --git a/cmake/cppbessot/dbGenerationCommon.cmake b/cmake/dbGenerationCommon.cmake
similarity index 100%
rename from cmake/cppbessot/dbGenerationCommon.cmake
rename to cmake/dbGenerationCommon.cmake
diff --git a/cmake/cppbessot/dbSchemaCheck.cmake b/cmake/dbSchemaCheck.cmake
similarity index 83%
rename from cmake/cppbessot/dbSchemaCheck.cmake
rename to cmake/dbSchemaCheck.cmake
index 7906028..6a25cc5 100644
--- a/cmake/cppbessot/dbSchemaCheck.cmake
+++ b/cmake/dbSchemaCheck.cmake
@@ -14,9 +14,9 @@ function(cppbessot_add_db_check_schema_changes_target)
 
   add_custom_target(db_check_schema_changes
     COMMAND "${CMAKE_COMMAND}"
-            -DCPPBESSOT_GIT_EXECUTABLE="${CPPBESSOT_GIT_EXECUTABLE}"
-            -DCPPBESSOT_WORKDIR_ABS="${_workdir}"
-            -DCPPBESSOT_PROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}"
+            -DCPPBESSOT_GIT_EXECUTABLE=${CPPBESSOT_GIT_EXECUTABLE}
+            -DCPPBESSOT_WORKDIR_ABS=${_workdir}
+            -DCPPBESSOT_PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR}
             -P "${CMAKE_CURRENT_LIST_DIR}/scripts/check_schema_changes.cmake"
     COMMENT "Checking for schema changes under ${CPPBESSOT_WORKDIR}"
     VERBATIM
diff --git a/cmake/cppbessot/scripts/check_schema_changes.cmake b/cmake/scripts/check_schema_changes.cmake
similarity index 100%
rename from cmake/cppbessot/scripts/check_schema_changes.cmake
rename to cmake/scripts/check_schema_changes.cmake
diff --git a/cmake/cppbessot/scripts/run_odb_logic.cmake b/cmake/scripts/run_odb_logic.cmake
similarity index 100%
rename from cmake/cppbessot/scripts/run_odb_logic.cmake
rename to cmake/scripts/run_odb_logic.cmake
diff --git a/cmake/cppbessot/scripts/run_odb_migrations.cmake b/cmake/scripts/run_odb_migrations.cmake
similarity index 100%
rename from cmake/cppbessot/scripts/run_odb_migrations.cmake
rename to cmake/scripts/run_odb_migrations.cmake
diff --git a/cmake/cppbessot/scripts/run_odb_sql_ddl.cmake b/cmake/scripts/run_odb_sql_ddl.cmake
similarity index 100%
rename from cmake/cppbessot/scripts/run_odb_sql_ddl.cmake
rename to cmake/scripts/run_odb_sql_ddl.cmake