From ceec5727ed93a7e192267866e5f9824a2057c513 Mon Sep 17 00:00:00 2001
From: rtcoder <dawidjez@gmail.com>
Date: Tue, 16 Jun 2026 21:23:44 +0200
Subject: [PATCH 1/2] Document completed refactoring steps

---
 REFACTORING.md | 69 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/REFACTORING.md b/REFACTORING.md
index 219ce2d..612a8a1 100644
--- a/REFACTORING.md
+++ b/REFACTORING.md
@@ -2,24 +2,33 @@
 
 ShiftPHP is moving toward an API-only modular monolith. View templates, compiled view storage, page assets and MVC rendering are out of scope for this line.
 
-## 0.5 Scope
-
-Implemented in this branch:
-
-- module-owned routing,
-- route parameters with `{name}` placeholders,
-- controller actions returning response objects,
-- `Response`, `JsonResponse` and `ResponseEmitter`,
-- JSON response helpers on the base controller,
-- request helpers for query, post, input, raw body, JSON and route params,
-- JSON errors for `400`, `404` and `500`,
-- `405 Method Not Allowed` with an `Allow` header,
-- lightweight API core tests through `composer test`,
-- `route:list` CLI command,
-- PHP 8 attributes for controller routing,
-- PHP 8 attributes for response metadata and parameter binding,
-- modular monolith support through `application/modules/*/Module.php`,
-- removal of view storage and example page assets from runtime.
+## Completed
+
+- [x] API-only runtime direction.
+- [x] Route parameters with `{name}` placeholders.
+- [x] Controller actions returning response objects.
+- [x] `Engine\Response\Response`, `JsonResponse` and `ResponseEmitter`.
+- [x] JSON response helpers on the base controller.
+- [x] Request helpers for query, post, input, raw body, JSON and route params.
+- [x] JSON errors for `400`, `404` and `500`.
+- [x] `405 Method Not Allowed` with an `Allow` header.
+- [x] Lightweight API core tests through `composer test`.
+- [x] `route:list` CLI command.
+- [x] PHP 8 attributes for controller routing.
+- [x] PHP 8 attributes for response metadata and parameter binding.
+- [x] Modular monolith support through `application/modules/*/Module.php`.
+- [x] Module-owned controllers, routes, services and commands.
+- [x] Removal of view storage and example page assets from runtime.
+- [x] Removal of legacy `application/controllers` and `application/routes.php`.
+- [x] Domain-oriented engine namespaces:
+  - `Engine\Response`
+  - `Engine\Routing\Router`
+  - `Engine\Routing\Attributes`
+  - `Engine\Service`
+  - `Engine\Modules`
+- [x] GitHub API workflow with PHP 8.3 checks.
+- [x] PR version label validation.
+- [x] Release workflow using PR summary as release notes.
 
 ## Modular Monolith Direction
 
@@ -127,11 +136,19 @@ Internal errors return a generic `500` message unless `display_errors` is enable
 - `Engine/Error/StorageError.php`
 - example CSS and JS page assets
 - `View\\` composer namespace
-
-## Next After 0.5
-
-- Middleware pipeline.
-- Controller autowiring through the container.
-- Validation helpers and typed request DTOs.
-- CORS and auth middleware.
-- Structured logging for exceptions.
+- `application/controllers`
+- `application/routes.php`
+
+## Next
+
+- [ ] Middleware pipeline.
+- [ ] Controller autowiring through the container.
+- [ ] Validation helpers and typed request DTOs.
+- [ ] CORS middleware.
+- [ ] Authentication and authorization middleware contracts.
+- [ ] Structured logging for exceptions.
+- [ ] Module configuration loading.
+- [ ] Module lifecycle hooks, for example `boot()` after service registration.
+- [ ] Module discovery cache for production.
+- [ ] CLI command namespaces and command metadata.
+- [ ] Basic package-quality checks, for example static analysis and coding style.

From 32452edcc172f186b7e9914b710cccffd3c37786 Mon Sep 17 00:00:00 2001
From: rtcoder <dawidjez@gmail.com>
Date: Tue, 16 Jun 2026 21:31:20 +0200
Subject: [PATCH 2/2] Rename framework namespace to Shift

