diff --git a/cmd/core-php/main.go b/cmd/core-php/main.go
index fb08c80..55ae99a 100644
--- a/cmd/core-php/main.go
+++ b/cmd/core-php/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	php "forge.lthn.ai/core/php"
+	php "forge.lthn.ai/core/php/pkg/php"
 
 	"forge.lthn.ai/core/cli/pkg/cli"
 )
diff --git a/bridge.go b/pkg/php/bridge.go
similarity index 100%
rename from bridge.go
rename to pkg/php/bridge.go
diff --git a/cmd.go b/pkg/php/cmd.go
similarity index 100%
rename from cmd.go
rename to pkg/php/cmd.go
diff --git a/cmd_build.go b/pkg/php/cmd_build.go
similarity index 100%
rename from cmd_build.go
rename to pkg/php/cmd_build.go
diff --git a/cmd_ci.go b/pkg/php/cmd_ci.go
similarity index 100%
rename from cmd_ci.go
rename to pkg/php/cmd_ci.go
diff --git a/cmd_commands.go b/pkg/php/cmd_commands.go
similarity index 100%
rename from cmd_commands.go
rename to pkg/php/cmd_commands.go
diff --git a/cmd_deploy.go b/pkg/php/cmd_deploy.go
similarity index 100%
rename from cmd_deploy.go
rename to pkg/php/cmd_deploy.go
diff --git a/cmd_dev.go b/pkg/php/cmd_dev.go
similarity index 100%
rename from cmd_dev.go
rename to pkg/php/cmd_dev.go
diff --git a/cmd_packages.go b/pkg/php/cmd_packages.go
similarity index 100%
rename from cmd_packages.go
rename to pkg/php/cmd_packages.go
diff --git a/cmd_serve_frankenphp.go b/pkg/php/cmd_serve_frankenphp.go
similarity index 100%
rename from cmd_serve_frankenphp.go
rename to pkg/php/cmd_serve_frankenphp.go
diff --git a/container.go b/pkg/php/container.go
similarity index 100%
rename from container.go
rename to pkg/php/container.go
diff --git a/container_test.go b/pkg/php/container_test.go
similarity index 100%
rename from container_test.go
rename to pkg/php/container_test.go
diff --git a/coolify.go b/pkg/php/coolify.go
similarity index 100%
rename from coolify.go
rename to pkg/php/coolify.go
diff --git a/coolify_test.go b/pkg/php/coolify_test.go
similarity index 100%
rename from coolify_test.go
rename to pkg/php/coolify_test.go
diff --git a/deploy.go b/pkg/php/deploy.go
similarity index 100%
rename from deploy.go
rename to pkg/php/deploy.go
diff --git a/deploy_internal_test.go b/pkg/php/deploy_internal_test.go
similarity index 100%
rename from deploy_internal_test.go
rename to pkg/php/deploy_internal_test.go
diff --git a/deploy_test.go b/pkg/php/deploy_test.go
similarity index 100%
rename from deploy_test.go
rename to pkg/php/deploy_test.go
diff --git a/detect.go b/pkg/php/detect.go
similarity index 100%
rename from detect.go
rename to pkg/php/detect.go
diff --git a/detect_test.go b/pkg/php/detect_test.go
similarity index 100%
rename from detect_test.go
rename to pkg/php/detect_test.go
diff --git a/dockerfile.go b/pkg/php/dockerfile.go
similarity index 100%
rename from dockerfile.go
rename to pkg/php/dockerfile.go
diff --git a/dockerfile_test.go b/pkg/php/dockerfile_test.go
similarity index 100%
rename from dockerfile_test.go
rename to pkg/php/dockerfile_test.go
diff --git a/env.go b/pkg/php/env.go
similarity index 100%
rename from env.go
rename to pkg/php/env.go
diff --git a/extract.go b/pkg/php/extract.go
similarity index 100%
rename from extract.go
rename to pkg/php/extract.go
diff --git a/handler.go b/pkg/php/handler.go
similarity index 100%
rename from handler.go
rename to pkg/php/handler.go
diff --git a/i18n.go b/pkg/php/i18n.go
similarity index 100%
rename from i18n.go
rename to pkg/php/i18n.go
diff --git a/locales/en_GB.json b/pkg/php/locales/en_GB.json
similarity index 100%
rename from locales/en_GB.json
rename to pkg/php/locales/en_GB.json
diff --git a/packages.go b/pkg/php/packages.go
similarity index 100%
rename from packages.go
rename to pkg/php/packages.go
diff --git a/packages_test.go b/pkg/php/packages_test.go
similarity index 100%
rename from packages_test.go
rename to pkg/php/packages_test.go
diff --git a/php.go b/pkg/php/php.go
similarity index 100%
rename from php.go
rename to pkg/php/php.go
diff --git a/php_test.go b/pkg/php/php_test.go
similarity index 100%
rename from php_test.go
rename to pkg/php/php_test.go
diff --git a/quality.go b/pkg/php/quality.go
similarity index 100%
rename from quality.go
rename to pkg/php/quality.go
diff --git a/services.go b/pkg/php/services.go
similarity index 100%
rename from services.go
rename to pkg/php/services.go
diff --git a/services_extended_test.go b/pkg/php/services_extended_test.go
similarity index 100%
rename from services_extended_test.go
rename to pkg/php/services_extended_test.go
diff --git a/services_test.go b/pkg/php/services_test.go
similarity index 100%
rename from services_test.go
rename to pkg/php/services_test.go
diff --git a/services_unix.go b/pkg/php/services_unix.go
similarity index 100%
rename from services_unix.go
rename to pkg/php/services_unix.go
diff --git a/services_windows.go b/pkg/php/services_windows.go
similarity index 100%
rename from services_windows.go
rename to pkg/php/services_windows.go
diff --git a/ssl.go b/pkg/php/ssl.go
similarity index 100%
rename from ssl.go
rename to pkg/php/ssl.go
diff --git a/ssl_extended_test.go b/pkg/php/ssl_extended_test.go
similarity index 100%
rename from ssl_extended_test.go
rename to pkg/php/ssl_extended_test.go
diff --git a/ssl_test.go b/pkg/php/ssl_test.go
similarity index 100%
rename from ssl_test.go
rename to pkg/php/ssl_test.go
diff --git a/testing.go b/pkg/php/testing.go
similarity index 100%
rename from testing.go
rename to pkg/php/testing.go
diff --git a/workspace.go b/pkg/php/workspace.go
similarity index 100%
rename from workspace.go
rename to pkg/php/workspace.go