diff --git a/dbal/cpp/src/entities/user/batch_users.hpp b/dbal/cpp/src/entities/user/batch/batch_users.hpp
similarity index 100%
rename from dbal/cpp/src/entities/user/batch_users.hpp
rename to dbal/cpp/src/entities/user/batch/batch_users.hpp
diff --git a/dbal/cpp/src/entities/user/create_user.hpp b/dbal/cpp/src/entities/user/crud/create_user.hpp
similarity index 100%
rename from dbal/cpp/src/entities/user/create_user.hpp
rename to dbal/cpp/src/entities/user/crud/create_user.hpp
diff --git a/dbal/cpp/src/entities/user/delete_user.hpp b/dbal/cpp/src/entities/user/crud/delete_user.hpp
similarity index 100%
rename from dbal/cpp/src/entities/user/delete_user.hpp
rename to dbal/cpp/src/entities/user/crud/delete_user.hpp
diff --git a/dbal/cpp/src/entities/user/get_user.hpp b/dbal/cpp/src/entities/user/crud/get_user.hpp
similarity index 100%
rename from dbal/cpp/src/entities/user/get_user.hpp
rename to dbal/cpp/src/entities/user/crud/get_user.hpp
diff --git a/dbal/cpp/src/entities/user/list_users.hpp b/dbal/cpp/src/entities/user/crud/list_users.hpp
similarity index 100%
rename from dbal/cpp/src/entities/user/list_users.hpp
rename to dbal/cpp/src/entities/user/crud/list_users.hpp
diff --git a/dbal/cpp/src/entities/user/update_user.hpp b/dbal/cpp/src/entities/user/crud/update_user.hpp
similarity index 100%
rename from dbal/cpp/src/entities/user/update_user.hpp
rename to dbal/cpp/src/entities/user/crud/update_user.hpp