diff --git a/.gitignore b/.gitignore
index dc89cfda..00a207ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,12 +71,11 @@ comparison-report/
 # Git worktrees (subagent-driven development workspaces)
 .worktrees/
 
-# Pi crew runtime artifacts
-.crew/state/
-.crew/artifacts/
-.crew/worktrees/
-.crew/imports/
-.crew/exports/
+# pi-crew runtime state
+.pi/teams/state/
+.pi/teams/artifacts/
+.pi/teams/worktrees/
+.pi/teams/imports/
 .pi/sessions/
 
 # Agent memory runtime artifacts
diff --git a/.crew/agents/critic.md b/.pi/teams/agents/critic.md
similarity index 100%
rename from .crew/agents/critic.md
rename to .pi/teams/agents/critic.md
diff --git a/.crew/agents/devops.md b/.pi/teams/agents/devops.md
similarity index 100%
rename from .crew/agents/devops.md
rename to .pi/teams/agents/devops.md
diff --git a/.crew/agents/docs-specialist.md b/.pi/teams/agents/docs-specialist.md
similarity index 100%
rename from .crew/agents/docs-specialist.md
rename to .pi/teams/agents/docs-specialist.md
diff --git a/.crew/agents/e2e-tester.md b/.pi/teams/agents/e2e-tester.md
similarity index 100%
rename from .crew/agents/e2e-tester.md
rename to .pi/teams/agents/e2e-tester.md
diff --git a/.crew/agents/gitops.md b/.pi/teams/agents/gitops.md
similarity index 100%
rename from .crew/agents/gitops.md
rename to .pi/teams/agents/gitops.md
diff --git a/.crew/agents/memory-curator.md b/.pi/teams/agents/memory-curator.md
similarity index 100%
rename from .crew/agents/memory-curator.md
rename to .pi/teams/agents/memory-curator.md
diff --git a/.crew/agents/prompt-evolution-analyst.md b/.pi/teams/agents/prompt-evolution-analyst.md
similarity index 92%
rename from .crew/agents/prompt-evolution-analyst.md
rename to .pi/teams/agents/prompt-evolution-analyst.md
index ebe1f17b..e9a938ec 100644
--- a/.crew/agents/prompt-evolution-analyst.md
+++ b/.pi/teams/agents/prompt-evolution-analyst.md
@@ -24,15 +24,15 @@ Inputs to inspect:
 - `docs/agent-memory/daily/`
 - `docs/agent-memory/prompt-evolution/`
 - `docs/agent-memory/prompt-change-log.md`
-- recent `.crew/artifacts/` if present
-- current `.crew/agents/`, `.crew/workflows/`, `.crew/teams/`
+- recent `.pi/teams/artifacts/` if present
+- current `.pi/teams/agents/`, `.pi/teams/workflows/`, `.pi/teams/`
 - current `.pi/prompts/`
 
 Allowed targets for proposed patches:
 
-- `.crew/agents/*.md`
-- `.crew/workflows/*.workflow.md`
-- `.crew/teams/*.team.md`
+- `.pi/teams/agents/*.md`
+- `.pi/teams/workflows/*.workflow.md`
+- `.pi/teams/teams/*.team.md`
 - `.pi/prompts/*.md`
 - `docs/agent-memory/**`
 - `AGENTS.md` only when the lesson is a project-wide rule
