diff --git a/dbal/ts/src/core/entities/user/create-user.ts b/dbal/ts/src/core/entities/user/crud/create-user.ts
similarity index 100%
rename from dbal/ts/src/core/entities/user/create-user.ts
rename to dbal/ts/src/core/entities/user/crud/create-user.ts
diff --git a/dbal/ts/src/core/entities/user/delete-user.ts b/dbal/ts/src/core/entities/user/crud/delete-user.ts
similarity index 100%
rename from dbal/ts/src/core/entities/user/delete-user.ts
rename to dbal/ts/src/core/entities/user/crud/delete-user.ts
diff --git a/dbal/ts/src/core/entities/user/get-user.ts b/dbal/ts/src/core/entities/user/crud/get-user.ts
similarity index 100%
rename from dbal/ts/src/core/entities/user/get-user.ts
rename to dbal/ts/src/core/entities/user/crud/get-user.ts
diff --git a/dbal/ts/src/core/entities/user/list-users.ts b/dbal/ts/src/core/entities/user/crud/list-users.ts
similarity index 100%
rename from dbal/ts/src/core/entities/user/list-users.ts
rename to dbal/ts/src/core/entities/user/crud/list-users.ts
diff --git a/dbal/ts/src/core/entities/user/update-user.ts b/dbal/ts/src/core/entities/user/crud/update-user.ts
similarity index 100%
rename from dbal/ts/src/core/entities/user/update-user.ts
rename to dbal/ts/src/core/entities/user/crud/update-user.ts
diff --git a/dbal/ts/src/core/entities/validation/lua-script-validation.ts b/dbal/ts/src/core/entities/validation/validators/lua-script-validation.ts
similarity index 100%
rename from dbal/ts/src/core/entities/validation/lua-script-validation.ts
rename to dbal/ts/src/core/entities/validation/validators/lua-script-validation.ts
diff --git a/dbal/ts/src/core/entities/validation/package-validation.ts b/dbal/ts/src/core/entities/validation/validators/package-validation.ts
similarity index 100%
rename from dbal/ts/src/core/entities/validation/package-validation.ts
rename to dbal/ts/src/core/entities/validation/validators/package-validation.ts
diff --git a/dbal/ts/src/core/entities/validation/page-validation.ts b/dbal/ts/src/core/entities/validation/validators/page-validation.ts
similarity index 100%
rename from dbal/ts/src/core/entities/validation/page-validation.ts
rename to dbal/ts/src/core/entities/validation/validators/page-validation.ts
diff --git a/dbal/ts/src/core/entities/validation/user-validation.ts b/dbal/ts/src/core/entities/validation/validators/user-validation.ts
similarity index 100%
rename from dbal/ts/src/core/entities/validation/user-validation.ts
rename to dbal/ts/src/core/entities/validation/validators/user-validation.ts
diff --git a/dbal/ts/src/core/entities/validation/workflow-validation.ts b/dbal/ts/src/core/entities/validation/validators/workflow-validation.ts
similarity index 100%
rename from dbal/ts/src/core/entities/validation/workflow-validation.ts
rename to dbal/ts/src/core/entities/validation/validators/workflow-validation.ts