diff --git a/.github/workflows/guardrails.yml b/.github/workflows/guardrails.yml
index a150f6b..7c1d460 100644
--- a/.github/workflows/guardrails.yml
+++ b/.github/workflows/guardrails.yml
@@ -96,7 +96,7 @@ jobs:
           )
 
           required_script_files=(
-            "scripts/verify_manifest.sh"
+            "scripts/validate_manifest.sh"
             "scripts/validate_xml_wellformed.sh"
             "scripts/validate_changelog.sh"
             "scripts/validate_tabs.sh"
diff --git a/scripts/validate_language_structure.sh b/scripts/fix/license_headers.sh
similarity index 100%
rename from scripts/validate_language_structure.sh
rename to scripts/fix/license_headers.sh
diff --git a/scripts/fix_paths.sh b/scripts/fix/paths.sh
similarity index 100%
rename from scripts/fix_paths.sh
rename to scripts/fix/paths.sh
diff --git a/scripts/fix_tabs.sh b/scripts/fix/tabs.sh
similarity index 100%
rename from scripts/fix_tabs.sh
rename to scripts/fix/tabs.sh
diff --git a/scripts/validate_license_headers.sh b/scripts/lib/common.sh
similarity index 100%
rename from scripts/validate_license_headers.sh
rename to scripts/lib/common.sh
diff --git a/scripts/validate_no_secrets.sh b/scripts/lib/find_files.sh
similarity index 100%
rename from scripts/validate_no_secrets.sh
rename to scripts/lib/find_files.sh
diff --git a/scripts/update_changelog.sh b/scripts/release/changelog.sh
similarity index 100%
rename from scripts/update_changelog.sh
rename to scripts/release/changelog.sh
diff --git a/scripts/update_dates.sh b/scripts/release/dates.sh
similarity index 100%
rename from scripts/update_dates.sh
rename to scripts/release/dates.sh
diff --git a/scripts/validate_changelog.sh b/scripts/validate/changelog.sh
similarity index 100%
rename from scripts/validate_changelog.sh
rename to scripts/validate/changelog.sh
diff --git a/scripts/validate_php_syntax.sh b/scripts/validate/language_structure.sh
similarity index 100%
rename from scripts/validate_php_syntax.sh
rename to scripts/validate/language_structure.sh
diff --git a/scripts/validate_version_alignment.sh b/scripts/validate/license_headers.sh
similarity index 100%
rename from scripts/validate_version_alignment.sh
rename to scripts/validate/license_headers.sh
diff --git a/scripts/verify_manifest.sh b/scripts/validate/manifest.sh
similarity index 100%
rename from scripts/verify_manifest.sh
rename to scripts/validate/manifest.sh
diff --git a/scripts/validate_xml_wellformed.sh b/scripts/validate/no_secrets.sh
similarity index 100%
rename from scripts/validate_xml_wellformed.sh
rename to scripts/validate/no_secrets.sh
diff --git a/scripts/validate_paths.sh b/scripts/validate/paths.sh
similarity index 100%
rename from scripts/validate_paths.sh
rename to scripts/validate/paths.sh
diff --git a/scripts/validate/php_syntax.sh b/scripts/validate/php_syntax.sh
new file mode 100644
index 0000000..e69de29
diff --git a/scripts/validate_tabs.sh b/scripts/validate/tabs.sh
similarity index 100%
rename from scripts/validate_tabs.sh
rename to scripts/validate/tabs.sh
diff --git a/scripts/validate/version_alignment.sh b/scripts/validate/version_alignment.sh
new file mode 100644
index 0000000..e69de29
diff --git a/scripts/validate/xml_wellformed.sh b/scripts/validate/xml_wellformed.sh
new file mode 100644
index 0000000..e69de29