diff --git a/.claude-plugin/commands/payload/SKILL.md b/.claude-plugin/SKILL.md
similarity index 100%
rename from .claude-plugin/commands/payload/SKILL.md
rename to .claude-plugin/SKILL.md
diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
index 82b28264b51..20f3754be17 100644
--- a/.claude-plugin/plugin.json
+++ b/.claude-plugin/plugin.json
@@ -11,5 +11,5 @@
   "repository": "https://github.com/payloadcms/payload",
   "license": "MIT",
   "keywords": ["payload", "cms", "payload-cms", "nextjs", "typescript", "headless-cms"],
-  "commands": "./commands"
+  "commands": "."
 }
diff --git a/.claude-plugin/commands/payload/reference/ACCESS-CONTROL-ADVANCED.md b/.claude-plugin/reference/ACCESS-CONTROL-ADVANCED.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ACCESS-CONTROL-ADVANCED.md
rename to .claude-plugin/reference/ACCESS-CONTROL-ADVANCED.md
diff --git a/.claude-plugin/commands/payload/reference/ACCESS-CONTROL.md b/.claude-plugin/reference/ACCESS-CONTROL.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ACCESS-CONTROL.md
rename to .claude-plugin/reference/ACCESS-CONTROL.md
diff --git a/.claude-plugin/commands/payload/reference/ADAPTERS.md b/.claude-plugin/reference/ADAPTERS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ADAPTERS.md
rename to .claude-plugin/reference/ADAPTERS.md
diff --git a/.claude-plugin/commands/payload/reference/ADVANCED.md b/.claude-plugin/reference/ADVANCED.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ADVANCED.md
rename to .claude-plugin/reference/ADVANCED.md
diff --git a/.claude-plugin/commands/payload/reference/COLLECTIONS.md b/.claude-plugin/reference/COLLECTIONS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/COLLECTIONS.md
rename to .claude-plugin/reference/COLLECTIONS.md
diff --git a/.claude-plugin/commands/payload/reference/FIELDS.md b/.claude-plugin/reference/FIELDS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/FIELDS.md
rename to .claude-plugin/reference/FIELDS.md
diff --git a/.claude-plugin/commands/payload/reference/HOOKS.md b/.claude-plugin/reference/HOOKS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/HOOKS.md
rename to .claude-plugin/reference/HOOKS.md
diff --git a/.claude-plugin/commands/payload/reference/PLUGIN-DEVELOPMENT.md b/.claude-plugin/reference/PLUGIN-DEVELOPMENT.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/PLUGIN-DEVELOPMENT.md
rename to .claude-plugin/reference/PLUGIN-DEVELOPMENT.md
diff --git a/.claude-plugin/commands/payload/reference/QUERIES.md b/.claude-plugin/reference/QUERIES.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/QUERIES.md
rename to .claude-plugin/reference/QUERIES.md