diff --git a/dbal/cpp/src/util/backoff.hpp b/dbal/cpp/src/util/backoff/backoff.hpp
similarity index 100%
rename from dbal/cpp/src/util/backoff.hpp
rename to dbal/cpp/src/util/backoff/backoff.hpp
diff --git a/dbal/cpp/src/util/backoff_reset.hpp b/dbal/cpp/src/util/backoff/backoff_reset.hpp
similarity index 100%
rename from dbal/cpp/src/util/backoff_reset.hpp
rename to dbal/cpp/src/util/backoff/backoff_reset.hpp
diff --git a/dbal/cpp/src/util/backoff_sleep.hpp b/dbal/cpp/src/util/backoff/backoff_sleep.hpp
similarity index 100%
rename from dbal/cpp/src/util/backoff_sleep.hpp
rename to dbal/cpp/src/util/backoff/backoff_sleep.hpp
diff --git a/dbal/cpp/src/util/uuid.hpp b/dbal/cpp/src/util/uuid/uuid.hpp
similarity index 100%
rename from dbal/cpp/src/util/uuid.hpp
rename to dbal/cpp/src/util/uuid/uuid.hpp
diff --git a/dbal/cpp/src/util/uuid_generate.hpp b/dbal/cpp/src/util/uuid/uuid_generate.hpp
similarity index 100%
rename from dbal/cpp/src/util/uuid_generate.hpp
rename to dbal/cpp/src/util/uuid/uuid_generate.hpp
diff --git a/dbal/cpp/src/util/uuid_is_valid.hpp b/dbal/cpp/src/util/uuid/uuid_is_valid.hpp
similarity index 100%
rename from dbal/cpp/src/util/uuid_is_valid.hpp
rename to dbal/cpp/src/util/uuid/uuid_is_valid.hpp
diff --git a/dbal/cpp/src/validation/lua_script_validation.hpp b/dbal/cpp/src/validation/entity/lua_script_validation.hpp
similarity index 100%
rename from dbal/cpp/src/validation/lua_script_validation.hpp
rename to dbal/cpp/src/validation/entity/lua_script_validation.hpp
diff --git a/dbal/cpp/src/validation/package_validation.hpp b/dbal/cpp/src/validation/entity/package_validation.hpp
similarity index 100%
rename from dbal/cpp/src/validation/package_validation.hpp
rename to dbal/cpp/src/validation/entity/package_validation.hpp
diff --git a/dbal/cpp/src/validation/page_validation.hpp b/dbal/cpp/src/validation/entity/page_validation.hpp
similarity index 100%
rename from dbal/cpp/src/validation/page_validation.hpp
rename to dbal/cpp/src/validation/entity/page_validation.hpp
diff --git a/dbal/cpp/src/validation/user_validation.hpp b/dbal/cpp/src/validation/entity/user_validation.hpp
similarity index 100%
rename from dbal/cpp/src/validation/user_validation.hpp
rename to dbal/cpp/src/validation/entity/user_validation.hpp
diff --git a/dbal/cpp/src/validation/workflow_validation.hpp b/dbal/cpp/src/validation/entity/workflow_validation.hpp
similarity index 100%
rename from dbal/cpp/src/validation/workflow_validation.hpp
rename to dbal/cpp/src/validation/entity/workflow_validation.hpp