diff --git a/src/main/resources/db/changelog/24-hs-domain.sql b/sql/24-hs-domain.sql
similarity index 100%
rename from src/main/resources/db/changelog/24-hs-domain.sql
rename to sql/24-hs-domain.sql
diff --git a/src/main/resources/db/changelog/25-hs-emailaddress.sql b/sql/25-hs-emailaddress.sql
similarity index 100%
rename from src/main/resources/db/changelog/25-hs-emailaddress.sql
rename to sql/25-hs-emailaddress.sql
diff --git a/src/main/resources/db/changelog/29-hs-statistics.sql b/sql/29-hs-statistics.sql
similarity index 100%
rename from src/main/resources/db/changelog/29-hs-statistics.sql
rename to sql/29-hs-statistics.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-000-template.sql b/src/main/resources/db/changelog/000-template.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-000-template.sql
rename to src/main/resources/db/changelog/000-template.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-001-last-row-count.sql b/src/main/resources/db/changelog/001-last-row-count.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-001-last-row-count.sql
rename to src/main/resources/db/changelog/001-last-row-count.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-002-int-to-var.sql b/src/main/resources/db/changelog/002-int-to-var.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-002-int-to-var.sql
rename to src/main/resources/db/changelog/002-int-to-var.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-003-random-in-range.sql b/src/main/resources/db/changelog/003-random-in-range.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-003-random-in-range.sql
rename to src/main/resources/db/changelog/003-random-in-range.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-004-uuid-ossp-extension.sql b/src/main/resources/db/changelog/005-uuid-ossp-extension.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-004-uuid-ossp-extension.sql
rename to src/main/resources/db/changelog/005-uuid-ossp-extension.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-005-rbac-base.sql b/src/main/resources/db/changelog/030-rbac-base.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-005-rbac-base.sql
rename to src/main/resources/db/changelog/030-rbac-base.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-006-rbac-current.sql b/src/main/resources/db/changelog/031-rbac-current.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-006-rbac-current.sql
rename to src/main/resources/db/changelog/031-rbac-current.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-007-rbac-user-grant.sql b/src/main/resources/db/changelog/033-rbac-user-grant.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-007-rbac-user-grant.sql
rename to src/main/resources/db/changelog/033-rbac-user-grant.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-008-rbac-views.sql b/src/main/resources/db/changelog/035-rbac-views.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-008-rbac-views.sql
rename to src/main/resources/db/changelog/035-rbac-views.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-020-rbac-role-builder.sql b/src/main/resources/db/changelog/037-rbac-role-builder.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-020-rbac-role-builder.sql
rename to src/main/resources/db/changelog/037-rbac-role-builder.sql
diff --git a/src/main/resources/db/changelog/2022-07-28-030-rbac-statistics.sql b/src/main/resources/db/changelog/039-rbac-statistics.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-28-030-rbac-statistics.sql
rename to src/main/resources/db/changelog/039-rbac-statistics.sql
diff --git a/src/main/resources/db/changelog/2022-07-29-050-hs-base.sql b/src/main/resources/db/changelog/100-hs-base.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-29-050-hs-base.sql
rename to src/main/resources/db/changelog/100-hs-base.sql
diff --git a/src/main/resources/db/changelog/2022-07-29-060-hs-customer.sql b/src/main/resources/db/changelog/110-hs-customer.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-29-060-hs-customer.sql
rename to src/main/resources/db/changelog/110-hs-customer.sql
diff --git a/src/main/resources/db/changelog/2022-07-29-061-hs-customer-rbac.sql b/src/main/resources/db/changelog/113-hs-customer-rbac.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-29-061-hs-customer-rbac.sql
rename to src/main/resources/db/changelog/113-hs-customer-rbac.sql
diff --git a/src/main/resources/db/changelog/2022-07-29-062-hs-customer-test-data.sql b/src/main/resources/db/changelog/118-hs-customer-test-data.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-29-062-hs-customer-test-data.sql
rename to src/main/resources/db/changelog/118-hs-customer-test-data.sql
diff --git a/src/main/resources/db/changelog/2022-07-29-070-hs-package.sql b/src/main/resources/db/changelog/120-hs-package.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-29-070-hs-package.sql
rename to src/main/resources/db/changelog/120-hs-package.sql
diff --git a/src/main/resources/db/changelog/2022-07-29-070-hs-package-rbac.sql b/src/main/resources/db/changelog/123-hs-package-rbac.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-29-070-hs-package-rbac.sql
rename to src/main/resources/db/changelog/123-hs-package-rbac.sql
diff --git a/src/main/resources/db/changelog/2022-07-29-070-hs-package-test-data.sql b/src/main/resources/db/changelog/128-hs-package-test-data.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-07-29-070-hs-package-test-data.sql
rename to src/main/resources/db/changelog/128-hs-package-test-data.sql
diff --git a/src/main/resources/db/changelog/2022-08-14-080-hs-unixuser.sql b/src/main/resources/db/changelog/130-hs-unixuser.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-08-14-080-hs-unixuser.sql
rename to src/main/resources/db/changelog/130-hs-unixuser.sql
diff --git a/src/main/resources/db/changelog/2022-08-14-081-hs-unixuser-rbac.sql b/src/main/resources/db/changelog/133-hs-unixuser-rbac.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-08-14-081-hs-unixuser-rbac.sql
rename to src/main/resources/db/changelog/133-hs-unixuser-rbac.sql
diff --git a/src/main/resources/db/changelog/2022-08-14-082-hs-unixuser-test-data.sql b/src/main/resources/db/changelog/138-hs-unixuser-test-data.sql
similarity index 100%
rename from src/main/resources/db/changelog/2022-08-14-082-hs-unixuser-test-data.sql
rename to src/main/resources/db/changelog/138-hs-unixuser-test-data.sql
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 04dca17e..c7175eb0 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -1,43 +1,43 @@
 databaseChangeLog:
     - include:
