diff --git a/.gemini/skills/review-pr/SKILL.md b/.gemini/skills/review-pr/SKILL.md
index a6d82bffa2..69fedc787a 100644
--- a/.gemini/skills/review-pr/SKILL.md
+++ b/.gemini/skills/review-pr/SKILL.md
@@ -1,7 +1,7 @@
 # Review PR Skill
 
 This skill enables the agent to conduct a high-fidelity, behavioral code review
-for a Pull Request. It is designed to be run in a dedicated, offloaded remote
+for a Pull Request. It is designed to be run in a dedicated, workspace remote
 session where parallel infrastructure validation (build, CI check) is already 
 underway.
 
@@ -21,7 +21,7 @@ The agent must follow these steps to conduct the review:
 - Run `/review-frontend <PR_NUMBER>` to get an initial static analysis report.
 
 ### 2. Infrastructure Validation
-- Trust the parallel worker results in `.gemini/logs/offload-<PR_NUMBER>/`.
+- Trust the parallel worker results in `.gemini/logs/workspace-<PR_NUMBER>/`.
 - Read `build.log` to ensure the environment is stable for testing.
 - Read `ci-status.exit`. 
 - **If CI is failing**: Use the extractor to identify failing tests:
diff --git a/MAINTAINER_ONBOARDING.md b/MAINTAINER_ONBOARDING.md
index e78f111c91..16fae83a8a 100644
--- a/MAINTAINER_ONBOARDING.md
+++ b/MAINTAINER_ONBOARDING.md
@@ -1,6 +1,6 @@
 # Gemini Workspaces: Maintainer Onboarding
 
-Gemini Workspaces allow you to offload heavy tasks (PR reviews, agentic fixes,
+Gemini Workspaces allow you to delegate heavy tasks (PR reviews, agentic fixes,
 full builds) to a high-performance GCP worker. It uses a **Unified Data Disk**
 architecture to ensure your work persists even if the VM is deleted or
 recreated.
diff --git a/gemini-extension.json b/gemini-extension.json
index 3e0d5073a0..4a122b5722 100644
--- a/gemini-extension.json
+++ b/gemini-extension.json
@@ -5,7 +5,7 @@
   "author": "Google Gemini Team",
   "license": "Apache-2.0",
   "skills": [
-    "extensions/workspaces/skills/SKILL.md"
+    "skills/workspaces/SKILL.md"
   ],
   "contextFileName": "extensions/workspaces/docs/GEMINI.md"
 }
diff --git a/extensions/workspaces/policies/workspace-policy.toml b/policies/workspaces/workspace-policy.toml
similarity index 100%
rename from extensions/workspaces/policies/workspace-policy.toml
rename to policies/workspaces/workspace-policy.toml
diff --git a/extensions/workspaces/skills/SKILL.md b/skills/workspaces/SKILL.md
similarity index 100%
rename from extensions/workspaces/skills/SKILL.md
rename to skills/workspaces/SKILL.md