diff --git a/engine/php/pkg/php/bridge.go b/engine/php/bridge.go
similarity index 100%
rename from engine/php/pkg/php/bridge.go
rename to engine/php/bridge.go
diff --git a/engine/php/pkg/php/bridge_example_test.go b/engine/php/bridge_example_test.go
similarity index 100%
rename from engine/php/pkg/php/bridge_example_test.go
rename to engine/php/bridge_example_test.go
diff --git a/engine/php/pkg/php/bridge_test.go b/engine/php/bridge_test.go
similarity index 100%
rename from engine/php/pkg/php/bridge_test.go
rename to engine/php/bridge_test.go
diff --git a/engine/php/pkg/php/cmd.go b/engine/php/cmd.go
similarity index 100%
rename from engine/php/pkg/php/cmd.go
rename to engine/php/cmd.go
diff --git a/engine/php/cmd/core-php/main.go b/engine/php/cmd/core-php/main.go
index 5a5527c..d48f066 100644
--- a/engine/php/cmd/core-php/main.go
+++ b/engine/php/cmd/core-php/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	php "dappco.re/go/render/engine/php/pkg/php"
+	php "dappco.re/go/render/engine/php"
 
 	"dappco.re/go/cli/pkg/cli"
 )
diff --git a/engine/php/pkg/php/cmd_build.go b/engine/php/cmd_build.go
similarity index 100%
rename from engine/php/pkg/php/cmd_build.go
rename to engine/php/cmd_build.go
diff --git a/engine/php/pkg/php/cmd_ci.go b/engine/php/cmd_ci.go
similarity index 100%
rename from engine/php/pkg/php/cmd_ci.go
rename to engine/php/cmd_ci.go
diff --git a/engine/php/pkg/php/cmd_ci_example_test.go b/engine/php/cmd_ci_example_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_ci_example_test.go
rename to engine/php/cmd_ci_example_test.go
diff --git a/engine/php/pkg/php/cmd_ci_test.go b/engine/php/cmd_ci_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_ci_test.go
rename to engine/php/cmd_ci_test.go
diff --git a/engine/php/pkg/php/cmd_commands.go b/engine/php/cmd_commands.go
similarity index 100%
rename from engine/php/pkg/php/cmd_commands.go
rename to engine/php/cmd_commands.go
diff --git a/engine/php/pkg/php/cmd_commands_example_test.go b/engine/php/cmd_commands_example_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_commands_example_test.go
rename to engine/php/cmd_commands_example_test.go
diff --git a/engine/php/pkg/php/cmd_commands_test.go b/engine/php/cmd_commands_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_commands_test.go
rename to engine/php/cmd_commands_test.go
diff --git a/engine/php/pkg/php/cmd_deploy.go b/engine/php/cmd_deploy.go
similarity index 100%
rename from engine/php/pkg/php/cmd_deploy.go
rename to engine/php/cmd_deploy.go
diff --git a/engine/php/pkg/php/cmd_dev.go b/engine/php/cmd_dev.go
similarity index 100%
rename from engine/php/pkg/php/cmd_dev.go
rename to engine/php/cmd_dev.go
diff --git a/engine/php/pkg/php/cmd_example_test.go b/engine/php/cmd_example_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_example_test.go
rename to engine/php/cmd_example_test.go
diff --git a/engine/php/pkg/php/cmd_packages.go b/engine/php/cmd_packages.go
similarity index 100%
rename from engine/php/pkg/php/cmd_packages.go
rename to engine/php/cmd_packages.go
diff --git a/engine/php/pkg/php/cmd_serve_frankenphp.go b/engine/php/cmd_serve_frankenphp.go
similarity index 100%
rename from engine/php/pkg/php/cmd_serve_frankenphp.go
rename to engine/php/cmd_serve_frankenphp.go
diff --git a/engine/php/pkg/php/cmd_serve_frankenphp_example_test.go b/engine/php/cmd_serve_frankenphp_example_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_serve_frankenphp_example_test.go
rename to engine/php/cmd_serve_frankenphp_example_test.go
diff --git a/engine/php/pkg/php/cmd_serve_frankenphp_stub.go b/engine/php/cmd_serve_frankenphp_stub.go
similarity index 100%
rename from engine/php/pkg/php/cmd_serve_frankenphp_stub.go
rename to engine/php/cmd_serve_frankenphp_stub.go
diff --git a/engine/php/pkg/php/cmd_serve_frankenphp_stub_example_test.go b/engine/php/cmd_serve_frankenphp_stub_example_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_serve_frankenphp_stub_example_test.go
rename to engine/php/cmd_serve_frankenphp_stub_example_test.go
diff --git a/engine/php/pkg/php/cmd_serve_frankenphp_stub_test.go b/engine/php/cmd_serve_frankenphp_stub_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_serve_frankenphp_stub_test.go
rename to engine/php/cmd_serve_frankenphp_stub_test.go
diff --git a/engine/php/pkg/php/cmd_serve_frankenphp_test.go b/engine/php/cmd_serve_frankenphp_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_serve_frankenphp_test.go
rename to engine/php/cmd_serve_frankenphp_test.go
diff --git a/engine/php/pkg/php/cmd_test.go b/engine/php/cmd_test.go
similarity index 100%
rename from engine/php/pkg/php/cmd_test.go
rename to engine/php/cmd_test.go
diff --git a/engine/php/pkg/php/compat.go b/engine/php/compat.go
similarity index 100%
rename from engine/php/pkg/php/compat.go
rename to engine/php/compat.go
diff --git a/engine/php/pkg/php/container.go b/engine/php/container.go
similarity index 100%
rename from engine/php/pkg/php/container.go
rename to engine/php/container.go
diff --git a/engine/php/pkg/php/container_example_test.go b/engine/php/container_example_test.go
similarity index 100%
rename from engine/php/pkg/php/container_example_test.go
rename to engine/php/container_example_test.go
diff --git a/engine/php/pkg/php/container_test.go b/engine/php/container_test.go
similarity index 100%
rename from engine/php/pkg/php/container_test.go
rename to engine/php/container_test.go
diff --git a/engine/php/pkg/php/coolify.go b/engine/php/coolify.go
similarity index 100%
rename from engine/php/pkg/php/coolify.go
rename to engine/php/coolify.go
diff --git a/engine/php/pkg/php/coolify_example_test.go b/engine/php/coolify_example_test.go
similarity index 100%
rename from engine/php/pkg/php/coolify_example_test.go
rename to engine/php/coolify_example_test.go
diff --git a/engine/php/pkg/php/coolify_test.go b/engine/php/coolify_test.go
similarity index 100%
rename from engine/php/pkg/php/coolify_test.go
rename to engine/php/coolify_test.go
diff --git a/engine/php/pkg/php/core_assert_test.go b/engine/php/core_assert_test.go
similarity index 100%
rename from engine/php/pkg/php/core_assert_test.go
rename to engine/php/core_assert_test.go
diff --git a/engine/php/pkg/php/deploy.go b/engine/php/deploy.go
similarity index 100%
rename from engine/php/pkg/php/deploy.go
rename to engine/php/deploy.go
diff --git a/engine/php/pkg/php/deploy_example_test.go b/engine/php/deploy_example_test.go
similarity index 100%
rename from engine/php/pkg/php/deploy_example_test.go
rename to engine/php/deploy_example_test.go
diff --git a/engine/php/pkg/php/deploy_test.go b/engine/php/deploy_test.go
similarity index 100%
rename from engine/php/pkg/php/deploy_test.go
rename to engine/php/deploy_test.go
diff --git a/engine/php/pkg/php/detect.go b/engine/php/detect.go
similarity index 100%
rename from engine/php/pkg/php/detect.go
rename to engine/php/detect.go
diff --git a/engine/php/pkg/php/detect_example_test.go b/engine/php/detect_example_test.go
similarity index 100%
rename from engine/php/pkg/php/detect_example_test.go
rename to engine/php/detect_example_test.go
diff --git a/engine/php/pkg/php/detect_test.go b/engine/php/detect_test.go
similarity index 100%
rename from engine/php/pkg/php/detect_test.go
rename to engine/php/detect_test.go
diff --git a/engine/php/pkg/php/dockerfile.go b/engine/php/dockerfile.go
similarity index 100%
rename from engine/php/pkg/php/dockerfile.go
rename to engine/php/dockerfile.go
diff --git a/engine/php/pkg/php/dockerfile_example_test.go b/engine/php/dockerfile_example_test.go
similarity index 100%
rename from engine/php/pkg/php/dockerfile_example_test.go
rename to engine/php/dockerfile_example_test.go
diff --git a/engine/php/pkg/php/dockerfile_test.go b/engine/php/dockerfile_test.go
similarity index 100%
rename from engine/php/pkg/php/dockerfile_test.go
rename to engine/php/dockerfile_test.go
diff --git a/engine/php/pkg/php/env.go b/engine/php/env.go
similarity index 100%
rename from engine/php/pkg/php/env.go
rename to engine/php/env.go
diff --git a/engine/php/pkg/php/env_example_test.go b/engine/php/env_example_test.go
similarity index 100%
rename from engine/php/pkg/php/env_example_test.go
rename to engine/php/env_example_test.go
diff --git a/engine/php/pkg/php/env_test.go b/engine/php/env_test.go
similarity index 100%
rename from engine/php/pkg/php/env_test.go
rename to engine/php/env_test.go
diff --git a/engine/php/pkg/php/extract.go b/engine/php/extract.go
similarity index 100%
rename from engine/php/pkg/php/extract.go
rename to engine/php/extract.go
diff --git a/engine/php/pkg/php/extract_example_test.go b/engine/php/extract_example_test.go
similarity index 100%
rename from engine/php/pkg/php/extract_example_test.go
rename to engine/php/extract_example_test.go
diff --git a/engine/php/pkg/php/extract_test.go b/engine/php/extract_test.go
similarity index 100%
rename from engine/php/pkg/php/extract_test.go
rename to engine/php/extract_test.go
diff --git a/engine/php/pkg/php/go_cli_helpers.go b/engine/php/go_cli_helpers.go
similarity index 100%
rename from engine/php/pkg/php/go_cli_helpers.go
rename to engine/php/go_cli_helpers.go
diff --git a/engine/php/pkg/php/go_cli_helpers_example_test.go b/engine/php/go_cli_helpers_example_test.go
similarity index 100%
rename from engine/php/pkg/php/go_cli_helpers_example_test.go
rename to engine/php/go_cli_helpers_example_test.go
diff --git a/engine/php/pkg/php/go_cli_helpers_test.go b/engine/php/go_cli_helpers_test.go
similarity index 100%
rename from engine/php/pkg/php/go_cli_helpers_test.go
rename to engine/php/go_cli_helpers_test.go
diff --git a/engine/php/pkg/php/handler.go b/engine/php/handler.go
similarity index 100%
rename from engine/php/pkg/php/handler.go
rename to engine/php/handler.go
diff --git a/engine/php/pkg/php/handler_example_test.go b/engine/php/handler_example_test.go
similarity index 100%
rename from engine/php/pkg/php/handler_example_test.go
rename to engine/php/handler_example_test.go
diff --git a/engine/php/pkg/php/handler_stub.go b/engine/php/handler_stub.go
similarity index 100%
rename from engine/php/pkg/php/handler_stub.go
rename to engine/php/handler_stub.go
diff --git a/engine/php/pkg/php/handler_stub_example_test.go b/engine/php/handler_stub_example_test.go
similarity index 100%
rename from engine/php/pkg/php/handler_stub_example_test.go
rename to engine/php/handler_stub_example_test.go
diff --git a/engine/php/pkg/php/handler_stub_test.go b/engine/php/handler_stub_test.go
similarity index 100%
rename from engine/php/pkg/php/handler_stub_test.go
rename to engine/php/handler_stub_test.go
diff --git a/engine/php/pkg/php/handler_test.go b/engine/php/handler_test.go
similarity index 100%
rename from engine/php/pkg/php/handler_test.go
rename to engine/php/handler_test.go
diff --git a/engine/php/pkg/php/i18n.go b/engine/php/i18n.go
similarity index 100%
rename from engine/php/pkg/php/i18n.go
rename to engine/php/i18n.go
diff --git a/engine/php/pkg/php/locales/en_GB.json b/engine/php/locales/en_GB.json
similarity index 100%
rename from engine/php/pkg/php/locales/en_GB.json
rename to engine/php/locales/en_GB.json
diff --git a/engine/php/pkg/php/packages.go b/engine/php/packages.go
similarity index 100%
rename from engine/php/pkg/php/packages.go
rename to engine/php/packages.go
diff --git a/engine/php/pkg/php/packages_example_test.go b/engine/php/packages_example_test.go
similarity index 100%
rename from engine/php/pkg/php/packages_example_test.go
rename to engine/php/packages_example_test.go
diff --git a/engine/php/pkg/php/packages_test.go b/engine/php/packages_test.go
similarity index 100%
rename from engine/php/pkg/php/packages_test.go
rename to engine/php/packages_test.go
diff --git a/engine/php/pkg/php/php.go b/engine/php/php.go
similarity index 100%
rename from engine/php/pkg/php/php.go
rename to engine/php/php.go
diff --git a/engine/php/pkg/php/php_example_test.go b/engine/php/php_example_test.go
similarity index 100%
rename from engine/php/pkg/php/php_example_test.go
rename to engine/php/php_example_test.go
diff --git a/engine/php/pkg/php/php_test.go b/engine/php/php_test.go
similarity index 100%
rename from engine/php/pkg/php/php_test.go
rename to engine/php/php_test.go
diff --git a/engine/php/pkg/php/quality.go b/engine/php/quality.go
similarity index 100%
rename from engine/php/pkg/php/quality.go
rename to engine/php/quality.go
diff --git a/engine/php/pkg/php/quality_example_test.go b/engine/php/quality_example_test.go
similarity index 100%
rename from engine/php/pkg/php/quality_example_test.go
rename to engine/php/quality_example_test.go
diff --git a/engine/php/pkg/php/quality_test.go b/engine/php/quality_test.go
similarity index 100%
rename from engine/php/pkg/php/quality_test.go
rename to engine/php/quality_test.go
diff --git a/engine/php/pkg/php/service.go b/engine/php/service.go
similarity index 100%
rename from engine/php/pkg/php/service.go
rename to engine/php/service.go
diff --git a/engine/php/pkg/php/service_example_test.go b/engine/php/service_example_test.go
similarity index 100%
rename from engine/php/pkg/php/service_example_test.go
rename to engine/php/service_example_test.go
diff --git a/engine/php/pkg/php/service_test.go b/engine/php/service_test.go
similarity index 100%
rename from engine/php/pkg/php/service_test.go
rename to engine/php/service_test.go
diff --git a/engine/php/pkg/php/services.go b/engine/php/services.go
similarity index 100%
rename from engine/php/pkg/php/services.go
rename to engine/php/services.go
diff --git a/engine/php/pkg/php/services_example_test.go b/engine/php/services_example_test.go
similarity index 100%
rename from engine/php/pkg/php/services_example_test.go
rename to engine/php/services_example_test.go
diff --git a/engine/php/pkg/php/services_test.go b/engine/php/services_test.go
similarity index 100%
rename from engine/php/pkg/php/services_test.go
rename to engine/php/services_test.go
diff --git a/engine/php/pkg/php/services_unix.go b/engine/php/services_unix.go
similarity index 100%
rename from engine/php/pkg/php/services_unix.go
rename to engine/php/services_unix.go
diff --git a/engine/php/pkg/php/services_windows.go b/engine/php/services_windows.go
similarity index 100%
rename from engine/php/pkg/php/services_windows.go
rename to engine/php/services_windows.go
diff --git a/engine/php/pkg/php/sonar_constants.go b/engine/php/sonar_constants.go
similarity index 100%
rename from engine/php/pkg/php/sonar_constants.go
rename to engine/php/sonar_constants.go
diff --git a/engine/php/pkg/php/ssl.go b/engine/php/ssl.go
similarity index 100%
rename from engine/php/pkg/php/ssl.go
rename to engine/php/ssl.go
diff --git a/engine/php/pkg/php/ssl_example_test.go b/engine/php/ssl_example_test.go
similarity index 100%
rename from engine/php/pkg/php/ssl_example_test.go
rename to engine/php/ssl_example_test.go
diff --git a/engine/php/pkg/php/ssl_test.go b/engine/php/ssl_test.go
similarity index 100%
rename from engine/php/pkg/php/ssl_test.go
rename to engine/php/ssl_test.go
diff --git a/engine/php/pkg/php/testing.go b/engine/php/testing.go
similarity index 100%
rename from engine/php/pkg/php/testing.go
rename to engine/php/testing.go
diff --git a/engine/php/pkg/php/testing_example_test.go b/engine/php/testing_example_test.go
similarity index 100%
rename from engine/php/pkg/php/testing_example_test.go
rename to engine/php/testing_example_test.go
diff --git a/engine/php/pkg/php/testing_test.go b/engine/php/testing_test.go
similarity index 100%
rename from engine/php/pkg/php/testing_test.go
rename to engine/php/testing_test.go
diff --git a/engine/php/pkg/php/workspace.go b/engine/php/workspace.go
similarity index 100%
rename from engine/php/pkg/php/workspace.go
rename to engine/php/workspace.go