diff --git a/src/main/kotlin/work/slhaf/hub/CliHost.kt b/src/main/kotlin/work/slhaf/hub/cli/CliHost.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/CliHost.kt
rename to src/main/kotlin/work/slhaf/hub/cli/CliHost.kt
diff --git a/src/main/kotlin/work/slhaf/hub/ScriptEngine.kt b/src/main/kotlin/work/slhaf/hub/script/ScriptEngine.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/ScriptEngine.kt
rename to src/main/kotlin/work/slhaf/hub/script/ScriptEngine.kt
diff --git a/src/main/kotlin/work/slhaf/hub/ScriptMetadataEngine.kt b/src/main/kotlin/work/slhaf/hub/script/ScriptMetadataEngine.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/ScriptMetadataEngine.kt
rename to src/main/kotlin/work/slhaf/hub/script/ScriptMetadataEngine.kt
diff --git a/src/main/kotlin/work/slhaf/hub/ScriptRuntime.kt b/src/main/kotlin/work/slhaf/hub/script/ScriptRuntime.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/ScriptRuntime.kt
rename to src/main/kotlin/work/slhaf/hub/script/ScriptRuntime.kt
diff --git a/src/main/kotlin/work/slhaf/hub/SimpleScriptDef.kt b/src/main/kotlin/work/slhaf/hub/script/SimpleScriptDef.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/SimpleScriptDef.kt
rename to src/main/kotlin/work/slhaf/hub/script/SimpleScriptDef.kt
diff --git a/src/main/kotlin/work/slhaf/hub/WebHost.kt b/src/main/kotlin/work/slhaf/hub/web/WebHost.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/WebHost.kt
rename to src/main/kotlin/work/slhaf/hub/web/WebHost.kt
diff --git a/src/main/kotlin/work/slhaf/hub/WebRoutes.kt b/src/main/kotlin/work/slhaf/hub/web/WebRoutes.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/WebRoutes.kt
rename to src/main/kotlin/work/slhaf/hub/web/WebRoutes.kt
diff --git a/src/main/kotlin/work/slhaf/hub/WebScriptService.kt b/src/main/kotlin/work/slhaf/hub/web/WebScriptService.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/WebScriptService.kt
rename to src/main/kotlin/work/slhaf/hub/web/WebScriptService.kt
diff --git a/src/main/kotlin/work/slhaf/hub/WebSecurity.kt b/src/main/kotlin/work/slhaf/hub/web/WebSecurity.kt
similarity index 100%
rename from src/main/kotlin/work/slhaf/hub/WebSecurity.kt
rename to src/main/kotlin/work/slhaf/hub/web/WebSecurity.kt
diff --git a/src/test/kotlin/work/slhaf/hub/WebAuthAndScriptApiTest.kt b/src/test/kotlin/work/slhaf/hub/web/WebAuthAndScriptApiTest.kt
similarity index 100%
rename from src/test/kotlin/work/slhaf/hub/WebAuthAndScriptApiTest.kt
rename to src/test/kotlin/work/slhaf/hub/web/WebAuthAndScriptApiTest.kt
diff --git a/src/test/kotlin/work/slhaf/hub/WebHostTestSupport.kt b/src/test/kotlin/work/slhaf/hub/web/WebHostTestSupport.kt
similarity index 100%
rename from src/test/kotlin/work/slhaf/hub/WebHostTestSupport.kt
rename to src/test/kotlin/work/slhaf/hub/web/WebHostTestSupport.kt
diff --git a/src/test/kotlin/work/slhaf/hub/WebRunApiTest.kt b/src/test/kotlin/work/slhaf/hub/web/WebRunApiTest.kt
similarity index 100%
rename from src/test/kotlin/work/slhaf/hub/WebRunApiTest.kt
rename to src/test/kotlin/work/slhaf/hub/web/WebRunApiTest.kt
diff --git a/src/test/kotlin/work/slhaf/hub/WebSubTokenApiTest.kt b/src/test/kotlin/work/slhaf/hub/web/WebSubTokenApiTest.kt
similarity index 100%
rename from src/test/kotlin/work/slhaf/hub/WebSubTokenApiTest.kt
rename to src/test/kotlin/work/slhaf/hub/web/WebSubTokenApiTest.kt