diff --git a/dbal/cpp/src/entities/package/batch_create_packages.hpp b/dbal/cpp/src/entities/package/batch/batch_create_packages.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/batch_create_packages.hpp
rename to dbal/cpp/src/entities/package/batch/batch_create_packages.hpp
diff --git a/dbal/cpp/src/entities/package/batch_delete_packages.hpp b/dbal/cpp/src/entities/package/batch/batch_delete_packages.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/batch_delete_packages.hpp
rename to dbal/cpp/src/entities/package/batch/batch_delete_packages.hpp
diff --git a/dbal/cpp/src/entities/package/batch_packages.hpp b/dbal/cpp/src/entities/package/batch/batch_packages.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/batch_packages.hpp
rename to dbal/cpp/src/entities/package/batch/batch_packages.hpp
diff --git a/dbal/cpp/src/entities/package/batch_update_packages.hpp b/dbal/cpp/src/entities/package/batch/batch_update_packages.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/batch_update_packages.hpp
rename to dbal/cpp/src/entities/package/batch/batch_update_packages.hpp
diff --git a/dbal/cpp/src/entities/package/create_package.hpp b/dbal/cpp/src/entities/package/crud/create_package.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/create_package.hpp
rename to dbal/cpp/src/entities/package/crud/create_package.hpp
diff --git a/dbal/cpp/src/entities/package/delete_package.hpp b/dbal/cpp/src/entities/package/crud/delete_package.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/delete_package.hpp
rename to dbal/cpp/src/entities/package/crud/delete_package.hpp
diff --git a/dbal/cpp/src/entities/package/get_package.hpp b/dbal/cpp/src/entities/package/crud/get_package.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/get_package.hpp
rename to dbal/cpp/src/entities/package/crud/get_package.hpp
diff --git a/dbal/cpp/src/entities/package/list_packages.hpp b/dbal/cpp/src/entities/package/crud/list_packages.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/list_packages.hpp
rename to dbal/cpp/src/entities/package/crud/list_packages.hpp
diff --git a/dbal/cpp/src/entities/package/update_package.hpp b/dbal/cpp/src/entities/package/crud/update_package.hpp
similarity index 100%
rename from dbal/cpp/src/entities/package/update_package.hpp
rename to dbal/cpp/src/entities/package/crud/update_package.hpp
diff --git a/dbal/cpp/src/entities/page/create_page.hpp b/dbal/cpp/src/entities/page/crud/create_page.hpp
similarity index 100%
rename from dbal/cpp/src/entities/page/create_page.hpp
rename to dbal/cpp/src/entities/page/crud/create_page.hpp
diff --git a/dbal/cpp/src/entities/page/delete_page.hpp b/dbal/cpp/src/entities/page/crud/delete_page.hpp
similarity index 100%
rename from dbal/cpp/src/entities/page/delete_page.hpp
rename to dbal/cpp/src/entities/page/crud/delete_page.hpp
diff --git a/dbal/cpp/src/entities/page/get_page.hpp b/dbal/cpp/src/entities/page/crud/get_page.hpp
similarity index 100%
rename from dbal/cpp/src/entities/page/get_page.hpp
rename to dbal/cpp/src/entities/page/crud/get_page.hpp
diff --git a/dbal/cpp/src/entities/page/get_page_by_slug.hpp b/dbal/cpp/src/entities/page/crud/get_page_by_slug.hpp
similarity index 100%
rename from dbal/cpp/src/entities/page/get_page_by_slug.hpp
rename to dbal/cpp/src/entities/page/crud/get_page_by_slug.hpp
diff --git a/dbal/cpp/src/entities/page/list_pages.hpp b/dbal/cpp/src/entities/page/crud/list_pages.hpp
similarity index 100%
rename from dbal/cpp/src/entities/page/list_pages.hpp
rename to dbal/cpp/src/entities/page/crud/list_pages.hpp
diff --git a/dbal/cpp/src/entities/page/update_page.hpp b/dbal/cpp/src/entities/page/crud/update_page.hpp
similarity index 100%
rename from dbal/cpp/src/entities/page/update_page.hpp
rename to dbal/cpp/src/entities/page/crud/update_page.hpp
diff --git a/dbal/cpp/src/entities/session/clean_expired.hpp b/dbal/cpp/src/entities/session/crud/clean_expired.hpp
similarity index 100%
rename from dbal/cpp/src/entities/session/clean_expired.hpp
rename to dbal/cpp/src/entities/session/crud/clean_expired.hpp
diff --git a/dbal/cpp/src/entities/session/create_session.hpp b/dbal/cpp/src/entities/session/crud/create_session.hpp
similarity index 100%
rename from dbal/cpp/src/entities/session/create_session.hpp
rename to dbal/cpp/src/entities/session/crud/create_session.hpp
diff --git a/dbal/cpp/src/entities/session/delete_session.hpp b/dbal/cpp/src/entities/session/crud/delete_session.hpp
similarity index 100%
rename from dbal/cpp/src/entities/session/delete_session.hpp
rename to dbal/cpp/src/entities/session/crud/delete_session.hpp
diff --git a/dbal/cpp/src/entities/session/get_session.hpp b/dbal/cpp/src/entities/session/crud/get_session.hpp
similarity index 100%
rename from dbal/cpp/src/entities/session/get_session.hpp
rename to dbal/cpp/src/entities/session/crud/get_session.hpp
diff --git a/dbal/cpp/src/entities/session/list_sessions.hpp b/dbal/cpp/src/entities/session/crud/list_sessions.hpp
similarity index 100%
rename from dbal/cpp/src/entities/session/list_sessions.hpp
rename to dbal/cpp/src/entities/session/crud/list_sessions.hpp
diff --git a/dbal/cpp/src/entities/session/update_session.hpp b/dbal/cpp/src/entities/session/crud/update_session.hpp
similarity index 100%
rename from dbal/cpp/src/entities/session/update_session.hpp
rename to dbal/cpp/src/entities/session/crud/update_session.hpp