diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 0bc78cdba42..1b8ce36d960 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -1,5 +1,7 @@
 {
-  "name": "payload",
+  "name": "payload-marketplace",
+  "version": "0.0.1",
+  "description": "Development marketplace for Payload",
   "owner": {
     "name": "Payload",
     "email": "info@payloadcms.com"
@@ -7,7 +9,13 @@
   "plugins": [
     {
       "name": "payload",
-      "source": "./"
+      "description": "Payload Development plugin - covers collections, fields, hooks, access control, plugins, and database adapters.",
+      "version": "0.0.1",
+      "source": "./tools/claude-plugin",
+      "author": {
+        "name": "Payload",
+        "email": "info@payloadcms.com"
+      }
     }
   ]
 }
diff --git a/.claude-plugin/plugin.json b/tools/claude-plugin/.claude-plugin/plugin.json
similarity index 65%
rename from .claude-plugin/plugin.json
rename to tools/claude-plugin/.claude-plugin/plugin.json
index 82b28264b51..ffb8f141bbb 100644
--- a/.claude-plugin/plugin.json
+++ b/tools/claude-plugin/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "payload",
   "version": "0.0.1",
-  "description": "Payload CMS 3.x development skill with TypeScript patterns, field configs, hooks, access control, and API examples",
+  "description": "Payload Development plugin - covers collections, fields, hooks, access control, plugins, and database adapters.",
   "author": {
     "name": "Payload",
     "email": "info@payloadcms.com",
@@ -10,6 +10,5 @@
   "homepage": "https://github.com/payloadcms/payload",
   "repository": "https://github.com/payloadcms/payload",
   "license": "MIT",
-  "keywords": ["payload", "cms", "payload-cms", "nextjs", "typescript", "headless-cms"],
-  "commands": "./commands"
+  "keywords": ["payload", "cms", "payload-cms", "nextjs", "typescript", "headless-cms"]
 }
diff --git a/.claude-plugin/README.md b/tools/claude-plugin/README.md
similarity index 100%
rename from .claude-plugin/README.md
rename to tools/claude-plugin/README.md
diff --git a/.claude-plugin/commands/payload/SKILL.md b/tools/claude-plugin/skills/payload/SKILL.md
similarity index 100%
rename from .claude-plugin/commands/payload/SKILL.md
rename to tools/claude-plugin/skills/payload/SKILL.md
diff --git a/.claude-plugin/commands/payload/reference/ACCESS-CONTROL-ADVANCED.md b/tools/claude-plugin/skills/payload/reference/ACCESS-CONTROL-ADVANCED.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ACCESS-CONTROL-ADVANCED.md
rename to tools/claude-plugin/skills/payload/reference/ACCESS-CONTROL-ADVANCED.md
diff --git a/.claude-plugin/commands/payload/reference/ACCESS-CONTROL.md b/tools/claude-plugin/skills/payload/reference/ACCESS-CONTROL.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ACCESS-CONTROL.md
rename to tools/claude-plugin/skills/payload/reference/ACCESS-CONTROL.md
diff --git a/.claude-plugin/commands/payload/reference/ADAPTERS.md b/tools/claude-plugin/skills/payload/reference/ADAPTERS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ADAPTERS.md
rename to tools/claude-plugin/skills/payload/reference/ADAPTERS.md
diff --git a/.claude-plugin/commands/payload/reference/ADVANCED.md b/tools/claude-plugin/skills/payload/reference/ADVANCED.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/ADVANCED.md
rename to tools/claude-plugin/skills/payload/reference/ADVANCED.md
diff --git a/.claude-plugin/commands/payload/reference/COLLECTIONS.md b/tools/claude-plugin/skills/payload/reference/COLLECTIONS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/COLLECTIONS.md
rename to tools/claude-plugin/skills/payload/reference/COLLECTIONS.md
diff --git a/.claude-plugin/commands/payload/reference/FIELDS.md b/tools/claude-plugin/skills/payload/reference/FIELDS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/FIELDS.md
rename to tools/claude-plugin/skills/payload/reference/FIELDS.md
diff --git a/.claude-plugin/commands/payload/reference/HOOKS.md b/tools/claude-plugin/skills/payload/reference/HOOKS.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/HOOKS.md
rename to tools/claude-plugin/skills/payload/reference/HOOKS.md
diff --git a/.claude-plugin/commands/payload/reference/PLUGIN-DEVELOPMENT.md b/tools/claude-plugin/skills/payload/reference/PLUGIN-DEVELOPMENT.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/PLUGIN-DEVELOPMENT.md
rename to tools/claude-plugin/skills/payload/reference/PLUGIN-DEVELOPMENT.md
diff --git a/.claude-plugin/commands/payload/reference/QUERIES.md b/tools/claude-plugin/skills/payload/reference/QUERIES.md
similarity index 100%
rename from .claude-plugin/commands/payload/reference/QUERIES.md
rename to tools/claude-plugin/skills/payload/reference/QUERIES.md