diff --git a/skills/apex-development/apex-class/SKILL.md b/skills/apex-class/SKILL.md
similarity index 100%
rename from skills/apex-development/apex-class/SKILL.md
rename to skills/apex-class/SKILL.md
diff --git a/skills/apex-development/apex-class/examples/AccountDeduplicationBatch.cls b/skills/apex-class/examples/AccountDeduplicationBatch.cls
similarity index 100%
rename from skills/apex-development/apex-class/examples/AccountDeduplicationBatch.cls
rename to skills/apex-class/examples/AccountDeduplicationBatch.cls
diff --git a/skills/apex-development/apex-class/examples/AccountSelector.cls b/skills/apex-class/examples/AccountSelector.cls
similarity index 100%
rename from skills/apex-development/apex-class/examples/AccountSelector.cls
rename to skills/apex-class/examples/AccountSelector.cls
diff --git a/skills/apex-development/apex-class/examples/AccountService.cls b/skills/apex-class/examples/AccountService.cls
similarity index 100%
rename from skills/apex-development/apex-class/examples/AccountService.cls
rename to skills/apex-class/examples/AccountService.cls
diff --git a/skills/apex-development/apex-class/templates/abstract.cls b/skills/apex-class/templates/abstract.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/abstract.cls
rename to skills/apex-class/templates/abstract.cls
diff --git a/skills/apex-development/apex-class/templates/batch.cls b/skills/apex-class/templates/batch.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/batch.cls
rename to skills/apex-class/templates/batch.cls
diff --git a/skills/apex-development/apex-class/templates/domain.cls b/skills/apex-class/templates/domain.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/domain.cls
rename to skills/apex-class/templates/domain.cls
diff --git a/skills/apex-development/apex-class/templates/dto.cls b/skills/apex-class/templates/dto.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/dto.cls
rename to skills/apex-class/templates/dto.cls
diff --git a/skills/apex-development/apex-class/templates/exception.cls b/skills/apex-class/templates/exception.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/exception.cls
rename to skills/apex-class/templates/exception.cls
diff --git a/skills/apex-development/apex-class/templates/interface.cls b/skills/apex-class/templates/interface.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/interface.cls
rename to skills/apex-class/templates/interface.cls
diff --git a/skills/apex-development/apex-class/templates/queueable.cls b/skills/apex-class/templates/queueable.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/queueable.cls
rename to skills/apex-class/templates/queueable.cls
diff --git a/skills/apex-development/apex-class/templates/schedulable.cls b/skills/apex-class/templates/schedulable.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/schedulable.cls
rename to skills/apex-class/templates/schedulable.cls
diff --git a/skills/apex-development/apex-class/templates/selector.cls b/skills/apex-class/templates/selector.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/selector.cls
rename to skills/apex-class/templates/selector.cls
diff --git a/skills/apex-development/apex-class/templates/service.cls b/skills/apex-class/templates/service.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/service.cls
rename to skills/apex-class/templates/service.cls
diff --git a/skills/apex-development/apex-class/templates/utility.cls b/skills/apex-class/templates/utility.cls
similarity index 100%
rename from skills/apex-development/apex-class/templates/utility.cls
rename to skills/apex-class/templates/utility.cls
diff --git a/skills/testing-automation/apex-test-class/SKILL.md b/skills/apex-test-class/SKILL.md
similarity index 100%
rename from skills/testing-automation/apex-test-class/SKILL.md
rename to skills/apex-test-class/SKILL.md
diff --git a/skills/testing-automation/apex-test-class/references/assertion-patterns.md b/skills/apex-test-class/references/assertion-patterns.md
similarity index 100%
rename from skills/testing-automation/apex-test-class/references/assertion-patterns.md
rename to skills/apex-test-class/references/assertion-patterns.md
diff --git a/skills/testing-automation/apex-test-class/references/async-testing.md b/skills/apex-test-class/references/async-testing.md
similarity index 100%
rename from skills/testing-automation/apex-test-class/references/async-testing.md
rename to skills/apex-test-class/references/async-testing.md
diff --git a/skills/testing-automation/apex-test-class/references/mocking-patterns.md b/skills/apex-test-class/references/mocking-patterns.md
similarity index 100%
rename from skills/testing-automation/apex-test-class/references/mocking-patterns.md
rename to skills/apex-test-class/references/mocking-patterns.md
diff --git a/skills/testing-automation/apex-test-class/references/test-data-factory.md b/skills/apex-test-class/references/test-data-factory.md
similarity index 100%
rename from skills/testing-automation/apex-test-class/references/test-data-factory.md
rename to skills/apex-test-class/references/test-data-factory.md
diff --git a/skills/metadata-deployments/deployment-readiness-check/SKILL.md b/skills/deployment-readiness-check/SKILL.md
similarity index 100%
rename from skills/metadata-deployments/deployment-readiness-check/SKILL.md
rename to skills/deployment-readiness-check/SKILL.md
diff --git a/skills/metadata-deployments/deployment-readiness-check/assets/deployment_checklist.md b/skills/deployment-readiness-check/assets/deployment_checklist.md
similarity index 100%
rename from skills/metadata-deployments/deployment-readiness-check/assets/deployment_checklist.md
rename to skills/deployment-readiness-check/assets/deployment_checklist.md
diff --git a/skills/metadata-deployments/deployment-readiness-check/references/rollback_procedures.md b/skills/deployment-readiness-check/references/rollback_procedures.md
similarity index 100%
rename from skills/metadata-deployments/deployment-readiness-check/references/rollback_procedures.md
rename to skills/deployment-readiness-check/references/rollback_procedures.md
diff --git a/skills/metadata-deployments/deployment-readiness-check/scripts/check_metadata.sh b/skills/deployment-readiness-check/scripts/check_metadata.sh
similarity index 100%
rename from skills/metadata-deployments/deployment-readiness-check/scripts/check_metadata.sh
rename to skills/deployment-readiness-check/scripts/check_metadata.sh
diff --git a/skills/apex-development/trigger-refactor-pipeline/SKILL.md b/skills/trigger-refactor-pipeline/SKILL.md
similarity index 100%
rename from skills/apex-development/trigger-refactor-pipeline/SKILL.md
rename to skills/trigger-refactor-pipeline/SKILL.md
diff --git a/skills/apex-development/trigger-refactor-pipeline/assets/test_template.apex b/skills/trigger-refactor-pipeline/assets/test_template.apex
similarity index 100%
rename from skills/apex-development/trigger-refactor-pipeline/assets/test_template.apex
rename to skills/trigger-refactor-pipeline/assets/test_template.apex
diff --git a/skills/apex-development/trigger-refactor-pipeline/references/handler_patterns.md b/skills/trigger-refactor-pipeline/references/handler_patterns.md
similarity index 100%
rename from skills/apex-development/trigger-refactor-pipeline/references/handler_patterns.md
rename to skills/trigger-refactor-pipeline/references/handler_patterns.md
diff --git a/skills/apex-development/trigger-refactor-pipeline/scripts/analyze_trigger.py b/skills/trigger-refactor-pipeline/scripts/analyze_trigger.py
similarity index 100%
rename from skills/apex-development/trigger-refactor-pipeline/scripts/analyze_trigger.py
rename to skills/trigger-refactor-pipeline/scripts/analyze_trigger.py