diff --git a/packages/bare-os-booter/lib/bare-os-boot-graph-proc.js b/packages/bare-os-booter/lib/boot/bare-os-boot-graph-proc.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-boot-graph-proc.js
rename to packages/bare-os-booter/lib/boot/bare-os-boot-graph-proc.js
diff --git a/packages/bare-os-booter/lib/bare-os-boot-manifest-sig-bridge.cjs b/packages/bare-os-booter/lib/boot/bare-os-boot-manifest-sig-bridge.cjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-boot-manifest-sig-bridge.cjs
rename to packages/bare-os-booter/lib/boot/bare-os-boot-manifest-sig-bridge.cjs
diff --git a/packages/bare-os-booter/lib/bare-os-boot-manifest-sig.bare.js b/packages/bare-os-booter/lib/boot/bare-os-boot-manifest-sig.bare.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-boot-manifest-sig.bare.js
rename to packages/bare-os-booter/lib/boot/bare-os-boot-manifest-sig.bare.js
diff --git a/packages/bare-os-booter/lib/bare-os-boot-manifest-sig.node.js b/packages/bare-os-booter/lib/boot/bare-os-boot-manifest-sig.node.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-boot-manifest-sig.node.js
rename to packages/bare-os-booter/lib/boot/bare-os-boot-manifest-sig.node.js
diff --git a/packages/bare-os-booter/lib/bare-os-boot-phases.js b/packages/bare-os-booter/lib/boot/bare-os-boot-phases.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-boot-phases.js
rename to packages/bare-os-booter/lib/boot/bare-os-boot-phases.js
diff --git a/packages/bare-os-booter/lib/bare-os-kernel-loader.js b/packages/bare-os-booter/lib/boot/bare-os-kernel-loader.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-kernel-loader.js
rename to packages/bare-os-booter/lib/boot/bare-os-kernel-loader.js
diff --git a/packages/bare-os-booter/lib/bare-os-kernel-metrics.js b/packages/bare-os-booter/lib/boot/bare-os-kernel-metrics.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-kernel-metrics.js
rename to packages/bare-os-booter/lib/boot/bare-os-kernel-metrics.js
diff --git a/packages/bare-os-booter/lib/bare-os-kernel-program-proc.js b/packages/bare-os-booter/lib/boot/bare-os-kernel-program-proc.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-kernel-program-proc.js
rename to packages/bare-os-booter/lib/boot/bare-os-kernel-program-proc.js
diff --git a/packages/bare-os-booter/lib/bare-os-wasm-kernel.js b/packages/bare-os-booter/lib/boot/bare-os-wasm-kernel.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-wasm-kernel.js
rename to packages/bare-os-booter/lib/boot/bare-os-wasm-kernel.js
diff --git a/packages/bare-os-booter/lib/boot-prefetch.js b/packages/bare-os-booter/lib/boot/boot-prefetch.js
similarity index 100%
rename from packages/bare-os-booter/lib/boot-prefetch.js
rename to packages/bare-os-booter/lib/boot/boot-prefetch.js
diff --git a/packages/bare-os-booter/lib/boot-splash.js b/packages/bare-os-booter/lib/boot/boot-splash.js
similarity index 100%
rename from packages/bare-os-booter/lib/boot-splash.js
rename to packages/bare-os-booter/lib/boot/boot-splash.js
diff --git a/packages/bare-os-booter/lib/kernel-extension-resolver.js b/packages/bare-os-booter/lib/boot/kernel-extension-resolver.js
similarity index 100%
rename from packages/bare-os-booter/lib/kernel-extension-resolver.js
rename to packages/bare-os-booter/lib/boot/kernel-extension-resolver.js
diff --git a/packages/bare-os-booter/lib/kernel-runner.js b/packages/bare-os-booter/lib/boot/kernel-runner.js
similarity index 100%
rename from packages/bare-os-booter/lib/kernel-runner.js
rename to packages/bare-os-booter/lib/boot/kernel-runner.js
diff --git a/packages/bare-os-booter/lib/bare-os-theme-presets.js b/packages/bare-os-booter/lib/cli/bare-os-theme-presets.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-theme-presets.js
rename to packages/bare-os-booter/lib/cli/bare-os-theme-presets.js
diff --git a/packages/bare-os-booter/lib/cli-readline.js b/packages/bare-os-booter/lib/cli/cli-readline.js
similarity index 100%
rename from packages/bare-os-booter/lib/cli-readline.js
rename to packages/bare-os-booter/lib/cli/cli-readline.js
diff --git a/packages/bare-os-booter/lib/completion-engine.js b/packages/bare-os-booter/lib/cli/completion-engine.js
similarity index 100%
rename from packages/bare-os-booter/lib/completion-engine.js
rename to packages/bare-os-booter/lib/cli/completion-engine.js
diff --git a/packages/bare-os-booter/lib/debug-repl.js b/packages/bare-os-booter/lib/cli/debug-repl.js
similarity index 100%
rename from packages/bare-os-booter/lib/debug-repl.js
rename to packages/bare-os-booter/lib/cli/debug-repl.js
diff --git a/packages/bare-os-booter/lib/fish-readline.js b/packages/bare-os-booter/lib/cli/fish-readline.js
similarity index 100%
rename from packages/bare-os-booter/lib/fish-readline.js
rename to packages/bare-os-booter/lib/cli/fish-readline.js
diff --git a/packages/bare-os-booter/lib/repl-session.js b/packages/bare-os-booter/lib/cli/repl-session.js
similarity index 100%
rename from packages/bare-os-booter/lib/repl-session.js
rename to packages/bare-os-booter/lib/cli/repl-session.js
diff --git a/packages/bare-os-booter/lib/resolve-stdio.js b/packages/bare-os-booter/lib/cli/resolve-stdio.js
similarity index 100%
rename from packages/bare-os-booter/lib/resolve-stdio.js
rename to packages/bare-os-booter/lib/cli/resolve-stdio.js
diff --git a/packages/bare-os-booter/lib/terminal-escapes.js b/packages/bare-os-booter/lib/cli/terminal-escapes.js
similarity index 100%
rename from packages/bare-os-booter/lib/terminal-escapes.js
rename to packages/bare-os-booter/lib/cli/terminal-escapes.js
diff --git a/packages/bare-os-booter/lib/bare-module-manifest.data.mjs b/packages/bare-os-booter/lib/ctx/bare-module-manifest.data.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-module-manifest.data.mjs
rename to packages/bare-os-booter/lib/ctx/bare-module-manifest.data.mjs
diff --git a/packages/bare-os-booter/lib/bare-module-manifest.json b/packages/bare-os-booter/lib/ctx/bare-module-manifest.json
similarity index 100%
rename from packages/bare-os-booter/lib/bare-module-manifest.json
rename to packages/bare-os-booter/lib/ctx/bare-module-manifest.json
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-api.js b/packages/bare-os-booter/lib/ctx/bare-os-ctx-api.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-api.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-api.js
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-bare-host-modules.mjs b/packages/bare-os-booter/lib/ctx/bare-os-ctx-bare-host-modules.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-bare-host-modules.mjs
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-bare-host-modules.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-bare.js b/packages/bare-os-booter/lib/ctx/bare-os-ctx-bare.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-bare.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-bare.js
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-discord-packed.js b/packages/bare-os-booter/lib/ctx/bare-os-ctx-discord-packed.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-discord-packed.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-discord-packed.js
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-discord-registry.js b/packages/bare-os-booter/lib/ctx/bare-os-ctx-discord-registry.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-discord-registry.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-discord-registry.js
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-pear-host-pear-only.js b/packages/bare-os-booter/lib/ctx/bare-os-ctx-pear-host-pear-only.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-pear-host-pear-only.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-pear-host-pear-only.js
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-pear-host.js b/packages/bare-os-booter/lib/ctx/bare-os-ctx-pear-host.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-pear-host.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-pear-host.js
diff --git a/packages/bare-os-booter/lib/bare-os-ctx-pear-host.node.js b/packages/bare-os-booter/lib/ctx/bare-os-ctx-pear-host.node.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx-pear-host.node.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx-pear-host.node.js
diff --git a/packages/bare-os-booter/lib/bare-os-ctx.d.ts b/packages/bare-os-booter/lib/ctx/bare-os-ctx.d.ts
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ctx.d.ts
rename to packages/bare-os-booter/lib/ctx/bare-os-ctx.d.ts
diff --git a/packages/bare-os-booter/lib/bare-os-ensure-bare-fetch.js b/packages/bare-os-booter/lib/ctx/bare-os-ensure-bare-fetch.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ensure-bare-fetch.js
rename to packages/bare-os-booter/lib/ctx/bare-os-ensure-bare-fetch.js
diff --git a/packages/bare-os-booter/lib/bare-os-runtime-caps.js b/packages/bare-os-booter/lib/ctx/bare-os-runtime-caps.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-runtime-caps.js
rename to packages/bare-os-booter/lib/ctx/bare-os-runtime-caps.js
diff --git a/packages/bare-os-booter/lib/bare-os-standalone-pack-imports.mjs b/packages/bare-os-booter/lib/ctx/bare-os-standalone-pack-imports.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-standalone-pack-imports.mjs
rename to packages/bare-os-booter/lib/ctx/bare-os-standalone-pack-imports.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-disk-os-bridge.js b/packages/bare-os-booter/lib/host/bare-os-disk-os-bridge.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-disk-os-bridge.js
rename to packages/bare-os-booter/lib/host/bare-os-disk-os-bridge.js
diff --git a/packages/bare-os-booter/lib/bare-os-host-booter-log.js b/packages/bare-os-booter/lib/host/bare-os-host-booter-log.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-host-booter-log.js
rename to packages/bare-os-booter/lib/host/bare-os-host-booter-log.js
diff --git a/packages/bare-os-booter/lib/bare-os-host-env-keys.js b/packages/bare-os-booter/lib/host/bare-os-host-env-keys.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-host-env-keys.js
rename to packages/bare-os-booter/lib/host/bare-os-host-env-keys.js
diff --git a/packages/bare-os-booter/lib/bare-os-host-ota-boot.mjs b/packages/bare-os-booter/lib/host/bare-os-host-ota-boot.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-host-ota-boot.mjs
rename to packages/bare-os-booter/lib/host/bare-os-host-ota-boot.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-host-profile.js b/packages/bare-os-booter/lib/host/bare-os-host-profile.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-host-profile.js
rename to packages/bare-os-booter/lib/host/bare-os-host-profile.js
diff --git a/packages/bare-os-booter/lib/bare-os-host-signals-bridge.js b/packages/bare-os-booter/lib/host/bare-os-host-signals-bridge.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-host-signals-bridge.js
rename to packages/bare-os-booter/lib/host/bare-os-host-signals-bridge.js
diff --git a/packages/bare-os-booter/lib/bare-os-lifecycle-hooks.js b/packages/bare-os-booter/lib/host/bare-os-lifecycle-hooks.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-lifecycle-hooks.js
rename to packages/bare-os-booter/lib/host/bare-os-lifecycle-hooks.js
diff --git a/packages/bare-os-booter/lib/bare-os-lifecycle-manager.js b/packages/bare-os-booter/lib/host/bare-os-lifecycle-manager.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-lifecycle-manager.js
rename to packages/bare-os-booter/lib/host/bare-os-lifecycle-manager.js
diff --git a/packages/bare-os-booter/lib/bare-os-lifecycle-schema.js b/packages/bare-os-booter/lib/host/bare-os-lifecycle-schema.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-lifecycle-schema.js
rename to packages/bare-os-booter/lib/host/bare-os-lifecycle-schema.js
diff --git a/packages/bare-os-booter/lib/bare-os-loader-audit.js b/packages/bare-os-booter/lib/host/bare-os-loader-audit.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-loader-audit.js
rename to packages/bare-os-booter/lib/host/bare-os-loader-audit.js
diff --git a/packages/bare-os-booter/lib/booter-host-session.js b/packages/bare-os-booter/lib/host/booter-host-session.js
similarity index 100%
rename from packages/bare-os-booter/lib/booter-host-session.js
rename to packages/bare-os-booter/lib/host/booter-host-session.js
diff --git a/packages/bare-os-booter/lib/corestore-host-lifecycle.js b/packages/bare-os-booter/lib/host/corestore-host-lifecycle.js
similarity index 100%
rename from packages/bare-os-booter/lib/corestore-host-lifecycle.js
rename to packages/bare-os-booter/lib/host/corestore-host-lifecycle.js
diff --git a/packages/bare-os-booter/lib/corestore-opts.js b/packages/bare-os-booter/lib/host/corestore-opts.js
similarity index 100%
rename from packages/bare-os-booter/lib/corestore-opts.js
rename to packages/bare-os-booter/lib/host/corestore-opts.js
diff --git a/packages/bare-os-booter/lib/host-bridge-cli.js b/packages/bare-os-booter/lib/host/host-bridge-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/host-bridge-cli.js
rename to packages/bare-os-booter/lib/host/host-bridge-cli.js
diff --git a/packages/bare-os-booter/lib/host-delegate-registry.js b/packages/bare-os-booter/lib/host/host-delegate-registry.js
similarity index 100%
rename from packages/bare-os-booter/lib/host-delegate-registry.js
rename to packages/bare-os-booter/lib/host/host-delegate-registry.js
diff --git a/packages/bare-os-booter/lib/paths.js b/packages/bare-os-booter/lib/host/paths.js
similarity index 100%
rename from packages/bare-os-booter/lib/paths.js
rename to packages/bare-os-booter/lib/host/paths.js
diff --git a/packages/bare-os-booter/lib/bare-os-secret-handle-registry.js b/packages/bare-os-booter/lib/identity/bare-os-secret-handle-registry.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-secret-handle-registry.js
rename to packages/bare-os-booter/lib/identity/bare-os-secret-handle-registry.js
diff --git a/packages/bare-os-booter/lib/bare-os-vault-rotation-audit.js b/packages/bare-os-booter/lib/identity/bare-os-vault-rotation-audit.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-vault-rotation-audit.js
rename to packages/bare-os-booter/lib/identity/bare-os-vault-rotation-audit.js
diff --git a/packages/bare-os-booter/lib/bare-user-session-stack.js b/packages/bare-os-booter/lib/identity/bare-user-session-stack.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-user-session-stack.js
rename to packages/bare-os-booter/lib/identity/bare-user-session-stack.js
diff --git a/packages/bare-os-booter/lib/identity-account.js b/packages/bare-os-booter/lib/identity/identity-account.js
similarity index 100%
rename from packages/bare-os-booter/lib/identity-account.js
rename to packages/bare-os-booter/lib/identity/identity-account.js
diff --git a/packages/bare-os-booter/lib/identity-session.js b/packages/bare-os-booter/lib/identity/identity-session.js
similarity index 100%
rename from packages/bare-os-booter/lib/identity-session.js
rename to packages/bare-os-booter/lib/identity/identity-session.js
diff --git a/packages/bare-os-booter/lib/bare-cron.js b/packages/bare-os-booter/lib/initd/bare-cron.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-cron.js
rename to packages/bare-os-booter/lib/initd/bare-cron.js
diff --git a/packages/bare-os-booter/lib/bare-initd-journal.js b/packages/bare-os-booter/lib/initd/bare-initd-journal.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-initd-journal.js
rename to packages/bare-os-booter/lib/initd/bare-initd-journal.js
diff --git a/packages/bare-os-booter/lib/bare-initd-user.js b/packages/bare-os-booter/lib/initd/bare-initd-user.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-initd-user.js
rename to packages/bare-os-booter/lib/initd/bare-initd-user.js
diff --git a/packages/bare-os-booter/lib/bare-initd.js b/packages/bare-os-booter/lib/initd/bare-initd.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-initd.js
rename to packages/bare-os-booter/lib/initd/bare-initd.js
diff --git a/packages/bare-os-booter/lib/systemctl-cli.js b/packages/bare-os-booter/lib/initd/systemctl-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/systemctl-cli.js
rename to packages/bare-os-booter/lib/initd/systemctl-cli.js
diff --git a/packages/bare-os-booter/lib/bare-holesail-env.js b/packages/bare-os-booter/lib/p2p/bare-holesail-env.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-holesail-env.js
rename to packages/bare-os-booter/lib/p2p/bare-holesail-env.js
diff --git a/packages/bare-os-booter/lib/bare-holesail-loader.js b/packages/bare-os-booter/lib/p2p/bare-holesail-loader.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-holesail-loader.js
rename to packages/bare-os-booter/lib/p2p/bare-holesail-loader.js
diff --git a/packages/bare-os-booter/lib/bare-holesail-managed.js b/packages/bare-os-booter/lib/p2p/bare-holesail-managed.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-holesail-managed.js
rename to packages/bare-os-booter/lib/p2p/bare-holesail-managed.js
diff --git a/packages/bare-os-booter/lib/bare-holesail.js b/packages/bare-os-booter/lib/p2p/bare-holesail.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-holesail.js
rename to packages/bare-os-booter/lib/p2p/bare-holesail.js
diff --git a/packages/bare-os-booter/lib/bare-os-meshdrop-service.js b/packages/bare-os-booter/lib/p2p/bare-os-meshdrop-service.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-meshdrop-service.js
rename to packages/bare-os-booter/lib/p2p/bare-os-meshdrop-service.js
diff --git a/packages/bare-os-booter/lib/bare-os-peer-admission.js b/packages/bare-os-booter/lib/p2p/bare-os-peer-admission.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-peer-admission.js
rename to packages/bare-os-booter/lib/p2p/bare-os-peer-admission.js
diff --git a/packages/bare-os-booter/lib/bare-os-peer-system-seed.js b/packages/bare-os-booter/lib/p2p/bare-os-peer-system-seed.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-peer-system-seed.js
rename to packages/bare-os-booter/lib/p2p/bare-os-peer-system-seed.js
diff --git a/packages/bare-os-booter/lib/bare-os-protomux-alias-registry.js b/packages/bare-os-booter/lib/p2p/bare-os-protomux-alias-registry.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-protomux-alias-registry.js
rename to packages/bare-os-booter/lib/p2p/bare-os-protomux-alias-registry.js
diff --git a/packages/bare-os-booter/lib/bare-os-protomux-extensions-proc.js b/packages/bare-os-booter/lib/p2p/bare-os-protomux-extensions-proc.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-protomux-extensions-proc.js
rename to packages/bare-os-booter/lib/p2p/bare-os-protomux-extensions-proc.js
diff --git a/packages/bare-os-booter/lib/bare-os-replication-priority.js b/packages/bare-os-booter/lib/p2p/bare-os-replication-priority.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-replication-priority.js
rename to packages/bare-os-booter/lib/p2p/bare-os-replication-priority.js
diff --git a/packages/bare-os-booter/lib/bare-os-replication-proc-live.js b/packages/bare-os-booter/lib/p2p/bare-os-replication-proc-live.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-replication-proc-live.js
rename to packages/bare-os-booter/lib/p2p/bare-os-replication-proc-live.js
diff --git a/packages/bare-os-booter/lib/bare-os-swarm-connection-manager.js b/packages/bare-os-booter/lib/p2p/bare-os-swarm-connection-manager.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-swarm-connection-manager.js
rename to packages/bare-os-booter/lib/p2p/bare-os-swarm-connection-manager.js
diff --git a/packages/bare-os-booter/lib/bare-os-swarm-lifecycle.js b/packages/bare-os-booter/lib/p2p/bare-os-swarm-lifecycle.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-swarm-lifecycle.js
rename to packages/bare-os-booter/lib/p2p/bare-os-swarm-lifecycle.js
diff --git a/packages/bare-os-booter/lib/bare-os-swarm-peer-policy.js b/packages/bare-os-booter/lib/p2p/bare-os-swarm-peer-policy.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-swarm-peer-policy.js
rename to packages/bare-os-booter/lib/p2p/bare-os-swarm-peer-policy.js
diff --git a/packages/bare-os-booter/lib/bare-os-swarm-subsystem-proc.js b/packages/bare-os-booter/lib/p2p/bare-os-swarm-subsystem-proc.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-swarm-subsystem-proc.js
rename to packages/bare-os-booter/lib/p2p/bare-os-swarm-subsystem-proc.js
diff --git a/packages/bare-os-booter/lib/bare-os-sync-window.js b/packages/bare-os-booter/lib/p2p/bare-os-sync-window.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-sync-window.js
rename to packages/bare-os-booter/lib/p2p/bare-os-sync-window.js
diff --git a/packages/bare-os-booter/lib/hdms-cli-argv.js b/packages/bare-os-booter/lib/p2p/hdms-cli-argv.js
similarity index 100%
rename from packages/bare-os-booter/lib/hdms-cli-argv.js
rename to packages/bare-os-booter/lib/p2p/hdms-cli-argv.js
diff --git a/packages/bare-os-booter/lib/hdms-manager.js b/packages/bare-os-booter/lib/p2p/hdms-manager.js
similarity index 100%
rename from packages/bare-os-booter/lib/hdms-manager.js
rename to packages/bare-os-booter/lib/p2p/hdms-manager.js
diff --git a/packages/bare-os-booter/lib/hdms-share-offer.js b/packages/bare-os-booter/lib/p2p/hdms-share-offer.js
similarity index 100%
rename from packages/bare-os-booter/lib/hdms-share-offer.js
rename to packages/bare-os-booter/lib/p2p/hdms-share-offer.js
diff --git a/packages/bare-os-booter/lib/holesail-cli.js b/packages/bare-os-booter/lib/p2p/holesail-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/holesail-cli.js
rename to packages/bare-os-booter/lib/p2p/holesail-cli.js
diff --git a/packages/bare-os-booter/lib/swarm-disk.js b/packages/bare-os-booter/lib/p2p/swarm-disk.js
similarity index 100%
rename from packages/bare-os-booter/lib/swarm-disk.js
rename to packages/bare-os-booter/lib/p2p/swarm-disk.js
diff --git a/packages/bare-os-booter/lib/swarm-opts.js b/packages/bare-os-booter/lib/p2p/swarm-opts.js
similarity index 100%
rename from packages/bare-os-booter/lib/swarm-opts.js
rename to packages/bare-os-booter/lib/p2p/swarm-opts.js
diff --git a/packages/bare-os-booter/lib/bare-os-bind-fallback.js b/packages/bare-os-booter/lib/posix/bare-os-bind-fallback.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-bind-fallback.js
rename to packages/bare-os-booter/lib/posix/bare-os-bind-fallback.js
diff --git a/packages/bare-os-booter/lib/bare-os-fcntl-cooperative-lock.js b/packages/bare-os-booter/lib/posix/bare-os-fcntl-cooperative-lock.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-fcntl-cooperative-lock.js
rename to packages/bare-os-booter/lib/posix/bare-os-fcntl-cooperative-lock.js
diff --git a/packages/bare-os-booter/lib/bare-os-logical-fd.js b/packages/bare-os-booter/lib/posix/bare-os-logical-fd.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-logical-fd.js
rename to packages/bare-os-booter/lib/posix/bare-os-logical-fd.js
diff --git a/packages/bare-os-booter/lib/bare-os-monotonic-time.js b/packages/bare-os-booter/lib/posix/bare-os-monotonic-time.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-monotonic-time.js
rename to packages/bare-os-booter/lib/posix/bare-os-monotonic-time.js
diff --git a/packages/bare-os-booter/lib/bare-os-pathconf.js b/packages/bare-os-booter/lib/posix/bare-os-pathconf.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-pathconf.js
rename to packages/bare-os-booter/lib/posix/bare-os-pathconf.js
diff --git a/packages/bare-os-booter/lib/bare-os-posix-errno.js b/packages/bare-os-booter/lib/posix/bare-os-posix-errno.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-posix-errno.js
rename to packages/bare-os-booter/lib/posix/bare-os-posix-errno.js
diff --git a/packages/bare-os-booter/lib/bare-os-posix-fd-sim.js b/packages/bare-os-booter/lib/posix/bare-os-posix-fd-sim.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-posix-fd-sim.js
rename to packages/bare-os-booter/lib/posix/bare-os-posix-fd-sim.js
diff --git a/packages/bare-os-booter/lib/bare-os-posix-signals.js b/packages/bare-os-booter/lib/posix/bare-os-posix-signals.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-posix-signals.js
rename to packages/bare-os-booter/lib/posix/bare-os-posix-signals.js
diff --git a/packages/bare-os-booter/lib/bare-os-posix-syscall-helpers.js b/packages/bare-os-booter/lib/posix/bare-os-posix-syscall-helpers.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-posix-syscall-helpers.js
rename to packages/bare-os-booter/lib/posix/bare-os-posix-syscall-helpers.js
diff --git a/packages/bare-os-booter/lib/bare-os-process-control.js b/packages/bare-os-booter/lib/posix/bare-os-process-control.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-process-control.js
rename to packages/bare-os-booter/lib/posix/bare-os-process-control.js
diff --git a/packages/bare-os-booter/lib/bare-os-socket-bridge.js b/packages/bare-os-booter/lib/posix/bare-os-socket-bridge.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-socket-bridge.js
rename to packages/bare-os-booter/lib/posix/bare-os-socket-bridge.js
diff --git a/packages/bare-os-booter/lib/bare-os-socket-scm-rights.js b/packages/bare-os-booter/lib/posix/bare-os-socket-scm-rights.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-socket-scm-rights.js
rename to packages/bare-os-booter/lib/posix/bare-os-socket-scm-rights.js
diff --git a/packages/bare-os-booter/lib/bare-os-syscall-ops.js b/packages/bare-os-booter/lib/posix/bare-os-syscall-ops.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-syscall-ops.js
rename to packages/bare-os-booter/lib/posix/bare-os-syscall-ops.js
diff --git a/packages/bare-os-booter/lib/bare-os-syscall.js b/packages/bare-os-booter/lib/posix/bare-os-syscall.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-syscall.js
rename to packages/bare-os-booter/lib/posix/bare-os-syscall.js
diff --git a/packages/bare-os-booter/lib/bare-os-syscalls-proc-json.js b/packages/bare-os-booter/lib/posix/bare-os-syscalls-proc-json.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-syscalls-proc-json.js
rename to packages/bare-os-booter/lib/posix/bare-os-syscalls-proc-json.js
diff --git a/packages/bare-os-booter/lib/bare-os-virtual-signal.js b/packages/bare-os-booter/lib/posix/bare-os-virtual-signal.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-virtual-signal.js
rename to packages/bare-os-booter/lib/posix/bare-os-virtual-signal.js
diff --git a/packages/bare-os-booter/lib/bare-os-booter-proc-helpers.js b/packages/bare-os-booter/lib/proc/bare-os-booter-proc-helpers.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-booter-proc-helpers.js
rename to packages/bare-os-booter/lib/proc/bare-os-booter-proc-helpers.js
diff --git a/packages/bare-os-booter/lib/bare-os-host-proc-snapshot.js b/packages/bare-os-booter/lib/proc/bare-os-host-proc-snapshot.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-host-proc-snapshot.js
rename to packages/bare-os-booter/lib/proc/bare-os-host-proc-snapshot.js
diff --git a/packages/bare-os-booter/lib/bare-os-proc-bare-module-crypto-staging.js b/packages/bare-os-booter/lib/proc/bare-os-proc-bare-module-crypto-staging.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-proc-bare-module-crypto-staging.js
rename to packages/bare-os-booter/lib/proc/bare-os-proc-bare-module-crypto-staging.js
diff --git a/packages/bare-os-booter/lib/bare-os-proc-bare-runtime-proto-mux.js b/packages/bare-os-booter/lib/proc/bare-os-proc-bare-runtime-proto-mux.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-proc-bare-runtime-proto-mux.js
rename to packages/bare-os-booter/lib/proc/bare-os-proc-bare-runtime-proto-mux.js
diff --git a/packages/bare-os-booter/lib/bare-os-proc-blind-peer-relay-gate.js b/packages/bare-os-booter/lib/proc/bare-os-proc-blind-peer-relay-gate.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-proc-blind-peer-relay-gate.js
rename to packages/bare-os-booter/lib/proc/bare-os-proc-blind-peer-relay-gate.js
diff --git a/packages/bare-os-booter/lib/bare-os-proc-hypercore-pack-hrpc-lifecycle.js b/packages/bare-os-booter/lib/proc/bare-os-proc-hypercore-pack-hrpc-lifecycle.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-proc-hypercore-pack-hrpc-lifecycle.js
rename to packages/bare-os-booter/lib/proc/bare-os-proc-hypercore-pack-hrpc-lifecycle.js
diff --git a/packages/bare-os-booter/lib/bare-os-proc-pear-corestore-hrpc.js b/packages/bare-os-booter/lib/proc/bare-os-proc-pear-corestore-hrpc.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-proc-pear-corestore-hrpc.js
rename to packages/bare-os-booter/lib/proc/bare-os-proc-pear-corestore-hrpc.js
diff --git a/packages/bare-os-booter/lib/bare-os-proc-pear-inspect-logger-tls.js b/packages/bare-os-booter/lib/proc/bare-os-proc-pear-inspect-logger-tls.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-proc-pear-inspect-logger-tls.js
rename to packages/bare-os-booter/lib/proc/bare-os-proc-pear-inspect-logger-tls.js
diff --git a/packages/bare-os-booter/lib/bare-os-proc-replication-operator-surface.js b/packages/bare-os-booter/lib/proc/bare-os-proc-replication-operator-surface.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-proc-replication-operator-surface.js
rename to packages/bare-os-booter/lib/proc/bare-os-proc-replication-operator-surface.js
diff --git a/packages/bare-os-booter/lib/bare-os-process-table.js b/packages/bare-os-booter/lib/proc/bare-os-process-table.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-process-table.js
rename to packages/bare-os-booter/lib/proc/bare-os-process-table.js
diff --git a/packages/bare-os-booter/lib/bare-os-abort.js b/packages/bare-os-booter/lib/security/bare-os-abort.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-abort.js
rename to packages/bare-os-booter/lib/security/bare-os-abort.js
diff --git a/packages/bare-os-booter/lib/bare-os-acl-eval.js b/packages/bare-os-booter/lib/security/bare-os-acl-eval.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-acl-eval.js
rename to packages/bare-os-booter/lib/security/bare-os-acl-eval.js
diff --git a/packages/bare-os-booter/lib/bare-os-audit-chain.js b/packages/bare-os-booter/lib/security/bare-os-audit-chain.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-audit-chain.js
rename to packages/bare-os-booter/lib/security/bare-os-audit-chain.js
diff --git a/packages/bare-os-booter/lib/bare-os-audit-redact.js b/packages/bare-os-booter/lib/security/bare-os-audit-redact.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-audit-redact.js
rename to packages/bare-os-booter/lib/security/bare-os-audit-redact.js
diff --git a/packages/bare-os-booter/lib/bare-os-capability-registry.js b/packages/bare-os-booter/lib/security/bare-os-capability-registry.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-capability-registry.js
rename to packages/bare-os-booter/lib/security/bare-os-capability-registry.js
diff --git a/packages/bare-os-booter/lib/bare-os-dns-policy.js b/packages/bare-os-booter/lib/security/bare-os-dns-policy.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-dns-policy.js
rename to packages/bare-os-booter/lib/security/bare-os-dns-policy.js
diff --git a/packages/bare-os-booter/lib/bare-os-errors.js b/packages/bare-os-booter/lib/security/bare-os-errors.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-errors.js
rename to packages/bare-os-booter/lib/security/bare-os-errors.js
diff --git a/packages/bare-os-booter/lib/bare-os-http-policy.js b/packages/bare-os-booter/lib/security/bare-os-http-policy.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-http-policy.js
rename to packages/bare-os-booter/lib/security/bare-os-http-policy.js
diff --git a/packages/bare-os-booter/lib/bare-os-path-capability.js b/packages/bare-os-booter/lib/security/bare-os-path-capability.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-path-capability.js
rename to packages/bare-os-booter/lib/security/bare-os-path-capability.js
diff --git a/packages/bare-os-booter/lib/bare-os-sandbox.js b/packages/bare-os-booter/lib/security/bare-os-sandbox.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-sandbox.js
rename to packages/bare-os-booter/lib/security/bare-os-sandbox.js
diff --git a/packages/bare-os-booter/lib/bare-discord-js-loader.js b/packages/bare-os-booter/lib/services/bare-discord-js-loader.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-discord-js-loader.js
rename to packages/bare-os-booter/lib/services/bare-discord-js-loader.js
diff --git a/packages/bare-os-booter/lib/bare-openssh-pty-console.js b/packages/bare-os-booter/lib/services/bare-openssh-pty-console.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-openssh-pty-console.js
rename to packages/bare-os-booter/lib/services/bare-openssh-pty-console.js
diff --git a/packages/bare-os-booter/lib/bare-openssh-sftp.js b/packages/bare-os-booter/lib/services/bare-openssh-sftp.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-openssh-sftp.js
rename to packages/bare-os-booter/lib/services/bare-openssh-sftp.js
diff --git a/packages/bare-os-booter/lib/bare-openssh.js b/packages/bare-os-booter/lib/services/bare-openssh.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-openssh.js
rename to packages/bare-os-booter/lib/services/bare-openssh.js
diff --git a/packages/bare-os-booter/lib/bare-os-chat-initd.js b/packages/bare-os-booter/lib/services/bare-os-chat-initd.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-chat-initd.js
rename to packages/bare-os-booter/lib/services/bare-os-chat-initd.js
diff --git a/packages/bare-os-booter/lib/bare-os-chat-service.js b/packages/bare-os-booter/lib/services/bare-os-chat-service.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-chat-service.js
rename to packages/bare-os-booter/lib/services/bare-os-chat-service.js
diff --git a/packages/bare-os-booter/lib/bare-os-discord-commands-guest.cjs b/packages/bare-os-booter/lib/services/bare-os-discord-commands-guest.cjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-discord-commands-guest.cjs
rename to packages/bare-os-booter/lib/services/bare-os-discord-commands-guest.cjs
diff --git a/packages/bare-os-booter/lib/bare-os-discord-initd.js b/packages/bare-os-booter/lib/services/bare-os-discord-initd.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-discord-initd.js
rename to packages/bare-os-booter/lib/services/bare-os-discord-initd.js
diff --git a/packages/bare-os-booter/lib/bare-os-discord-ws-bootstrap.mjs b/packages/bare-os-booter/lib/services/bare-os-discord-ws-bootstrap.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-discord-ws-bootstrap.mjs
rename to packages/bare-os-booter/lib/services/bare-os-discord-ws-bootstrap.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-irc-policy.js b/packages/bare-os-booter/lib/services/bare-os-irc-policy.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-irc-policy.js
rename to packages/bare-os-booter/lib/services/bare-os-irc-policy.js
diff --git a/packages/bare-os-booter/lib/bare-os-qvac-gguf-diagnose.mjs b/packages/bare-os-booter/lib/services/bare-os-qvac-gguf-diagnose.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-qvac-gguf-diagnose.mjs
rename to packages/bare-os-booter/lib/services/bare-os-qvac-gguf-diagnose.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-qvac-gpu-probe.mjs b/packages/bare-os-booter/lib/services/bare-os-qvac-gpu-probe.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-qvac-gpu-probe.mjs
rename to packages/bare-os-booter/lib/services/bare-os-qvac-gpu-probe.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-qvac-host.mjs b/packages/bare-os-booter/lib/services/bare-os-qvac-host.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-qvac-host.mjs
rename to packages/bare-os-booter/lib/services/bare-os-qvac-host.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-qvac-models-store.mjs b/packages/bare-os-booter/lib/services/bare-os-qvac-models-store.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-qvac-models-store.mjs
rename to packages/bare-os-booter/lib/services/bare-os-qvac-models-store.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-qvac-pack-anchor.mjs b/packages/bare-os-booter/lib/services/bare-os-qvac-pack-anchor.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-qvac-pack-anchor.mjs
rename to packages/bare-os-booter/lib/services/bare-os-qvac-pack-anchor.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-qvac-sdk-bind.mjs b/packages/bare-os-booter/lib/services/bare-os-qvac-sdk-bind.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-qvac-sdk-bind.mjs
rename to packages/bare-os-booter/lib/services/bare-os-qvac-sdk-bind.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-ssh-holesail.js b/packages/bare-os-booter/lib/services/bare-os-ssh-holesail.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ssh-holesail.js
rename to packages/bare-os-booter/lib/services/bare-os-ssh-holesail.js
diff --git a/packages/bare-os-booter/lib/bare-os-tui-sdk.data.mjs b/packages/bare-os-booter/lib/services/bare-os-tui-sdk.data.mjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-tui-sdk.data.mjs
rename to packages/bare-os-booter/lib/services/bare-os-tui-sdk.data.mjs
diff --git a/packages/bare-os-booter/lib/bare-os-tui-sdk.js b/packages/bare-os-booter/lib/services/bare-os-tui-sdk.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-tui-sdk.js
rename to packages/bare-os-booter/lib/services/bare-os-tui-sdk.js
diff --git a/packages/bare-os-booter/lib/bare-os-www-holesail.js b/packages/bare-os-booter/lib/services/bare-os-www-holesail.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-www-holesail.js
rename to packages/bare-os-booter/lib/services/bare-os-www-holesail.js
diff --git a/packages/bare-os-booter/lib/bare-os-www-initd.js b/packages/bare-os-booter/lib/services/bare-os-www-initd.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-www-initd.js
rename to packages/bare-os-booter/lib/services/bare-os-www-initd.js
diff --git a/packages/bare-os-booter/lib/ssh-keygen-cli.js b/packages/bare-os-booter/lib/services/ssh-keygen-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/ssh-keygen-cli.js
rename to packages/bare-os-booter/lib/services/ssh-keygen-cli.js
diff --git a/packages/bare-os-booter/lib/sshd-config-parse.js b/packages/bare-os-booter/lib/services/sshd-config-parse.js
similarity index 100%
rename from packages/bare-os-booter/lib/sshd-config-parse.js
rename to packages/bare-os-booter/lib/services/sshd-config-parse.js
diff --git a/packages/bare-os-booter/lib/shell-alias.js b/packages/bare-os-booter/lib/shell/shell-alias.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-alias.js
rename to packages/bare-os-booter/lib/shell/shell-alias.js
diff --git a/packages/bare-os-booter/lib/shell-arithmetic.js b/packages/bare-os-booter/lib/shell/shell-arithmetic.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-arithmetic.js
rename to packages/bare-os-booter/lib/shell/shell-arithmetic.js
diff --git a/packages/bare-os-booter/lib/shell-builtins.js b/packages/bare-os-booter/lib/shell/shell-builtins.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-builtins.js
rename to packages/bare-os-booter/lib/shell/shell-builtins.js
diff --git a/packages/bare-os-booter/lib/shell-expand.js b/packages/bare-os-booter/lib/shell/shell-expand.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-expand.js
rename to packages/bare-os-booter/lib/shell/shell-expand.js
diff --git a/packages/bare-os-booter/lib/shell-glob.js b/packages/bare-os-booter/lib/shell/shell-glob.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-glob.js
rename to packages/bare-os-booter/lib/shell/shell-glob.js
diff --git a/packages/bare-os-booter/lib/shell-lex.js b/packages/bare-os-booter/lib/shell/shell-lex.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-lex.js
rename to packages/bare-os-booter/lib/shell/shell-lex.js
diff --git a/packages/bare-os-booter/lib/shell-nounset.js b/packages/bare-os-booter/lib/shell/shell-nounset.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-nounset.js
rename to packages/bare-os-booter/lib/shell/shell-nounset.js
diff --git a/packages/bare-os-booter/lib/shell-parse.js b/packages/bare-os-booter/lib/shell/shell-parse.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-parse.js
rename to packages/bare-os-booter/lib/shell/shell-parse.js
diff --git a/packages/bare-os-booter/lib/shell-pipeline.js b/packages/bare-os-booter/lib/shell/shell-pipeline.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-pipeline.js
rename to packages/bare-os-booter/lib/shell/shell-pipeline.js
diff --git a/packages/bare-os-booter/lib/shell-policy.js b/packages/bare-os-booter/lib/shell/shell-policy.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-policy.js
rename to packages/bare-os-booter/lib/shell/shell-policy.js
diff --git a/packages/bare-os-booter/lib/shell-runtime.js b/packages/bare-os-booter/lib/shell/shell-runtime.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-runtime.js
rename to packages/bare-os-booter/lib/shell/shell-runtime.js
diff --git a/packages/bare-os-booter/lib/shell-stmt.js b/packages/bare-os-booter/lib/shell/shell-stmt.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-stmt.js
rename to packages/bare-os-booter/lib/shell/shell-stmt.js
diff --git a/packages/bare-os-booter/lib/shell-syntax.js b/packages/bare-os-booter/lib/shell/shell-syntax.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-syntax.js
rename to packages/bare-os-booter/lib/shell/shell-syntax.js
diff --git a/packages/bare-os-booter/lib/shell-token.js b/packages/bare-os-booter/lib/shell/shell-token.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-token.js
rename to packages/bare-os-booter/lib/shell/shell-token.js
diff --git a/packages/bare-os-booter/lib/shell-tokenizer.js b/packages/bare-os-booter/lib/shell/shell-tokenizer.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell-tokenizer.js
rename to packages/bare-os-booter/lib/shell/shell-tokenizer.js
diff --git a/packages/bare-os-booter/lib/shell.js b/packages/bare-os-booter/lib/shell/shell.js
similarity index 100%
rename from packages/bare-os-booter/lib/shell.js
rename to packages/bare-os-booter/lib/shell/shell.js
diff --git a/packages/bare-os-booter/lib/archive-cli.js b/packages/bare-os-booter/lib/tools/archive-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/archive-cli.js
rename to packages/bare-os-booter/lib/tools/archive-cli.js
diff --git a/packages/bare-os-booter/lib/bare-os-bin-index.js b/packages/bare-os-booter/lib/tools/bare-os-bin-index.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-bin-index.js
rename to packages/bare-os-booter/lib/tools/bare-os-bin-index.js
diff --git a/packages/bare-os-booter/lib/bare-os-bin-offload-worker.cjs b/packages/bare-os-booter/lib/tools/bare-os-bin-offload-worker.cjs
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-bin-offload-worker.cjs
rename to packages/bare-os-booter/lib/tools/bare-os-bin-offload-worker.cjs
diff --git a/packages/bare-os-booter/lib/bare-os-delegate-concurrent.js b/packages/bare-os-booter/lib/tools/bare-os-delegate-concurrent.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-delegate-concurrent.js
rename to packages/bare-os-booter/lib/tools/bare-os-delegate-concurrent.js
diff --git a/packages/bare-os-booter/lib/bare-os-hrpc-allowlist.js b/packages/bare-os-booter/lib/tools/bare-os-hrpc-allowlist.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-hrpc-allowlist.js
rename to packages/bare-os-booter/lib/tools/bare-os-hrpc-allowlist.js
diff --git a/packages/bare-os-booter/lib/bare-os-hrpc-route-table.js b/packages/bare-os-booter/lib/tools/bare-os-hrpc-route-table.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-hrpc-route-table.js
rename to packages/bare-os-booter/lib/tools/bare-os-hrpc-route-table.js
diff --git a/packages/bare-os-booter/lib/bare-os-hrpc-stock-request.js b/packages/bare-os-booter/lib/tools/bare-os-hrpc-stock-request.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-hrpc-stock-request.js
rename to packages/bare-os-booter/lib/tools/bare-os-hrpc-stock-request.js
diff --git a/packages/bare-os-booter/lib/bare-os-hyperbee-guest-hint.js b/packages/bare-os-booter/lib/tools/bare-os-hyperbee-guest-hint.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-hyperbee-guest-hint.js
rename to packages/bare-os-booter/lib/tools/bare-os-hyperbee-guest-hint.js
diff --git a/packages/bare-os-booter/lib/bare-os-ipc-namespace.js b/packages/bare-os-booter/lib/tools/bare-os-ipc-namespace.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ipc-namespace.js
rename to packages/bare-os-booter/lib/tools/bare-os-ipc-namespace.js
diff --git a/packages/bare-os-booter/lib/bare-os-ipc.js b/packages/bare-os-booter/lib/tools/bare-os-ipc.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-ipc.js
rename to packages/bare-os-booter/lib/tools/bare-os-ipc.js
diff --git a/packages/bare-os-booter/lib/bare-os-pear-ipc-registry.js b/packages/bare-os-booter/lib/tools/bare-os-pear-ipc-registry.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-pear-ipc-registry.js
rename to packages/bare-os-booter/lib/tools/bare-os-pear-ipc-registry.js
diff --git a/packages/bare-os-booter/lib/bare-os-pear-updater-bridge.js b/packages/bare-os-booter/lib/tools/bare-os-pear-updater-bridge.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-pear-updater-bridge.js
rename to packages/bare-os-booter/lib/tools/bare-os-pear-updater-bridge.js
diff --git a/packages/bare-os-booter/lib/curl-cli.js b/packages/bare-os-booter/lib/tools/curl-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/curl-cli.js
rename to packages/bare-os-booter/lib/tools/curl-cli.js
diff --git a/packages/bare-os-booter/lib/delegate-rate-limit.js b/packages/bare-os-booter/lib/tools/delegate-rate-limit.js
similarity index 100%
rename from packages/bare-os-booter/lib/delegate-rate-limit.js
rename to packages/bare-os-booter/lib/tools/delegate-rate-limit.js
diff --git a/packages/bare-os-booter/lib/git-cli.js b/packages/bare-os-booter/lib/tools/git-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/git-cli.js
rename to packages/bare-os-booter/lib/tools/git-cli.js
diff --git a/packages/bare-os-booter/lib/http-fetch-url.js b/packages/bare-os-booter/lib/tools/http-fetch-url.js
similarity index 100%
rename from packages/bare-os-booter/lib/http-fetch-url.js
rename to packages/bare-os-booter/lib/tools/http-fetch-url.js
diff --git a/packages/bare-os-booter/lib/openssl-cli.js b/packages/bare-os-booter/lib/tools/openssl-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/openssl-cli.js
rename to packages/bare-os-booter/lib/tools/openssl-cli.js
diff --git a/packages/bare-os-booter/lib/tar-cli.js b/packages/bare-os-booter/lib/tools/tar-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/tar-cli.js
rename to packages/bare-os-booter/lib/tools/tar-cli.js
diff --git a/packages/bare-os-booter/lib/warc-cli.js b/packages/bare-os-booter/lib/tools/warc-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/warc-cli.js
rename to packages/bare-os-booter/lib/tools/warc-cli.js
diff --git a/packages/bare-os-booter/lib/wget-cli.js b/packages/bare-os-booter/lib/tools/wget-cli.js
similarity index 100%
rename from packages/bare-os-booter/lib/wget-cli.js
rename to packages/bare-os-booter/lib/tools/wget-cli.js
diff --git a/packages/bare-os-booter/lib/bare-os-mounts-persist.js b/packages/bare-os-booter/lib/vfs/bare-os-mounts-persist.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-mounts-persist.js
rename to packages/bare-os-booter/lib/vfs/bare-os-mounts-persist.js
diff --git a/packages/bare-os-booter/lib/bare-os-statvfs-from-drive.js b/packages/bare-os-booter/lib/vfs/bare-os-statvfs-from-drive.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-statvfs-from-drive.js
rename to packages/bare-os-booter/lib/vfs/bare-os-statvfs-from-drive.js
diff --git a/packages/bare-os-booter/lib/bare-os-var-log.js b/packages/bare-os-booter/lib/vfs/bare-os-var-log.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-var-log.js
rename to packages/bare-os-booter/lib/vfs/bare-os-var-log.js
diff --git a/packages/bare-os-booter/lib/bare-os-vfs-acl-enforce.js b/packages/bare-os-booter/lib/vfs/bare-os-vfs-acl-enforce.js
similarity index 100%
rename from packages/bare-os-booter/lib/bare-os-vfs-acl-enforce.js
rename to packages/bare-os-booter/lib/vfs/bare-os-vfs-acl-enforce.js
diff --git a/packages/bare-os-booter/lib/git-fs-adapter.js b/packages/bare-os-booter/lib/vfs/git-fs-adapter.js
similarity index 100%
rename from packages/bare-os-booter/lib/git-fs-adapter.js
rename to packages/bare-os-booter/lib/vfs/git-fs-adapter.js
diff --git a/packages/bare-os-booter/lib/vfs-path.js b/packages/bare-os-booter/lib/vfs/vfs-path.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-path.js
rename to packages/bare-os-booter/lib/vfs/vfs-path.js
diff --git a/packages/bare-os-booter/lib/vfs-personal-io.js b/packages/bare-os-booter/lib/vfs/vfs-personal-io.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-personal-io.js
rename to packages/bare-os-booter/lib/vfs/vfs-personal-io.js
diff --git a/packages/bare-os-booter/lib/vfs-personal.js b/packages/bare-os-booter/lib/vfs/vfs-personal.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-personal.js
rename to packages/bare-os-booter/lib/vfs/vfs-personal.js
diff --git a/packages/bare-os-booter/lib/vfs-policy.js b/packages/bare-os-booter/lib/vfs/vfs-policy.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-policy.js
rename to packages/bare-os-booter/lib/vfs/vfs-policy.js
diff --git a/packages/bare-os-booter/lib/vfs-posix-meta.js b/packages/bare-os-booter/lib/vfs/vfs-posix-meta.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-posix-meta.js
rename to packages/bare-os-booter/lib/vfs/vfs-posix-meta.js
diff --git a/packages/bare-os-booter/lib/vfs-proc-id-maps.js b/packages/bare-os-booter/lib/vfs/vfs-proc-id-maps.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-proc-id-maps.js
rename to packages/bare-os-booter/lib/vfs/vfs-proc-id-maps.js
diff --git a/packages/bare-os-booter/lib/vfs-pseudo-bytes.js b/packages/bare-os-booter/lib/vfs/vfs-pseudo-bytes.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-pseudo-bytes.js
rename to packages/bare-os-booter/lib/vfs/vfs-pseudo-bytes.js
diff --git a/packages/bare-os-booter/lib/vfs-pseudo-classify.js b/packages/bare-os-booter/lib/vfs/vfs-pseudo-classify.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-pseudo-classify.js
rename to packages/bare-os-booter/lib/vfs/vfs-pseudo-classify.js
diff --git a/packages/bare-os-booter/lib/vfs-pseudo-linux.js b/packages/bare-os-booter/lib/vfs/vfs-pseudo-linux.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-pseudo-linux.js
rename to packages/bare-os-booter/lib/vfs/vfs-pseudo-linux.js
diff --git a/packages/bare-os-booter/lib/vfs-route.js b/packages/bare-os-booter/lib/vfs/vfs-route.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-route.js
rename to packages/bare-os-booter/lib/vfs/vfs-route.js
diff --git a/packages/bare-os-booter/lib/vfs-warm-cache.js b/packages/bare-os-booter/lib/vfs/vfs-warm-cache.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs-warm-cache.js
rename to packages/bare-os-booter/lib/vfs/vfs-warm-cache.js
diff --git a/packages/bare-os-booter/lib/vfs.js b/packages/bare-os-booter/lib/vfs/vfs.js
similarity index 100%
rename from packages/bare-os-booter/lib/vfs.js
rename to packages/bare-os-booter/lib/vfs/vfs.js
diff --git a/packages/bare-os-coreutils/lib/agent-abort-polyfill.js b/packages/bare-os-coreutils/lib/agent/agent-abort-polyfill.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-abort-polyfill.js
rename to packages/bare-os-coreutils/lib/agent/agent-abort-polyfill.js
diff --git a/packages/bare-os-coreutils/lib/agent-compact.js b/packages/bare-os-coreutils/lib/agent/agent-compact.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-compact.js
rename to packages/bare-os-coreutils/lib/agent/agent-compact.js
diff --git a/packages/bare-os-coreutils/lib/agent-grok-port.js b/packages/bare-os-coreutils/lib/agent/agent-grok-port.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-grok-port.js
rename to packages/bare-os-coreutils/lib/agent/agent-grok-port.js
diff --git a/packages/bare-os-coreutils/lib/agent-helpers.js b/packages/bare-os-coreutils/lib/agent/agent-helpers.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-helpers.js
rename to packages/bare-os-coreutils/lib/agent/agent-helpers.js
diff --git a/packages/bare-os-coreutils/lib/agent-markdown.js b/packages/bare-os-coreutils/lib/agent/agent-markdown.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-markdown.js
rename to packages/bare-os-coreutils/lib/agent/agent-markdown.js
diff --git a/packages/bare-os-coreutils/lib/agent-models.js b/packages/bare-os-coreutils/lib/agent/agent-models.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-models.js
rename to packages/bare-os-coreutils/lib/agent/agent-models.js
diff --git a/packages/bare-os-coreutils/lib/agent-openai.js b/packages/bare-os-coreutils/lib/agent/agent-openai.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-openai.js
rename to packages/bare-os-coreutils/lib/agent/agent-openai.js
diff --git a/packages/bare-os-coreutils/lib/agent-qvac.js b/packages/bare-os-coreutils/lib/agent/agent-qvac.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-qvac.js
rename to packages/bare-os-coreutils/lib/agent/agent-qvac.js
diff --git a/packages/bare-os-coreutils/lib/agent-skills.js b/packages/bare-os-coreutils/lib/agent/agent-skills.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-skills.js
rename to packages/bare-os-coreutils/lib/agent/agent-skills.js
diff --git a/packages/bare-os-coreutils/lib/agent-sse-parse.js b/packages/bare-os-coreutils/lib/agent/agent-sse-parse.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-sse-parse.js
rename to packages/bare-os-coreutils/lib/agent/agent-sse-parse.js
diff --git a/packages/bare-os-coreutils/lib/agent-state.js b/packages/bare-os-coreutils/lib/agent/agent-state.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-state.js
rename to packages/bare-os-coreutils/lib/agent/agent-state.js
diff --git a/packages/bare-os-coreutils/lib/agent-text-polyfill.js b/packages/bare-os-coreutils/lib/agent/agent-text-polyfill.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-text-polyfill.js
rename to packages/bare-os-coreutils/lib/agent/agent-text-polyfill.js
diff --git a/packages/bare-os-coreutils/lib/agent-think-panel.js b/packages/bare-os-coreutils/lib/agent/agent-think-panel.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-think-panel.js
rename to packages/bare-os-coreutils/lib/agent/agent-think-panel.js
diff --git a/packages/bare-os-coreutils/lib/agent-tool-definitions.js b/packages/bare-os-coreutils/lib/agent/agent-tool-definitions.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-tool-definitions.js
rename to packages/bare-os-coreutils/lib/agent/agent-tool-definitions.js
diff --git a/packages/bare-os-coreutils/lib/agent-tool-dispatch.js b/packages/bare-os-coreutils/lib/agent/agent-tool-dispatch.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-tool-dispatch.js
rename to packages/bare-os-coreutils/lib/agent/agent-tool-dispatch.js
diff --git a/packages/bare-os-coreutils/lib/agent-tools.js b/packages/bare-os-coreutils/lib/agent/agent-tools.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-tools.js
rename to packages/bare-os-coreutils/lib/agent/agent-tools.js
diff --git a/packages/bare-os-coreutils/lib/agent-tui.js b/packages/bare-os-coreutils/lib/agent/agent-tui.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-tui.js
rename to packages/bare-os-coreutils/lib/agent/agent-tui.js
diff --git a/packages/bare-os-coreutils/lib/agent-web-fetch.js b/packages/bare-os-coreutils/lib/agent/agent-web-fetch.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-web-fetch.js
rename to packages/bare-os-coreutils/lib/agent/agent-web-fetch.js
diff --git a/packages/bare-os-coreutils/lib/agent-workspace.js b/packages/bare-os-coreutils/lib/agent/agent-workspace.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/agent-workspace.js
rename to packages/bare-os-coreutils/lib/agent/agent-workspace.js
diff --git a/packages/bare-os-coreutils/lib/baretop-compose.js b/packages/bare-os-coreutils/lib/baretop/baretop-compose.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/baretop-compose.js
rename to packages/bare-os-coreutils/lib/baretop/baretop-compose.js
diff --git a/packages/bare-os-coreutils/lib/baretop-snapshot.js b/packages/bare-os-coreutils/lib/baretop/baretop-snapshot.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/baretop-snapshot.js
rename to packages/bare-os-coreutils/lib/baretop/baretop-snapshot.js
diff --git a/packages/bare-os-coreutils/lib/baretop-tui.js b/packages/bare-os-coreutils/lib/baretop/baretop-tui.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/baretop-tui.js
rename to packages/bare-os-coreutils/lib/baretop/baretop-tui.js
diff --git a/packages/bare-os-coreutils/lib/baretop-ui-helpers.js b/packages/bare-os-coreutils/lib/baretop/baretop-ui-helpers.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/baretop-ui-helpers.js
rename to packages/bare-os-coreutils/lib/baretop/baretop-ui-helpers.js
diff --git a/packages/bare-os-coreutils/lib/chat-tui.js b/packages/bare-os-coreutils/lib/edit/chat-tui.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/chat-tui.js
rename to packages/bare-os-coreutils/lib/edit/chat-tui.js
diff --git a/packages/bare-os-coreutils/lib/edit-ansi.js b/packages/bare-os-coreutils/lib/edit/edit-ansi.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/edit-ansi.js
rename to packages/bare-os-coreutils/lib/edit/edit-ansi.js
diff --git a/packages/bare-os-coreutils/lib/edit-buffer.js b/packages/bare-os-coreutils/lib/edit/edit-buffer.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/edit-buffer.js
rename to packages/bare-os-coreutils/lib/edit/edit-buffer.js
diff --git a/packages/bare-os-coreutils/lib/edit-highlight.js b/packages/bare-os-coreutils/lib/edit/edit-highlight.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/edit-highlight.js
rename to packages/bare-os-coreutils/lib/edit/edit-highlight.js
diff --git a/packages/bare-os-coreutils/lib/edit-key-parse.js b/packages/bare-os-coreutils/lib/edit/edit-key-parse.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/edit-key-parse.js
rename to packages/bare-os-coreutils/lib/edit/edit-key-parse.js
diff --git a/packages/bare-os-coreutils/lib/edit-stream-read.js b/packages/bare-os-coreutils/lib/edit/edit-stream-read.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/edit-stream-read.js
rename to packages/bare-os-coreutils/lib/edit/edit-stream-read.js
diff --git a/packages/bare-os-coreutils/lib/edit-tui.js b/packages/bare-os-coreutils/lib/edit/edit-tui.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/edit-tui.js
rename to packages/bare-os-coreutils/lib/edit/edit-tui.js
diff --git a/packages/bare-os-coreutils/lib/interactive-masked-line.js b/packages/bare-os-coreutils/lib/edit/interactive-masked-line.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/interactive-masked-line.js
rename to packages/bare-os-coreutils/lib/edit/interactive-masked-line.js
diff --git a/packages/bare-os-coreutils/lib/awk-engine.js b/packages/bare-os-coreutils/lib/engines/awk-engine.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/awk-engine.js
rename to packages/bare-os-coreutils/lib/engines/awk-engine.js
diff --git a/packages/bare-os-coreutils/lib/baresay-engine.js b/packages/bare-os-coreutils/lib/engines/baresay-engine.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/baresay-engine.js
rename to packages/bare-os-coreutils/lib/engines/baresay-engine.js
diff --git a/packages/bare-os-coreutils/lib/jq-engine.js b/packages/bare-os-coreutils/lib/engines/jq-engine.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/jq-engine.js
rename to packages/bare-os-coreutils/lib/engines/jq-engine.js
diff --git a/packages/bare-os-coreutils/lib/ls-colors.js b/packages/bare-os-coreutils/lib/engines/ls-colors.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/ls-colors.js
rename to packages/bare-os-coreutils/lib/engines/ls-colors.js
diff --git a/packages/bare-os-coreutils/lib/man-render.js b/packages/bare-os-coreutils/lib/engines/man-render.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/man-render.js
rename to packages/bare-os-coreutils/lib/engines/man-render.js
diff --git a/packages/bare-os-coreutils/lib/md5.js b/packages/bare-os-coreutils/lib/engines/md5.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/md5.js
rename to packages/bare-os-coreutils/lib/engines/md5.js
diff --git a/packages/bare-os-coreutils/lib/sed-engine.js b/packages/bare-os-coreutils/lib/engines/sed-engine.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/sed-engine.js
rename to packages/bare-os-coreutils/lib/engines/sed-engine.js
diff --git a/packages/bare-os-coreutils/lib/sha224.js b/packages/bare-os-coreutils/lib/engines/sha224.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/sha224.js
rename to packages/bare-os-coreutils/lib/engines/sha224.js
diff --git a/packages/bare-os-coreutils/lib/irc-client.js b/packages/bare-os-coreutils/lib/irc/irc-client.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-client.js
rename to packages/bare-os-coreutils/lib/irc/irc-client.js
diff --git a/packages/bare-os-coreutils/lib/irc-commands.js b/packages/bare-os-coreutils/lib/irc/irc-commands.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-commands.js
rename to packages/bare-os-coreutils/lib/irc/irc-commands.js
diff --git a/packages/bare-os-coreutils/lib/irc-config.js b/packages/bare-os-coreutils/lib/irc/irc-config.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-config.js
rename to packages/bare-os-coreutils/lib/irc/irc-config.js
diff --git a/packages/bare-os-coreutils/lib/irc-dial.js b/packages/bare-os-coreutils/lib/irc/irc-dial.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-dial.js
rename to packages/bare-os-coreutils/lib/irc/irc-dial.js
diff --git a/packages/bare-os-coreutils/lib/irc-isupport.js b/packages/bare-os-coreutils/lib/irc/irc-isupport.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-isupport.js
rename to packages/bare-os-coreutils/lib/irc/irc-isupport.js
diff --git a/packages/bare-os-coreutils/lib/irc-parse.js b/packages/bare-os-coreutils/lib/irc/irc-parse.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-parse.js
rename to packages/bare-os-coreutils/lib/irc/irc-parse.js
diff --git a/packages/bare-os-coreutils/lib/irc-sasl.js b/packages/bare-os-coreutils/lib/irc/irc-sasl.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-sasl.js
rename to packages/bare-os-coreutils/lib/irc/irc-sasl.js
diff --git a/packages/bare-os-coreutils/lib/irc-state.js b/packages/bare-os-coreutils/lib/irc/irc-state.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-state.js
rename to packages/bare-os-coreutils/lib/irc/irc-state.js
diff --git a/packages/bare-os-coreutils/lib/irc-tui.js b/packages/bare-os-coreutils/lib/irc/irc-tui.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/irc-tui.js
rename to packages/bare-os-coreutils/lib/irc/irc-tui.js
diff --git a/packages/bare-os-coreutils/lib/p2p-suite-tui.js b/packages/bare-os-coreutils/lib/p2p/p2p-suite-tui.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/p2p-suite-tui.js
rename to packages/bare-os-coreutils/lib/p2p/p2p-suite-tui.js
diff --git a/packages/bare-os-coreutils/lib/p2p-suite.js b/packages/bare-os-coreutils/lib/p2p/p2p-suite.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/p2p-suite.js
rename to packages/bare-os-coreutils/lib/p2p/p2p-suite.js
diff --git a/packages/bare-os-coreutils/lib/appstore-pear.js b/packages/bare-os-coreutils/lib/pear/appstore-pear.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/appstore-pear.js
rename to packages/bare-os-coreutils/lib/pear/appstore-pear.js
diff --git a/packages/bare-os-coreutils/lib/pear-release.js b/packages/bare-os-coreutils/lib/pear/pear-release.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/pear-release.js
rename to packages/bare-os-coreutils/lib/pear/pear-release.js
diff --git a/packages/bare-os-coreutils/lib/pear-stage.js b/packages/bare-os-coreutils/lib/pear/pear-stage.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/pear-stage.js
rename to packages/bare-os-coreutils/lib/pear/pear-stage.js
diff --git a/packages/bare-os-coreutils/lib/summon-cookie.js b/packages/bare-os-coreutils/lib/summon/summon-cookie.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-cookie.js
rename to packages/bare-os-coreutils/lib/summon/summon-cookie.js
diff --git a/packages/bare-os-coreutils/lib/summon-css.js b/packages/bare-os-coreutils/lib/summon/summon-css.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-css.js
rename to packages/bare-os-coreutils/lib/summon/summon-css.js
diff --git a/packages/bare-os-coreutils/lib/summon-dom.js b/packages/bare-os-coreutils/lib/summon/summon-dom.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-dom.js
rename to packages/bare-os-coreutils/lib/summon/summon-dom.js
diff --git a/packages/bare-os-coreutils/lib/summon-form.js b/packages/bare-os-coreutils/lib/summon/summon-form.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-form.js
rename to packages/bare-os-coreutils/lib/summon/summon-form.js
diff --git a/packages/bare-os-coreutils/lib/summon-html.js b/packages/bare-os-coreutils/lib/summon/summon-html.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-html.js
rename to packages/bare-os-coreutils/lib/summon/summon-html.js
diff --git a/packages/bare-os-coreutils/lib/summon-http.js b/packages/bare-os-coreutils/lib/summon/summon-http.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-http.js
rename to packages/bare-os-coreutils/lib/summon/summon-http.js
diff --git a/packages/bare-os-coreutils/lib/summon-js.js b/packages/bare-os-coreutils/lib/summon/summon-js.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-js.js
rename to packages/bare-os-coreutils/lib/summon/summon-js.js
diff --git a/packages/bare-os-coreutils/lib/summon-layout.js b/packages/bare-os-coreutils/lib/summon/summon-layout.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-layout.js
rename to packages/bare-os-coreutils/lib/summon/summon-layout.js
diff --git a/packages/bare-os-coreutils/lib/summon-session.js b/packages/bare-os-coreutils/lib/summon/summon-session.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-session.js
rename to packages/bare-os-coreutils/lib/summon/summon-session.js
diff --git a/packages/bare-os-coreutils/lib/summon-tui.js b/packages/bare-os-coreutils/lib/summon/summon-tui.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-tui.js
rename to packages/bare-os-coreutils/lib/summon/summon-tui.js
diff --git a/packages/bare-os-coreutils/lib/summon-url.js b/packages/bare-os-coreutils/lib/summon/summon-url.js
similarity index 100%
rename from packages/bare-os-coreutils/lib/summon-url.js
rename to packages/bare-os-coreutils/lib/summon/summon-url.js