diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
index f01646a..3701920 100644
--- a/.claude-plugin/plugin.json
+++ b/.claude-plugin/plugin.json
@@ -8,8 +8,28 @@
   },
   "repository": "https://github.com/cppalliance/tools-public",
   "commands": [
-    "./tools/",
-    "./tools/code/",
-    "./tools-wg21/"
+    "./tools/btc-talk.md",
+    "./tools/normalize-prompt.md",
+    "./tools/refine-plan.md",
+    "./tools/research.md",
+    "./tools/code/boost-review.md",
+    "./tools/code/code-cleanup.md",
+    "./tools/code/code-review.md",
+    "./tools/code/lib-review.md",
+    "./tools-wg21/advocatus.md",
+    "./tools-wg21/auditor.md",
+    "./tools-wg21/herald.md",
+    "./tools-wg21/is-this-cpp.md",
+    "./tools-wg21/review-paper.md",
+    "./tools-wg21/tighten.md",
+    "./tools/voice.md",
+    "./tools/voice/",
+    "./tools/interview.md",
+    "./tools/interview/",
+    "./tools/tutor.md",
+    "./tools/tutor/"
+  ],
+  "skills": [
+    "./tools-wg21/pick-pr-review/"
   ]
 }
diff --git a/README.md b/README.md
index f100482..61d121c 100644
--- a/README.md
+++ b/README.md
@@ -396,10 +396,6 @@ Given a name in WG21, produces a heraldic pedigree with order, rank, epithets, a
 _[tools-wg21/is-this-cpp.md](tools-wg21/is-this-cpp.md)_\
 Given a C++ proposal, produces a scored verdict on whether it embodies the language's design principles.
 
-**PaperGate**\
-_[tools-wg21/papergate.md](tools-wg21/papergate.md)_\
-Evaluate a WG21 paper against admission-gate criteria and report what evidence for standardization it does and does not provide.
-
 **The Papersmith**\
 _[tools-wg21/papersmith.md](tools-wg21/papersmith.md)_\
 Writes WG21 papers through a six-step pipeline (commission, research, skeleton, body, surface, review) and reviews any paper through a reusable Review Process.
@@ -466,6 +462,10 @@ Given a political landscape with shifting factions, produces a survival strategy
 _[tools-wg21/retired/legendary-lecturer.md](tools-wg21/retired/legendary-lecturer.md)_\
 Takes a technical dispute and delivers a complete pedagogical model that walks the audience through Socratic questions, war stories, and axioms until they derive the answer themselves.
 
+**PaperGate**\
+_[tools-wg21/retired/papergate.md](tools-wg21/retired/papergate.md)_\
+Evaluate a WG21 paper against admission-gate criteria and report what evidence for standardization it does and does not provide.
+
 **Plovdiv Assassin**\
 _[tools-wg21/retired/plovdiv-assassin.md](tools-wg21/retired/plovdiv-assassin.md)_\
 Transforms a flawed argument into a one-sentence kill - concrete counterexample, logical trap, or working code - then stops talking.
diff --git a/tools-wg21/images/papergate.png b/tools-wg21/retired/images/papergate.png
similarity index 100%
rename from tools-wg21/images/papergate.png
rename to tools-wg21/retired/images/papergate.png
diff --git a/tools-wg21/papergate.md b/tools-wg21/retired/papergate.md
similarity index 100%
rename from tools-wg21/papergate.md
rename to tools-wg21/retired/papergate.md