diff --git a/.agents/plugins/marketplace.json b/.agents/plugins/marketplace.json
new file mode 100644
index 0000000..1cae473
--- /dev/null
+++ b/.agents/plugins/marketplace.json
@@ -0,0 +1,23 @@
+{
+  "name": "pcmstack",
+  "interface": {
+    "displayName": "PCMStack"
+  },
+  "plugins": [
+    {
+      "name": "pcm",
+      "interface": {
+        "displayName": "Pro Cycling Manager"
+      },
+      "source": {
+        "source": "local",
+        "path": "./plugins/pcm"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_USE"
+      },
+      "category": "Developer Tools"
+    }
+  ]
+}
diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 0000000..2a6b63b
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://json.schemastore.org/claude-code-marketplace.json",
+  "name": "pcmstack",
+  "description": "Community tooling for Pro Cycling Manager. Unofficial, not affiliated with Cyanide Studio or Nacon.",
+  "owner": {
+    "name": "PCMStack",
+    "url": "https://github.com/PCMStack"
+  },
+  "plugins": [
+    {
+      "name": "pcm",
+      "description": "Explore and edit Pro Cycling Manager game databases (.cdb) — rider ratings, team rosters, contracts, races — and build race startlists exported as the .xml file the game imports. Unofficial, not affiliated with Cyanide Studio or Nacon.",
+      "category": "Developer Tools",
+      "source": "./plugins/pcm"
+    }
+  ]
+}
diff --git a/AGENTS.md b/AGENTS.md
index 23cd285..794f732 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -30,6 +30,6 @@ skills/
 
 ### Naming Conventions
 
-- **Skill directory**: `kebab-case` (e.g., `pcm-db-editor`)
+- **Skill directory**: `kebab-case` (e.g., `pcm-database`)
 - **SKILL.md**: Always uppercase, always this exact filename
 - **Scripts**: `kebab-case.sh` or `kebab-case.mjs` (e.g., `open-cdb.sh`)
diff --git a/plugins/pcm/.claude-plugin/plugin.json b/plugins/pcm/.claude-plugin/plugin.json
new file mode 100644
index 0000000..7ff67c0
--- /dev/null
+++ b/plugins/pcm/.claude-plugin/plugin.json
@@ -0,0 +1,25 @@
+{
+  "name": "pcm",
+  "displayName": "Pro Cycling Manager",
+  "version": "0.1.0",
+  "description": "Explore and edit Pro Cycling Manager game databases (.cdb) — rider ratings, team rosters, contracts, races — and build race startlists exported as the .xml file the game imports. Unofficial, not affiliated with Cyanide Studio or Nacon.",
+  "author": {
+    "name": "PCMStack",
+    "url": "https://github.com/PCMStack"
+  },
+  "homepage": "https://github.com/PCMStack/agent-skills",
+  "repository": "https://github.com/PCMStack/agent-skills",
+  "license": "MIT",
+  "keywords": [
+    "pro-cycling-manager",
+    "pcm",
+    "cycling",
+    "cdb",
+    "sqlite",
+    "database",
+    "startlist",
+    "modding"
+  ],
+  "skills": "./skills/",
+  "mcpServers": "./.mcp.json"
+}
diff --git a/.codex-plugin/plugin.json b/plugins/pcm/.codex-plugin/plugin.json
similarity index 70%
rename from .codex-plugin/plugin.json
rename to plugins/pcm/.codex-plugin/plugin.json
index 14ee99e..e82af03 100644
--- a/.codex-plugin/plugin.json
+++ b/plugins/pcm/.codex-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
-  "name": "pcmstack",
+  "name": "pcm",
   "version": "0.1.0",
