diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 0000000..0842227
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,13 @@
+{
+    "name": "dev-team-agents",
+    "owner": {
+        "name": "jodavis"
+    },
+    "plugins": [
+        {
+            "name": "dev-team",
+            "source": "./plugins/dev-team",
+            "description": "Dev-team agent pipeline: researcher, developer, reviewer, and debugger agents for implementing Jira tasks and fixing GitHub issues."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 0000000..0d40288
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,5 @@
+{
+  "enabledPlugins": {
+    "dev-team@dev-team-agents": true
+  }
+}
diff --git a/.claude-plugin/plugin.json b/plugins/dev-team/.claude-plugin/plugin.json
similarity index 79%
rename from .claude-plugin/plugin.json
rename to plugins/dev-team/.claude-plugin/plugin.json
index f8e9949..7604f69 100644
--- a/.claude-plugin/plugin.json
+++ b/plugins/dev-team/.claude-plugin/plugin.json
@@ -2,6 +2,5 @@
   "name": "dev-team",
   "version": "1.0.0",
   "description": "Dev-team agent pipeline: researcher, developer, reviewer, and debugger agents for implementing Jira tasks and fixing GitHub issues.",
-  "commands": "./commands",
-  "agents": "./agents"
+  "commands": "./commands"
 }
diff --git a/agents/debugger.md b/plugins/dev-team/agents/debugger.md
similarity index 100%
rename from agents/debugger.md
rename to plugins/dev-team/agents/debugger.md
diff --git a/agents/developer.md b/plugins/dev-team/agents/developer.md
similarity index 100%
rename from agents/developer.md
rename to plugins/dev-team/agents/developer.md
diff --git a/agents/researcher.md b/plugins/dev-team/agents/researcher.md
similarity index 100%
rename from agents/researcher.md
rename to plugins/dev-team/agents/researcher.md
diff --git a/agents/reviewer.md b/plugins/dev-team/agents/reviewer.md
similarity index 100%
rename from agents/reviewer.md
rename to plugins/dev-team/agents/reviewer.md
diff --git a/commands/add-to-spec.md b/plugins/dev-team/commands/add-to-spec.md
similarity index 100%
rename from commands/add-to-spec.md
rename to plugins/dev-team/commands/add-to-spec.md
diff --git a/commands/create-branch.md b/plugins/dev-team/commands/create-branch.md
similarity index 100%
rename from commands/create-branch.md
rename to plugins/dev-team/commands/create-branch.md
diff --git a/commands/debugger-investigate.md b/plugins/dev-team/commands/debugger-investigate.md
similarity index 100%
rename from commands/debugger-investigate.md
rename to plugins/dev-team/commands/debugger-investigate.md
diff --git a/commands/dev-team.md b/plugins/dev-team/commands/dev-team.md
similarity index 100%
rename from commands/dev-team.md
rename to plugins/dev-team/commands/dev-team.md
diff --git a/commands/developer-create-pr.md b/plugins/dev-team/commands/developer-create-pr.md
similarity index 100%
rename from commands/developer-create-pr.md
rename to plugins/dev-team/commands/developer-create-pr.md
diff --git a/commands/developer-fix.md b/plugins/dev-team/commands/developer-fix.md
similarity index 100%
rename from commands/developer-fix.md
rename to plugins/dev-team/commands/developer-fix.md
diff --git a/commands/developer-implement.md b/plugins/dev-team/commands/developer-implement.md
similarity index 100%
rename from commands/developer-implement.md
rename to plugins/dev-team/commands/developer-implement.md
diff --git a/commands/researcher-issue.md b/plugins/dev-team/commands/researcher-issue.md
similarity index 100%
rename from commands/researcher-issue.md
rename to plugins/dev-team/commands/researcher-issue.md
diff --git a/commands/researcher-plan.md b/plugins/dev-team/commands/researcher-plan.md
similarity index 100%
rename from commands/researcher-plan.md
rename to plugins/dev-team/commands/researcher-plan.md
diff --git a/commands/researcher-spec-review.md b/plugins/dev-team/commands/researcher-spec-review.md
similarity index 100%
rename from commands/researcher-spec-review.md
rename to plugins/dev-team/commands/researcher-spec-review.md
diff --git a/commands/researcher-validate.md b/plugins/dev-team/commands/researcher-validate.md
similarity index 100%
rename from commands/researcher-validate.md
rename to plugins/dev-team/commands/researcher-validate.md
diff --git a/commands/reviewer-pr-review.md b/plugins/dev-team/commands/reviewer-pr-review.md
similarity index 100%
rename from commands/reviewer-pr-review.md
rename to plugins/dev-team/commands/reviewer-pr-review.md
diff --git a/commands/reviewer-review.md b/plugins/dev-team/commands/reviewer-review.md
similarity index 100%
rename from commands/reviewer-review.md
rename to plugins/dev-team/commands/reviewer-review.md
diff --git a/commands/reviewer-sign-off.md b/plugins/dev-team/commands/reviewer-sign-off.md
similarity index 100%
rename from commands/reviewer-sign-off.md
rename to plugins/dev-team/commands/reviewer-sign-off.md
diff --git a/commands/spec.md b/plugins/dev-team/commands/spec.md
similarity index 100%
rename from commands/spec.md
rename to plugins/dev-team/commands/spec.md
diff --git a/scripts/dev_team.py b/plugins/dev-team/scripts/dev_team.py
similarity index 100%
rename from scripts/dev_team.py
rename to plugins/dev-team/scripts/dev_team.py
diff --git a/scripts/fix-issue-plan.md b/plugins/dev-team/scripts/fix-issue-plan.md
similarity index 100%
rename from scripts/fix-issue-plan.md
rename to plugins/dev-team/scripts/fix-issue-plan.md
diff --git a/scripts/implement-task-plan.md b/plugins/dev-team/scripts/implement-task-plan.md
similarity index 100%
rename from scripts/implement-task-plan.md
rename to plugins/dev-team/scripts/implement-task-plan.md
diff --git a/scripts/validate-build.cmd b/plugins/dev-team/scripts/validate-build.cmd
similarity index 100%
rename from scripts/validate-build.cmd
rename to plugins/dev-team/scripts/validate-build.cmd
diff --git a/scripts/validate-build.sh b/plugins/dev-team/scripts/validate-build.sh
similarity index 100%
rename from scripts/validate-build.sh
rename to plugins/dev-team/scripts/validate-build.sh
diff --git a/scripts/validate-tests.cmd b/plugins/dev-team/scripts/validate-tests.cmd
similarity index 100%
rename from scripts/validate-tests.cmd
rename to plugins/dev-team/scripts/validate-tests.cmd
diff --git a/scripts/validate-tests.sh b/plugins/dev-team/scripts/validate-tests.sh
similarity index 100%
rename from scripts/validate-tests.sh
rename to plugins/dev-team/scripts/validate-tests.sh
diff --git a/scripts/validate.cmd b/plugins/dev-team/scripts/validate.cmd
similarity index 100%
rename from scripts/validate.cmd
rename to plugins/dev-team/scripts/validate.cmd
diff --git a/scripts/validate.sh b/plugins/dev-team/scripts/validate.sh
similarity index 100%
rename from scripts/validate.sh
rename to plugins/dev-team/scripts/validate.sh