diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index f62bbd5..9a94578 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -6,10 +6,50 @@
     "url": "https://workers.cloudflare.com"
   },
   "plugins": [
+    {
+      "name": "cloudflare-core",
+      "source": "./plugins/cloudflare-core",
+      "description": "Core Cloudflare context: API and docs MCP servers, plus the platform overview skill. Required by most other Cloudflare plugins."
+    },
+    {
+      "name": "cloudflare-workers",
+      "source": "./plugins/cloudflare-workers",
+      "description": "Cloudflare Workers: Wrangler CLI, best practices, bindings, and builds. Depends on cloudflare-core."
+    },
+    {
+      "name": "cloudflare-observability",
+      "source": "./plugins/cloudflare-observability",
+      "description": "Cloudflare Workers Observability: query logs and metrics. Depends on cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-durable-objects",
+      "source": "./plugins/cloudflare-durable-objects",
+      "description": "Cloudflare Durable Objects: stateful coordination. Depends on cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-agents",
+      "source": "./plugins/cloudflare-agents",
+      "description": "Cloudflare Agents SDK for building AI agents on Workers. Includes /build-agent and /build-mcp commands. Depends on cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-sandbox",
+      "source": "./plugins/cloudflare-sandbox",
+      "description": "Cloudflare Sandbox SDK for secure code execution on Workers. Depends on cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-email",
+      "source": "./plugins/cloudflare-email",
+      "description": "Cloudflare Email Service: transactional email and routing. Depends on cloudflare-core."
+    },
+    {
+      "name": "cloudflare-web-perf",
+      "source": "./plugins/cloudflare-web-perf",
+      "description": "Web performance auditing with Chrome DevTools MCP. No Cloudflare dependency."
+    },
     {
       "name": "cloudflare",
-      "source": "./",
-      "description": "Skills for the Cloudflare developer platform"
+      "source": "./plugins/cloudflare",
+      "description": "Umbrella plugin: depends on every other Cloudflare plugin. Install for full developer-platform context; uninstall and install per-product plugins for narrower scope."
     }
   ]
 }
diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
deleted file mode 100644
index 9e4a69d..0000000
--- a/.claude-plugin/plugin.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "cloudflare",
-  "description": "Skills for the Cloudflare developer platform: Workers, Durable Objects, Agents SDK, MCP servers, Wrangler CLI, and web performance",
-  "version": "1.0.0",
-  "author": {
-    "name": "Cloudflare"
-  }
-}
diff --git a/.cursor-plugin/marketplace.json b/.cursor-plugin/marketplace.json
index 0ad5b94..3fb5841 100644
--- a/.cursor-plugin/marketplace.json
+++ b/.cursor-plugin/marketplace.json
@@ -4,10 +4,50 @@
     "name": "Cloudflare"
   },
   "plugins": [
+    {
+      "name": "cloudflare-core",
+      "source": "./plugins/cloudflare-core",
+      "description": "Core Cloudflare context: API and docs MCP servers, plus the platform overview skill. Install alongside the per-product plugins below."
+    },
+    {
+      "name": "cloudflare-workers",
+      "source": "./plugins/cloudflare-workers",
+      "description": "Cloudflare Workers: Wrangler CLI, best practices, bindings, and builds. Pair with cloudflare-core."
+    },
+    {
+      "name": "cloudflare-observability",
+      "source": "./plugins/cloudflare-observability",
+      "description": "Cloudflare Workers Observability: query logs and metrics. Pair with cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-durable-objects",
+      "source": "./plugins/cloudflare-durable-objects",
+      "description": "Cloudflare Durable Objects: stateful coordination. Pair with cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-agents",
+      "source": "./plugins/cloudflare-agents",
+      "description": "Cloudflare Agents SDK for building AI agents on Workers. Pair with cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-sandbox",
+      "source": "./plugins/cloudflare-sandbox",
+      "description": "Cloudflare Sandbox SDK for secure code execution. Pair with cloudflare-workers."
+    },
+    {
+      "name": "cloudflare-email",
+      "source": "./plugins/cloudflare-email",
+      "description": "Cloudflare Email Service: transactional email and routing. Pair with cloudflare-core."
+    },
+    {
+      "name": "cloudflare-web-perf",
+      "source": "./plugins/cloudflare-web-perf",
+      "description": "Web performance auditing with Chrome DevTools MCP. No Cloudflare dependency."
+    },
     {
       "name": "cloudflare",
       "source": "./",
-      "description": "Skills for the Cloudflare developer platform"
+      "description": "Umbrella plugin: all Cloudflare skills and MCP servers in a single install. Use for full developer-platform context; install per-product plugins above for narrower scope."
     }
   ]
 }
diff --git a/README.md b/README.md
index d6186e9..129fc57 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # Cloudflare Skills
 
