diff --git a/dbal/ts/src/core/validation/entities/validate-component-hierarchy-create.ts b/dbal/ts/src/core/validation/entities/component/validate-component-hierarchy-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-component-hierarchy-create.ts
rename to dbal/ts/src/core/validation/entities/component/validate-component-hierarchy-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-component-hierarchy-update.ts b/dbal/ts/src/core/validation/entities/component/validate-component-hierarchy-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-component-hierarchy-update.ts
rename to dbal/ts/src/core/validation/entities/component/validate-component-hierarchy-update.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-credential-create.ts b/dbal/ts/src/core/validation/entities/credential/validate-credential-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-credential-create.ts
rename to dbal/ts/src/core/validation/entities/credential/validate-credential-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-credential-update.ts b/dbal/ts/src/core/validation/entities/credential/validate-credential-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-credential-update.ts
rename to dbal/ts/src/core/validation/entities/credential/validate-credential-update.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-lua-script-create.ts b/dbal/ts/src/core/validation/entities/lua-script/validate-lua-script-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-lua-script-create.ts
rename to dbal/ts/src/core/validation/entities/lua-script/validate-lua-script-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-lua-script-update.ts b/dbal/ts/src/core/validation/entities/lua-script/validate-lua-script-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-lua-script-update.ts
rename to dbal/ts/src/core/validation/entities/lua-script/validate-lua-script-update.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-package-create.ts b/dbal/ts/src/core/validation/entities/package/validate-package-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-package-create.ts
rename to dbal/ts/src/core/validation/entities/package/validate-package-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-package-update.ts b/dbal/ts/src/core/validation/entities/package/validate-package-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-package-update.ts
rename to dbal/ts/src/core/validation/entities/package/validate-package-update.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-page-create.ts b/dbal/ts/src/core/validation/entities/page/validate-page-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-page-create.ts
rename to dbal/ts/src/core/validation/entities/page/validate-page-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-page-update.ts b/dbal/ts/src/core/validation/entities/page/validate-page-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-page-update.ts
rename to dbal/ts/src/core/validation/entities/page/validate-page-update.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-session-create.ts b/dbal/ts/src/core/validation/entities/session/validate-session-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-session-create.ts
rename to dbal/ts/src/core/validation/entities/session/validate-session-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-session-update.ts b/dbal/ts/src/core/validation/entities/session/validate-session-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-session-update.ts
rename to dbal/ts/src/core/validation/entities/session/validate-session-update.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-user-create.ts b/dbal/ts/src/core/validation/entities/user/validate-user-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-user-create.ts
rename to dbal/ts/src/core/validation/entities/user/validate-user-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-user-update.ts b/dbal/ts/src/core/validation/entities/user/validate-user-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-user-update.ts
rename to dbal/ts/src/core/validation/entities/user/validate-user-update.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-workflow-create.ts b/dbal/ts/src/core/validation/entities/workflow/validate-workflow-create.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-workflow-create.ts
rename to dbal/ts/src/core/validation/entities/workflow/validate-workflow-create.ts
diff --git a/dbal/ts/src/core/validation/entities/validate-workflow-update.ts b/dbal/ts/src/core/validation/entities/workflow/validate-workflow-update.ts
similarity index 100%
rename from dbal/ts/src/core/validation/entities/validate-workflow-update.ts
rename to dbal/ts/src/core/validation/entities/workflow/validate-workflow-update.ts
diff --git a/dbal/ts/src/core/validation/predicates/is-allowed-lua-global.ts b/dbal/ts/src/core/validation/predicates/lua/is-allowed-lua-global.ts
similarity index 100%
rename from dbal/ts/src/core/validation/predicates/is-allowed-lua-global.ts
rename to dbal/ts/src/core/validation/predicates/lua/is-allowed-lua-global.ts
diff --git a/dbal/ts/src/core/validation/predicates/lua-script-allowed-globals.ts b/dbal/ts/src/core/validation/predicates/lua/lua-script-allowed-globals.ts
similarity index 100%
rename from dbal/ts/src/core/validation/predicates/lua-script-allowed-globals.ts
rename to dbal/ts/src/core/validation/predicates/lua/lua-script-allowed-globals.ts
diff --git a/dbal/ts/src/core/validation/predicates/is-valid-email.ts b/dbal/ts/src/core/validation/predicates/string/is-valid-email.ts
similarity index 100%
rename from dbal/ts/src/core/validation/predicates/is-valid-email.ts
rename to dbal/ts/src/core/validation/predicates/string/is-valid-email.ts
diff --git a/dbal/ts/src/core/validation/predicates/is-valid-semver.ts b/dbal/ts/src/core/validation/predicates/string/is-valid-semver.ts
similarity index 100%
rename from dbal/ts/src/core/validation/predicates/is-valid-semver.ts
rename to dbal/ts/src/core/validation/predicates/string/is-valid-semver.ts
diff --git a/dbal/ts/src/core/validation/predicates/is-valid-slug.ts b/dbal/ts/src/core/validation/predicates/string/is-valid-slug.ts
similarity index 100%
rename from dbal/ts/src/core/validation/predicates/is-valid-slug.ts
rename to dbal/ts/src/core/validation/predicates/string/is-valid-slug.ts
diff --git a/dbal/ts/src/core/validation/predicates/is-valid-title.ts b/dbal/ts/src/core/validation/predicates/string/is-valid-title.ts
similarity index 100%
rename from dbal/ts/src/core/validation/predicates/is-valid-title.ts
rename to dbal/ts/src/core/validation/predicates/string/is-valid-title.ts
diff --git a/dbal/ts/src/core/validation/predicates/is-valid-username.ts b/dbal/ts/src/core/validation/predicates/string/is-valid-username.ts
similarity index 100%
rename from dbal/ts/src/core/validation/predicates/is-valid-username.ts
rename to dbal/ts/src/core/validation/predicates/string/is-valid-username.ts