-  "description": "Community tooling for Pro Cycling Manager: explore and edit game databases (.cdb) and build race startlists. Unofficial, not affiliated with Cyanide Studio or Nacon.",
+  "description": "Explore and edit Pro Cycling Manager game databases (.cdb) — rider ratings, team rosters, contracts, races — and build race startlists exported as the .xml file the game imports. Unofficial, not affiliated with Cyanide Studio or Nacon.",
   "author": {
     "name": "PCMStack",
     "url": "https://github.com/PCMStack"
@@ -22,7 +22,7 @@
   "skills": "./skills/",
   "mcpServers": "./.mcp.json",
   "interface": {
-    "displayName": "PCMStack",
+    "displayName": "CDB Editor",
     "shortDescription": "Edit Pro Cycling Manager databases and build race startlists",
     "longDescription": "Community tooling for Pro Cycling Manager. Open and edit the game database (.cdb) — rider ratings, team rosters, contracts, races — via the pcm-mcp MCP server or a lossless CDB to SQLite conversion, and compose race startlists exported as the .xml file the game imports. Unofficial project, not affiliated with or endorsed by Cyanide Studio or Nacon.",
     "developerName": "PCMStack",
@@ -33,10 +33,13 @@
       "Write"
     ],
     "websiteURL": "https://github.com/PCMStack/agent-skills",
-    "defaultPrompt": "Explore or edit a Pro Cycling Manager database, or build a startlist for a race",
+    "defaultPrompt": [
+      "List my Pro Cycling Manager saves",
+      "Who's the best climber in my team?",
+      "Build the startlist for the Tour de France"
+    ],
     "brandColor": "#ffd21e",
     "composerIcon": "./assets/logo.svg",
-    "logo": "./assets/app-icon.png",
-    "screenshots": []
+    "logo": "./assets/app-icon.png"
   }
 }
diff --git a/.mcp.json b/plugins/pcm/.mcp.json
similarity index 98%
rename from .mcp.json
rename to plugins/pcm/.mcp.json
index 02431c0..39b8bd0 100644
--- a/.mcp.json
+++ b/plugins/pcm/.mcp.json
@@ -5,4 +5,4 @@
       "args": ["-y", "pcm-mcp"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/assets/app-icon.png b/plugins/pcm/assets/app-icon.png
similarity index 100%
rename from assets/app-icon.png
rename to plugins/pcm/assets/app-icon.png
diff --git a/assets/logo.svg b/plugins/pcm/assets/logo.svg
similarity index 100%
rename from assets/logo.svg
rename to plugins/pcm/assets/logo.svg
diff --git a/skills/pcm-db-editor/SKILL.md b/plugins/pcm/skills/pcm-database/SKILL.md
similarity index 99%
rename from skills/pcm-db-editor/SKILL.md
rename to plugins/pcm/skills/pcm-database/SKILL.md
index 5016b5b..6471677 100644
--- a/skills/pcm-db-editor/SKILL.md
+++ b/plugins/pcm/skills/pcm-database/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: pcm-db-editor
+name: pcm-database
 description: Open, explore and edit Pro Cycling Manager databases (.cdb) — rider ratings, team rosters, contracts, races. Routes between the pcm-mcp MCP server and a cdb → SQLite conversion via the cdb-converter CLI. Use this skill whenever a .cdb file is mentioned, or whenever someone talks about a PCM / Pro Cycling Manager save, career, database, roster, cyclist stats, or wants to "edit my game" — even if they never say the words "cdb" or "database", and even if they only want to read something rather than change it.
 ---
 
diff --git a/skills/pcm-db-editor/references/database-constraints.md b/plugins/pcm/skills/pcm-database/references/database-constraints.md
similarity index 100%
rename from skills/pcm-db-editor/references/database-constraints.md
rename to plugins/pcm/skills/pcm-database/references/database-constraints.md
diff --git a/skills/pcm-db-editor/references/database-schema.md b/plugins/pcm/skills/pcm-database/references/database-schema.md
similarity index 100%
rename from skills/pcm-db-editor/references/database-schema.md
rename to plugins/pcm/skills/pcm-database/references/database-schema.md
diff --git a/skills/pcm-db-editor/scripts/open-cdb.sh b/plugins/pcm/skills/pcm-database/scripts/open-cdb.sh
similarity index 100%
rename from skills/pcm-db-editor/scripts/open-cdb.sh
rename to plugins/pcm/skills/pcm-database/scripts/open-cdb.sh
diff --git a/skills/pcm-startlist/SKILL.md b/plugins/pcm/skills/pcm-startlist/SKILL.md
similarity index 100%
rename from skills/pcm-startlist/SKILL.md
rename to plugins/pcm/skills/pcm-startlist/SKILL.md