---
 Engine/App.php                                | 28 ++++++-------
 Engine/Console/Cli.php                        |  2 +-
 Engine/Console/CommandInterface.php           |  2 +-
 Engine/Console/Commands/Help.php              |  2 +-
 Engine/Console/Commands/RouteList.php         |  8 ++--
 Engine/Console/Commands/Serve.php             |  2 +-
 Engine/Console/Console.php                    |  2 +-
 Engine/Console/Shift.php                      |  4 +-
 Engine/Controller.php                         | 10 ++---
 Engine/Error/ErrorHandler.php                 |  4 +-
 Engine/Error/HttpError.php                    |  2 +-
 Engine/Error/ShiftError.php                   |  4 +-
 Engine/Error/ShiftError/ErrorHighlighter.php  |  2 +-
 Engine/Error/ShiftError/StackTrace.php        |  2 +-
 Engine/Modules/AbstractModule.php             |  6 +--
 Engine/Modules/ModuleInterface.php            |  6 +--
 Engine/Modules/ModuleLoader.php               |  6 +--
 Engine/Request.php                            |  6 +--
 Engine/Response/JsonResponse.php              |  2 +-
 Engine/Response/Response.php                  |  2 +-
 Engine/Response/ResponseEmitter.php           |  2 +-
 Engine/Routing/AttributeRouteLoader.php       |  8 ++--
 Engine/Routing/Attributes/Body.php            |  2 +-
 Engine/Routing/Attributes/Delete.php          |  2 +-
 Engine/Routing/Attributes/Get.php             |  2 +-
 Engine/Routing/Attributes/Header.php          |  2 +-
 Engine/Routing/Attributes/Patch.php           |  2 +-
 Engine/Routing/Attributes/PathParam.php       |  2 +-
 Engine/Routing/Attributes/Post.php            |  2 +-
 Engine/Routing/Attributes/Put.php             |  2 +-
 Engine/Routing/Attributes/QueryParam.php      |  2 +-
 Engine/Routing/Attributes/Route.php           |  2 +-
 Engine/Routing/Attributes/RoutePrefix.php     |  2 +-
 Engine/Routing/Attributes/Status.php          |  2 +-
 Engine/Routing/Router/Route.php               |  4 +-
 Engine/Routing/Router/RouteMatch.php          |  2 +-
 Engine/Routing/Router/Router.php              |  6 +--
 Engine/Service/ServiceContainer.php           |  4 +-
 Engine/Service/ServiceInterface.php           |  4 +-
 Engine/Tools/ClassFinder.php                  |  2 +-
 Engine/Utils/Debug.php                        |  2 +-
 Engine/Utils/helpers.php                      |  4 +-
 README.md                                     | 28 ++++++-------
 REFACTORING.md                                | 20 +++++-----
 .../modules/Health/Commands/Health.php        |  4 +-
 .../Health/Controllers/HealthController.php   |  8 ++--
 application/modules/Health/Module.php         |  8 ++--
 bootstrap.php                                 |  6 +--
 composer.json                                 |  4 +-
 index.php                                     |  6 +--
 shift.php                                     |  4 +-
 tests/ApiCoreTest.php                         | 40 +++++++++----------
 52 files changed, 145 insertions(+), 147 deletions(-)

diff --git a/Engine/App.php b/Engine/App.php
index 9647609..145dd70 100755
--- a/Engine/App.php
+++ b/Engine/App.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Engine;
-
-use Engine\Error\HttpError;
-use Engine\Response\JsonResponse;
-use Engine\Response\Response;
-use Engine\Response\ResponseEmitter;
-use Engine\Routing\Attributes\Body;
-use Engine\Routing\Attributes\Header;
-use Engine\Routing\Attributes\PathParam;
-use Engine\Routing\Attributes\QueryParam;
-use Engine\Routing\Attributes\Status;
-use Engine\Routing\Router\Router;
-use Engine\Service\ServiceContainer;
+namespace Shift;
+
+use Shift\Error\HttpError;
+use Shift\Response\JsonResponse;
+use Shift\Response\Response;
+use Shift\Response\ResponseEmitter;
+use Shift\Routing\Attributes\Body;
+use Shift\Routing\Attributes\Header;
+use Shift\Routing\Attributes\PathParam;
+use Shift\Routing\Attributes\QueryParam;
+use Shift\Routing\Attributes\Status;
+use Shift\Routing\Router\Router;
+use Shift\Service\ServiceContainer;
 use JsonException;
 use ReflectionClass;
 use ReflectionException;