-A collection of [Agent Skills](https://www.anthropic.com/engineering/equipping-agents-for-the-real-world-with-agent-skills) for building on Cloudflare, Workers, the Agents SDK, and the wider Cloudflare Developer Platform.
+A collection of [Agent Skills](https://www.anthropic.com/engineering/equipping-agents-for-the-real-world-with-agent-skills), MCP servers, and slash commands for building on Cloudflare, Workers, the Agents SDK, and the wider Cloudflare Developer Platform.
+
+This marketplace ships **9 plugins** for both Claude Code and Cursor: 8 product plugins plus an umbrella. Install the umbrella for the full experience, or install only the product plugins you need to keep your context window lean.
 
 ## Installing
 
@@ -8,16 +10,43 @@ These skills work with any agent that supports the Agent Skills standard, includ
 
 ### Claude Code
 
-Install using the [plugin marketplace](https://code.claude.com/docs/en/discover-plugins#add-from-github):
+Add the marketplace, then install:
 
 ```
 /plugin marketplace add cloudflare/skills
+```
+
+For the **full experience** (everything, identical to previous behavior):
+
+```
 /plugin install cloudflare@cloudflare
 ```
 
+This installs the `cloudflare` umbrella plugin, which depends on all 8 product plugins and pulls them in automatically.
+
+For **narrower scope** (lower per-session token usage), install only the plugins you need. Examples:
+
+```
+# Just Workers + the umbrella's API/docs context
+/plugin install cloudflare-workers@cloudflare
+
+# Workers + log inspection
+/plugin install cloudflare-workers@cloudflare
+/plugin install cloudflare-observability@cloudflare
+
+# Just web-performance auditing (no Cloudflare context loaded at all)
+/plugin install cloudflare-web-perf@cloudflare
+```
+
+Each product plugin transitively pulls in the plugins it depends on (e.g. installing `cloudflare-workers` automatically installs `cloudflare-core`).
+
 ### Cursor
 
-Install from the Cursor Marketplace or add manually via **Settings > Rules > Add Rule > Remote Rule (Github)** with `cloudflare/skills`.
+Add the marketplace via the Cursor plugin UI, then install plugins from it.
+
+For the **full experience** (all skills + all 5 MCP servers in one install, identical to previous behavior), install the `cloudflare` umbrella plugin.
+
+For **narrower scope**, install only the per-product plugins you need. Cursor's plugin system has no dependency mechanism, so each plugin is installed individually and ships only its own MCP servers — installing only `cloudflare-workers`, for example, gives you `cloudflare-bindings` and `cloudflare-builds` but not `cloudflare-api`/`cloudflare-docs`/`cloudflare-observability`. Install the umbrella `cloudflare` plugin if you want the full MCP surface.
 
 ### npx skills
 
@@ -29,7 +58,7 @@ npx skills add https://github.com/cloudflare/skills
 
 ### Clone / Copy
 
-Clone this repo and copy the skill folders into the appropriate directory for your agent:
+Clone this repo and copy the relevant skill folders from `plugins/<plugin-name>/skills/` into the appropriate directory for your agent:
 
 | Agent | Skill Directory | Docs |
 |-------|-----------------|------|
@@ -39,41 +68,65 @@ Clone this repo and copy the skill folders into the appropriate directory for yo
 | OpenAI Codex | `~/.codex/skills/` | [docs](https://developers.openai.com/codex/skills/) |
 | Pi | `~/.pi/agent/skills/` | [docs](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent#skills) |
 
+## Plugins
+
+| Plugin | Skills | MCP servers | Commands | Depends on |
+|---|---|---|---|---|
+| `cloudflare-core` | `cloudflare` | `cloudflare-api`, `cloudflare-docs` | — | — |
+| `cloudflare-workers` | `wrangler`, `workers-best-practices` | `cloudflare-bindings`, `cloudflare-builds` | — | `cloudflare-core` |
+| `cloudflare-observability` | — | `cloudflare-observability` | — | `cloudflare-workers` |
+| `cloudflare-durable-objects` | `durable-objects` | — | — | `cloudflare-workers` |
+| `cloudflare-agents` | `agents-sdk` | — | `/build-agent`, `/build-mcp` | `cloudflare-workers` |
+| `cloudflare-sandbox` | `sandbox-sdk` | — | — | `cloudflare-workers` |
+| `cloudflare-email` | `cloudflare-email-service` | — | — | `cloudflare-core` |
+| `cloudflare-web-perf` | `web-perf` | — | — | — *(no Cloudflare dep)* |
+| `cloudflare` | — | — | — | all 8 above (umbrella) |
+
+Cursor's plugin system has no dependency mechanism, so the dependency arrows above don't apply on Cursor. The Cursor `cloudflare` umbrella bundles all skills and MCP servers in a single install (rather than depending on the product plugins, which is what the Claude umbrella does); per-product Cursor installs ship only their own MCP servers. See the [Repository layout](#repository-layout) section for how this is wired.
+
 ## Commands
 
-Commands are user-invocable slash commands that you explicitly call.
+Commands are user-invocable slash commands that you explicitly call. They're shipped by the `cloudflare-agents` plugin.
 
 | Command | Description |
 |---------|-------------|
-| `/cloudflare:build-agent` | Build an AI agent on Cloudflare using the Agents SDK |
-| `/cloudflare:build-mcp` | Build an MCP server on Cloudflare |
+| `/cloudflare-agents:build-agent` | Build an AI agent on Cloudflare using the Agents SDK |
+| `/cloudflare-agents:build-mcp` | Build an MCP server on Cloudflare |
 
 ## Skills
 
 Skills are contextual and auto-loaded based on your conversation. When a request matches a skill's triggers, the agent loads and applies the relevant skill to provide accurate, up-to-date guidance.
 
-| Skill | Useful for |
-|-------|------------|
-| cloudflare | Comprehensive platform skill covering Workers, Pages, storage (KV, D1, R2), AI (Workers AI, Vectorize, Agents SDK), networking (Tunnel, Spectrum), security (WAF, DDoS), and IaC (Terraform, Pulumi) |
-| agents-sdk | Building stateful AI agents with state, scheduling, RPC, MCP servers, email, and streaming chat |
-| durable-objects | Stateful coordination (chat rooms, games, booking), RPC, SQLite, alarms, WebSockets |
-| sandbox-sdk | Secure code execution for AI code execution, code interpreters, CI/CD systems, and interactive dev environments |
-| wrangler | Deploying and managing Workers, KV, R2, D1, Vectorize, Queues, Workflows |
-| web-perf | Auditing Core Web Vitals (FCP, LCP, TBT, CLS), render-blocking resources, network chains |
-| building-mcp-server-on-cloudflare | Building remote MCP servers with tools, OAuth, and deployment |
-| building-ai-agent-on-cloudflare | Building AI agents with state, WebSockets, and tool integration |
+| Skill | Plugin | Useful for |
+|-------|--------|------------|
+| cloudflare | cloudflare-core | Comprehensive platform skill covering Workers, Pages, storage (KV, D1, R2), AI (Workers AI, Vectorize, Agents SDK), networking (Tunnel, Spectrum), security (WAF, DDoS), and IaC (Terraform, Pulumi) |
+| wrangler | cloudflare-workers | Deploying and managing Workers, KV, R2, D1, Vectorize, Queues, Workflows |
+| workers-best-practices | cloudflare-workers | Reviewing and authoring Workers code against production best practices |
+| durable-objects | cloudflare-durable-objects | Stateful coordination (chat rooms, games, booking), RPC, SQLite, alarms, WebSockets |
+| agents-sdk | cloudflare-agents | Building stateful AI agents with state, scheduling, RPC, MCP servers, email, and streaming chat |
+| sandbox-sdk | cloudflare-sandbox | Secure code execution for AI code execution, code interpreters, CI/CD systems, and interactive dev environments |
+| cloudflare-email-service | cloudflare-email | Sending and receiving transactional emails (Workers binding or REST API) |
+| web-perf | cloudflare-web-perf | Auditing Core Web Vitals (FCP, LCP, TBT, CLS), render-blocking resources, network chains |
 
 ## MCP Servers
 
-This plugin includes [Cloudflare's remote MCP servers](https://developers.cloudflare.com/agents/model-context-protocol/mcp-servers-for-cloudflare/) for enhanced functionality:
+This marketplace bundles [Cloudflare's remote MCP servers](https://developers.cloudflare.com/agents/model-context-protocol/mcp-servers-for-cloudflare/), distributed across the plugins that own them:
+
+| Server | Plugin | Purpose |
+|--------|--------|---------|
+| cloudflare-api | cloudflare-core | Manage Cloudflare account resources, zones, and settings |
+| cloudflare-docs | cloudflare-core | Up-to-date Cloudflare documentation and reference |
+| cloudflare-bindings | cloudflare-workers | Build Workers applications with storage, AI, and compute primitives |
+| cloudflare-builds | cloudflare-workers | Manage and get insights into Workers builds |
+| cloudflare-observability | cloudflare-observability | Debug and analyze Workers logs and analytics |
+
+## Repository layout
+
+Canonical plugin content lives under `plugins/<product>/` — each product plugin owns its own `skills/`, `commands/`, `rules/`, and (where applicable) `.mcp.json`. Edit there.
+
+The repo root has `skills/`, `commands/`, `rules/` directories of **symlinks** pointing into the product plugins. These exist so the Cursor `cloudflare` umbrella plugin (rooted at `./`) can serve the same content as the per-product plugins without duplication on disk.
 
-| Server | Purpose |
-|--------|---------|
-| cloudflare-api | Manage Cloudflare account resources, zones, and settings |
-| cloudflare-docs | Up-to-date Cloudflare documentation and reference |
-| cloudflare-bindings | Build Workers applications with storage, AI, and compute primitives |
-| cloudflare-builds | Manage and get insights into Workers builds |
-| cloudflare-observability | Debug and analyze application logs and analytics |
+The root `.mcp.json` aggregates all 5 MCP servers and is **hand-maintained**. When you add or remove a server in any product `plugins/<product>/.mcp.json`, also update the root file to keep them in sync.
 
 ## Resources
 
diff --git a/commands/build-agent.md b/commands/build-agent.md
deleted file mode 100644
index 79d4df4..0000000
--- a/commands/build-agent.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-description: Build an AI agent on Cloudflare using the Agents SDK
-argument-hint: [agent-description]
-allowed-tools: [Read, Glob, Grep, Bash, Write, Edit, WebFetch]
----
-
-# Build AI Agent on Cloudflare
-
-## Arguments
-
-The user invoked this command with: $ARGUMENTS
-
-## Instructions
-
-When this command is invoked:
-
-1. Read the skill file at `agents-sdk/SKILL.md` for core SDK guidance, APIs, and wrangler config
-2. Based on what the user wants to build, read the relevant references from `agents-sdk/references/`:
-   - For chat/AI agents: `streaming-chat.md`, `client-sdk.md`
-   - For state management: `state-scheduling.md`
-   - For RPC methods: `callable.md`
-   - For background work: `workflows.md`, `durable-execution.md`, `queue-retries.md`
-   - For MCP integration: `mcp.md`
-   - For email handling: `email.md`
-   - For webhooks/push: `webhooks-push.md`
-   - For approval flows: `human-in-the-loop.md`
-   - For voice: `voice.md`
-   - For browser tools: `browse-the-web.md`
-   - For higher-level chat: `think.md`
-3. Fetch the relevant pages from https://developers.cloudflare.com/agents/ for the latest API details
-4. Always start with `configuration.md` and `routing.md` for project setup
-
-## Scaffold Steps
-
-1. **Create project**: `npx create-cloudflare@latest --template cloudflare/agents-starter`
-2. **Configure wrangler.jsonc**: DO bindings, migrations, AI binding, assets
-3. **Implement agent class**: extend `Agent` or `AIChatAgent` depending on use case
-4. **Wire routing**: `routeAgentRequest` in the default export
-5. **Build client**: `useAgent` + `useAgentChat` React hooks
-6. **Deploy**: `npx wrangler deploy`
-
-## Key Decision: Agent vs AIChatAgent vs Think
-
-| Need | Use | Package |
-|------|-----|---------|
-| Custom stateful logic, RPC, scheduling | `Agent` | `agents` |
-| AI chat with streaming, tools, persistence | `AIChatAgent` | `@cloudflare/ai-chat` |
-| AI chat with automatic tool loop, built-in workspace | `Think` | `@cloudflare/think` (experimental) |
-
-## Example Usage
-
-```
-/build-agent a customer support chatbot with tool calling
-/build-agent a real-time collaborative editor with state sync
-/build-agent a background processing agent with scheduled tasks
-/build-agent a voice assistant that can browse the web
-```
diff --git a/commands/build-agent.md b/commands/build-agent.md
new file mode 120000
index 0000000..7bc4d71
--- /dev/null
+++ b/commands/build-agent.md
@@ -0,0 +1 @@
+../plugins/cloudflare-agents/commands/build-agent.md
\ No newline at end of file
diff --git a/commands/build-mcp.md b/commands/build-mcp.md
deleted file mode 100644
index 7238842..0000000
--- a/commands/build-mcp.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-description: Build a remote MCP server on Cloudflare using McpAgent
-argument-hint: [mcp-description]
-allowed-tools: [Read, Glob, Grep, Bash, Write, Edit, WebFetch]
----
-
-# Build MCP Server on Cloudflare
-
-## Arguments
-
-The user invoked this command with: $ARGUMENTS
-
-## Instructions
-
-When this command is invoked:
-
-1. Read the skill file at `agents-sdk/SKILL.md` for core SDK guidance
-2. Read `agents-sdk/references/mcp.md` for MCP client and server APIs, transports, and securing
-3. Read `agents-sdk/references/configuration.md` for wrangler setup
-4. Fetch https://developers.cloudflare.com/agents/api-reference/mcp-agent-api/ for the latest McpAgent API
-5. For OAuth/security, fetch https://developers.cloudflare.com/agents/api-reference/securing-mcp-servers/
-
-## Scaffold Steps
-
-1. **Create project**: `npx create-cloudflare@latest --template cloudflare/agents-starter` (or start fresh)
-2. **Install MCP SDK**: `npm install @modelcontextprotocol/sdk zod`
-3. **Configure wrangler.jsonc**: DO binding + `new_sqlite_classes` migration for the McpAgent class
-4. **Implement McpAgent**: extend `McpAgent`, create `McpServer`, register tools in `init()`
-5. **Serve transport**: `MyMCP.serve("/mcp", { binding: "MyMCP" })` (Streamable HTTP, recommended)
-6. **Test**: `npx @modelcontextprotocol/inspector@latest`
-7. **Deploy**: `npx wrangler deploy`
-
-## Quick Reference
-
-```typescript
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { McpAgent } from "agents/mcp";
-import { z } from "zod";
-
-export class MyMCP extends McpAgent<Env, State, {}> {
-  server = new McpServer({ name: "my-mcp", version: "1.0.0" });
-  initialState = { counter: 0 };
-
-  async init() {
-    this.server.registerTool("my_tool", {
-      description: "Does something useful",
-      inputSchema: { query: z.string() }
-    }, async ({ query }) => ({
-      content: [{ text: `Result: ${query}`, type: "text" }]
-    }));
-  }
-}
-
-// Entry point
-export default {
-  fetch(request: Request, env: Env, ctx: ExecutionContext) {
-    return MyMCP.serve("/mcp", { binding: "MyMCP" }).fetch(request, env, ctx);
-  }
-};
-```
-
-## Transport Options
-
-| Transport | Method | Use for |
-|-----------|--------|---------|
-| Streamable HTTP | `MyMCP.serve("/mcp")` | External/public clients (recommended) |
-| SSE | `MyMCP.serveSSE("/sse")` | Legacy clients only (deprecated) |
-| RPC | `addMcpServer(name, env.Binding)` | Same-Worker internal calls |
-
-## Example Usage
-
-```
-/build-mcp a GitHub integration server with repo tools
-/build-mcp a database query tool with D1
-/build-mcp an authenticated API gateway with OAuth
-```
diff --git a/commands/build-mcp.md b/commands/build-mcp.md
new file mode 120000
index 0000000..78c3487
--- /dev/null
+++ b/commands/build-mcp.md
@@ -0,0 +1 @@
+../plugins/cloudflare-agents/commands/build-mcp.md
\ No newline at end of file
diff --git a/plugins/cloudflare-agents/.claude-plugin/plugin.json b/plugins/cloudflare-agents/.claude-plugin/plugin.json
new file mode 100644
index 0000000..eb188e0
--- /dev/null
+++ b/plugins/cloudflare-agents/.claude-plugin/plugin.json
@@ -0,0 +1,7 @@
+{
+  "name": "cloudflare-agents",
+  "description": "Cloudflare Agents SDK: build AI agents on Workers with state, workflows, scheduling, MCP servers, chat, voice, and browser automation. Includes /build-agent and /build-mcp slash commands.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" },
+  "dependencies": ["cloudflare-workers"]
+}
diff --git a/plugins/cloudflare-agents/.cursor-plugin/plugin.json b/plugins/cloudflare-agents/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..4bff2e1
--- /dev/null
+++ b/plugins/cloudflare-agents/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-agents",
+  "version": "1.0.0",
+  "description": "Cloudflare Agents SDK: build AI agents on Workers with state, workflows, scheduling, MCP servers, chat, voice, and browser automation.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["cloudflare", "agents", "ai", "mcp", "workflows"]
+}
diff --git a/plugins/cloudflare-agents/commands/build-agent.md b/plugins/cloudflare-agents/commands/build-agent.md
new file mode 100644
index 0000000..79d4df4
--- /dev/null
+++ b/plugins/cloudflare-agents/commands/build-agent.md
@@ -0,0 +1,57 @@
+---
+description: Build an AI agent on Cloudflare using the Agents SDK
+argument-hint: [agent-description]
+allowed-tools: [Read, Glob, Grep, Bash, Write, Edit, WebFetch]
+---
+
+# Build AI Agent on Cloudflare
+
+## Arguments
+
+The user invoked this command with: $ARGUMENTS
+
+## Instructions
+
+When this command is invoked:
+
+1. Read the skill file at `agents-sdk/SKILL.md` for core SDK guidance, APIs, and wrangler config
+2. Based on what the user wants to build, read the relevant references from `agents-sdk/references/`:
+   - For chat/AI agents: `streaming-chat.md`, `client-sdk.md`
+   - For state management: `state-scheduling.md`
+   - For RPC methods: `callable.md`
+   - For background work: `workflows.md`, `durable-execution.md`, `queue-retries.md`
+   - For MCP integration: `mcp.md`
+   - For email handling: `email.md`
+   - For webhooks/push: `webhooks-push.md`
+   - For approval flows: `human-in-the-loop.md`
+   - For voice: `voice.md`
+   - For browser tools: `browse-the-web.md`
+   - For higher-level chat: `think.md`
+3. Fetch the relevant pages from https://developers.cloudflare.com/agents/ for the latest API details
+4. Always start with `configuration.md` and `routing.md` for project setup
+
+## Scaffold Steps
+
+1. **Create project**: `npx create-cloudflare@latest --template cloudflare/agents-starter`
+2. **Configure wrangler.jsonc**: DO bindings, migrations, AI binding, assets
+3. **Implement agent class**: extend `Agent` or `AIChatAgent` depending on use case
+4. **Wire routing**: `routeAgentRequest` in the default export
+5. **Build client**: `useAgent` + `useAgentChat` React hooks
+6. **Deploy**: `npx wrangler deploy`
+
+## Key Decision: Agent vs AIChatAgent vs Think
+
+| Need | Use | Package |
+|------|-----|---------|
+| Custom stateful logic, RPC, scheduling | `Agent` | `agents` |
+| AI chat with streaming, tools, persistence | `AIChatAgent` | `@cloudflare/ai-chat` |
+| AI chat with automatic tool loop, built-in workspace | `Think` | `@cloudflare/think` (experimental) |
+
+## Example Usage
+
+```
+/build-agent a customer support chatbot with tool calling
+/build-agent a real-time collaborative editor with state sync
+/build-agent a background processing agent with scheduled tasks
+/build-agent a voice assistant that can browse the web
+```
diff --git a/plugins/cloudflare-agents/commands/build-mcp.md b/plugins/cloudflare-agents/commands/build-mcp.md
new file mode 100644
index 0000000..7238842
--- /dev/null
+++ b/plugins/cloudflare-agents/commands/build-mcp.md
@@ -0,0 +1,76 @@
+---
+description: Build a remote MCP server on Cloudflare using McpAgent
+argument-hint: [mcp-description]
+allowed-tools: [Read, Glob, Grep, Bash, Write, Edit, WebFetch]
+---
+
+# Build MCP Server on Cloudflare
+
+## Arguments
+
+The user invoked this command with: $ARGUMENTS
+
+## Instructions
+
+When this command is invoked:
+
+1. Read the skill file at `agents-sdk/SKILL.md` for core SDK guidance
+2. Read `agents-sdk/references/mcp.md` for MCP client and server APIs, transports, and securing
+3. Read `agents-sdk/references/configuration.md` for wrangler setup
+4. Fetch https://developers.cloudflare.com/agents/api-reference/mcp-agent-api/ for the latest McpAgent API
+5. For OAuth/security, fetch https://developers.cloudflare.com/agents/api-reference/securing-mcp-servers/
+
+## Scaffold Steps
+
+1. **Create project**: `npx create-cloudflare@latest --template cloudflare/agents-starter` (or start fresh)
+2. **Install MCP SDK**: `npm install @modelcontextprotocol/sdk zod`
+3. **Configure wrangler.jsonc**: DO binding + `new_sqlite_classes` migration for the McpAgent class
+4. **Implement McpAgent**: extend `McpAgent`, create `McpServer`, register tools in `init()`
+5. **Serve transport**: `MyMCP.serve("/mcp", { binding: "MyMCP" })` (Streamable HTTP, recommended)
+6. **Test**: `npx @modelcontextprotocol/inspector@latest`
+7. **Deploy**: `npx wrangler deploy`
+
+## Quick Reference
+
+```typescript
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpAgent } from "agents/mcp";
+import { z } from "zod";
+
+export class MyMCP extends McpAgent<Env, State, {}> {
+  server = new McpServer({ name: "my-mcp", version: "1.0.0" });
+  initialState = { counter: 0 };
+
+  async init() {
+    this.server.registerTool("my_tool", {
+      description: "Does something useful",
+      inputSchema: { query: z.string() }
+    }, async ({ query }) => ({
+      content: [{ text: `Result: ${query}`, type: "text" }]
+    }));
+  }
+}
+
+// Entry point
+export default {
+  fetch(request: Request, env: Env, ctx: ExecutionContext) {
+    return MyMCP.serve("/mcp", { binding: "MyMCP" }).fetch(request, env, ctx);
+  }
+};
+```
+
+## Transport Options
+
+| Transport | Method | Use for |
+|-----------|--------|---------|
+| Streamable HTTP | `MyMCP.serve("/mcp")` | External/public clients (recommended) |
+| SSE | `MyMCP.serveSSE("/sse")` | Legacy clients only (deprecated) |
+| RPC | `addMcpServer(name, env.Binding)` | Same-Worker internal calls |
+
+## Example Usage
+
+```
+/build-mcp a GitHub integration server with repo tools
+/build-mcp a database query tool with D1
+/build-mcp an authenticated API gateway with OAuth
+```
diff --git a/skills/agents-sdk/SKILL.md b/plugins/cloudflare-agents/skills/agents-sdk/SKILL.md
similarity index 100%
rename from skills/agents-sdk/SKILL.md
rename to plugins/cloudflare-agents/skills/agents-sdk/SKILL.md
diff --git a/skills/agents-sdk/references/browse-the-web.md b/plugins/cloudflare-agents/skills/agents-sdk/references/browse-the-web.md
similarity index 100%
rename from skills/agents-sdk/references/browse-the-web.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/browse-the-web.md
diff --git a/skills/agents-sdk/references/callable.md b/plugins/cloudflare-agents/skills/agents-sdk/references/callable.md
similarity index 100%
rename from skills/agents-sdk/references/callable.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/callable.md
diff --git a/skills/agents-sdk/references/client-sdk.md b/plugins/cloudflare-agents/skills/agents-sdk/references/client-sdk.md
similarity index 100%
rename from skills/agents-sdk/references/client-sdk.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/client-sdk.md
diff --git a/skills/agents-sdk/references/codemode.md b/plugins/cloudflare-agents/skills/agents-sdk/references/codemode.md
similarity index 100%
rename from skills/agents-sdk/references/codemode.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/codemode.md
diff --git a/skills/agents-sdk/references/configuration.md b/plugins/cloudflare-agents/skills/agents-sdk/references/configuration.md
similarity index 100%
rename from skills/agents-sdk/references/configuration.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/configuration.md
diff --git a/skills/agents-sdk/references/durable-execution.md b/plugins/cloudflare-agents/skills/agents-sdk/references/durable-execution.md
similarity index 100%
rename from skills/agents-sdk/references/durable-execution.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/durable-execution.md
diff --git a/skills/agents-sdk/references/email.md b/plugins/cloudflare-agents/skills/agents-sdk/references/email.md
similarity index 100%
rename from skills/agents-sdk/references/email.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/email.md
diff --git a/skills/agents-sdk/references/human-in-the-loop.md b/plugins/cloudflare-agents/skills/agents-sdk/references/human-in-the-loop.md
similarity index 100%
rename from skills/agents-sdk/references/human-in-the-loop.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/human-in-the-loop.md
diff --git a/skills/agents-sdk/references/mcp.md b/plugins/cloudflare-agents/skills/agents-sdk/references/mcp.md
similarity index 100%
rename from skills/agents-sdk/references/mcp.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/mcp.md
diff --git a/skills/agents-sdk/references/observability.md b/plugins/cloudflare-agents/skills/agents-sdk/references/observability.md
similarity index 100%
rename from skills/agents-sdk/references/observability.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/observability.md
diff --git a/skills/agents-sdk/references/queue-retries.md b/plugins/cloudflare-agents/skills/agents-sdk/references/queue-retries.md
similarity index 100%
rename from skills/agents-sdk/references/queue-retries.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/queue-retries.md
diff --git a/skills/agents-sdk/references/routing.md b/plugins/cloudflare-agents/skills/agents-sdk/references/routing.md
similarity index 100%
rename from skills/agents-sdk/references/routing.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/routing.md
diff --git a/skills/agents-sdk/references/server-driven-messages.md b/plugins/cloudflare-agents/skills/agents-sdk/references/server-driven-messages.md
similarity index 100%
rename from skills/agents-sdk/references/server-driven-messages.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/server-driven-messages.md
diff --git a/skills/agents-sdk/references/state-scheduling.md b/plugins/cloudflare-agents/skills/agents-sdk/references/state-scheduling.md
similarity index 100%
rename from skills/agents-sdk/references/state-scheduling.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/state-scheduling.md
diff --git a/skills/agents-sdk/references/streaming-chat.md b/plugins/cloudflare-agents/skills/agents-sdk/references/streaming-chat.md
similarity index 100%
rename from skills/agents-sdk/references/streaming-chat.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/streaming-chat.md
diff --git a/skills/agents-sdk/references/think.md b/plugins/cloudflare-agents/skills/agents-sdk/references/think.md
similarity index 100%
rename from skills/agents-sdk/references/think.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/think.md
diff --git a/skills/agents-sdk/references/voice.md b/plugins/cloudflare-agents/skills/agents-sdk/references/voice.md
similarity index 100%
rename from skills/agents-sdk/references/voice.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/voice.md
diff --git a/skills/agents-sdk/references/webhooks-push.md b/plugins/cloudflare-agents/skills/agents-sdk/references/webhooks-push.md
similarity index 100%
rename from skills/agents-sdk/references/webhooks-push.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/webhooks-push.md
diff --git a/skills/agents-sdk/references/workflows.md b/plugins/cloudflare-agents/skills/agents-sdk/references/workflows.md
similarity index 100%
rename from skills/agents-sdk/references/workflows.md
rename to plugins/cloudflare-agents/skills/agents-sdk/references/workflows.md
diff --git a/plugins/cloudflare-core/.claude-plugin/plugin.json b/plugins/cloudflare-core/.claude-plugin/plugin.json
new file mode 100644
index 0000000..45e6dbf
--- /dev/null
+++ b/plugins/cloudflare-core/.claude-plugin/plugin.json
@@ -0,0 +1,6 @@
+{
+  "name": "cloudflare-core",
+  "description": "Core Cloudflare context: pan-Cloudflare API and docs MCP servers, plus a comprehensive platform overview skill. Other Cloudflare plugins depend on this for shared API and docs access.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" }
+}
diff --git a/plugins/cloudflare-core/.cursor-plugin/plugin.json b/plugins/cloudflare-core/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..efe767c
--- /dev/null
+++ b/plugins/cloudflare-core/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-core",
+  "version": "1.0.0",
+  "description": "Core Cloudflare context: pan-Cloudflare API and docs MCP servers, plus a comprehensive platform overview skill. Other Cloudflare plugins depend on this for shared API and docs access.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["cloudflare", "api", "docs"]
+}
diff --git a/plugins/cloudflare-core/.mcp.json b/plugins/cloudflare-core/.mcp.json
new file mode 100644
index 0000000..573bcfb
--- /dev/null
+++ b/plugins/cloudflare-core/.mcp.json
@@ -0,0 +1,12 @@
+{
+  "mcpServers": {
+    "cloudflare-api": {
+      "type": "http",
+      "url": "https://mcp.cloudflare.com/mcp"
+    },
+    "cloudflare-docs": {
+      "type": "http",
+      "url": "https://docs.mcp.cloudflare.com/mcp"
+    }
+  }
+}
diff --git a/skills/cloudflare/SKILL.md b/plugins/cloudflare-core/skills/cloudflare/SKILL.md
similarity index 100%
rename from skills/cloudflare/SKILL.md
rename to plugins/cloudflare-core/skills/cloudflare/SKILL.md
diff --git a/skills/cloudflare/references/agents-sdk/README.md b/plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/README.md
similarity index 100%
rename from skills/cloudflare/references/agents-sdk/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/README.md
diff --git a/skills/cloudflare/references/agents-sdk/api.md b/plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/api.md
similarity index 100%
rename from skills/cloudflare/references/agents-sdk/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/api.md
diff --git a/skills/cloudflare/references/agents-sdk/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/configuration.md
similarity index 100%
rename from skills/cloudflare/references/agents-sdk/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/configuration.md
diff --git a/skills/cloudflare/references/agents-sdk/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/agents-sdk/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/gotchas.md
diff --git a/skills/cloudflare/references/agents-sdk/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/patterns.md
similarity index 100%
rename from skills/cloudflare/references/agents-sdk/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/agents-sdk/patterns.md
diff --git a/skills/cloudflare/references/ai-gateway/README.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/README.md
similarity index 100%
rename from skills/cloudflare/references/ai-gateway/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/README.md
diff --git a/skills/cloudflare/references/ai-gateway/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/configuration.md
similarity index 100%
rename from skills/cloudflare/references/ai-gateway/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/configuration.md
diff --git a/skills/cloudflare/references/ai-gateway/dynamic-routing.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/dynamic-routing.md
similarity index 100%
rename from skills/cloudflare/references/ai-gateway/dynamic-routing.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/dynamic-routing.md
diff --git a/skills/cloudflare/references/ai-gateway/features.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/features.md
similarity index 100%
rename from skills/cloudflare/references/ai-gateway/features.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/features.md
diff --git a/skills/cloudflare/references/ai-gateway/sdk-integration.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/sdk-integration.md
similarity index 100%
rename from skills/cloudflare/references/ai-gateway/sdk-integration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/sdk-integration.md
diff --git a/skills/cloudflare/references/ai-gateway/troubleshooting.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/troubleshooting.md
similarity index 100%
rename from skills/cloudflare/references/ai-gateway/troubleshooting.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-gateway/troubleshooting.md
diff --git a/skills/cloudflare/references/ai-search/README.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-search/README.md
similarity index 100%
rename from skills/cloudflare/references/ai-search/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-search/README.md
diff --git a/skills/cloudflare/references/ai-search/api.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-search/api.md
similarity index 100%
rename from skills/cloudflare/references/ai-search/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-search/api.md
diff --git a/skills/cloudflare/references/ai-search/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-search/configuration.md
similarity index 100%
rename from skills/cloudflare/references/ai-search/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-search/configuration.md
diff --git a/skills/cloudflare/references/ai-search/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-search/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/ai-search/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-search/gotchas.md
diff --git a/skills/cloudflare/references/ai-search/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/ai-search/patterns.md
similarity index 100%
rename from skills/cloudflare/references/ai-search/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ai-search/patterns.md
diff --git a/skills/cloudflare/references/analytics-engine/README.md b/plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/README.md
similarity index 100%
rename from skills/cloudflare/references/analytics-engine/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/README.md
diff --git a/skills/cloudflare/references/analytics-engine/api.md b/plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/api.md
similarity index 100%
rename from skills/cloudflare/references/analytics-engine/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/api.md
diff --git a/skills/cloudflare/references/analytics-engine/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/configuration.md
similarity index 100%
rename from skills/cloudflare/references/analytics-engine/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/configuration.md
diff --git a/skills/cloudflare/references/analytics-engine/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/analytics-engine/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/gotchas.md
diff --git a/skills/cloudflare/references/analytics-engine/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/patterns.md
similarity index 100%
rename from skills/cloudflare/references/analytics-engine/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/analytics-engine/patterns.md
diff --git a/skills/cloudflare/references/api-shield/README.md b/plugins/cloudflare-core/skills/cloudflare/references/api-shield/README.md
similarity index 100%
rename from skills/cloudflare/references/api-shield/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api-shield/README.md
diff --git a/skills/cloudflare/references/api-shield/api.md b/plugins/cloudflare-core/skills/cloudflare/references/api-shield/api.md
similarity index 100%
rename from skills/cloudflare/references/api-shield/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api-shield/api.md
diff --git a/skills/cloudflare/references/api-shield/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/api-shield/configuration.md
similarity index 100%
rename from skills/cloudflare/references/api-shield/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api-shield/configuration.md
diff --git a/skills/cloudflare/references/api-shield/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/api-shield/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/api-shield/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api-shield/gotchas.md
diff --git a/skills/cloudflare/references/api-shield/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/api-shield/patterns.md
similarity index 100%
rename from skills/cloudflare/references/api-shield/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api-shield/patterns.md
diff --git a/skills/cloudflare/references/api/README.md b/plugins/cloudflare-core/skills/cloudflare/references/api/README.md
similarity index 100%
rename from skills/cloudflare/references/api/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api/README.md
diff --git a/skills/cloudflare/references/api/api.md b/plugins/cloudflare-core/skills/cloudflare/references/api/api.md
similarity index 100%
rename from skills/cloudflare/references/api/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api/api.md
diff --git a/skills/cloudflare/references/api/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/api/configuration.md
similarity index 100%
rename from skills/cloudflare/references/api/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api/configuration.md
diff --git a/skills/cloudflare/references/api/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/api/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/api/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api/gotchas.md
diff --git a/skills/cloudflare/references/api/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/api/patterns.md
similarity index 100%
rename from skills/cloudflare/references/api/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/api/patterns.md
diff --git a/skills/cloudflare/references/argo-smart-routing/README.md b/plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/README.md
similarity index 100%
rename from skills/cloudflare/references/argo-smart-routing/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/README.md
diff --git a/skills/cloudflare/references/argo-smart-routing/api.md b/plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/api.md
similarity index 100%
rename from skills/cloudflare/references/argo-smart-routing/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/api.md
diff --git a/skills/cloudflare/references/argo-smart-routing/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/configuration.md
similarity index 100%
rename from skills/cloudflare/references/argo-smart-routing/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/configuration.md
diff --git a/skills/cloudflare/references/argo-smart-routing/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/argo-smart-routing/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/gotchas.md
diff --git a/skills/cloudflare/references/argo-smart-routing/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/patterns.md
similarity index 100%
rename from skills/cloudflare/references/argo-smart-routing/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/argo-smart-routing/patterns.md
diff --git a/skills/cloudflare/references/artifacts/README.md b/plugins/cloudflare-core/skills/cloudflare/references/artifacts/README.md
similarity index 100%
rename from skills/cloudflare/references/artifacts/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/artifacts/README.md
diff --git a/skills/cloudflare/references/artifacts/api.md b/plugins/cloudflare-core/skills/cloudflare/references/artifacts/api.md
similarity index 100%
rename from skills/cloudflare/references/artifacts/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/artifacts/api.md
diff --git a/skills/cloudflare/references/artifacts/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/artifacts/configuration.md
similarity index 100%
rename from skills/cloudflare/references/artifacts/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/artifacts/configuration.md
diff --git a/skills/cloudflare/references/bindings/README.md b/plugins/cloudflare-core/skills/cloudflare/references/bindings/README.md
similarity index 100%
rename from skills/cloudflare/references/bindings/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bindings/README.md
diff --git a/skills/cloudflare/references/bindings/api.md b/plugins/cloudflare-core/skills/cloudflare/references/bindings/api.md
similarity index 100%
rename from skills/cloudflare/references/bindings/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bindings/api.md
diff --git a/skills/cloudflare/references/bindings/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/bindings/configuration.md
similarity index 100%
rename from skills/cloudflare/references/bindings/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bindings/configuration.md
diff --git a/skills/cloudflare/references/bindings/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/bindings/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/bindings/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bindings/gotchas.md
diff --git a/skills/cloudflare/references/bindings/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/bindings/patterns.md
similarity index 100%
rename from skills/cloudflare/references/bindings/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bindings/patterns.md
diff --git a/skills/cloudflare/references/bot-management/README.md b/plugins/cloudflare-core/skills/cloudflare/references/bot-management/README.md
similarity index 100%
rename from skills/cloudflare/references/bot-management/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bot-management/README.md
diff --git a/skills/cloudflare/references/bot-management/api.md b/plugins/cloudflare-core/skills/cloudflare/references/bot-management/api.md
similarity index 100%
rename from skills/cloudflare/references/bot-management/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bot-management/api.md
diff --git a/skills/cloudflare/references/bot-management/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/bot-management/configuration.md
similarity index 100%
rename from skills/cloudflare/references/bot-management/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bot-management/configuration.md
diff --git a/skills/cloudflare/references/bot-management/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/bot-management/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/bot-management/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bot-management/gotchas.md
diff --git a/skills/cloudflare/references/bot-management/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/bot-management/patterns.md
similarity index 100%
rename from skills/cloudflare/references/bot-management/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/bot-management/patterns.md
diff --git a/skills/cloudflare/references/browser-rendering/README.md b/plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/README.md
similarity index 100%
rename from skills/cloudflare/references/browser-rendering/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/README.md
diff --git a/skills/cloudflare/references/browser-rendering/api.md b/plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/api.md
similarity index 100%
rename from skills/cloudflare/references/browser-rendering/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/api.md
diff --git a/skills/cloudflare/references/browser-rendering/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/configuration.md
similarity index 100%
rename from skills/cloudflare/references/browser-rendering/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/configuration.md
diff --git a/skills/cloudflare/references/browser-rendering/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/browser-rendering/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/gotchas.md
diff --git a/skills/cloudflare/references/browser-rendering/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/patterns.md
similarity index 100%
rename from skills/cloudflare/references/browser-rendering/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/browser-rendering/patterns.md
diff --git a/skills/cloudflare/references/c3/README.md b/plugins/cloudflare-core/skills/cloudflare/references/c3/README.md
similarity index 100%
rename from skills/cloudflare/references/c3/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/c3/README.md
diff --git a/skills/cloudflare/references/c3/api.md b/plugins/cloudflare-core/skills/cloudflare/references/c3/api.md
similarity index 100%
rename from skills/cloudflare/references/c3/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/c3/api.md
diff --git a/skills/cloudflare/references/c3/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/c3/configuration.md
similarity index 100%
rename from skills/cloudflare/references/c3/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/c3/configuration.md
diff --git a/skills/cloudflare/references/c3/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/c3/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/c3/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/c3/gotchas.md
diff --git a/skills/cloudflare/references/c3/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/c3/patterns.md
similarity index 100%
rename from skills/cloudflare/references/c3/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/c3/patterns.md
diff --git a/skills/cloudflare/references/cache-reserve/README.md b/plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/README.md
similarity index 100%
rename from skills/cloudflare/references/cache-reserve/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/README.md
diff --git a/skills/cloudflare/references/cache-reserve/api.md b/plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/api.md
similarity index 100%
rename from skills/cloudflare/references/cache-reserve/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/api.md
diff --git a/skills/cloudflare/references/cache-reserve/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/configuration.md
similarity index 100%
rename from skills/cloudflare/references/cache-reserve/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/configuration.md
diff --git a/skills/cloudflare/references/cache-reserve/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/cache-reserve/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/gotchas.md
diff --git a/skills/cloudflare/references/cache-reserve/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/patterns.md
similarity index 100%
rename from skills/cloudflare/references/cache-reserve/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cache-reserve/patterns.md
diff --git a/skills/cloudflare/references/containers/README.md b/plugins/cloudflare-core/skills/cloudflare/references/containers/README.md
similarity index 100%
rename from skills/cloudflare/references/containers/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/containers/README.md
diff --git a/skills/cloudflare/references/containers/api.md b/plugins/cloudflare-core/skills/cloudflare/references/containers/api.md
similarity index 100%
rename from skills/cloudflare/references/containers/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/containers/api.md
diff --git a/skills/cloudflare/references/containers/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/containers/configuration.md
similarity index 100%
rename from skills/cloudflare/references/containers/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/containers/configuration.md
diff --git a/skills/cloudflare/references/containers/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/containers/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/containers/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/containers/gotchas.md
diff --git a/skills/cloudflare/references/containers/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/containers/patterns.md
similarity index 100%
rename from skills/cloudflare/references/containers/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/containers/patterns.md
diff --git a/skills/cloudflare/references/cron-triggers/README.md b/plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/README.md
similarity index 100%
rename from skills/cloudflare/references/cron-triggers/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/README.md
diff --git a/skills/cloudflare/references/cron-triggers/api.md b/plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/api.md
similarity index 100%
rename from skills/cloudflare/references/cron-triggers/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/api.md
diff --git a/skills/cloudflare/references/cron-triggers/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/configuration.md
similarity index 100%
rename from skills/cloudflare/references/cron-triggers/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/configuration.md
diff --git a/skills/cloudflare/references/cron-triggers/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/cron-triggers/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/gotchas.md
diff --git a/skills/cloudflare/references/cron-triggers/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/patterns.md
similarity index 100%
rename from skills/cloudflare/references/cron-triggers/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/cron-triggers/patterns.md
diff --git a/skills/cloudflare/references/d1/README.md b/plugins/cloudflare-core/skills/cloudflare/references/d1/README.md
similarity index 100%
rename from skills/cloudflare/references/d1/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/d1/README.md
diff --git a/skills/cloudflare/references/d1/api.md b/plugins/cloudflare-core/skills/cloudflare/references/d1/api.md
similarity index 100%
rename from skills/cloudflare/references/d1/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/d1/api.md
diff --git a/skills/cloudflare/references/d1/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/d1/configuration.md
similarity index 100%
rename from skills/cloudflare/references/d1/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/d1/configuration.md
diff --git a/skills/cloudflare/references/d1/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/d1/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/d1/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/d1/gotchas.md
diff --git a/skills/cloudflare/references/d1/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/d1/patterns.md
similarity index 100%
rename from skills/cloudflare/references/d1/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/d1/patterns.md
diff --git a/skills/cloudflare/references/ddos/README.md b/plugins/cloudflare-core/skills/cloudflare/references/ddos/README.md
similarity index 100%
rename from skills/cloudflare/references/ddos/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ddos/README.md
diff --git a/skills/cloudflare/references/ddos/api.md b/plugins/cloudflare-core/skills/cloudflare/references/ddos/api.md
similarity index 100%
rename from skills/cloudflare/references/ddos/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ddos/api.md
diff --git a/skills/cloudflare/references/ddos/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/ddos/configuration.md
similarity index 100%
rename from skills/cloudflare/references/ddos/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ddos/configuration.md
diff --git a/skills/cloudflare/references/ddos/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/ddos/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/ddos/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ddos/gotchas.md
diff --git a/skills/cloudflare/references/ddos/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/ddos/patterns.md
similarity index 100%
rename from skills/cloudflare/references/ddos/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/ddos/patterns.md
diff --git a/skills/cloudflare/references/do-storage/README.md b/plugins/cloudflare-core/skills/cloudflare/references/do-storage/README.md
similarity index 100%
rename from skills/cloudflare/references/do-storage/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/do-storage/README.md
diff --git a/skills/cloudflare/references/do-storage/api.md b/plugins/cloudflare-core/skills/cloudflare/references/do-storage/api.md
similarity index 100%
rename from skills/cloudflare/references/do-storage/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/do-storage/api.md
diff --git a/skills/cloudflare/references/do-storage/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/do-storage/configuration.md
similarity index 100%
rename from skills/cloudflare/references/do-storage/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/do-storage/configuration.md
diff --git a/skills/cloudflare/references/do-storage/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/do-storage/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/do-storage/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/do-storage/gotchas.md
diff --git a/skills/cloudflare/references/do-storage/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/do-storage/patterns.md
similarity index 100%
rename from skills/cloudflare/references/do-storage/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/do-storage/patterns.md
diff --git a/skills/cloudflare/references/do-storage/testing.md b/plugins/cloudflare-core/skills/cloudflare/references/do-storage/testing.md
similarity index 100%
rename from skills/cloudflare/references/do-storage/testing.md
rename to plugins/cloudflare-core/skills/cloudflare/references/do-storage/testing.md
diff --git a/skills/cloudflare/references/durable-objects/README.md b/plugins/cloudflare-core/skills/cloudflare/references/durable-objects/README.md
similarity index 100%
rename from skills/cloudflare/references/durable-objects/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/durable-objects/README.md
diff --git a/skills/cloudflare/references/durable-objects/api.md b/plugins/cloudflare-core/skills/cloudflare/references/durable-objects/api.md
similarity index 100%
rename from skills/cloudflare/references/durable-objects/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/durable-objects/api.md
diff --git a/skills/cloudflare/references/durable-objects/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/durable-objects/configuration.md
similarity index 100%
rename from skills/cloudflare/references/durable-objects/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/durable-objects/configuration.md
diff --git a/skills/cloudflare/references/durable-objects/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/durable-objects/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/durable-objects/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/durable-objects/gotchas.md
diff --git a/skills/cloudflare/references/durable-objects/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/durable-objects/patterns.md
similarity index 100%
rename from skills/cloudflare/references/durable-objects/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/durable-objects/patterns.md
diff --git a/skills/cloudflare/references/email-routing/README.md b/plugins/cloudflare-core/skills/cloudflare/references/email-routing/README.md
similarity index 100%
rename from skills/cloudflare/references/email-routing/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-routing/README.md
diff --git a/skills/cloudflare/references/email-routing/api.md b/plugins/cloudflare-core/skills/cloudflare/references/email-routing/api.md
similarity index 100%
rename from skills/cloudflare/references/email-routing/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-routing/api.md
diff --git a/skills/cloudflare/references/email-routing/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/email-routing/configuration.md
similarity index 100%
rename from skills/cloudflare/references/email-routing/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-routing/configuration.md
diff --git a/skills/cloudflare/references/email-routing/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/email-routing/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/email-routing/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-routing/gotchas.md
diff --git a/skills/cloudflare/references/email-routing/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/email-routing/patterns.md
similarity index 100%
rename from skills/cloudflare/references/email-routing/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-routing/patterns.md
diff --git a/skills/cloudflare/references/email-workers/README.md b/plugins/cloudflare-core/skills/cloudflare/references/email-workers/README.md
similarity index 100%
rename from skills/cloudflare/references/email-workers/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-workers/README.md
diff --git a/skills/cloudflare/references/email-workers/api.md b/plugins/cloudflare-core/skills/cloudflare/references/email-workers/api.md
similarity index 100%
rename from skills/cloudflare/references/email-workers/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-workers/api.md
diff --git a/skills/cloudflare/references/email-workers/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/email-workers/configuration.md
similarity index 100%
rename from skills/cloudflare/references/email-workers/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-workers/configuration.md
diff --git a/skills/cloudflare/references/email-workers/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/email-workers/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/email-workers/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-workers/gotchas.md
diff --git a/skills/cloudflare/references/email-workers/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/email-workers/patterns.md
similarity index 100%
rename from skills/cloudflare/references/email-workers/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/email-workers/patterns.md
diff --git a/skills/cloudflare/references/flagship/README.md b/plugins/cloudflare-core/skills/cloudflare/references/flagship/README.md
similarity index 100%
rename from skills/cloudflare/references/flagship/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/flagship/README.md
diff --git a/skills/cloudflare/references/flagship/api.md b/plugins/cloudflare-core/skills/cloudflare/references/flagship/api.md
similarity index 100%
rename from skills/cloudflare/references/flagship/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/flagship/api.md
diff --git a/skills/cloudflare/references/flagship/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/flagship/configuration.md
similarity index 100%
rename from skills/cloudflare/references/flagship/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/flagship/configuration.md
diff --git a/skills/cloudflare/references/flagship/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/flagship/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/flagship/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/flagship/gotchas.md
diff --git a/skills/cloudflare/references/flagship/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/flagship/patterns.md
similarity index 100%
rename from skills/cloudflare/references/flagship/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/flagship/patterns.md
diff --git a/skills/cloudflare/references/graphql-api/README.md b/plugins/cloudflare-core/skills/cloudflare/references/graphql-api/README.md
similarity index 100%
rename from skills/cloudflare/references/graphql-api/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/graphql-api/README.md
diff --git a/skills/cloudflare/references/graphql-api/api.md b/plugins/cloudflare-core/skills/cloudflare/references/graphql-api/api.md
similarity index 100%
rename from skills/cloudflare/references/graphql-api/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/graphql-api/api.md
diff --git a/skills/cloudflare/references/graphql-api/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/graphql-api/configuration.md
similarity index 100%
rename from skills/cloudflare/references/graphql-api/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/graphql-api/configuration.md
diff --git a/skills/cloudflare/references/graphql-api/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/graphql-api/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/graphql-api/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/graphql-api/gotchas.md
diff --git a/skills/cloudflare/references/graphql-api/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/graphql-api/patterns.md
similarity index 100%
rename from skills/cloudflare/references/graphql-api/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/graphql-api/patterns.md
diff --git a/skills/cloudflare/references/hyperdrive/README.md b/plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/README.md
similarity index 100%
rename from skills/cloudflare/references/hyperdrive/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/README.md
diff --git a/skills/cloudflare/references/hyperdrive/api.md b/plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/api.md
similarity index 100%
rename from skills/cloudflare/references/hyperdrive/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/api.md
diff --git a/skills/cloudflare/references/hyperdrive/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/configuration.md
similarity index 100%
rename from skills/cloudflare/references/hyperdrive/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/configuration.md
diff --git a/skills/cloudflare/references/hyperdrive/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/hyperdrive/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/gotchas.md
diff --git a/skills/cloudflare/references/hyperdrive/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/patterns.md
similarity index 100%
rename from skills/cloudflare/references/hyperdrive/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/hyperdrive/patterns.md
diff --git a/skills/cloudflare/references/images/README.md b/plugins/cloudflare-core/skills/cloudflare/references/images/README.md
similarity index 100%
rename from skills/cloudflare/references/images/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/images/README.md
diff --git a/skills/cloudflare/references/images/api.md b/plugins/cloudflare-core/skills/cloudflare/references/images/api.md
similarity index 100%
rename from skills/cloudflare/references/images/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/images/api.md
diff --git a/skills/cloudflare/references/images/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/images/configuration.md
similarity index 100%
rename from skills/cloudflare/references/images/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/images/configuration.md
diff --git a/skills/cloudflare/references/images/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/images/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/images/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/images/gotchas.md
diff --git a/skills/cloudflare/references/images/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/images/patterns.md
similarity index 100%
rename from skills/cloudflare/references/images/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/images/patterns.md
diff --git a/skills/cloudflare/references/kv/README.md b/plugins/cloudflare-core/skills/cloudflare/references/kv/README.md
similarity index 100%
rename from skills/cloudflare/references/kv/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/kv/README.md
diff --git a/skills/cloudflare/references/kv/api.md b/plugins/cloudflare-core/skills/cloudflare/references/kv/api.md
similarity index 100%
rename from skills/cloudflare/references/kv/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/kv/api.md
diff --git a/skills/cloudflare/references/kv/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/kv/configuration.md
similarity index 100%
rename from skills/cloudflare/references/kv/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/kv/configuration.md
diff --git a/skills/cloudflare/references/kv/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/kv/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/kv/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/kv/gotchas.md
diff --git a/skills/cloudflare/references/kv/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/kv/patterns.md
similarity index 100%
rename from skills/cloudflare/references/kv/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/kv/patterns.md
diff --git a/skills/cloudflare/references/miniflare/README.md b/plugins/cloudflare-core/skills/cloudflare/references/miniflare/README.md
similarity index 100%
rename from skills/cloudflare/references/miniflare/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/miniflare/README.md
diff --git a/skills/cloudflare/references/miniflare/api.md b/plugins/cloudflare-core/skills/cloudflare/references/miniflare/api.md
similarity index 100%
rename from skills/cloudflare/references/miniflare/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/miniflare/api.md
diff --git a/skills/cloudflare/references/miniflare/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/miniflare/configuration.md
similarity index 100%
rename from skills/cloudflare/references/miniflare/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/miniflare/configuration.md
diff --git a/skills/cloudflare/references/miniflare/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/miniflare/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/miniflare/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/miniflare/gotchas.md
diff --git a/skills/cloudflare/references/miniflare/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/miniflare/patterns.md
similarity index 100%
rename from skills/cloudflare/references/miniflare/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/miniflare/patterns.md
diff --git a/skills/cloudflare/references/network-interconnect/README.md b/plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/README.md
similarity index 100%
rename from skills/cloudflare/references/network-interconnect/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/README.md
diff --git a/skills/cloudflare/references/network-interconnect/api.md b/plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/api.md
similarity index 100%
rename from skills/cloudflare/references/network-interconnect/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/api.md
diff --git a/skills/cloudflare/references/network-interconnect/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/configuration.md
similarity index 100%
rename from skills/cloudflare/references/network-interconnect/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/configuration.md
diff --git a/skills/cloudflare/references/network-interconnect/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/network-interconnect/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/gotchas.md
diff --git a/skills/cloudflare/references/network-interconnect/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/patterns.md
similarity index 100%
rename from skills/cloudflare/references/network-interconnect/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/network-interconnect/patterns.md
diff --git a/skills/cloudflare/references/observability/README.md b/plugins/cloudflare-core/skills/cloudflare/references/observability/README.md
similarity index 100%
rename from skills/cloudflare/references/observability/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/observability/README.md
diff --git a/skills/cloudflare/references/observability/api.md b/plugins/cloudflare-core/skills/cloudflare/references/observability/api.md
similarity index 100%
rename from skills/cloudflare/references/observability/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/observability/api.md
diff --git a/skills/cloudflare/references/observability/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/observability/configuration.md
similarity index 100%
rename from skills/cloudflare/references/observability/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/observability/configuration.md
diff --git a/skills/cloudflare/references/observability/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/observability/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/observability/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/observability/gotchas.md
diff --git a/skills/cloudflare/references/observability/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/observability/patterns.md
similarity index 100%
rename from skills/cloudflare/references/observability/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/observability/patterns.md
diff --git a/skills/cloudflare/references/pages-functions/README.md b/plugins/cloudflare-core/skills/cloudflare/references/pages-functions/README.md
similarity index 100%
rename from skills/cloudflare/references/pages-functions/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages-functions/README.md
diff --git a/skills/cloudflare/references/pages-functions/api.md b/plugins/cloudflare-core/skills/cloudflare/references/pages-functions/api.md
similarity index 100%
rename from skills/cloudflare/references/pages-functions/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages-functions/api.md
diff --git a/skills/cloudflare/references/pages-functions/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/pages-functions/configuration.md
similarity index 100%
rename from skills/cloudflare/references/pages-functions/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages-functions/configuration.md
diff --git a/skills/cloudflare/references/pages-functions/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/pages-functions/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/pages-functions/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages-functions/gotchas.md
diff --git a/skills/cloudflare/references/pages-functions/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/pages-functions/patterns.md
similarity index 100%
rename from skills/cloudflare/references/pages-functions/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages-functions/patterns.md
diff --git a/skills/cloudflare/references/pages/README.md b/plugins/cloudflare-core/skills/cloudflare/references/pages/README.md
similarity index 100%
rename from skills/cloudflare/references/pages/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages/README.md
diff --git a/skills/cloudflare/references/pages/api.md b/plugins/cloudflare-core/skills/cloudflare/references/pages/api.md
similarity index 100%
rename from skills/cloudflare/references/pages/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages/api.md
diff --git a/skills/cloudflare/references/pages/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/pages/configuration.md
similarity index 100%
rename from skills/cloudflare/references/pages/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages/configuration.md
diff --git a/skills/cloudflare/references/pages/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/pages/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/pages/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages/gotchas.md
diff --git a/skills/cloudflare/references/pages/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/pages/patterns.md
similarity index 100%
rename from skills/cloudflare/references/pages/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pages/patterns.md
diff --git a/skills/cloudflare/references/pipelines/README.md b/plugins/cloudflare-core/skills/cloudflare/references/pipelines/README.md
similarity index 100%
rename from skills/cloudflare/references/pipelines/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pipelines/README.md
diff --git a/skills/cloudflare/references/pipelines/api.md b/plugins/cloudflare-core/skills/cloudflare/references/pipelines/api.md
similarity index 100%
rename from skills/cloudflare/references/pipelines/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pipelines/api.md
diff --git a/skills/cloudflare/references/pipelines/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/pipelines/configuration.md
similarity index 100%
rename from skills/cloudflare/references/pipelines/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pipelines/configuration.md
diff --git a/skills/cloudflare/references/pipelines/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/pipelines/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/pipelines/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pipelines/gotchas.md
diff --git a/skills/cloudflare/references/pipelines/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/pipelines/patterns.md
similarity index 100%
rename from skills/cloudflare/references/pipelines/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pipelines/patterns.md
diff --git a/skills/cloudflare/references/pulumi/README.md b/plugins/cloudflare-core/skills/cloudflare/references/pulumi/README.md
similarity index 100%
rename from skills/cloudflare/references/pulumi/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pulumi/README.md
diff --git a/skills/cloudflare/references/pulumi/api.md b/plugins/cloudflare-core/skills/cloudflare/references/pulumi/api.md
similarity index 100%
rename from skills/cloudflare/references/pulumi/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pulumi/api.md
diff --git a/skills/cloudflare/references/pulumi/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/pulumi/configuration.md
similarity index 100%
rename from skills/cloudflare/references/pulumi/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pulumi/configuration.md
diff --git a/skills/cloudflare/references/pulumi/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/pulumi/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/pulumi/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pulumi/gotchas.md
diff --git a/skills/cloudflare/references/pulumi/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/pulumi/patterns.md
similarity index 100%
rename from skills/cloudflare/references/pulumi/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/pulumi/patterns.md
diff --git a/skills/cloudflare/references/queues/README.md b/plugins/cloudflare-core/skills/cloudflare/references/queues/README.md
similarity index 100%
rename from skills/cloudflare/references/queues/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/queues/README.md
diff --git a/skills/cloudflare/references/queues/api.md b/plugins/cloudflare-core/skills/cloudflare/references/queues/api.md
similarity index 100%
rename from skills/cloudflare/references/queues/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/queues/api.md
diff --git a/skills/cloudflare/references/queues/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/queues/configuration.md
similarity index 100%
rename from skills/cloudflare/references/queues/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/queues/configuration.md
diff --git a/skills/cloudflare/references/queues/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/queues/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/queues/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/queues/gotchas.md
diff --git a/skills/cloudflare/references/queues/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/queues/patterns.md
similarity index 100%
rename from skills/cloudflare/references/queues/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/queues/patterns.md
diff --git a/skills/cloudflare/references/r2-data-catalog/README.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/README.md
similarity index 100%
rename from skills/cloudflare/references/r2-data-catalog/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/README.md
diff --git a/skills/cloudflare/references/r2-data-catalog/api.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/api.md
similarity index 100%
rename from skills/cloudflare/references/r2-data-catalog/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/api.md
diff --git a/skills/cloudflare/references/r2-data-catalog/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/configuration.md
similarity index 100%
rename from skills/cloudflare/references/r2-data-catalog/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/configuration.md
diff --git a/skills/cloudflare/references/r2-data-catalog/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/r2-data-catalog/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/gotchas.md
diff --git a/skills/cloudflare/references/r2-data-catalog/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/patterns.md
similarity index 100%
rename from skills/cloudflare/references/r2-data-catalog/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-data-catalog/patterns.md
diff --git a/skills/cloudflare/references/r2-sql/README.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-sql/README.md
similarity index 100%
rename from skills/cloudflare/references/r2-sql/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-sql/README.md
diff --git a/skills/cloudflare/references/r2-sql/SKILL.md.backup b/plugins/cloudflare-core/skills/cloudflare/references/r2-sql/SKILL.md.backup
similarity index 100%
rename from skills/cloudflare/references/r2-sql/SKILL.md.backup
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-sql/SKILL.md.backup
diff --git a/skills/cloudflare/references/r2-sql/api.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-sql/api.md
similarity index 100%
rename from skills/cloudflare/references/r2-sql/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-sql/api.md
diff --git a/skills/cloudflare/references/r2-sql/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-sql/configuration.md
similarity index 100%
rename from skills/cloudflare/references/r2-sql/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-sql/configuration.md
diff --git a/skills/cloudflare/references/r2-sql/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-sql/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/r2-sql/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-sql/gotchas.md
diff --git a/skills/cloudflare/references/r2-sql/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/r2-sql/patterns.md
similarity index 100%
rename from skills/cloudflare/references/r2-sql/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2-sql/patterns.md
diff --git a/skills/cloudflare/references/r2/README.md b/plugins/cloudflare-core/skills/cloudflare/references/r2/README.md
similarity index 100%
rename from skills/cloudflare/references/r2/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2/README.md
diff --git a/skills/cloudflare/references/r2/api.md b/plugins/cloudflare-core/skills/cloudflare/references/r2/api.md
similarity index 100%
rename from skills/cloudflare/references/r2/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2/api.md
diff --git a/skills/cloudflare/references/r2/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/r2/configuration.md
similarity index 100%
rename from skills/cloudflare/references/r2/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2/configuration.md
diff --git a/skills/cloudflare/references/r2/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/r2/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/r2/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2/gotchas.md
diff --git a/skills/cloudflare/references/r2/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/r2/patterns.md
similarity index 100%
rename from skills/cloudflare/references/r2/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/r2/patterns.md
diff --git a/skills/cloudflare/references/realtime-sfu/README.md b/plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/README.md
similarity index 100%
rename from skills/cloudflare/references/realtime-sfu/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/README.md
diff --git a/skills/cloudflare/references/realtime-sfu/api.md b/plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/api.md
similarity index 100%
rename from skills/cloudflare/references/realtime-sfu/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/api.md
diff --git a/skills/cloudflare/references/realtime-sfu/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/configuration.md
similarity index 100%
rename from skills/cloudflare/references/realtime-sfu/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/configuration.md
diff --git a/skills/cloudflare/references/realtime-sfu/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/realtime-sfu/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/gotchas.md
diff --git a/skills/cloudflare/references/realtime-sfu/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/patterns.md
similarity index 100%
rename from skills/cloudflare/references/realtime-sfu/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtime-sfu/patterns.md
diff --git a/skills/cloudflare/references/realtimekit/README.md b/plugins/cloudflare-core/skills/cloudflare/references/realtimekit/README.md
similarity index 100%
rename from skills/cloudflare/references/realtimekit/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtimekit/README.md
diff --git a/skills/cloudflare/references/realtimekit/api.md b/plugins/cloudflare-core/skills/cloudflare/references/realtimekit/api.md
similarity index 100%
rename from skills/cloudflare/references/realtimekit/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtimekit/api.md
diff --git a/skills/cloudflare/references/realtimekit/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/realtimekit/configuration.md
similarity index 100%
rename from skills/cloudflare/references/realtimekit/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtimekit/configuration.md
diff --git a/skills/cloudflare/references/realtimekit/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/realtimekit/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/realtimekit/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtimekit/gotchas.md
diff --git a/skills/cloudflare/references/realtimekit/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/realtimekit/patterns.md
similarity index 100%
rename from skills/cloudflare/references/realtimekit/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/realtimekit/patterns.md
diff --git a/skills/cloudflare/references/sandbox/README.md b/plugins/cloudflare-core/skills/cloudflare/references/sandbox/README.md
similarity index 100%
rename from skills/cloudflare/references/sandbox/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/sandbox/README.md
diff --git a/skills/cloudflare/references/sandbox/api.md b/plugins/cloudflare-core/skills/cloudflare/references/sandbox/api.md
similarity index 100%
rename from skills/cloudflare/references/sandbox/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/sandbox/api.md
diff --git a/skills/cloudflare/references/sandbox/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/sandbox/configuration.md
similarity index 100%
rename from skills/cloudflare/references/sandbox/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/sandbox/configuration.md
diff --git a/skills/cloudflare/references/sandbox/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/sandbox/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/sandbox/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/sandbox/gotchas.md
diff --git a/skills/cloudflare/references/sandbox/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/sandbox/patterns.md
similarity index 100%
rename from skills/cloudflare/references/sandbox/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/sandbox/patterns.md
diff --git a/skills/cloudflare/references/secrets-store/README.md b/plugins/cloudflare-core/skills/cloudflare/references/secrets-store/README.md
similarity index 100%
rename from skills/cloudflare/references/secrets-store/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/secrets-store/README.md
diff --git a/skills/cloudflare/references/secrets-store/api.md b/plugins/cloudflare-core/skills/cloudflare/references/secrets-store/api.md
similarity index 100%
rename from skills/cloudflare/references/secrets-store/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/secrets-store/api.md
diff --git a/skills/cloudflare/references/secrets-store/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/secrets-store/configuration.md
similarity index 100%
rename from skills/cloudflare/references/secrets-store/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/secrets-store/configuration.md
diff --git a/skills/cloudflare/references/secrets-store/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/secrets-store/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/secrets-store/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/secrets-store/gotchas.md
diff --git a/skills/cloudflare/references/secrets-store/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/secrets-store/patterns.md
similarity index 100%
rename from skills/cloudflare/references/secrets-store/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/secrets-store/patterns.md
diff --git a/skills/cloudflare/references/smart-placement/README.md b/plugins/cloudflare-core/skills/cloudflare/references/smart-placement/README.md
similarity index 100%
rename from skills/cloudflare/references/smart-placement/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/smart-placement/README.md
diff --git a/skills/cloudflare/references/smart-placement/api.md b/plugins/cloudflare-core/skills/cloudflare/references/smart-placement/api.md
similarity index 100%
rename from skills/cloudflare/references/smart-placement/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/smart-placement/api.md
diff --git a/skills/cloudflare/references/smart-placement/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/smart-placement/configuration.md
similarity index 100%
rename from skills/cloudflare/references/smart-placement/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/smart-placement/configuration.md
diff --git a/skills/cloudflare/references/smart-placement/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/smart-placement/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/smart-placement/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/smart-placement/gotchas.md
diff --git a/skills/cloudflare/references/smart-placement/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/smart-placement/patterns.md
similarity index 100%
rename from skills/cloudflare/references/smart-placement/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/smart-placement/patterns.md
diff --git a/skills/cloudflare/references/snippets/README.md b/plugins/cloudflare-core/skills/cloudflare/references/snippets/README.md
similarity index 100%
rename from skills/cloudflare/references/snippets/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/snippets/README.md
diff --git a/skills/cloudflare/references/snippets/api.md b/plugins/cloudflare-core/skills/cloudflare/references/snippets/api.md
similarity index 100%
rename from skills/cloudflare/references/snippets/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/snippets/api.md
diff --git a/skills/cloudflare/references/snippets/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/snippets/configuration.md
similarity index 100%
rename from skills/cloudflare/references/snippets/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/snippets/configuration.md
diff --git a/skills/cloudflare/references/snippets/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/snippets/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/snippets/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/snippets/gotchas.md
diff --git a/skills/cloudflare/references/snippets/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/snippets/patterns.md
similarity index 100%
rename from skills/cloudflare/references/snippets/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/snippets/patterns.md
diff --git a/skills/cloudflare/references/spectrum/README.md b/plugins/cloudflare-core/skills/cloudflare/references/spectrum/README.md
similarity index 100%
rename from skills/cloudflare/references/spectrum/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/spectrum/README.md
diff --git a/skills/cloudflare/references/spectrum/api.md b/plugins/cloudflare-core/skills/cloudflare/references/spectrum/api.md
similarity index 100%
rename from skills/cloudflare/references/spectrum/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/spectrum/api.md
diff --git a/skills/cloudflare/references/spectrum/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/spectrum/configuration.md
similarity index 100%
rename from skills/cloudflare/references/spectrum/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/spectrum/configuration.md
diff --git a/skills/cloudflare/references/spectrum/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/spectrum/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/spectrum/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/spectrum/gotchas.md
diff --git a/skills/cloudflare/references/spectrum/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/spectrum/patterns.md
similarity index 100%
rename from skills/cloudflare/references/spectrum/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/spectrum/patterns.md
diff --git a/skills/cloudflare/references/static-assets/README.md b/plugins/cloudflare-core/skills/cloudflare/references/static-assets/README.md
similarity index 100%
rename from skills/cloudflare/references/static-assets/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/static-assets/README.md
diff --git a/skills/cloudflare/references/static-assets/api.md b/plugins/cloudflare-core/skills/cloudflare/references/static-assets/api.md
similarity index 100%
rename from skills/cloudflare/references/static-assets/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/static-assets/api.md
diff --git a/skills/cloudflare/references/static-assets/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/static-assets/configuration.md
similarity index 100%
rename from skills/cloudflare/references/static-assets/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/static-assets/configuration.md
diff --git a/skills/cloudflare/references/static-assets/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/static-assets/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/static-assets/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/static-assets/gotchas.md
diff --git a/skills/cloudflare/references/static-assets/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/static-assets/patterns.md
similarity index 100%
rename from skills/cloudflare/references/static-assets/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/static-assets/patterns.md
diff --git a/skills/cloudflare/references/stream/README.md b/plugins/cloudflare-core/skills/cloudflare/references/stream/README.md
similarity index 100%
rename from skills/cloudflare/references/stream/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/stream/README.md
diff --git a/skills/cloudflare/references/stream/api-live.md b/plugins/cloudflare-core/skills/cloudflare/references/stream/api-live.md
similarity index 100%
rename from skills/cloudflare/references/stream/api-live.md
rename to plugins/cloudflare-core/skills/cloudflare/references/stream/api-live.md
diff --git a/skills/cloudflare/references/stream/api.md b/plugins/cloudflare-core/skills/cloudflare/references/stream/api.md
similarity index 100%
rename from skills/cloudflare/references/stream/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/stream/api.md
diff --git a/skills/cloudflare/references/stream/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/stream/configuration.md
similarity index 100%
rename from skills/cloudflare/references/stream/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/stream/configuration.md
diff --git a/skills/cloudflare/references/stream/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/stream/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/stream/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/stream/gotchas.md
diff --git a/skills/cloudflare/references/stream/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/stream/patterns.md
similarity index 100%
rename from skills/cloudflare/references/stream/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/stream/patterns.md
diff --git a/skills/cloudflare/references/tail-workers/README.md b/plugins/cloudflare-core/skills/cloudflare/references/tail-workers/README.md
similarity index 100%
rename from skills/cloudflare/references/tail-workers/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tail-workers/README.md
diff --git a/skills/cloudflare/references/tail-workers/api.md b/plugins/cloudflare-core/skills/cloudflare/references/tail-workers/api.md
similarity index 100%
rename from skills/cloudflare/references/tail-workers/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tail-workers/api.md
diff --git a/skills/cloudflare/references/tail-workers/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/tail-workers/configuration.md
similarity index 100%
rename from skills/cloudflare/references/tail-workers/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tail-workers/configuration.md
diff --git a/skills/cloudflare/references/tail-workers/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/tail-workers/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/tail-workers/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tail-workers/gotchas.md
diff --git a/skills/cloudflare/references/tail-workers/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/tail-workers/patterns.md
similarity index 100%
rename from skills/cloudflare/references/tail-workers/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tail-workers/patterns.md
diff --git a/skills/cloudflare/references/terraform/README.md b/plugins/cloudflare-core/skills/cloudflare/references/terraform/README.md
similarity index 100%
rename from skills/cloudflare/references/terraform/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/terraform/README.md
diff --git a/skills/cloudflare/references/terraform/api.md b/plugins/cloudflare-core/skills/cloudflare/references/terraform/api.md
similarity index 100%
rename from skills/cloudflare/references/terraform/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/terraform/api.md
diff --git a/skills/cloudflare/references/terraform/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/terraform/configuration.md
similarity index 100%
rename from skills/cloudflare/references/terraform/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/terraform/configuration.md
diff --git a/skills/cloudflare/references/terraform/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/terraform/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/terraform/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/terraform/gotchas.md
diff --git a/skills/cloudflare/references/terraform/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/terraform/patterns.md
similarity index 100%
rename from skills/cloudflare/references/terraform/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/terraform/patterns.md
diff --git a/skills/cloudflare/references/tunnel/README.md b/plugins/cloudflare-core/skills/cloudflare/references/tunnel/README.md
similarity index 100%
rename from skills/cloudflare/references/tunnel/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tunnel/README.md
diff --git a/skills/cloudflare/references/tunnel/api.md b/plugins/cloudflare-core/skills/cloudflare/references/tunnel/api.md
similarity index 100%
rename from skills/cloudflare/references/tunnel/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tunnel/api.md
diff --git a/skills/cloudflare/references/tunnel/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/tunnel/configuration.md
similarity index 100%
rename from skills/cloudflare/references/tunnel/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tunnel/configuration.md
diff --git a/skills/cloudflare/references/tunnel/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/tunnel/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/tunnel/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tunnel/gotchas.md
diff --git a/skills/cloudflare/references/tunnel/networking.md b/plugins/cloudflare-core/skills/cloudflare/references/tunnel/networking.md
similarity index 100%
rename from skills/cloudflare/references/tunnel/networking.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tunnel/networking.md
diff --git a/skills/cloudflare/references/tunnel/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/tunnel/patterns.md
similarity index 100%
rename from skills/cloudflare/references/tunnel/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/tunnel/patterns.md
diff --git a/skills/cloudflare/references/turn/README.md b/plugins/cloudflare-core/skills/cloudflare/references/turn/README.md
similarity index 100%
rename from skills/cloudflare/references/turn/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turn/README.md
diff --git a/skills/cloudflare/references/turn/api.md b/plugins/cloudflare-core/skills/cloudflare/references/turn/api.md
similarity index 100%
rename from skills/cloudflare/references/turn/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turn/api.md
diff --git a/skills/cloudflare/references/turn/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/turn/configuration.md
similarity index 100%
rename from skills/cloudflare/references/turn/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turn/configuration.md
diff --git a/skills/cloudflare/references/turn/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/turn/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/turn/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turn/gotchas.md
diff --git a/skills/cloudflare/references/turn/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/turn/patterns.md
similarity index 100%
rename from skills/cloudflare/references/turn/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turn/patterns.md
diff --git a/skills/cloudflare/references/turnstile/README.md b/plugins/cloudflare-core/skills/cloudflare/references/turnstile/README.md
similarity index 100%
rename from skills/cloudflare/references/turnstile/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turnstile/README.md
diff --git a/skills/cloudflare/references/turnstile/api.md b/plugins/cloudflare-core/skills/cloudflare/references/turnstile/api.md
similarity index 100%
rename from skills/cloudflare/references/turnstile/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turnstile/api.md
diff --git a/skills/cloudflare/references/turnstile/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/turnstile/configuration.md
similarity index 100%
rename from skills/cloudflare/references/turnstile/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turnstile/configuration.md
diff --git a/skills/cloudflare/references/turnstile/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/turnstile/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/turnstile/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turnstile/gotchas.md
diff --git a/skills/cloudflare/references/turnstile/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/turnstile/patterns.md
similarity index 100%
rename from skills/cloudflare/references/turnstile/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/turnstile/patterns.md
diff --git a/skills/cloudflare/references/vectorize/README.md b/plugins/cloudflare-core/skills/cloudflare/references/vectorize/README.md
similarity index 100%
rename from skills/cloudflare/references/vectorize/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/vectorize/README.md
diff --git a/skills/cloudflare/references/vectorize/api.md b/plugins/cloudflare-core/skills/cloudflare/references/vectorize/api.md
similarity index 100%
rename from skills/cloudflare/references/vectorize/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/vectorize/api.md
diff --git a/skills/cloudflare/references/vectorize/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/vectorize/configuration.md
similarity index 100%
rename from skills/cloudflare/references/vectorize/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/vectorize/configuration.md
diff --git a/skills/cloudflare/references/vectorize/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/vectorize/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/vectorize/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/vectorize/gotchas.md
diff --git a/skills/cloudflare/references/vectorize/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/vectorize/patterns.md
similarity index 100%
rename from skills/cloudflare/references/vectorize/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/vectorize/patterns.md
diff --git a/skills/cloudflare/references/waf/README.md b/plugins/cloudflare-core/skills/cloudflare/references/waf/README.md
similarity index 100%
rename from skills/cloudflare/references/waf/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/waf/README.md
diff --git a/skills/cloudflare/references/waf/api.md b/plugins/cloudflare-core/skills/cloudflare/references/waf/api.md
similarity index 100%
rename from skills/cloudflare/references/waf/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/waf/api.md
diff --git a/skills/cloudflare/references/waf/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/waf/configuration.md
similarity index 100%
rename from skills/cloudflare/references/waf/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/waf/configuration.md
diff --git a/skills/cloudflare/references/waf/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/waf/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/waf/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/waf/gotchas.md
diff --git a/skills/cloudflare/references/waf/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/waf/patterns.md
similarity index 100%
rename from skills/cloudflare/references/waf/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/waf/patterns.md
diff --git a/skills/cloudflare/references/web-analytics/README.md b/plugins/cloudflare-core/skills/cloudflare/references/web-analytics/README.md
similarity index 100%
rename from skills/cloudflare/references/web-analytics/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/web-analytics/README.md
diff --git a/skills/cloudflare/references/web-analytics/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/web-analytics/configuration.md
similarity index 100%
rename from skills/cloudflare/references/web-analytics/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/web-analytics/configuration.md
diff --git a/skills/cloudflare/references/web-analytics/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/web-analytics/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/web-analytics/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/web-analytics/gotchas.md
diff --git a/skills/cloudflare/references/web-analytics/integration.md b/plugins/cloudflare-core/skills/cloudflare/references/web-analytics/integration.md
similarity index 100%
rename from skills/cloudflare/references/web-analytics/integration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/web-analytics/integration.md
diff --git a/skills/cloudflare/references/web-analytics/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/web-analytics/patterns.md
similarity index 100%
rename from skills/cloudflare/references/web-analytics/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/web-analytics/patterns.md
diff --git a/skills/cloudflare/references/workerd/README.md b/plugins/cloudflare-core/skills/cloudflare/references/workerd/README.md
similarity index 100%
rename from skills/cloudflare/references/workerd/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workerd/README.md
diff --git a/skills/cloudflare/references/workerd/api.md b/plugins/cloudflare-core/skills/cloudflare/references/workerd/api.md
similarity index 100%
rename from skills/cloudflare/references/workerd/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workerd/api.md
diff --git a/skills/cloudflare/references/workerd/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/workerd/configuration.md
similarity index 100%
rename from skills/cloudflare/references/workerd/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workerd/configuration.md
diff --git a/skills/cloudflare/references/workerd/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/workerd/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/workerd/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workerd/gotchas.md
diff --git a/skills/cloudflare/references/workerd/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/workerd/patterns.md
similarity index 100%
rename from skills/cloudflare/references/workerd/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workerd/patterns.md
diff --git a/skills/cloudflare/references/workers-ai/README.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-ai/README.md
similarity index 100%
rename from skills/cloudflare/references/workers-ai/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-ai/README.md
diff --git a/skills/cloudflare/references/workers-ai/api.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-ai/api.md
similarity index 100%
rename from skills/cloudflare/references/workers-ai/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-ai/api.md
diff --git a/skills/cloudflare/references/workers-ai/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-ai/configuration.md
similarity index 100%
rename from skills/cloudflare/references/workers-ai/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-ai/configuration.md
diff --git a/skills/cloudflare/references/workers-ai/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-ai/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/workers-ai/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-ai/gotchas.md
diff --git a/skills/cloudflare/references/workers-ai/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-ai/patterns.md
similarity index 100%
rename from skills/cloudflare/references/workers-ai/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-ai/patterns.md
diff --git a/skills/cloudflare/references/workers-for-platforms/README.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/README.md
similarity index 100%
rename from skills/cloudflare/references/workers-for-platforms/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/README.md
diff --git a/skills/cloudflare/references/workers-for-platforms/api.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/api.md
similarity index 100%
rename from skills/cloudflare/references/workers-for-platforms/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/api.md
diff --git a/skills/cloudflare/references/workers-for-platforms/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/configuration.md
similarity index 100%
rename from skills/cloudflare/references/workers-for-platforms/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/configuration.md
diff --git a/skills/cloudflare/references/workers-for-platforms/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/workers-for-platforms/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/gotchas.md
diff --git a/skills/cloudflare/references/workers-for-platforms/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/patterns.md
similarity index 100%
rename from skills/cloudflare/references/workers-for-platforms/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-for-platforms/patterns.md
diff --git a/skills/cloudflare/references/workers-playground/README.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-playground/README.md
similarity index 100%
rename from skills/cloudflare/references/workers-playground/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-playground/README.md
diff --git a/skills/cloudflare/references/workers-playground/api.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-playground/api.md
similarity index 100%
rename from skills/cloudflare/references/workers-playground/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-playground/api.md
diff --git a/skills/cloudflare/references/workers-playground/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-playground/configuration.md
similarity index 100%
rename from skills/cloudflare/references/workers-playground/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-playground/configuration.md
diff --git a/skills/cloudflare/references/workers-playground/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-playground/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/workers-playground/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-playground/gotchas.md
diff --git a/skills/cloudflare/references/workers-playground/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-playground/patterns.md
similarity index 100%
rename from skills/cloudflare/references/workers-playground/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-playground/patterns.md
diff --git a/skills/cloudflare/references/workers-vpc/README.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/README.md
similarity index 100%
rename from skills/cloudflare/references/workers-vpc/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/README.md
diff --git a/skills/cloudflare/references/workers-vpc/api.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/api.md
similarity index 100%
rename from skills/cloudflare/references/workers-vpc/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/api.md
diff --git a/skills/cloudflare/references/workers-vpc/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/configuration.md
similarity index 100%
rename from skills/cloudflare/references/workers-vpc/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/configuration.md
diff --git a/skills/cloudflare/references/workers-vpc/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/workers-vpc/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/gotchas.md
diff --git a/skills/cloudflare/references/workers-vpc/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/patterns.md
similarity index 100%
rename from skills/cloudflare/references/workers-vpc/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers-vpc/patterns.md
diff --git a/skills/cloudflare/references/workers/README.md b/plugins/cloudflare-core/skills/cloudflare/references/workers/README.md
similarity index 100%
rename from skills/cloudflare/references/workers/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers/README.md
diff --git a/skills/cloudflare/references/workers/api.md b/plugins/cloudflare-core/skills/cloudflare/references/workers/api.md
similarity index 100%
rename from skills/cloudflare/references/workers/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers/api.md
diff --git a/skills/cloudflare/references/workers/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/workers/configuration.md
similarity index 100%
rename from skills/cloudflare/references/workers/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers/configuration.md
diff --git a/skills/cloudflare/references/workers/frameworks.md b/plugins/cloudflare-core/skills/cloudflare/references/workers/frameworks.md
similarity index 100%
rename from skills/cloudflare/references/workers/frameworks.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers/frameworks.md
diff --git a/skills/cloudflare/references/workers/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/workers/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/workers/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers/gotchas.md
diff --git a/skills/cloudflare/references/workers/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/workers/patterns.md
similarity index 100%
rename from skills/cloudflare/references/workers/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workers/patterns.md
diff --git a/skills/cloudflare/references/workflows/README.md b/plugins/cloudflare-core/skills/cloudflare/references/workflows/README.md
similarity index 100%
rename from skills/cloudflare/references/workflows/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workflows/README.md
diff --git a/skills/cloudflare/references/workflows/api.md b/plugins/cloudflare-core/skills/cloudflare/references/workflows/api.md
similarity index 100%
rename from skills/cloudflare/references/workflows/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workflows/api.md
diff --git a/skills/cloudflare/references/workflows/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/workflows/configuration.md
similarity index 100%
rename from skills/cloudflare/references/workflows/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workflows/configuration.md
diff --git a/skills/cloudflare/references/workflows/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/workflows/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/workflows/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workflows/gotchas.md
diff --git a/skills/cloudflare/references/workflows/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/workflows/patterns.md
similarity index 100%
rename from skills/cloudflare/references/workflows/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/workflows/patterns.md
diff --git a/skills/cloudflare/references/wrangler/README.md b/plugins/cloudflare-core/skills/cloudflare/references/wrangler/README.md
similarity index 100%
rename from skills/cloudflare/references/wrangler/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/wrangler/README.md
diff --git a/skills/cloudflare/references/wrangler/api.md b/plugins/cloudflare-core/skills/cloudflare/references/wrangler/api.md
similarity index 100%
rename from skills/cloudflare/references/wrangler/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/wrangler/api.md
diff --git a/skills/cloudflare/references/wrangler/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/wrangler/configuration.md
similarity index 100%
rename from skills/cloudflare/references/wrangler/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/wrangler/configuration.md
diff --git a/skills/cloudflare/references/wrangler/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/wrangler/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/wrangler/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/wrangler/gotchas.md
diff --git a/skills/cloudflare/references/wrangler/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/wrangler/patterns.md
similarity index 100%
rename from skills/cloudflare/references/wrangler/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/wrangler/patterns.md
diff --git a/skills/cloudflare/references/zaraz/IMPLEMENTATION_SUMMARY.md b/plugins/cloudflare-core/skills/cloudflare/references/zaraz/IMPLEMENTATION_SUMMARY.md
similarity index 100%
rename from skills/cloudflare/references/zaraz/IMPLEMENTATION_SUMMARY.md
rename to plugins/cloudflare-core/skills/cloudflare/references/zaraz/IMPLEMENTATION_SUMMARY.md
diff --git a/skills/cloudflare/references/zaraz/README.md b/plugins/cloudflare-core/skills/cloudflare/references/zaraz/README.md
similarity index 100%
rename from skills/cloudflare/references/zaraz/README.md
rename to plugins/cloudflare-core/skills/cloudflare/references/zaraz/README.md
diff --git a/skills/cloudflare/references/zaraz/api.md b/plugins/cloudflare-core/skills/cloudflare/references/zaraz/api.md
similarity index 100%
rename from skills/cloudflare/references/zaraz/api.md
rename to plugins/cloudflare-core/skills/cloudflare/references/zaraz/api.md
diff --git a/skills/cloudflare/references/zaraz/configuration.md b/plugins/cloudflare-core/skills/cloudflare/references/zaraz/configuration.md
similarity index 100%
rename from skills/cloudflare/references/zaraz/configuration.md
rename to plugins/cloudflare-core/skills/cloudflare/references/zaraz/configuration.md
diff --git a/skills/cloudflare/references/zaraz/gotchas.md b/plugins/cloudflare-core/skills/cloudflare/references/zaraz/gotchas.md
similarity index 100%
rename from skills/cloudflare/references/zaraz/gotchas.md
rename to plugins/cloudflare-core/skills/cloudflare/references/zaraz/gotchas.md
diff --git a/skills/cloudflare/references/zaraz/patterns.md b/plugins/cloudflare-core/skills/cloudflare/references/zaraz/patterns.md
similarity index 100%
rename from skills/cloudflare/references/zaraz/patterns.md
rename to plugins/cloudflare-core/skills/cloudflare/references/zaraz/patterns.md
diff --git a/plugins/cloudflare-durable-objects/.claude-plugin/plugin.json b/plugins/cloudflare-durable-objects/.claude-plugin/plugin.json
new file mode 100644
index 0000000..ffe7b23
--- /dev/null
+++ b/plugins/cloudflare-durable-objects/.claude-plugin/plugin.json
@@ -0,0 +1,7 @@
+{
+  "name": "cloudflare-durable-objects",
+  "description": "Cloudflare Durable Objects: stateful coordination with SQLite storage, alarms, and WebSockets.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" },
+  "dependencies": ["cloudflare-workers"]
+}
diff --git a/plugins/cloudflare-durable-objects/.cursor-plugin/plugin.json b/plugins/cloudflare-durable-objects/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..3e976e4
--- /dev/null
+++ b/plugins/cloudflare-durable-objects/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-durable-objects",
+  "version": "1.0.0",
+  "description": "Cloudflare Durable Objects: stateful coordination with SQLite storage, alarms, and WebSockets.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["cloudflare", "durable-objects", "stateful", "sqlite", "websockets"]
+}
diff --git a/skills/durable-objects/SKILL.md b/plugins/cloudflare-durable-objects/skills/durable-objects/SKILL.md
similarity index 100%
rename from skills/durable-objects/SKILL.md
rename to plugins/cloudflare-durable-objects/skills/durable-objects/SKILL.md
diff --git a/skills/durable-objects/references/rules.md b/plugins/cloudflare-durable-objects/skills/durable-objects/references/rules.md
similarity index 100%
rename from skills/durable-objects/references/rules.md
rename to plugins/cloudflare-durable-objects/skills/durable-objects/references/rules.md
diff --git a/skills/durable-objects/references/testing.md b/plugins/cloudflare-durable-objects/skills/durable-objects/references/testing.md
similarity index 100%
rename from skills/durable-objects/references/testing.md
rename to plugins/cloudflare-durable-objects/skills/durable-objects/references/testing.md
diff --git a/skills/durable-objects/references/workers.md b/plugins/cloudflare-durable-objects/skills/durable-objects/references/workers.md
similarity index 100%
rename from skills/durable-objects/references/workers.md
rename to plugins/cloudflare-durable-objects/skills/durable-objects/references/workers.md
diff --git a/plugins/cloudflare-email/.claude-plugin/plugin.json b/plugins/cloudflare-email/.claude-plugin/plugin.json
new file mode 100644
index 0000000..16d076d
--- /dev/null
+++ b/plugins/cloudflare-email/.claude-plugin/plugin.json
@@ -0,0 +1,7 @@
+{
+  "name": "cloudflare-email",
+  "description": "Cloudflare Email Service: send transactional emails and route incoming mail via the Workers binding or REST API.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" },
+  "dependencies": ["cloudflare-core"]
+}
diff --git a/plugins/cloudflare-email/.cursor-plugin/plugin.json b/plugins/cloudflare-email/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..8c516ee
--- /dev/null
+++ b/plugins/cloudflare-email/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-email",
+  "version": "1.0.0",
+  "description": "Cloudflare Email Service: send transactional emails and route incoming mail via the Workers binding or REST API.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["cloudflare", "email", "routing", "transactional"]
+}
diff --git a/skills/cloudflare-email-service/SKILL.md b/plugins/cloudflare-email/skills/cloudflare-email-service/SKILL.md
similarity index 100%
rename from skills/cloudflare-email-service/SKILL.md
rename to plugins/cloudflare-email/skills/cloudflare-email-service/SKILL.md
diff --git a/skills/cloudflare-email-service/references/cli-and-mcp.md b/plugins/cloudflare-email/skills/cloudflare-email-service/references/cli-and-mcp.md
similarity index 100%
rename from skills/cloudflare-email-service/references/cli-and-mcp.md
rename to plugins/cloudflare-email/skills/cloudflare-email-service/references/cli-and-mcp.md
diff --git a/skills/cloudflare-email-service/references/deliverability.md b/plugins/cloudflare-email/skills/cloudflare-email-service/references/deliverability.md
similarity index 100%
rename from skills/cloudflare-email-service/references/deliverability.md
rename to plugins/cloudflare-email/skills/cloudflare-email-service/references/deliverability.md
diff --git a/skills/cloudflare-email-service/references/rest-api.md b/plugins/cloudflare-email/skills/cloudflare-email-service/references/rest-api.md
similarity index 100%
rename from skills/cloudflare-email-service/references/rest-api.md
rename to plugins/cloudflare-email/skills/cloudflare-email-service/references/rest-api.md
diff --git a/skills/cloudflare-email-service/references/routing.md b/plugins/cloudflare-email/skills/cloudflare-email-service/references/routing.md
similarity index 100%
rename from skills/cloudflare-email-service/references/routing.md
rename to plugins/cloudflare-email/skills/cloudflare-email-service/references/routing.md
diff --git a/skills/cloudflare-email-service/references/sending.md b/plugins/cloudflare-email/skills/cloudflare-email-service/references/sending.md
similarity index 100%
rename from skills/cloudflare-email-service/references/sending.md
rename to plugins/cloudflare-email/skills/cloudflare-email-service/references/sending.md
diff --git a/plugins/cloudflare-observability/.claude-plugin/plugin.json b/plugins/cloudflare-observability/.claude-plugin/plugin.json
new file mode 100644
index 0000000..92b5e28
--- /dev/null
+++ b/plugins/cloudflare-observability/.claude-plugin/plugin.json
@@ -0,0 +1,7 @@
+{
+  "name": "cloudflare-observability",
+  "description": "Query and analyze Cloudflare Workers logs and metrics via the observability MCP server. Install only when you need to inspect Workers telemetry; otherwise the per-session token cost can be saved.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" },
+  "dependencies": ["cloudflare-workers"]
+}
diff --git a/plugins/cloudflare-observability/.cursor-plugin/plugin.json b/plugins/cloudflare-observability/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..8b677cb
--- /dev/null
+++ b/plugins/cloudflare-observability/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-observability",
+  "version": "1.0.0",
+  "description": "Query and analyze Cloudflare Workers logs and metrics via the observability MCP server.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["cloudflare", "observability", "workers", "logs", "metrics"]
+}
diff --git a/plugins/cloudflare-observability/.mcp.json b/plugins/cloudflare-observability/.mcp.json
new file mode 100644
index 0000000..1e1992b
--- /dev/null
+++ b/plugins/cloudflare-observability/.mcp.json
@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "cloudflare-observability": {
+      "type": "http",
+      "url": "https://observability.mcp.cloudflare.com/mcp"
+    }
+  }
+}
diff --git a/plugins/cloudflare-sandbox/.claude-plugin/plugin.json b/plugins/cloudflare-sandbox/.claude-plugin/plugin.json
new file mode 100644
index 0000000..3b34504
--- /dev/null
+++ b/plugins/cloudflare-sandbox/.claude-plugin/plugin.json
@@ -0,0 +1,7 @@
+{
+  "name": "cloudflare-sandbox",
+  "description": "Cloudflare Sandbox SDK: secure code-execution environments on Workers for AI code interpreters, CI/CD, and untrusted code.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" },
+  "dependencies": ["cloudflare-workers"]
+}
diff --git a/plugins/cloudflare-sandbox/.cursor-plugin/plugin.json b/plugins/cloudflare-sandbox/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..df4e146
--- /dev/null
+++ b/plugins/cloudflare-sandbox/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-sandbox",
+  "version": "1.0.0",
+  "description": "Cloudflare Sandbox SDK: secure code-execution environments on Workers for AI code interpreters, CI/CD, and untrusted code.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["cloudflare", "sandbox", "code-execution", "containers"]
+}
diff --git a/skills/sandbox-sdk/SKILL.md b/plugins/cloudflare-sandbox/skills/sandbox-sdk/SKILL.md
similarity index 100%
rename from skills/sandbox-sdk/SKILL.md
rename to plugins/cloudflare-sandbox/skills/sandbox-sdk/SKILL.md
diff --git a/skills/sandbox-sdk/references/api-quick-ref.md b/plugins/cloudflare-sandbox/skills/sandbox-sdk/references/api-quick-ref.md
similarity index 100%
rename from skills/sandbox-sdk/references/api-quick-ref.md
rename to plugins/cloudflare-sandbox/skills/sandbox-sdk/references/api-quick-ref.md
diff --git a/skills/sandbox-sdk/references/examples.md b/plugins/cloudflare-sandbox/skills/sandbox-sdk/references/examples.md
similarity index 100%
rename from skills/sandbox-sdk/references/examples.md
rename to plugins/cloudflare-sandbox/skills/sandbox-sdk/references/examples.md
diff --git a/plugins/cloudflare-web-perf/.claude-plugin/plugin.json b/plugins/cloudflare-web-perf/.claude-plugin/plugin.json
new file mode 100644
index 0000000..a21379c
--- /dev/null
+++ b/plugins/cloudflare-web-perf/.claude-plugin/plugin.json
@@ -0,0 +1,6 @@
+{
+  "name": "cloudflare-web-perf",
+  "description": "Web performance auditing using Chrome DevTools MCP. Measures Core Web Vitals, identifies render-blocking resources, and surfaces optimization opportunities. Independent of Cloudflare; ships in this marketplace for convenience.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" }
+}
diff --git a/plugins/cloudflare-web-perf/.cursor-plugin/plugin.json b/plugins/cloudflare-web-perf/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..02d68ab
--- /dev/null
+++ b/plugins/cloudflare-web-perf/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-web-perf",
+  "version": "1.0.0",
+  "description": "Web performance auditing using Chrome DevTools MCP. Measures Core Web Vitals, identifies render-blocking resources, and surfaces optimization opportunities.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["web-perf", "lighthouse", "core-web-vitals", "chrome-devtools"]
+}
diff --git a/skills/web-perf/SKILL.md b/plugins/cloudflare-web-perf/skills/web-perf/SKILL.md
similarity index 100%
rename from skills/web-perf/SKILL.md
rename to plugins/cloudflare-web-perf/skills/web-perf/SKILL.md
diff --git a/plugins/cloudflare-workers/.claude-plugin/plugin.json b/plugins/cloudflare-workers/.claude-plugin/plugin.json
new file mode 100644
index 0000000..f1a7e70
--- /dev/null
+++ b/plugins/cloudflare-workers/.claude-plugin/plugin.json
@@ -0,0 +1,7 @@
+{
+  "name": "cloudflare-workers",
+  "description": "Cloudflare Workers: Wrangler CLI, Workers best practices, bindings (D1/KV/R2/Hyperdrive), and Workers Builds CI/CD.",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" },
+  "dependencies": ["cloudflare-core"]
+}
diff --git a/plugins/cloudflare-workers/.cursor-plugin/plugin.json b/plugins/cloudflare-workers/.cursor-plugin/plugin.json
new file mode 100644
index 0000000..b47149e
--- /dev/null
+++ b/plugins/cloudflare-workers/.cursor-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-workers",
+  "version": "1.0.0",
+  "description": "Cloudflare Workers: Wrangler CLI, Workers best practices, bindings (D1/KV/R2/Hyperdrive), and Workers Builds CI/CD.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://workers.cloudflare.com"
+  },
+  "keywords": ["cloudflare", "workers", "wrangler", "bindings", "serverless"]
+}
diff --git a/plugins/cloudflare-workers/.mcp.json b/plugins/cloudflare-workers/.mcp.json
new file mode 100644
index 0000000..e5eb1d5
--- /dev/null
+++ b/plugins/cloudflare-workers/.mcp.json
@@ -0,0 +1,12 @@
+{
+  "mcpServers": {
+    "cloudflare-bindings": {
+      "type": "http",
+      "url": "https://bindings.mcp.cloudflare.com/mcp"
+    },
+    "cloudflare-builds": {
+      "type": "http",
+      "url": "https://builds.mcp.cloudflare.com/mcp"
+    }
+  }
+}
diff --git a/plugins/cloudflare-workers/rules/workers.mdc b/plugins/cloudflare-workers/rules/workers.mdc
new file mode 100644
index 0000000..a6af337
--- /dev/null
+++ b/plugins/cloudflare-workers/rules/workers.mdc
@@ -0,0 +1,60 @@
+---
+description: When building applications on Cloudflare Workers or with frameworks that deploy to Cloudflare Workers, strongly prefer retrieval and fetching documentation over training data.
+alwaysApply: false
+globs:
+  - "**/*.ts"
+  - "**/*.tsx"
+  - "**/*.js"
+  - "**/*.mts"
+  - "**/*.mjs"
+  - "wrangler.jsonc"
+  - "wrangler.json"
+  - "wrangler.toml"
+  - "worker-configuration.d.ts"
+  - "**/workers/**"
+  - "**/worker/**"
+---
+
+# Cloudflare Workers
+
+STOP. Your knowledge of Cloudflare Workers APIs and limits may be outdated. Always retrieve current documentation before any Workers, KV, R2, D1, Durable Objects, Queues, Vectorize, AI, or Agents SDK task.
+
+## Docs
+
+- https://developers.cloudflare.com/workers/
+- MCP: `https://docs.mcp.cloudflare.com/mcp`
+
+For all limits and quotas, retrieve from the product's `/platform/limits/` page.
+
+## Commands
+
+| Command | Purpose |
+|---------|---------|
+| `npx wrangler dev` | Local development |
+| `npx wrangler deploy` | Deploy to Cloudflare |
+| `npx wrangler types` | Generate TypeScript types |
+
+Run `wrangler types` after changing bindings in wrangler.jsonc.
+
+## Node.js Compatibility
+
+If you encounter `Dynamic require of "X" is not supported` or missing Node.js APIs:
+
+```jsonc
+{
+  "compatibility_flags": ["nodejs_compat"],
+  "compatibility_date": "YYYY-MM-DD" // Use today's date
+}
+```
+
+Docs: https://developers.cloudflare.com/workers/runtime-apis/nodejs/
+
+## Errors
+
+- **Error 1102** (CPU/Memory exceeded): Retrieve limits from `/workers/platform/limits/`
+- **All errors**: https://developers.cloudflare.com/workers/observability/errors/
+
+## Product Docs
+
+Retrieve API references and limits from:
+`/kv/` · `/r2/` · `/d1/` · `/durable-objects/` · `/queues/` · `/vectorize/` · `/workers-ai/` · `/agents/`
diff --git a/skills/workers-best-practices/SKILL.md b/plugins/cloudflare-workers/skills/workers-best-practices/SKILL.md
similarity index 100%
rename from skills/workers-best-practices/SKILL.md
rename to plugins/cloudflare-workers/skills/workers-best-practices/SKILL.md
diff --git a/skills/workers-best-practices/references/review.md b/plugins/cloudflare-workers/skills/workers-best-practices/references/review.md
similarity index 100%
rename from skills/workers-best-practices/references/review.md
rename to plugins/cloudflare-workers/skills/workers-best-practices/references/review.md
diff --git a/skills/workers-best-practices/references/rules.md b/plugins/cloudflare-workers/skills/workers-best-practices/references/rules.md
similarity index 100%
rename from skills/workers-best-practices/references/rules.md
rename to plugins/cloudflare-workers/skills/workers-best-practices/references/rules.md
diff --git a/skills/wrangler/SKILL.md b/plugins/cloudflare-workers/skills/wrangler/SKILL.md
similarity index 100%
rename from skills/wrangler/SKILL.md
rename to plugins/cloudflare-workers/skills/wrangler/SKILL.md
diff --git a/plugins/cloudflare/.claude-plugin/plugin.json b/plugins/cloudflare/.claude-plugin/plugin.json
new file mode 100644
index 0000000..0d89a9c
--- /dev/null
+++ b/plugins/cloudflare/.claude-plugin/plugin.json
@@ -0,0 +1,16 @@
+{
+  "name": "cloudflare",
+  "description": "Umbrella plugin that installs all Cloudflare product plugins via dependencies. Use this for the comprehensive Cloudflare developer-platform context. For narrower scope and reduced session token usage, install only the per-product plugins you need (e.g. cloudflare-workers, cloudflare-agents).",
+  "version": "1.0.0",
+  "author": { "name": "Cloudflare" },
+  "dependencies": [
+    "cloudflare-core",
+    "cloudflare-workers",
+    "cloudflare-observability",
+    "cloudflare-durable-objects",
+    "cloudflare-agents",
+    "cloudflare-sandbox",
+    "cloudflare-email",
+    "cloudflare-web-perf"
+  ]
+}
diff --git a/rules/workers.mdc b/rules/workers.mdc
deleted file mode 100644
index a6af337..0000000
--- a/rules/workers.mdc
+++ /dev/null
@@ -1,60 +0,0 @@
----
-description: When building applications on Cloudflare Workers or with frameworks that deploy to Cloudflare Workers, strongly prefer retrieval and fetching documentation over training data.
-alwaysApply: false
-globs:
-  - "**/*.ts"
-  - "**/*.tsx"
-  - "**/*.js"
-  - "**/*.mts"
-  - "**/*.mjs"
-  - "wrangler.jsonc"
-  - "wrangler.json"
-  - "wrangler.toml"
-  - "worker-configuration.d.ts"
-  - "**/workers/**"
-  - "**/worker/**"
----
-
-# Cloudflare Workers
-
-STOP. Your knowledge of Cloudflare Workers APIs and limits may be outdated. Always retrieve current documentation before any Workers, KV, R2, D1, Durable Objects, Queues, Vectorize, AI, or Agents SDK task.
-
-## Docs
-
-- https://developers.cloudflare.com/workers/
-- MCP: `https://docs.mcp.cloudflare.com/mcp`
-
-For all limits and quotas, retrieve from the product's `/platform/limits/` page.
-
-## Commands
-
-| Command | Purpose |
-|---------|---------|
-| `npx wrangler dev` | Local development |
-| `npx wrangler deploy` | Deploy to Cloudflare |
-| `npx wrangler types` | Generate TypeScript types |
-
-Run `wrangler types` after changing bindings in wrangler.jsonc.
-
-## Node.js Compatibility
-
-If you encounter `Dynamic require of "X" is not supported` or missing Node.js APIs:
-
-```jsonc
-{
-  "compatibility_flags": ["nodejs_compat"],
-  "compatibility_date": "YYYY-MM-DD" // Use today's date
-}
-```
-
-Docs: https://developers.cloudflare.com/workers/runtime-apis/nodejs/
-
-## Errors
-
-- **Error 1102** (CPU/Memory exceeded): Retrieve limits from `/workers/platform/limits/`
-- **All errors**: https://developers.cloudflare.com/workers/observability/errors/
-
-## Product Docs
-
-Retrieve API references and limits from:
-`/kv/` · `/r2/` · `/d1/` · `/durable-objects/` · `/queues/` · `/vectorize/` · `/workers-ai/` · `/agents/`
diff --git a/rules/workers.mdc b/rules/workers.mdc
new file mode 120000
index 0000000..90d94c9
--- /dev/null
+++ b/rules/workers.mdc
@@ -0,0 +1 @@
+../plugins/cloudflare-workers/rules/workers.mdc
\ No newline at end of file
diff --git a/skills/agents-sdk b/skills/agents-sdk
new file mode 120000
index 0000000..cac275b
--- /dev/null
+++ b/skills/agents-sdk
@@ -0,0 +1 @@
+../plugins/cloudflare-agents/skills/agents-sdk
\ No newline at end of file
diff --git a/skills/cloudflare b/skills/cloudflare
new file mode 120000
index 0000000..3e9dfa6
--- /dev/null
+++ b/skills/cloudflare
@@ -0,0 +1 @@
+../plugins/cloudflare-core/skills/cloudflare
\ No newline at end of file
diff --git a/skills/cloudflare-email-service b/skills/cloudflare-email-service
new file mode 120000
index 0000000..13b06f0
--- /dev/null
+++ b/skills/cloudflare-email-service
@@ -0,0 +1 @@
+../plugins/cloudflare-email/skills/cloudflare-email-service
\ No newline at end of file
diff --git a/skills/durable-objects b/skills/durable-objects
new file mode 120000
index 0000000..4aa415b
--- /dev/null
+++ b/skills/durable-objects
@@ -0,0 +1 @@
+../plugins/cloudflare-durable-objects/skills/durable-objects
\ No newline at end of file
diff --git a/skills/sandbox-sdk b/skills/sandbox-sdk
new file mode 120000
index 0000000..571b395
--- /dev/null
+++ b/skills/sandbox-sdk
@@ -0,0 +1 @@
+../plugins/cloudflare-sandbox/skills/sandbox-sdk
\ No newline at end of file
diff --git a/skills/web-perf b/skills/web-perf
new file mode 120000
index 0000000..b1cef11
--- /dev/null
+++ b/skills/web-perf
@@ -0,0 +1 @@
+../plugins/cloudflare-web-perf/skills/web-perf
\ No newline at end of file
diff --git a/skills/workers-best-practices b/skills/workers-best-practices
new file mode 120000
index 0000000..d028c3a
--- /dev/null
+++ b/skills/workers-best-practices
@@ -0,0 +1 @@
+../plugins/cloudflare-workers/skills/workers-best-practices
\ No newline at end of file
diff --git a/skills/wrangler b/skills/wrangler
new file mode 120000
index 0000000..833ad6e
--- /dev/null
+++ b/skills/wrangler
@@ -0,0 +1 @@
+../plugins/cloudflare-workers/skills/wrangler
\ No newline at end of file