diff --git a/cmd/picoclaw/workspace/AGENT.md b/cmd/picoclaw/internal/onboard/workspace/AGENT.md
similarity index 100%
rename from cmd/picoclaw/workspace/AGENT.md
rename to cmd/picoclaw/internal/onboard/workspace/AGENT.md
diff --git a/cmd/picoclaw/workspace/IDENTITY.md b/cmd/picoclaw/internal/onboard/workspace/IDENTITY.md
similarity index 100%
rename from cmd/picoclaw/workspace/IDENTITY.md
rename to cmd/picoclaw/internal/onboard/workspace/IDENTITY.md
diff --git a/cmd/picoclaw/workspace/SOUL.md b/cmd/picoclaw/internal/onboard/workspace/SOUL.md
similarity index 100%
rename from cmd/picoclaw/workspace/SOUL.md
rename to cmd/picoclaw/internal/onboard/workspace/SOUL.md
diff --git a/cmd/picoclaw/workspace/USER.md b/cmd/picoclaw/internal/onboard/workspace/USER.md
similarity index 100%
rename from cmd/picoclaw/workspace/USER.md
rename to cmd/picoclaw/internal/onboard/workspace/USER.md
diff --git a/cmd/picoclaw/workspace/memory/MEMORY.md b/cmd/picoclaw/internal/onboard/workspace/memory/MEMORY.md
similarity index 100%
rename from cmd/picoclaw/workspace/memory/MEMORY.md
rename to cmd/picoclaw/internal/onboard/workspace/memory/MEMORY.md
diff --git a/cmd/picoclaw/workspace/skills/github/SKILL.md b/cmd/picoclaw/internal/onboard/workspace/skills/github/SKILL.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/github/SKILL.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/github/SKILL.md
diff --git a/cmd/picoclaw/workspace/skills/hardware/SKILL.md b/cmd/picoclaw/internal/onboard/workspace/skills/hardware/SKILL.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/hardware/SKILL.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/hardware/SKILL.md
diff --git a/cmd/picoclaw/workspace/skills/hardware/references/board-pinout.md b/cmd/picoclaw/internal/onboard/workspace/skills/hardware/references/board-pinout.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/hardware/references/board-pinout.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/hardware/references/board-pinout.md
diff --git a/cmd/picoclaw/workspace/skills/hardware/references/common-devices.md b/cmd/picoclaw/internal/onboard/workspace/skills/hardware/references/common-devices.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/hardware/references/common-devices.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/hardware/references/common-devices.md
diff --git a/cmd/picoclaw/workspace/skills/skill-creator/SKILL.md b/cmd/picoclaw/internal/onboard/workspace/skills/skill-creator/SKILL.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/skill-creator/SKILL.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/skill-creator/SKILL.md
diff --git a/cmd/picoclaw/workspace/skills/summarize/SKILL.md b/cmd/picoclaw/internal/onboard/workspace/skills/summarize/SKILL.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/summarize/SKILL.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/summarize/SKILL.md
diff --git a/cmd/picoclaw/workspace/skills/tmux/SKILL.md b/cmd/picoclaw/internal/onboard/workspace/skills/tmux/SKILL.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/tmux/SKILL.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/tmux/SKILL.md
diff --git a/cmd/picoclaw/workspace/skills/tmux/scripts/find-sessions.sh b/cmd/picoclaw/internal/onboard/workspace/skills/tmux/scripts/find-sessions.sh
similarity index 100%
rename from cmd/picoclaw/workspace/skills/tmux/scripts/find-sessions.sh
rename to cmd/picoclaw/internal/onboard/workspace/skills/tmux/scripts/find-sessions.sh
diff --git a/cmd/picoclaw/workspace/skills/tmux/scripts/wait-for-text.sh b/cmd/picoclaw/internal/onboard/workspace/skills/tmux/scripts/wait-for-text.sh
similarity index 100%
rename from cmd/picoclaw/workspace/skills/tmux/scripts/wait-for-text.sh
rename to cmd/picoclaw/internal/onboard/workspace/skills/tmux/scripts/wait-for-text.sh
diff --git a/cmd/picoclaw/workspace/skills/weather/SKILL.md b/cmd/picoclaw/internal/onboard/workspace/skills/weather/SKILL.md
similarity index 100%
rename from cmd/picoclaw/workspace/skills/weather/SKILL.md
rename to cmd/picoclaw/internal/onboard/workspace/skills/weather/SKILL.md