diff --git a/fs/session/create.go b/fs/session/create.go
index c7d8360..f696c94 100644
--- a/fs/session/create.go
+++ b/fs/session/create.go
@@ -10,7 +10,7 @@ import (
 	"ollie/backend"
 	coresession "ollie/session"
 	"ollie/toolsrv"
-	"ollie/tools"
+	"ollie/tools/builtin"
 	"ollie/paths"
 	"ollie/prompts"
 )
@@ -128,7 +128,7 @@ func Create(rs *rootState, args []string) (string, error) {
 		}
 		if rs.cfg.SkillsRegistry != nil {
 			execOpts = append(execOpts, toolsrv.WithSkillsRegistry(rs.cfg.SkillsRegistry))
-			execOpts = append(execOpts, toolsrv.WithBuiltins(tools.Builtins()))
+			execOpts = append(execOpts, toolsrv.WithBuiltins(builtin.Builtins()))
 		}
 		var newToolServer func() toolsrv.Runner
 		var remoteEnv []string
diff --git a/fs/session/persist.go b/fs/session/persist.go
index 2003b3b..a3397f8 100644
--- a/fs/session/persist.go
+++ b/fs/session/persist.go
@@ -13,7 +13,7 @@ import (
 	"ollie/backend"
 	coresession "ollie/session"
 	"ollie/toolsrv"
-	"ollie/tools"
+	"ollie/tools/builtin"
 	"ollie/prompts"
 )
 
@@ -268,7 +268,7 @@ func restoreSession(rs *rootState, ps *agent.PersistedAgent) error {
 		}
 		if rs.cfg.SkillsRegistry != nil {
 			execOpts = append(execOpts, toolsrv.WithSkillsRegistry(rs.cfg.SkillsRegistry))
-			execOpts = append(execOpts, toolsrv.WithBuiltins(tools.Builtins()))
+			execOpts = append(execOpts, toolsrv.WithBuiltins(builtin.Builtins()))
 		}
 		newToolServer = func() toolsrv.Runner {
 			srv, _ := toolsrv.Dial(rs.cfg.Ctx, toolsrv.LocalAddr(cwd), execOpts...)
diff --git a/justfile b/justfile
index 5d1a394..ab77fdd 100644
--- a/justfile
+++ b/justfile
@@ -26,7 +26,7 @@ build-kf5: core ninep acme kde-kf5
 
 core:
     @echo === Building ollie-core ===
-    go build ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./fs/session/... ./log/... ./mount/... ./paths/... ./prompts/... ./sandbox/... ./session/... ./skills/... ./tools/... ./toolsrv/... ./dbus/...
+    go build ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./fs/session/... ./log/... ./mount/... ./paths/... ./prompts/... ./sandbox/... ./session/... ./skills/... ./tools/builtin/... ./toolsrv/... ./dbus/...
 
 ninep:
     @echo === Building ollie-9p ===
@@ -222,7 +222,7 @@ test: test-core test-9p
 
 test-core:
     @echo === Testing ollie-core ===
-    go test ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./log/... ./paths/... ./sandbox/... ./session/... ./skills/... ./tools/... ./toolsrv/... ./dbus/... ./prompts/...
+    go test ./agent/... ./backend/... ./detach/... ./elevate/... ./env/... ./log/... ./paths/... ./sandbox/... ./session/... ./skills/... ./tools/builtin/... ./toolsrv/... ./dbus/... ./prompts/...
 
 test-9p:
     @echo === Testing ollie-9p ===
diff --git a/tools/builtins.go b/tools/builtin/builtins.go
similarity index 97%
rename from tools/builtins.go
rename to tools/builtin/builtins.go
index fc6d4e1..93c6d41 100644
--- a/tools/builtins.go
+++ b/tools/builtin/builtins.go
@@ -1,6 +1,6 @@
 // Package tools provides the built-in tool handlers for the toolsrv server.
 // Each file in this package is one tool. Builtins() is the single registry.
-package tools
+package builtin
 
 import "ollie/toolsrv"
 
diff --git a/tools/reasoning.go b/tools/builtin/reasoning.go
similarity index 97%
rename from tools/reasoning.go
rename to tools/builtin/reasoning.go
index fa35ebd..d5c3933 100644
--- a/tools/reasoning.go
+++ b/tools/builtin/reasoning.go
@@ -1,4 +1,4 @@
-package tools
+package builtin
 
 import (
 	"context"
diff --git a/tools/shell.go b/tools/builtin/shell.go
similarity index 98%
rename from tools/shell.go
rename to tools/builtin/shell.go
index d1bab41..1e39044 100644
--- a/tools/shell.go
+++ b/tools/builtin/shell.go
@@ -1,4 +1,4 @@
-package tools
+package builtin
 
 import (
 	"context"
diff --git a/tools/skill.go b/tools/builtin/skill.go
similarity index 99%
rename from tools/skill.go
rename to tools/builtin/skill.go
index 395d0da..ced332f 100644
--- a/tools/skill.go
+++ b/tools/builtin/skill.go
@@ -1,4 +1,4 @@
-package tools
+package builtin
 
 import (
 	"context"
diff --git a/tools/tool.go b/tools/builtin/tool.go
similarity index 99%
rename from tools/tool.go
rename to tools/builtin/tool.go
index c18b0b1..ce3d80f 100644
--- a/tools/tool.go
+++ b/tools/builtin/tool.go
@@ -1,4 +1,4 @@
-package tools
+package builtin
 
 import (
 	"context"