diff --git a/dbal/cpp/src/entities/lua_script/index.hpp b/dbal/cpp/src/entities/lua_script/index.hpp
index c7e79924b..d16b6b2cf 100644
--- a/dbal/cpp/src/entities/lua_script/index.hpp
+++ b/dbal/cpp/src/entities/lua_script/index.hpp
@@ -5,10 +5,10 @@
 #ifndef DBAL_LUA_SCRIPT_INDEX_HPP
 #define DBAL_LUA_SCRIPT_INDEX_HPP
 
-#include "create_lua_script.hpp"
-#include "get_lua_script.hpp"
-#include "update_lua_script.hpp"
-#include "delete_lua_script.hpp"
-#include "list_lua_scripts.hpp"
+#include "crud/create_lua_script.hpp"
+#include "crud/get_lua_script.hpp"
+#include "crud/update_lua_script.hpp"
+#include "crud/delete_lua_script.hpp"
+#include "crud/list_lua_scripts.hpp"
 
 #endif
diff --git a/dbal/cpp/src/entities/package/index.hpp b/dbal/cpp/src/entities/package/index.hpp
index 22f72c6c0..df88bce6a 100644
--- a/dbal/cpp/src/entities/package/index.hpp
+++ b/dbal/cpp/src/entities/package/index.hpp
@@ -5,11 +5,11 @@
 #ifndef DBAL_PACKAGE_INDEX_HPP
 #define DBAL_PACKAGE_INDEX_HPP
 
-#include "create_package.hpp"
-#include "get_package.hpp"
-#include "update_package.hpp"
-#include "delete_package.hpp"
-#include "list_packages.hpp"
-#include "batch_packages.hpp"
+#include "crud/create_package.hpp"
+#include "crud/get_package.hpp"
+#include "crud/update_package.hpp"
+#include "crud/delete_package.hpp"
+#include "crud/list_packages.hpp"
+#include "batch/batch_packages.hpp"
 
 #endif
diff --git a/dbal/cpp/src/entities/session/index.hpp b/dbal/cpp/src/entities/session/index.hpp
index c1868cff7..ad0c26841 100644
--- a/dbal/cpp/src/entities/session/index.hpp
+++ b/dbal/cpp/src/entities/session/index.hpp
@@ -5,11 +5,11 @@
 #ifndef DBAL_SESSION_INDEX_HPP
 #define DBAL_SESSION_INDEX_HPP
 
-#include "create_session.hpp"
-#include "get_session.hpp"
-#include "update_session.hpp"
-#include "delete_session.hpp"
-#include "list_sessions.hpp"
-#include "clean_expired.hpp"
+#include "crud/create_session.hpp"
+#include "crud/get_session.hpp"
+#include "crud/update_session.hpp"
+#include "crud/delete_session.hpp"
+#include "crud/list_sessions.hpp"
+#include "crud/lifecycle/clean_expired.hpp"
 
 #endif