diff --git a/dbal/cpp/src/daemon/server.cpp b/dbal/cpp/src/daemon/server.cpp
index 56a17cbdd..65dd66fe4 100644
--- a/dbal/cpp/src/daemon/server.cpp
+++ b/dbal/cpp/src/daemon/server.cpp
@@ -7,8 +7,6 @@
 
 #include <drogon/drogon.h>
 #include <json/json.h>
-#include <algorithm>
-#include <cctype>
 #include <functional>
 
 namespace {
diff --git a/dbal/ts/src/core/entities/session/create-session.ts b/dbal/ts/src/core/entities/session/crud/create-session.ts
similarity index 100%
rename from dbal/ts/src/core/entities/session/create-session.ts
rename to dbal/ts/src/core/entities/session/crud/create-session.ts
diff --git a/dbal/ts/src/core/entities/session/delete-session.ts b/dbal/ts/src/core/entities/session/crud/delete-session.ts
similarity index 100%
rename from dbal/ts/src/core/entities/session/delete-session.ts
rename to dbal/ts/src/core/entities/session/crud/delete-session.ts
diff --git a/dbal/ts/src/core/entities/session/get-session.ts b/dbal/ts/src/core/entities/session/crud/get-session.ts
similarity index 100%
rename from dbal/ts/src/core/entities/session/get-session.ts
rename to dbal/ts/src/core/entities/session/crud/get-session.ts
diff --git a/dbal/ts/src/core/entities/session/list-sessions.ts b/dbal/ts/src/core/entities/session/crud/list-sessions.ts
similarity index 100%
rename from dbal/ts/src/core/entities/session/list-sessions.ts
rename to dbal/ts/src/core/entities/session/crud/list-sessions.ts
diff --git a/dbal/ts/src/core/entities/session/update-session.ts b/dbal/ts/src/core/entities/session/crud/update-session.ts
similarity index 100%
rename from dbal/ts/src/core/entities/session/update-session.ts
rename to dbal/ts/src/core/entities/session/crud/update-session.ts
diff --git a/dbal/ts/src/core/entities/session/clean-expired.ts b/dbal/ts/src/core/entities/session/lifecycle/clean-expired.ts
similarity index 100%
rename from dbal/ts/src/core/entities/session/clean-expired.ts
rename to dbal/ts/src/core/entities/session/lifecycle/clean-expired.ts
diff --git a/dbal/ts/src/core/entities/session/extend-session.ts b/dbal/ts/src/core/entities/session/lifecycle/extend-session.ts
similarity index 100%
rename from dbal/ts/src/core/entities/session/extend-session.ts
rename to dbal/ts/src/core/entities/session/lifecycle/extend-session.ts
diff --git a/frontends/nextjs/src/lib/db/dbal-client.ts b/frontends/nextjs/src/lib/db/core/dbal-client.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/dbal-client.ts
rename to frontends/nextjs/src/lib/db/core/dbal-client.ts
diff --git a/frontends/nextjs/src/lib/db/index.ts b/frontends/nextjs/src/lib/db/core/index.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/index.ts
rename to frontends/nextjs/src/lib/db/core/index.ts
diff --git a/frontends/nextjs/src/lib/db/initialize-database.ts b/frontends/nextjs/src/lib/db/core/initialize-database.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/initialize-database.ts
rename to frontends/nextjs/src/lib/db/core/initialize-database.ts
diff --git a/frontends/nextjs/src/lib/db/prisma.ts b/frontends/nextjs/src/lib/db/core/prisma.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/prisma.ts
rename to frontends/nextjs/src/lib/db/core/prisma.ts
diff --git a/frontends/nextjs/src/lib/db/types.ts b/frontends/nextjs/src/lib/db/core/types.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/types.ts
rename to frontends/nextjs/src/lib/db/core/types.ts
diff --git a/frontends/nextjs/src/lib/db/hash-password.test.ts b/frontends/nextjs/src/lib/db/password/hash-password.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/hash-password.test.ts
rename to frontends/nextjs/src/lib/db/password/hash-password.test.ts
diff --git a/frontends/nextjs/src/lib/db/hash-password.ts b/frontends/nextjs/src/lib/db/password/hash-password.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/hash-password.ts
rename to frontends/nextjs/src/lib/db/password/hash-password.ts
diff --git a/frontends/nextjs/src/lib/db/verify-password.test.ts b/frontends/nextjs/src/lib/db/password/verify-password.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/verify-password.test.ts
rename to frontends/nextjs/src/lib/db/password/verify-password.test.ts
diff --git a/frontends/nextjs/src/lib/db/verify-password.ts b/frontends/nextjs/src/lib/db/password/verify-password.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/verify-password.ts
rename to frontends/nextjs/src/lib/db/password/verify-password.ts