diff --git a/agents/claude/anvillm-agent.md b/claude/agent/anvillm-agent.md
similarity index 100%
rename from agents/claude/anvillm-agent.md
rename to claude/agent/anvillm-agent.md
diff --git a/cfg/backends/claude.yaml b/claude/backend.yaml
similarity index 100%
rename from cfg/backends/claude.yaml
rename to claude/backend.yaml
diff --git a/scripts/install-claude-hooks.sh b/claude/install-hooks.sh
similarity index 100%
rename from scripts/install-claude-hooks.sh
rename to claude/install-hooks.sh
diff --git a/agents/kiro-cli/anvillm-agent.json b/kiro-cli/agent/anvillm-agent.json
similarity index 100%
rename from agents/kiro-cli/anvillm-agent.json
rename to kiro-cli/agent/anvillm-agent.json
diff --git a/cfg/backends/kiro-cli.yaml b/kiro-cli/backend.yaml
similarity index 100%
rename from cfg/backends/kiro-cli.yaml
rename to kiro-cli/backend.yaml
diff --git a/mkfile b/mkfile
index b1ebe62..b03b17b 100644
--- a/mkfile
+++ b/mkfile
@@ -19,11 +19,11 @@ build:V:
 	mkdir -p $HOME/.kiro/agents/kiro-cli
 	mkdir -p $HOME/.claude/agents
 	mkdir -p $HOME/.claude/hooks
-	cp agents/kiro-cli/* $HOME/.kiro/agents/kiro-cli/
-	cp agents/claude/* $HOME/.claude/agents/
+	cp kiro-cli/agent/* $HOME/.kiro/agents/kiro-cli/
+	cp claude/agent/* $HOME/.claude/agents/
 	cp claude/hooks/* $HOME/.claude/hooks/
 	chmod +x $HOME/.claude/hooks/*.sh
-	bash scripts/install-claude-hooks.sh
+	bash claude/install-hooks.sh
 
 install:V: build