diff --git a/registry/personas.yaml b/crates/google-workspace-cli/registry/personas.yaml
similarity index 100%
rename from registry/personas.yaml
rename to crates/google-workspace-cli/registry/personas.yaml
diff --git a/registry/recipes.yaml b/crates/google-workspace-cli/registry/recipes.yaml
similarity index 100%
rename from registry/recipes.yaml
rename to crates/google-workspace-cli/registry/recipes.yaml
diff --git a/crates/google-workspace-cli/src/generate_skills.rs b/crates/google-workspace-cli/src/generate_skills.rs
index 9826aac8..e9d18941 100644
--- a/crates/google-workspace-cli/src/generate_skills.rs
+++ b/crates/google-workspace-cli/src/generate_skills.rs
@@ -24,8 +24,8 @@ use crate::services;
 use clap::Command;
 use std::path::Path;
 
-const PERSONAS_YAML: &str = include_str!("../../../registry/personas.yaml");
-const RECIPES_YAML: &str = include_str!("../../../registry/recipes.yaml");
+const PERSONAS_YAML: &str = include_str!("../registry/personas.yaml");
+const RECIPES_YAML: &str = include_str!("../registry/recipes.yaml");
 
 /// Methods blocked from skill generation.
 /// Format: (service_alias, resource, method).
diff --git a/crates/google-workspace-cli/src/helpers/modelarmor.rs b/crates/google-workspace-cli/src/helpers/modelarmor.rs
index 46684135..e1551dd1 100644
--- a/crates/google-workspace-cli/src/helpers/modelarmor.rs
+++ b/crates/google-workspace-cli/src/helpers/modelarmor.rs
@@ -430,7 +430,7 @@ fn load_preset_template(name: &str) -> Result<String, GwsError> {
 
     // Fallback: embedded preset
     eprintln!("Template file not found, using embedded '{}' preset", name);
-    Ok(include_str!("../../../../templates/modelarmor/jailbreak.json").to_string())
+    Ok(include_str!("../../templates/modelarmor/jailbreak.json").to_string())
 }
 
 #[cfg(test)]
diff --git a/templates/modelarmor/jailbreak.json b/crates/google-workspace-cli/templates/modelarmor/jailbreak.json
similarity index 100%
rename from templates/modelarmor/jailbreak.json
rename to crates/google-workspace-cli/templates/modelarmor/jailbreak.json
diff --git a/skills/gws-chat/SKILL.md b/skills/gws-chat/SKILL.md
index 979e96c6..601a08d3 100644
--- a/skills/gws-chat/SKILL.md
+++ b/skills/gws-chat/SKILL.md
@@ -56,7 +56,6 @@ gws chat <resource> <method> [flags]
 
 ### users
 
-  - `sections` — Operations on the 'sections' resource
   - `spaces` — Operations on the 'spaces' resource
 
 ## Discovering Commands