-        file: db/changelog/2022-07-28-001-last-row-count.sql
+        file: db/changelog/001-last-row-count.sql
     - include:
-        file: db/changelog/2022-07-28-002-int-to-var.sql
+        file: db/changelog/002-int-to-var.sql
     - include:
-        file: db/changelog/2022-07-28-003-random-in-range.sql
+        file: db/changelog/003-random-in-range.sql
     - include:
-        file: db/changelog/2022-07-28-004-uuid-ossp-extension.sql
+        file: db/changelog/005-uuid-ossp-extension.sql
     - include:
-        file: db/changelog/2022-07-28-005-rbac-base.sql
+        file: db/changelog/030-rbac-base.sql
     - include:
-        file: db/changelog/2022-07-28-006-rbac-current.sql
+        file: db/changelog/031-rbac-current.sql
     - include:
-        file: db/changelog/2022-07-28-007-rbac-user-grant.sql
+        file: db/changelog/033-rbac-user-grant.sql
     - include:
-        file: db/changelog/2022-07-28-008-rbac-views.sql
+        file: db/changelog/035-rbac-views.sql
     - include:
-        file: db/changelog/2022-07-28-020-rbac-role-builder.sql
+        file: db/changelog/037-rbac-role-builder.sql
     - include:
-        file: db/changelog/2022-07-28-030-rbac-statistics.sql
+        file: db/changelog/039-rbac-statistics.sql
     - include:
-        file: db/changelog/2022-07-29-050-hs-base.sql
+        file: db/changelog/100-hs-base.sql
     - include:
-        file: db/changelog/2022-07-29-060-hs-customer.sql
+        file: db/changelog/110-hs-customer.sql
     - include:
-        file: db/changelog/2022-07-29-061-hs-customer-rbac.sql
+        file: db/changelog/113-hs-customer-rbac.sql
     - include:
-        file: db/changelog/2022-07-29-062-hs-customer-test-data.sql
+        file: db/changelog/118-hs-customer-test-data.sql
     - include:
-        file: db/changelog/2022-07-29-070-hs-package.sql
+        file: db/changelog/120-hs-package.sql
     - include:
-          file: db/changelog/2022-07-29-070-hs-package-rbac.sql
+        file: db/changelog/123-hs-package-rbac.sql
     - include:
-        file: db/changelog/2022-07-29-070-hs-package-test-data.sql
+        file: db/changelog/128-hs-package-test-data.sql
     - include:
-        file: db/changelog/2022-08-14-080-hs-unixuser.sql
+        file: db/changelog/130-hs-unixuser.sql
     - include:
-        file: db/changelog/2022-08-14-081-hs-unixuser-rbac.sql
+        file: db/changelog/133-hs-unixuser-rbac.sql
     - include:
-        file: db/changelog/2022-08-14-082-hs-unixuser-test-data.sql
+        file: db/changelog/138-hs-unixuser-test-data.sql