diff --git a/claude/hooks/anvillm-agentspawn.sh b/hooks/claude/anvillm-agentspawn.sh
similarity index 100%
rename from claude/hooks/anvillm-agentspawn.sh
rename to hooks/claude/anvillm-agentspawn.sh
diff --git a/claude/hooks/anvillm-state-idle.sh b/hooks/claude/anvillm-state-idle.sh
similarity index 100%
rename from claude/hooks/anvillm-state-idle.sh
rename to hooks/claude/anvillm-state-idle.sh
diff --git a/claude/hooks/anvillm-state-running.sh b/hooks/claude/anvillm-state-running.sh
similarity index 100%
rename from claude/hooks/anvillm-state-running.sh
rename to hooks/claude/anvillm-state-running.sh
diff --git a/claude/install-hooks.sh b/hooks/claude/install-hooks.sh
similarity index 92%
rename from claude/install-hooks.sh
rename to hooks/claude/install-hooks.sh
index 41447f0..5a906f1 100644
--- a/claude/install-hooks.sh
+++ b/hooks/claude/install-hooks.sh
@@ -47,5 +47,5 @@ echo "Claude hooks installed to $SETTINGS_FILE"
 # Install agent configuration (includes Output Protocol + mailbox instructions)
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 mkdir -p "$HOME/.config/anvillm/claude/agents"
-cp "$SCRIPT_DIR/../agents/claude/anvillm-agent.md" "$HOME/.config/anvillm/claude/agents/anvillm-agent.md"
+cp "$SCRIPT_DIR/../../agents/claude/anvillm-agent.md" "$HOME/.config/anvillm/claude/agents/anvillm-agent.md"
 echo "Claude agent config installed to $HOME/.config/anvillm/claude/agents/anvillm-agent.md"
diff --git a/mkfile b/mkfile
index 393e448..492e7d4 100644
--- a/mkfile
+++ b/mkfile
@@ -24,9 +24,9 @@ build:V:
 	mkdir -p $HOME/.config/anvillm/claude/agents
 	mkdir -p $HOME/.config/anvillm/claude/hooks
 	cp agents/claude/* $HOME/.config/anvillm/claude/agents/
-	cp claude/hooks/* $HOME/.config/anvillm/claude/hooks/
+	cp hooks/claude/*.sh $HOME/.config/anvillm/claude/hooks/
 	chmod +x $HOME/.config/anvillm/claude/hooks/*.sh
-	bash claude/install-hooks.sh
+	bash hooks/claude/install-hooks.sh
 
 install:V: build