diff --git a/dbal/cpp/src/daemon/http/request_handler.hpp b/dbal/cpp/src/daemon/http/request/request_handler.hpp
similarity index 100%
rename from dbal/cpp/src/daemon/http/request_handler.hpp
rename to dbal/cpp/src/daemon/http/request/request_handler.hpp
diff --git a/dbal/cpp/src/daemon/http/request_parser.hpp b/dbal/cpp/src/daemon/http/request/request_parser.hpp
similarity index 100%
rename from dbal/cpp/src/daemon/http/request_parser.hpp
rename to dbal/cpp/src/daemon/http/request/request_parser.hpp
diff --git a/dbal/cpp/src/daemon/http/http_server.hpp b/dbal/cpp/src/daemon/http/server/http_server.hpp
similarity index 100%
rename from dbal/cpp/src/daemon/http/http_server.hpp
rename to dbal/cpp/src/daemon/http/server/http_server.hpp
diff --git a/dbal/cpp/src/daemon/http/security_limits.hpp b/dbal/cpp/src/daemon/http/server/security_limits.hpp
similarity index 100%
rename from dbal/cpp/src/daemon/http/security_limits.hpp
rename to dbal/cpp/src/daemon/http/server/security_limits.hpp
diff --git a/dbal/cpp/src/daemon/http/socket_utils.hpp b/dbal/cpp/src/daemon/http/server/socket_utils.hpp
similarity index 100%
rename from dbal/cpp/src/daemon/http/socket_utils.hpp
rename to dbal/cpp/src/daemon/http/server/socket_utils.hpp
diff --git a/dbal/cpp/src/entities/lua_script/create_lua_script.hpp b/dbal/cpp/src/entities/lua_script/crud/create_lua_script.hpp
similarity index 100%
rename from dbal/cpp/src/entities/lua_script/create_lua_script.hpp
rename to dbal/cpp/src/entities/lua_script/crud/create_lua_script.hpp
diff --git a/dbal/cpp/src/entities/lua_script/delete_lua_script.hpp b/dbal/cpp/src/entities/lua_script/crud/delete_lua_script.hpp
similarity index 100%
rename from dbal/cpp/src/entities/lua_script/delete_lua_script.hpp
rename to dbal/cpp/src/entities/lua_script/crud/delete_lua_script.hpp
diff --git a/dbal/cpp/src/entities/lua_script/get_lua_script.hpp b/dbal/cpp/src/entities/lua_script/crud/get_lua_script.hpp
similarity index 100%
rename from dbal/cpp/src/entities/lua_script/get_lua_script.hpp
rename to dbal/cpp/src/entities/lua_script/crud/get_lua_script.hpp
diff --git a/dbal/cpp/src/entities/lua_script/list_lua_scripts.hpp b/dbal/cpp/src/entities/lua_script/crud/list_lua_scripts.hpp
similarity index 100%
rename from dbal/cpp/src/entities/lua_script/list_lua_scripts.hpp
rename to dbal/cpp/src/entities/lua_script/crud/list_lua_scripts.hpp
diff --git a/dbal/cpp/src/entities/lua_script/update_lua_script.hpp b/dbal/cpp/src/entities/lua_script/crud/update_lua_script.hpp
similarity index 100%
rename from dbal/cpp/src/entities/lua_script/update_lua_script.hpp
rename to dbal/cpp/src/entities/lua_script/crud/update_lua_script.hpp
diff --git a/dbal/cpp/src/entities/workflow/create_workflow.hpp b/dbal/cpp/src/entities/workflow/crud/create_workflow.hpp
similarity index 100%
rename from dbal/cpp/src/entities/workflow/create_workflow.hpp
rename to dbal/cpp/src/entities/workflow/crud/create_workflow.hpp
diff --git a/dbal/cpp/src/entities/workflow/delete_workflow.hpp b/dbal/cpp/src/entities/workflow/crud/delete_workflow.hpp
similarity index 100%
rename from dbal/cpp/src/entities/workflow/delete_workflow.hpp
rename to dbal/cpp/src/entities/workflow/crud/delete_workflow.hpp
diff --git a/dbal/cpp/src/entities/workflow/get_workflow.hpp b/dbal/cpp/src/entities/workflow/crud/get_workflow.hpp
similarity index 100%
rename from dbal/cpp/src/entities/workflow/get_workflow.hpp
rename to dbal/cpp/src/entities/workflow/crud/get_workflow.hpp
diff --git a/dbal/cpp/src/entities/workflow/list_workflows.hpp b/dbal/cpp/src/entities/workflow/crud/list_workflows.hpp
similarity index 100%
rename from dbal/cpp/src/entities/workflow/list_workflows.hpp
rename to dbal/cpp/src/entities/workflow/crud/list_workflows.hpp
diff --git a/dbal/cpp/src/entities/workflow/update_workflow.hpp b/dbal/cpp/src/entities/workflow/crud/update_workflow.hpp
similarity index 100%
rename from dbal/cpp/src/entities/workflow/update_workflow.hpp
rename to dbal/cpp/src/entities/workflow/crud/update_workflow.hpp