@@ -23,7 +23,7 @@
 
 /**
  * Class App
- * @package Engine
+ * @package Shift
  */
 final class App
 {
diff --git a/Engine/Console/Cli.php b/Engine/Console/Cli.php
index de65ad6..e7e87a1 100644
--- a/Engine/Console/Cli.php
+++ b/Engine/Console/Cli.php
@@ -3,7 +3,7 @@
  * Klasa do obsługi wyjścia na terminal
  */
 
-namespace Engine\Console;
+namespace Shift\Console;
 
 class Cli
 {
diff --git a/Engine/Console/CommandInterface.php b/Engine/Console/CommandInterface.php
index 65d9db3..77cc6e9 100644
--- a/Engine/Console/CommandInterface.php
+++ b/Engine/Console/CommandInterface.php
@@ -6,7 +6,7 @@
  * Time: 12:51
  */
 
-namespace Engine\Console;
+namespace Shift\Console;
 
 
 interface CommandInterface
diff --git a/Engine/Console/Commands/Help.php b/Engine/Console/Commands/Help.php
index 8429b74..9b29f92 100644
--- a/Engine/Console/Commands/Help.php
+++ b/Engine/Console/Commands/Help.php
@@ -8,7 +8,7 @@
 
 namespace Console\Commands;
 
-use Engine\Console\CommandInterface;
+use Shift\Console\CommandInterface;
 
 class Help implements CommandInterface
 {
diff --git a/Engine/Console/Commands/RouteList.php b/Engine/Console/Commands/RouteList.php
index 05048c8..240c9ff 100644
--- a/Engine/Console/Commands/RouteList.php
+++ b/Engine/Console/Commands/RouteList.php
@@ -2,10 +2,10 @@
 
 namespace Console\Commands;
 
-use Engine\Console\Cli;
-use Engine\Console\CommandInterface;
-use Engine\Modules\ModuleLoader;
-use Engine\Routing\Router\Router;
+use Shift\Console\Cli;
+use Shift\Console\CommandInterface;
+use Shift\Modules\ModuleLoader;
+use Shift\Routing\Router\Router;
 
 class RouteList implements CommandInterface
 {
diff --git a/Engine/Console/Commands/Serve.php b/Engine/Console/Commands/Serve.php
index f0682cb..523afcc 100644
--- a/Engine/Console/Commands/Serve.php
+++ b/Engine/Console/Commands/Serve.php
@@ -9,7 +9,7 @@
 namespace Console\Commands;
 
 
-use Engine\Console\CommandInterface;
+use Shift\Console\CommandInterface;
 
 class Serve implements CommandInterface
 {
diff --git a/Engine/Console/Console.php b/Engine/Console/Console.php
index fe4e82a..5116bd1 100644
--- a/Engine/Console/Console.php
+++ b/Engine/Console/Console.php
@@ -7,7 +7,7 @@
  * Updated: 2025-06-22
  */
 
-namespace Engine\Console;
+namespace Shift\Console;
 
 /**
  * Główna klasa konsolowa
diff --git a/Engine/Console/Shift.php b/Engine/Console/Shift.php
index 9a6f862..9044a0a 100644
--- a/Engine/Console/Shift.php
+++ b/Engine/Console/Shift.php
@@ -6,9 +6,9 @@
  * Time: 11:57
  */
 
-namespace Engine\Console;
+namespace Shift\Console;
 
-use Engine\Modules\ModuleLoader;
+use Shift\Modules\ModuleLoader;
 use ReflectionClass;
 use ReflectionException;
 
diff --git a/Engine/Controller.php b/Engine/Controller.php
index 76fa991..631d490 100755
--- a/Engine/Controller.php
+++ b/Engine/Controller.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Engine;
+namespace Shift;
 
-use Engine\Response\JsonResponse;
-use Engine\Response\Response;
-use Engine\Service\ServiceContainer;
+use Shift\Response\JsonResponse;
+use Shift\Response\Response;
+use Shift\Service\ServiceContainer;
 use JsonException;
 
 /**
  * Class Controller
- * @package Engine
+ * @package Shift
  */
 abstract class Controller
 {
diff --git a/Engine/Error/ErrorHandler.php b/Engine/Error/ErrorHandler.php
index 5784ae6..68b858a 100644
--- a/Engine/Error/ErrorHandler.php
+++ b/Engine/Error/ErrorHandler.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Engine\Error;
+namespace Shift\Error;
 
 use Throwable;
 
 /**
  * Class ErrorHandler
- * @package Engine\Error
+ * @package Shift\Error
  */
 class ErrorHandler
 {
diff --git a/Engine/Error/HttpError.php b/Engine/Error/HttpError.php
index 6408401..6ce0b78 100644
--- a/Engine/Error/HttpError.php
+++ b/Engine/Error/HttpError.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Error;
+namespace Shift\Error;
 
 use Throwable;
 
diff --git a/Engine/Error/ShiftError.php b/Engine/Error/ShiftError.php
index fd9a3fa..4a5282f 100644
--- a/Engine/Error/ShiftError.php
+++ b/Engine/Error/ShiftError.php
@@ -6,14 +6,14 @@
  * Time: 17:58
  */
 
-namespace Engine\Error;
+namespace Shift\Error;
 
 
 use Throwable;
 
 /**
  * Class ShiftError
- * @package Engine\Error
+ * @package Shift\Error
  */
 class ShiftError extends \Error
 {
diff --git a/Engine/Error/ShiftError/ErrorHighlighter.php b/Engine/Error/ShiftError/ErrorHighlighter.php
index 5d16b1c..9da2772 100644
--- a/Engine/Error/ShiftError/ErrorHighlighter.php
+++ b/Engine/Error/ShiftError/ErrorHighlighter.php
@@ -6,7 +6,7 @@
  * Time: 23:15
  */
 
-namespace Engine\Error\ShiftError;
+namespace Shift\Error\ShiftError;
 
 
 final class ErrorHighlighter
diff --git a/Engine/Error/ShiftError/StackTrace.php b/Engine/Error/ShiftError/StackTrace.php
index 75cac39..461ffc7 100644
--- a/Engine/Error/ShiftError/StackTrace.php
+++ b/Engine/Error/ShiftError/StackTrace.php
@@ -6,7 +6,7 @@
  * Time: 23:02
  */
 
-namespace Engine\Error\ShiftError;
+namespace Shift\Error\ShiftError;
 
 
 class StackTrace
diff --git a/Engine/Modules/AbstractModule.php b/Engine/Modules/AbstractModule.php
index 40f763a..172e26f 100644
--- a/Engine/Modules/AbstractModule.php
+++ b/Engine/Modules/AbstractModule.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Engine\Modules;
+namespace Shift\Modules;
 
-use Engine\Routing\Router\Router;
-use Engine\Service\ServiceContainer;
+use Shift\Routing\Router\Router;
+use Shift\Service\ServiceContainer;
 
 abstract class AbstractModule implements ModuleInterface
 {
diff --git a/Engine/Modules/ModuleInterface.php b/Engine/Modules/ModuleInterface.php
index 012be35..867c010 100644
--- a/Engine/Modules/ModuleInterface.php
+++ b/Engine/Modules/ModuleInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Engine\Modules;
+namespace Shift\Modules;
 
-use Engine\Routing\Router\Router;
-use Engine\Service\ServiceContainer;
+use Shift\Routing\Router\Router;
+use Shift\Service\ServiceContainer;
 
 interface ModuleInterface
 {
diff --git a/Engine/Modules/ModuleLoader.php b/Engine/Modules/ModuleLoader.php
index acfb2d0..246edd5 100644
--- a/Engine/Modules/ModuleLoader.php
+++ b/Engine/Modules/ModuleLoader.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Engine\Modules;
+namespace Shift\Modules;
 
-use Engine\Routing\Router\Router;
-use Engine\Service\ServiceContainer;
+use Shift\Routing\Router\Router;
+use Shift\Service\ServiceContainer;
 
 class ModuleLoader
 {
diff --git a/Engine/Request.php b/Engine/Request.php
index 7b713ab..f1a82c6 100755
--- a/Engine/Request.php
+++ b/Engine/Request.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Engine;
+namespace Shift;
 
-use Engine\Error\HttpError;
+use Shift\Error\HttpError;
 
 /**
  * Class Request
- * @package Engine
+ * @package Shift
  */
 class Request
 {
diff --git a/Engine/Response/JsonResponse.php b/Engine/Response/JsonResponse.php
index 706e3a2..d016fa9 100644
--- a/Engine/Response/JsonResponse.php
+++ b/Engine/Response/JsonResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Response;
+namespace Shift\Response;
 
 use JsonException;
 
diff --git a/Engine/Response/Response.php b/Engine/Response/Response.php
index d9d2e77..3c531d2 100644
--- a/Engine/Response/Response.php
+++ b/Engine/Response/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Response;
+namespace Shift\Response;
 
 class Response
 {
diff --git a/Engine/Response/ResponseEmitter.php b/Engine/Response/ResponseEmitter.php
index daf8e95..2f00ffc 100644
--- a/Engine/Response/ResponseEmitter.php
+++ b/Engine/Response/ResponseEmitter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Response;
+namespace Shift\Response;
 
 class ResponseEmitter
 {
diff --git a/Engine/Routing/AttributeRouteLoader.php b/Engine/Routing/AttributeRouteLoader.php
index 8a3e0db..97f76d2 100644
--- a/Engine/Routing/AttributeRouteLoader.php
+++ b/Engine/Routing/AttributeRouteLoader.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Engine\Routing;
+namespace Shift\Routing;
 
-use Engine\Routing\Attributes\Route;
-use Engine\Routing\Attributes\RoutePrefix;
-use Engine\Routing\Router\Router;
+use Shift\Routing\Attributes\Route;
+use Shift\Routing\Attributes\RoutePrefix;
+use Shift\Routing\Router\Router;
 use ReflectionClass;
 
 class AttributeRouteLoader
diff --git a/Engine/Routing/Attributes/Body.php b/Engine/Routing/Attributes/Body.php
index 123c435..db16e4c 100644
--- a/Engine/Routing/Attributes/Body.php
+++ b/Engine/Routing/Attributes/Body.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Delete.php b/Engine/Routing/Attributes/Delete.php
index 53183f1..427aed7 100644
--- a/Engine/Routing/Attributes/Delete.php
+++ b/Engine/Routing/Attributes/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Get.php b/Engine/Routing/Attributes/Get.php
index 1a2b084..cd2bd12 100644
--- a/Engine/Routing/Attributes/Get.php
+++ b/Engine/Routing/Attributes/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Header.php b/Engine/Routing/Attributes/Header.php
index 430ff43..6d02975 100644
--- a/Engine/Routing/Attributes/Header.php
+++ b/Engine/Routing/Attributes/Header.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Patch.php b/Engine/Routing/Attributes/Patch.php
index 166d66c..26dc210 100644
--- a/Engine/Routing/Attributes/Patch.php
+++ b/Engine/Routing/Attributes/Patch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/PathParam.php b/Engine/Routing/Attributes/PathParam.php
index 49ff46e..9046132 100644
--- a/Engine/Routing/Attributes/PathParam.php
+++ b/Engine/Routing/Attributes/PathParam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Post.php b/Engine/Routing/Attributes/Post.php
index 7abe45e..39d1b20 100644
--- a/Engine/Routing/Attributes/Post.php
+++ b/Engine/Routing/Attributes/Post.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Put.php b/Engine/Routing/Attributes/Put.php
index 3635875..678337a 100644
--- a/Engine/Routing/Attributes/Put.php
+++ b/Engine/Routing/Attributes/Put.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/QueryParam.php b/Engine/Routing/Attributes/QueryParam.php
index 9679aba..d69c1b3 100644
--- a/Engine/Routing/Attributes/QueryParam.php
+++ b/Engine/Routing/Attributes/QueryParam.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Route.php b/Engine/Routing/Attributes/Route.php
index c3dc4ff..f7fa67e 100644
--- a/Engine/Routing/Attributes/Route.php
+++ b/Engine/Routing/Attributes/Route.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/RoutePrefix.php b/Engine/Routing/Attributes/RoutePrefix.php
index 861f786..4e0e4ed 100644
--- a/Engine/Routing/Attributes/RoutePrefix.php
+++ b/Engine/Routing/Attributes/RoutePrefix.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Attributes/Status.php b/Engine/Routing/Attributes/Status.php
index af6d4da..7148c76 100644
--- a/Engine/Routing/Attributes/Status.php
+++ b/Engine/Routing/Attributes/Status.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Attributes;
+namespace Shift\Routing\Attributes;
 
 use Attribute;
 
diff --git a/Engine/Routing/Router/Route.php b/Engine/Routing/Router/Route.php
index e71036c..bc45a6d 100644
--- a/Engine/Routing/Router/Route.php
+++ b/Engine/Routing/Router/Route.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Engine\Routing\Router;
+namespace Shift\Routing\Router;
 
-use Engine\Request;
+use Shift\Request;
 
 class Route
 {
diff --git a/Engine/Routing/Router/RouteMatch.php b/Engine/Routing/Router/RouteMatch.php
index 1e4c3da..457b812 100644
--- a/Engine/Routing/Router/RouteMatch.php
+++ b/Engine/Routing/Router/RouteMatch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine\Routing\Router;
+namespace Shift\Routing\Router;
 
 readonly class RouteMatch
 {
diff --git a/Engine/Routing/Router/Router.php b/Engine/Routing/Router/Router.php
index b6ccbd4..c1aa98b 100644
--- a/Engine/Routing/Router/Router.php
+++ b/Engine/Routing/Router/Router.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Engine\Routing\Router;
+namespace Shift\Routing\Router;
 
-use Engine\Error\HttpError;
-use Engine\Request;
+use Shift\Error\HttpError;
+use Shift\Request;
 
 class Router
 {
diff --git a/Engine/Service/ServiceContainer.php b/Engine/Service/ServiceContainer.php
index 36ac3eb..bc19e74 100644
--- a/Engine/Service/ServiceContainer.php
+++ b/Engine/Service/ServiceContainer.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Engine\Service;
+namespace Shift\Service;
 
 use Closure;
 use InvalidArgumentException;
 
 /**
  * Class ServiceContainer
- * @package Engine
+ * @package Shift
  */
 class ServiceContainer
 {
diff --git a/Engine/Service/ServiceInterface.php b/Engine/Service/ServiceInterface.php
index 6ce20cf..ad94d5f 100644
--- a/Engine/Service/ServiceInterface.php
+++ b/Engine/Service/ServiceInterface.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Engine\Service;
+namespace Shift\Service;
 
 /**
  * Interface ServiceInterface
- * @package Engine
+ * @package Shift
  */
 interface ServiceInterface
 {
diff --git a/Engine/Tools/ClassFinder.php b/Engine/Tools/ClassFinder.php
index ec81224..5dd04e7 100644
--- a/Engine/Tools/ClassFinder.php
+++ b/Engine/Tools/ClassFinder.php
@@ -6,7 +6,7 @@
  * Time: 11:00
  */
 
-namespace Engine\Tools;
+namespace Shift\Tools;
 
 class ClassFinder
 {
diff --git a/Engine/Utils/Debug.php b/Engine/Utils/Debug.php
index bbdb35d..969fee3 100755
--- a/Engine/Utils/Debug.php
+++ b/Engine/Utils/Debug.php
@@ -6,7 +6,7 @@
  * Time: 01:53
  */
 
-namespace Engine\Utils;
+namespace Shift\Utils;
 
 
 class Debug
diff --git a/Engine/Utils/helpers.php b/Engine/Utils/helpers.php
index c54096b..554b262 100755
--- a/Engine/Utils/helpers.php
+++ b/Engine/Utils/helpers.php
@@ -20,7 +20,7 @@ function __(string $str): string
  */
 function dd(...$args): void
 {
-    \Engine\Utils\Debug::dd(...$args);
+    \Shift\Utils\Debug::dd(...$args);
 }
 
 /**
@@ -28,7 +28,7 @@ function dd(...$args): void
  */
 function d(...$args): void
 {
-    \Engine\Utils\Debug::d(...$args);
+    \Shift\Utils\Debug::d(...$args);
 }
 
 /**
diff --git a/README.md b/README.md
index 2c706bc..9e4fd9e 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Routes are owned by modules and registered from each module boundary:
 ```php
 namespace Modules\Health;
 
-use Engine\Modules\AbstractModule;use Engine\Routing\AttributeRouteLoader;use Engine\Routing\Router\Router;use Modules\Health\Controllers\HealthController;
+use Shift\Modules\AbstractModule;use Shift\Routing\AttributeRouteLoader;use Shift\Routing\Router\Router;use Modules\Health\Controllers\HealthController;
 
 class Module extends AbstractModule
 {
@@ -49,21 +49,21 @@ Supported methods:
 
 ## Controllers
 
-Controllers extend `Engine\Controller` and return a response object:
+Controllers extend `Shift\Controller` and return a response object:
 
 ```php
 namespace Modules\Users\Controllers;
 
-use Engine\Controller;
-use Engine\Response\JsonResponse;
-use Engine\Routing\Attributes\Body;
-use Engine\Routing\Attributes\Get;
-use Engine\Routing\Attributes\Header;
-use Engine\Routing\Attributes\PathParam;
-use Engine\Routing\Attributes\Post;
-use Engine\Routing\Attributes\QueryParam;
-use Engine\Routing\Attributes\RoutePrefix;
-use Engine\Routing\Attributes\Status;
+use Shift\Controller;
+use Shift\Response\JsonResponse;
+use Shift\Routing\Attributes\Body;
+use Shift\Routing\Attributes\Get;
+use Shift\Routing\Attributes\Header;
+use Shift\Routing\Attributes\PathParam;
+use Shift\Routing\Attributes\Post;
+use Shift\Routing\Attributes\QueryParam;
+use Shift\Routing\Attributes\RoutePrefix;
+use Shift\Routing\Attributes\Status;
 
 #[RoutePrefix('/users')]
 class UserController extends Controller
@@ -87,7 +87,7 @@ class UserController extends Controller
 }
 ```
 
-Route parameters are passed by method parameter name. A controller action can also request the current `Engine\Request`.
+Route parameters are passed by method parameter name. A controller action can also request the current `Shift\Request`.
 
 You can use these routing attributes:
 
@@ -174,7 +174,7 @@ A module registers itself through `Module.php`:
 ```php
 namespace Modules\Health;
 
-use Engine\Modules\AbstractModule;use Engine\Routing\AttributeRouteLoader;use Engine\Routing\Router\Router;use Engine\Service\ServiceContainer;use Modules\Health\Controllers\HealthController;use Modules\Health\Services\HealthService;
+use Shift\Modules\AbstractModule;use Shift\Routing\AttributeRouteLoader;use Shift\Routing\Router\Router;use Shift\Service\ServiceContainer;use Modules\Health\Controllers\HealthController;use Modules\Health\Services\HealthService;
 
 class Module extends AbstractModule
 {
diff --git a/REFACTORING.md b/REFACTORING.md
index 612a8a1..5deeaa6 100644
--- a/REFACTORING.md
+++ b/REFACTORING.md
@@ -7,7 +7,7 @@ ShiftPHP is moving toward an API-only modular monolith. View templates, compiled
 - [x] API-only runtime direction.
 - [x] Route parameters with `{name}` placeholders.
 - [x] Controller actions returning response objects.
-- [x] `Engine\Response\Response`, `JsonResponse` and `ResponseEmitter`.
+- [x] `Shift\Response\Response`, `JsonResponse` and `ResponseEmitter`.
 - [x] JSON response helpers on the base controller.
 - [x] Request helpers for query, post, input, raw body, JSON and route params.
 - [x] JSON errors for `400`, `404` and `500`.
@@ -20,12 +20,12 @@ ShiftPHP is moving toward an API-only modular monolith. View templates, compiled
 - [x] Module-owned controllers, routes, services and commands.
 - [x] Removal of view storage and example page assets from runtime.
 - [x] Removal of legacy `application/controllers` and `application/routes.php`.
-- [x] Domain-oriented engine namespaces:
-  - `Engine\Response`
-  - `Engine\Routing\Router`
-  - `Engine\Routing\Attributes`
-  - `Engine\Service`
-  - `Engine\Modules`
+- [x] Domain-oriented framework namespaces:
+  - `Shift\Response`
+  - `Shift\Routing\Router`
+  - `Shift\Routing\Attributes`
+  - `Shift\Service`
+  - `Shift\Modules`
 - [x] GitHub API workflow with PHP 8.3 checks.
 - [x] PR version label validation.
 - [x] Release workflow using PR summary as release notes.
@@ -91,7 +91,7 @@ Supported methods:
 Controllers receive the current `Request` and `ServiceContainer` through the constructor. Actions should return `Response` or `JsonResponse`.
 
 ```php
-class HealthController extends \Engine\Controller
+class HealthController extends \Shift\Controller
 {
     #[Get('/api/{argument}')]
     public function api(#[PathParam] string $argument, #[QueryParam('include')] ?string $include = null): JsonResponse
@@ -111,7 +111,7 @@ class HealthController extends \Engine\Controller
 }
 ```
 
-Action arguments are resolved from route parameter names. An action can also type-hint `Engine\Request`.
+Action arguments are resolved from route parameter names. An action can also type-hint `Shift\Request`.
 
 ## Error Format
 
@@ -131,7 +131,7 @@ Internal errors return a generic `500` message unless `display_errors` is enable
 ## Removed From Runtime
 
 - `Engine/View`
-- `Engine\View`
+- legacy view namespace
 - `Engine/Utils/Storage.php`
 - `Engine/Error/StorageError.php`
 - example CSS and JS page assets
diff --git a/application/modules/Health/Commands/Health.php b/application/modules/Health/Commands/Health.php
index 4047cb5..50af607 100644
--- a/application/modules/Health/Commands/Health.php
+++ b/application/modules/Health/Commands/Health.php
@@ -2,8 +2,8 @@
 
 namespace Modules\Health\Commands;
 
-use Engine\Console\Cli;
-use Engine\Console\CommandInterface;
+use Shift\Console\Cli;
+use Shift\Console\CommandInterface;
 use Modules\Health\Services\HealthService;
 
 class Health implements CommandInterface
diff --git a/application/modules/Health/Controllers/HealthController.php b/application/modules/Health/Controllers/HealthController.php
index 1178098..d1cfaca 100644
--- a/application/modules/Health/Controllers/HealthController.php
+++ b/application/modules/Health/Controllers/HealthController.php
@@ -2,10 +2,10 @@
 
 namespace Modules\Health\Controllers;
 
-use Engine\Controller;
-use Engine\Response\JsonResponse;
-use Engine\Routing\Attributes\Get;
-use Engine\Routing\Attributes\RoutePrefix;
+use Shift\Controller;
+use Shift\Response\JsonResponse;
+use Shift\Routing\Attributes\Get;
+use Shift\Routing\Attributes\RoutePrefix;
 use Modules\Health\Services\HealthService;
 
 #[RoutePrefix('/health')]
diff --git a/application/modules/Health/Module.php b/application/modules/Health/Module.php
index 683a0f4..1f2de04 100644
--- a/application/modules/Health/Module.php
+++ b/application/modules/Health/Module.php
@@ -2,10 +2,10 @@
 
 namespace Modules\Health;
 
-use Engine\Modules\AbstractModule;
-use Engine\Routing\AttributeRouteLoader;
-use Engine\Routing\Router\Router;
-use Engine\Service\ServiceContainer;
+use Shift\Modules\AbstractModule;
+use Shift\Routing\AttributeRouteLoader;
+use Shift\Routing\Router\Router;
+use Shift\Service\ServiceContainer;
 use Modules\Health\Controllers\HealthController;
 use Modules\Health\Services\HealthService;
 
diff --git a/bootstrap.php b/bootstrap.php
index f02a800..7b0a76b 100755
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,8 +1,8 @@
 <?php
 
 // Define application constants
-use Engine\App;
-use Engine\Error\ErrorHandler;
+use Shift\App;
+use Shift\Error\ErrorHandler;
 
 define('APP_ROOT', realpath(__DIR__ . '/'));
 define('APP_PATH', realpath(__DIR__ . '/application/'));
@@ -13,7 +13,7 @@
 require_once VENDOR_PATH . '/autoload.php';
 
 // Register custom autoloader
-spl_autoload_register(['Engine\App', 'autoload']);
+spl_autoload_register(['Shift\App', 'autoload']);
 
 // Register error handler
 ErrorHandler::register();
diff --git a/composer.json b/composer.json
index ab950c4..b368222 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Tools\\": "Engine/Tools",
-      "Console\\": "Engine/Console",
-      "Engine\\": "Engine",
+      "Shift\\": "Engine",
       "Modules\\": "application/modules"
     }
   }
diff --git a/index.php b/index.php
index 62724bb..57f1fb9 100644
--- a/index.php
+++ b/index.php
@@ -1,8 +1,8 @@
 <?php
 //error_reporting(E_ALL);
-use Engine\App;
-use Engine\Modules\ModuleLoader;
-use Engine\Request;
+use Shift\App;
+use Shift\Modules\ModuleLoader;
+use Shift\Request;
 
 error_reporting(-1);
 ini_set('display_errors', 'Off');
diff --git a/shift.php b/shift.php
index 5493e67..6f7c49e 100755
--- a/shift.php
+++ b/shift.php
@@ -1,8 +1,8 @@
 #!/usr/bin/php
 <?php
 
-use Engine\App;
-use Engine\Console\Shift;
+use Shift\App;
+use Shift\Console\Shift;
 
 require_once 'bootstrap.php';
 App::setHelpers();
diff --git a/tests/ApiCoreTest.php b/tests/ApiCoreTest.php
index da4503a..cea9fed 100644
--- a/tests/ApiCoreTest.php
+++ b/tests/ApiCoreTest.php
@@ -1,24 +1,24 @@
 <?php
 
-use Engine\App;
-use Engine\Controller;
-use Engine\Error\HttpError;
-use Engine\Modules\ModuleLoader;
-use Engine\Request;
-use Engine\Response\JsonResponse;
-use Engine\Response\ResponseEmitter;
-use Engine\Routing\AttributeRouteLoader;
-use Engine\Routing\Attributes\Body;
-use Engine\Routing\Attributes\Get;
-use Engine\Routing\Attributes\Header;
-use Engine\Routing\Attributes\PathParam;
-use Engine\Routing\Attributes\Post;
-use Engine\Routing\Attributes\QueryParam;
-use Engine\Routing\Attributes\RoutePrefix;
-use Engine\Routing\Attributes\Status;
-use Engine\Routing\Router\Route;
-use Engine\Routing\Router\Router;
-use Engine\Service\ServiceContainer;
+use Shift\App;
+use Shift\Controller;
+use Shift\Error\HttpError;
+use Shift\Modules\ModuleLoader;
+use Shift\Request;
+use Shift\Response\JsonResponse;
+use Shift\Response\ResponseEmitter;
+use Shift\Routing\AttributeRouteLoader;
+use Shift\Routing\Attributes\Body;
+use Shift\Routing\Attributes\Get;
+use Shift\Routing\Attributes\Header;
+use Shift\Routing\Attributes\PathParam;
+use Shift\Routing\Attributes\Post;
+use Shift\Routing\Attributes\QueryParam;
+use Shift\Routing\Attributes\RoutePrefix;
+use Shift\Routing\Attributes\Status;
+use Shift\Routing\Router\Route;
+use Shift\Routing\Router\Router;
+use Shift\Service\ServiceContainer;
 use Modules\Health\Services\HealthService;
 
 require_once __DIR__ . '/../bootstrap.php';
@@ -29,7 +29,7 @@ final class CapturingEmitter extends ResponseEmitter
     public array $headers = [];
     public string $content = '';
 
-    public function emit(\Engine\Response\Response $response): void
+    public function emit(\Shift\Response\Response $response): void
     {
         $this->statusCode = $response->getStatusCode();
         $this->headers = $response->getHeaders();