diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 00000000..4586a478
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,13 @@
+{
+  "name": "tower-cli",
+  "owner": {
+    "name": "Tower"
+  },
+  "plugins": [
+    {
+      "name": "tower",
+      "source": "./plugin",
+      "description": "Tower compute platform — run and deploy Python apps, pipelines, and AI agents"
+    }
+  ]
+}
diff --git a/.github/workflows/regenerate-skill.yml b/.github/workflows/regenerate-skill.yml
index ea16be2d..f3bf89c2 100644
--- a/.github/workflows/regenerate-skill.yml
+++ b/.github/workflows/regenerate-skill.yml
@@ -6,7 +6,7 @@ on:
     paths:
       - 'crates/tower-cmd/**'
       - 'crates/tower/**'
-      - 'skills/tower/SKILL.md'
+      - 'plugin/skills/tower/SKILL.md'
       - '.github/workflows/regenerate-skill.yml'
 
 concurrency:
@@ -30,7 +30,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Regenerate SKILL.md
-        run: cargo run --quiet --bin tower -- skill generate > skills/tower/SKILL.md
+        run: cargo run --quiet --bin tower -- skill generate > plugin/skills/tower/SKILL.md
 
       - name: Open PR if SKILL.md changed
         uses: peter-evans/create-pull-request@v7
@@ -38,10 +38,10 @@ jobs:
           commit-message: "chore: regenerate SKILL.md"
           title: "chore: regenerate SKILL.md"
           body: |
-            `tower skill generate` output has drifted from the checked-in `skills/tower/SKILL.md`.
+            `tower skill generate` output has drifted from the checked-in `plugin/skills/tower/SKILL.md`.
 
             This PR was opened automatically by the `Regenerate SKILL.md` workflow after a merge to `develop`.
           branch: chore/regenerate-skill
           base: develop
           delete-branch: true
-          add-paths: skills/tower/SKILL.md
+          add-paths: plugin/skills/tower/SKILL.md
diff --git a/crates/tower-cmd/src/skill.rs b/crates/tower-cmd/src/skill.rs
index 62b1430d..c575293c 100644
--- a/crates/tower-cmd/src/skill.rs
+++ b/crates/tower-cmd/src/skill.rs
@@ -149,7 +149,7 @@ uvx tower mcp-server          # if using uvx
 tower mcp-server              # if installed via pip/nix
 ```
 
-If you installed Tower via the Claude Code plugin, this is already configured. Otherwise, copy the `.mcp.json` from the [tower-cli repo](https://github.com/tower/tower-cli) into your project root.
+If you installed Tower via the Claude Code plugin, this is already configured. Otherwise, copy [`plugin/.mcp.json`](https://github.com/tower/tower-cli/blob/develop/plugin/.mcp.json) from the tower-cli repo into your project root.
 
 **If MCP tools are unavailable**, fall back to the CLI equivalents — every MCP tool has a direct CLI counterpart (e.g. `tower apps list`, `tower deploy`).
 
diff --git a/.claude-plugin/plugin.json b/plugin/.claude-plugin/plugin.json
similarity index 100%
rename from .claude-plugin/plugin.json
rename to plugin/.claude-plugin/plugin.json
diff --git a/.mcp.json b/plugin/.mcp.json
similarity index 100%
rename from .mcp.json
rename to plugin/.mcp.json
diff --git a/skills/tower/SKILL.md b/plugin/skills/tower/SKILL.md
similarity index 98%
rename from skills/tower/SKILL.md
rename to plugin/skills/tower/SKILL.md
index b30d9efd..af564a20 100644
--- a/skills/tower/SKILL.md
+++ b/plugin/skills/tower/SKILL.md
@@ -49,7 +49,7 @@ uvx tower mcp-server          # if using uvx
 tower mcp-server              # if installed via pip/nix
 ```
 
-If you installed Tower via the Claude Code plugin, this is already configured. Otherwise, copy the `.mcp.json` from the [tower-cli repo](https://github.com/tower/tower-cli) into your project root.
+If you installed Tower via the Claude Code plugin, this is already configured. Otherwise, copy [`plugin/.mcp.json`](https://github.com/tower/tower-cli/blob/develop/plugin/.mcp.json) from the tower-cli repo into your project root.
 
 **If MCP tools are unavailable**, fall back to the CLI equivalents — every MCP tool has a direct CLI counterpart (e.g. `tower apps list`, `tower deploy`).