@@ -66,4 +66,3 @@ prompt_evolution_eval:
   validation_required: []
   rollback: ""
 ```
-
diff --git a/.crew/agents/spec-analyst.md b/.pi/teams/agents/spec-analyst.md
similarity index 100%
rename from .crew/agents/spec-analyst.md
rename to .pi/teams/agents/spec-analyst.md
diff --git a/.crew/agents/tdd-tester.md b/.pi/teams/agents/tdd-tester.md
similarity index 100%
rename from .crew/agents/tdd-tester.md
rename to .pi/teams/agents/tdd-tester.md
diff --git a/.crew/agents/tech-debt-auditor.md b/.pi/teams/agents/tech-debt-auditor.md
similarity index 100%
rename from .crew/agents/tech-debt-auditor.md
rename to .pi/teams/agents/tech-debt-auditor.md
diff --git a/.crew/agents/unit-tester.md b/.pi/teams/agents/unit-tester.md
similarity index 100%
rename from .crew/agents/unit-tester.md
rename to .pi/teams/agents/unit-tester.md
diff --git a/.crew/agents/version-parity-analyst.md b/.pi/teams/agents/version-parity-analyst.md
similarity index 100%
rename from .crew/agents/version-parity-analyst.md
rename to .pi/teams/agents/version-parity-analyst.md
diff --git a/.crew/config.json b/.pi/teams/config.json
similarity index 100%
rename from .crew/config.json
rename to .pi/teams/config.json
diff --git a/.crew/teams/flights-web.team.md b/.pi/teams/teams/flights-web.team.md
similarity index 100%
rename from .crew/teams/flights-web.team.md
rename to .pi/teams/teams/flights-web.team.md
diff --git a/.crew/workflows/angular-react-parity.workflow.md b/.pi/teams/workflows/angular-react-parity.workflow.md
similarity index 100%
rename from .crew/workflows/angular-react-parity.workflow.md
rename to .pi/teams/workflows/angular-react-parity.workflow.md
diff --git a/.crew/workflows/memory-evolution.workflow.md b/.pi/teams/workflows/memory-evolution.workflow.md
similarity index 94%
rename from .crew/workflows/memory-evolution.workflow.md
rename to .pi/teams/workflows/memory-evolution.workflow.md
index 5b1955ba..b4d23c1a 100644
--- a/.crew/workflows/memory-evolution.workflow.md
+++ b/.pi/teams/workflows/memory-evolution.workflow.md
@@ -25,7 +25,7 @@ dependsOn: compile-memory
 reads: compiled-memory.md
 output: prompt-evolution-proposal.md
 
-Create or update a proposal under `docs/agent-memory/prompt-evolution/`. If evidence is strong and scope is narrow, apply the smallest patch to `.crew/agents/`, `.crew/workflows/`, `.crew/teams/`, or `.pi/prompts/`.
+Create or update a proposal under `docs/agent-memory/prompt-evolution/`. If evidence is strong and scope is narrow, apply the smallest patch to `.pi/teams/agents/`, `.pi/teams/workflows/`, `.pi/teams/teams/`, or `.pi/prompts/`.
 
 ## critique
 role: critic
@@ -48,4 +48,3 @@ dependsOn: validate
 verify: true
 
 If files changed and validation is sufficient, commit them on a feature branch and push.
-
diff --git a/.crew/workflows/review-only.workflow.md b/.pi/teams/workflows/review-only.workflow.md
similarity index 100%
rename from .crew/workflows/review-only.workflow.md
rename to .pi/teams/workflows/review-only.workflow.md
diff --git a/.crew/workflows/spec-driven-implementation.workflow.md b/.pi/teams/workflows/spec-driven-implementation.workflow.md
similarity index 100%
rename from .crew/workflows/spec-driven-implementation.workflow.md
rename to .pi/teams/workflows/spec-driven-implementation.workflow.md
diff --git a/.crew/workflows/tech-debt-audit.workflow.md b/.pi/teams/workflows/tech-debt-audit.workflow.md
similarity index 100%
rename from .crew/workflows/tech-debt-audit.workflow.md
rename to .pi/teams/workflows/tech-debt-audit.workflow.md
diff --git a/docs/agent-memory/README.md b/docs/agent-memory/README.md
index 66e79309..7f803075 100644
--- a/docs/agent-memory/README.md
+++ b/docs/agent-memory/README.md
@@ -6,7 +6,7 @@ The design follows a three-layer pattern:
 
 - Raw observations: local, append-only session notes and error/fix snippets. Keep private runtime files under `.agent-memory/raw/`.
 - Compiled memory: reviewed, structured Markdown under `docs/agent-memory/`.
-- Schema and workflows: `.crew/agents/`, `.crew/workflows/`, `.pi/prompts/`, and this README define how memory is captured, queried, and used to improve prompts.
+- Schema and workflows: `.pi/teams/agents/`, `.pi/teams/workflows/`, `.pi/teams/teams/`, `.pi/prompts/`, and this README define how memory is captured, queried, and used to improve prompts.
 
 Do not store secrets, API keys, customer data, credentials, or full private transcripts. Prefer short, sanitized lessons with enough evidence to reproduce the issue.