diff --git a/templates/language/CROSSTEST_CHECKLIST.md b/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md
similarity index 94%
rename from templates/language/CROSSTEST_CHECKLIST.md
rename to agent-ops/skills/project/add-toki-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md
index 1a5b830..09995e7 100644
--- a/templates/language/CROSSTEST_CHECKLIST.md
+++ b/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md
@@ -1,6 +1,6 @@
 # Cross-language Test Checklist
 
-Use the runner layout from `skills/add-crosstest-language/SKILL.md`.
+Use the runner layout from `agent-ops/skills/project/add-toki-socket-crosstest-language/SKILL.md`.
 
 ## Runner Layout
 
diff --git a/templates/language/IMPLEMENTATION_CHECKLIST.md b/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/IMPLEMENTATION_CHECKLIST.md
similarity index 100%
rename from templates/language/IMPLEMENTATION_CHECKLIST.md
rename to agent-ops/skills/project/add-toki-socket-crosstest-language/templates/IMPLEMENTATION_CHECKLIST.md
diff --git a/templates/language/README.md b/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/README.md
similarity index 100%
rename from templates/language/README.md
rename to agent-ops/skills/project/add-toki-socket-crosstest-language/templates/README.md
diff --git a/tasks/ai_first_improvements/code_review_0.log b/agent-task/ai_first_improvements/code_review_0.log
similarity index 100%
rename from tasks/ai_first_improvements/code_review_0.log
rename to agent-task/ai_first_improvements/code_review_0.log
diff --git a/tasks/ai_first_improvements/plan_0.log b/agent-task/ai_first_improvements/plan_0.log
similarity index 100%
rename from tasks/ai_first_improvements/plan_0.log
rename to agent-task/ai_first_improvements/plan_0.log
diff --git a/tasks/dart_close_fix/code_review_0.md b/agent-task/dart_close_fix/code_review_0.md
similarity index 100%
rename from tasks/dart_close_fix/code_review_0.md
rename to agent-task/dart_close_fix/code_review_0.md
diff --git a/tasks/dart_close_fix/plan_0.md b/agent-task/dart_close_fix/plan_0.md
similarity index 100%
rename from tasks/dart_close_fix/plan_0.md
rename to agent-task/dart_close_fix/plan_0.md
diff --git a/tasks/kotlin_impl/code_review_0.log b/agent-task/kotlin_impl/code_review_0.log
similarity index 100%
rename from tasks/kotlin_impl/code_review_0.log
rename to agent-task/kotlin_impl/code_review_0.log
diff --git a/tasks/kotlin_impl/code_review_1.log b/agent-task/kotlin_impl/code_review_1.log
similarity index 100%
rename from tasks/kotlin_impl/code_review_1.log
rename to agent-task/kotlin_impl/code_review_1.log
diff --git a/tasks/kotlin_impl/complete.log b/agent-task/kotlin_impl/complete.log
similarity index 100%
rename from tasks/kotlin_impl/complete.log
rename to agent-task/kotlin_impl/complete.log
diff --git a/tasks/kotlin_impl/plan_0.log b/agent-task/kotlin_impl/plan_0.log
similarity index 100%
rename from tasks/kotlin_impl/plan_0.log
rename to agent-task/kotlin_impl/plan_0.log
diff --git a/tasks/kotlin_impl/plan_1.log b/agent-task/kotlin_impl/plan_1.log
similarity index 100%
rename from tasks/kotlin_impl/plan_1.log
rename to agent-task/kotlin_impl/plan_1.log