diff --git a/proposals/bootstrap-cicd.md b/COMMON/proposals/bootstrap-cicd.md
similarity index 100%
rename from proposals/bootstrap-cicd.md
rename to COMMON/proposals/bootstrap-cicd.md
diff --git a/questions/bootstrap-cicd.md b/COMMON/questions/bootstrap-cicd.md
similarity index 100%
rename from questions/bootstrap-cicd.md
rename to COMMON/questions/bootstrap-cicd.md
diff --git a/COO/AGENTS.md b/COO/AGENTS.md
index 2686a53..00c76cf 100644
--- a/COO/AGENTS.md
+++ b/COO/AGENTS.md
@@ -1,6 +1,6 @@
 COO Agent Pack
 
-Use the generated pack for agents: [dist/prompts/coo.md](../../dist/prompts/coo.md).
+Use the generated pack for agents: [dist/prompts/coo.md](dist/prompts/coo.md).
 
 Includes (via COMMON base):
 - System persona, style, safety
diff --git a/CTO/AGENTS.md b/CTO/AGENTS.md
index 33b9ad1..f4899ec 100644
--- a/CTO/AGENTS.md
+++ b/CTO/AGENTS.md
@@ -1,6 +1,6 @@
 CTO Agent Pack
 
-Use the generated pack for agents: [dist/prompts/cto.md](../../dist/prompts/cto.md).
+Use the generated pack for agents: [dist/prompts/cto.md](dist/prompts/cto.md).
 
 Includes (via COMMON base):
 - System persona, style, safety
diff --git a/README.md b/README.md
index ff9297c..7f91df7 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ Layout
 - COMMON/ CTO/ COO/ CCO/ — questions, proposals, and prompt modules only
 - scripts/ — Makefile and helper scripts
 - docker/ — CI compose and Dockerfile
-- dist/prompts/ — generated prompt packs (cto.md, coo.md)
-- proposals/, questions/ — repository planning artifacts
+- CTO/dist/prompts/ and COO/dist/prompts/ — generated prompt packs
+- COMMON/proposals/, COMMON/questions/ — planning artifacts
 
 Quickstart
 - Install hooks: `make -f scripts/Makefile hooks-setup`
diff --git a/dist/prompts/coo.md b/dist/prompts/coo.md
deleted file mode 100644
index e69de29..0000000
diff --git a/dist/prompts/cto.md b/dist/prompts/cto.md
deleted file mode 100644
index e69de29..0000000
diff --git a/DISCUSS.md b/docs/DISCUSS.md
similarity index 100%
rename from DISCUSS.md
rename to docs/DISCUSS.md
diff --git a/docs/TODO.md b/docs/TODO.md
index 14f8b66..9a70f50 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -12,7 +12,7 @@ TODO
 
 - CI/CD bootstrap
   - [x] Create branch bootstrap-cicd from main
-  - [x] Add questions at [questions/bootstrap-cicd.md](../questions/bootstrap-cicd.md)
+  - [x] Add questions at [COMMON/questions/bootstrap-cicd.md](../COMMON/questions/bootstrap-cicd.md)
   - [x] Draft proposal based on answers
   - [x] Implement parity tooling: scripts/ci, docker/ci.Dockerfile, docker/ci.compose.yml
   - [x] Add .gitea/workflows: ci.yml, release.yml, nightly.yml
diff --git a/scripts/prompts b/scripts/prompts
index b215478..d1fcd25 100755
--- a/scripts/prompts
+++ b/scripts/prompts
@@ -28,11 +28,11 @@ ci_run() {
 build_manifest() {
   local manifest=$1 out=$2 root
   root="$(repo_root)"
-  mkdir -p "$root/dist/prompts"
   # Write on host to avoid ownership issues; container prints to stdout.
   TMP_OUT=$(mktemp)
   trap '[[ -n "${TMP_OUT:-}" ]] && rm -f "$TMP_OUT"' EXIT
   ci_run "python3 scripts/prompt_build.py '$manifest' -" >"$TMP_OUT"
+  mkdir -p "$(dirname "$out")"
   mv "$TMP_OUT" "$out"
 }
 
@@ -44,12 +44,12 @@ case "$cmd" in
   pack)
     shift; area=${1:-}; root="$(repo_root)"
     case "$area" in
-      cto) build_manifest "$root/COMMON/prompt/manifests/cto.yaml" "$root/dist/prompts/cto.md" ;;
-      coo) build_manifest "$root/COMMON/prompt/manifests/coo.yaml" "$root/dist/prompts/coo.md" ;;
+      cto) build_manifest "$root/COMMON/prompt/manifests/cto.yaml" "$root/CTO/dist/prompts/cto.md" ;;
+      coo) build_manifest "$root/COMMON/prompt/manifests/coo.yaml" "$root/COO/dist/prompts/coo.md" ;;
       *) echo "Unknown area: $area" >&2; exit 2 ;;
     esac ;;
   all)
-    root="$(repo_root)"; mkdir -p "$root/dist/prompts"
+    root="$(repo_root)"
     "$0" pack cto
     "$0" pack coo ;;
   lint)