diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index 9c562c0..224ea88 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -53,8 +53,15 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const labels = context.payload.pull_request.labels.map((label) => label.name);
-            const versionLabels = labels.filter((name) => /^v\d+\.\d+(\.\d+)?$/.test(name));
+            const {owner, repo} = context.repo;
+            const pull_number = context.payload.pull_request.number;
+            const {data: labels} = await github.rest.issues.listLabelsOnIssue({
+              owner,
+              repo,
+              issue_number: pull_number,
+            });
+            const labelNames = labels.map((label) => label.name);
+            const versionLabels = labelNames.filter((name) => /^v\d+\.\d+(\.\d+)?$/.test(name));
 
             if (versionLabels.length !== 1) {
               core.setFailed(`Pull request must have exactly one version label like v0.6. Found: ${versionLabels.join(', ') || 'none'}`);
diff --git a/Engine/App.php b/Engine/App.php
index d6246bc..9647609 100755
--- a/Engine/App.php
+++ b/Engine/App.php
@@ -3,11 +3,16 @@
 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;
 use JsonException;
 use ReflectionClass;
 use ReflectionException;
diff --git a/Engine/Console/Commands/RouteList.php b/Engine/Console/Commands/RouteList.php
index 5d33409..05048c8 100644
--- a/Engine/Console/Commands/RouteList.php
+++ b/Engine/Console/Commands/RouteList.php
@@ -5,7 +5,7 @@
 use Engine\Console\Cli;
 use Engine\Console\CommandInterface;
 use Engine\Modules\ModuleLoader;
-use Engine\Router;
+use Engine\Routing\Router\Router;
 
 class RouteList implements CommandInterface
 {
diff --git a/Engine/Controller.php b/Engine/Controller.php
index d986efd..76fa991 100755
--- a/Engine/Controller.php
+++ b/Engine/Controller.php
@@ -2,6 +2,9 @@
 
 namespace Engine;
 
+use Engine\Response\JsonResponse;
+use Engine\Response\Response;
+use Engine\Service\ServiceContainer;
 use JsonException;
 
 /**
diff --git a/Engine/Modules/AbstractModule.php b/Engine/Modules/AbstractModule.php
index 37d530f..40f763a 100644
--- a/Engine/Modules/AbstractModule.php
+++ b/Engine/Modules/AbstractModule.php
@@ -2,8 +2,8 @@
 
 namespace Engine\Modules;
 
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 
 abstract class AbstractModule implements ModuleInterface
 {
diff --git a/Engine/Modules/ModuleInterface.php b/Engine/Modules/ModuleInterface.php
index b006d94..012be35 100644
--- a/Engine/Modules/ModuleInterface.php
+++ b/Engine/Modules/ModuleInterface.php
@@ -2,8 +2,8 @@
 
 namespace Engine\Modules;
 
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 
 interface ModuleInterface
 {
diff --git a/Engine/Modules/ModuleLoader.php b/Engine/Modules/ModuleLoader.php
index 39b2bc6..acfb2d0 100644
--- a/Engine/Modules/ModuleLoader.php
+++ b/Engine/Modules/ModuleLoader.php
@@ -2,8 +2,8 @@
 
 namespace Engine\Modules;
 
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 
 class ModuleLoader
 {
diff --git a/Engine/JsonResponse.php b/Engine/Response/JsonResponse.php
similarity index 97%
rename from Engine/JsonResponse.php
rename to Engine/Response/JsonResponse.php
index 08d91d8..706e3a2 100644
--- a/Engine/JsonResponse.php
+++ b/Engine/Response/JsonResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Response;
 
 use JsonException;
 
diff --git a/Engine/Response.php b/Engine/Response/Response.php
similarity index 94%
rename from Engine/Response.php
rename to Engine/Response/Response.php
index ccd8747..d9d2e77 100644
--- a/Engine/Response.php
+++ b/Engine/Response/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Response;
 
 class Response
 {
diff --git a/Engine/ResponseEmitter.php b/Engine/Response/ResponseEmitter.php
similarity index 91%
rename from Engine/ResponseEmitter.php
rename to Engine/Response/ResponseEmitter.php
index fcfa18d..daf8e95 100644
--- a/Engine/ResponseEmitter.php
+++ b/Engine/Response/ResponseEmitter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Response;
 
 class ResponseEmitter
 {
diff --git a/Engine/Routing/AttributeRouteLoader.php b/Engine/Routing/AttributeRouteLoader.php
index 0317647..8a3e0db 100644
--- a/Engine/Routing/AttributeRouteLoader.php
+++ b/Engine/Routing/AttributeRouteLoader.php
@@ -2,9 +2,9 @@
 
 namespace Engine\Routing;
 
-use Engine\Router;
 use Engine\Routing\Attributes\Route;
 use Engine\Routing\Attributes\RoutePrefix;
+use Engine\Routing\Router\Router;
 use ReflectionClass;
 
 class AttributeRouteLoader
diff --git a/Engine/Route.php b/Engine/Routing/Router/Route.php
similarity index 97%
rename from Engine/Route.php
rename to Engine/Routing/Router/Route.php
index 0cb9b61..e71036c 100644
--- a/Engine/Route.php
+++ b/Engine/Routing/Router/Route.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Engine;
+namespace Engine\Routing\Router;
+
+use Engine\Request;
 
 class Route
 {
diff --git a/Engine/RouteMatch.php b/Engine/Routing/Router/RouteMatch.php
similarity index 92%
rename from Engine/RouteMatch.php
rename to Engine/Routing/Router/RouteMatch.php
index 459e364..1e4c3da 100644
--- a/Engine/RouteMatch.php
+++ b/Engine/Routing/Router/RouteMatch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Routing\Router;
 
 readonly class RouteMatch
 {
diff --git a/Engine/Router.php b/Engine/Routing/Router/Router.php
similarity index 97%
rename from Engine/Router.php
rename to Engine/Routing/Router/Router.php
index 4c08b3e..b6ccbd4 100644
--- a/Engine/Router.php
+++ b/Engine/Routing/Router/Router.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Engine;
+namespace Engine\Routing\Router;
 
 use Engine\Error\HttpError;
+use Engine\Request;
 
 class Router
 {
diff --git a/Engine/ServiceContainer.php b/Engine/Service/ServiceContainer.php
similarity index 98%
rename from Engine/ServiceContainer.php
rename to Engine/Service/ServiceContainer.php
index 91ff3e1..36ac3eb 100644
--- a/Engine/ServiceContainer.php
+++ b/Engine/Service/ServiceContainer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Service;
 
 use Closure;
 use InvalidArgumentException;
@@ -107,4 +107,4 @@ public function getSingletonServices(): array
     {
         return array_keys($this->singletons);
     }
-} 
\ No newline at end of file
+} 
diff --git a/Engine/ServiceInterface.php b/Engine/Service/ServiceInterface.php
similarity index 92%
rename from Engine/ServiceInterface.php
rename to Engine/Service/ServiceInterface.php
index ab55e72..6ce20cf 100644
--- a/Engine/ServiceInterface.php
+++ b/Engine/Service/ServiceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Engine;
+namespace Engine\Service;
 
 /**
  * Interface ServiceInterface
@@ -22,4 +22,4 @@ public function isReady(): bool;
      * Get service name
      */
     public function getName(): string;
-} 
\ No newline at end of file
+} 
diff --git a/README.md b/README.md
index 015b957..2c706bc 100644
--- a/README.md
+++ b/README.md
@@ -26,10 +26,7 @@ Routes are owned by modules and registered from each module boundary:
 ```php
 namespace Modules\Health;
 
-use Engine\Modules\AbstractModule;
-use Engine\Router;
-use Engine\Routing\AttributeRouteLoader;
-use Modules\Health\Controllers\HealthController;
+use Engine\Modules\AbstractModule;use Engine\Routing\AttributeRouteLoader;use Engine\Routing\Router\Router;use Modules\Health\Controllers\HealthController;
 
 class Module extends AbstractModule
 {
@@ -58,12 +55,12 @@ Controllers extend `Engine\Controller` and return a response object:
 namespace Modules\Users\Controllers;
 
 use Engine\Controller;
-use Engine\JsonResponse;
+use Engine\Response\JsonResponse;
 use Engine\Routing\Attributes\Body;
 use Engine\Routing\Attributes\Get;
 use Engine\Routing\Attributes\Header;
-use Engine\Routing\Attributes\Post;
 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;
@@ -177,12 +174,7 @@ A module registers itself through `Module.php`:
 ```php
 namespace Modules\Health;
 
-use Engine\Modules\AbstractModule;
-use Engine\Router;
-use Engine\Routing\AttributeRouteLoader;
-use Engine\ServiceContainer;
-use Modules\Health\Controllers\HealthController;
-use Modules\Health\Services\HealthService;
+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;
 
 class Module extends AbstractModule
 {
diff --git a/application/modules/Health/Controllers/HealthController.php b/application/modules/Health/Controllers/HealthController.php
index edb7514..1178098 100644
--- a/application/modules/Health/Controllers/HealthController.php
+++ b/application/modules/Health/Controllers/HealthController.php
@@ -3,7 +3,7 @@
 namespace Modules\Health\Controllers;
 
 use Engine\Controller;
-use Engine\JsonResponse;
+use Engine\Response\JsonResponse;
 use Engine\Routing\Attributes\Get;
 use Engine\Routing\Attributes\RoutePrefix;
 use Modules\Health\Services\HealthService;
diff --git a/application/modules/Health/Module.php b/application/modules/Health/Module.php
index 138a22f..683a0f4 100644
--- a/application/modules/Health/Module.php
+++ b/application/modules/Health/Module.php
@@ -3,9 +3,9 @@
 namespace Modules\Health;
 
 use Engine\Modules\AbstractModule;
-use Engine\Router;
 use Engine\Routing\AttributeRouteLoader;
-use Engine\ServiceContainer;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 use Modules\Health\Controllers\HealthController;
 use Modules\Health\Services\HealthService;
 
diff --git a/tests/ApiCoreTest.php b/tests/ApiCoreTest.php
index 79898c5..da4503a 100644
--- a/tests/ApiCoreTest.php
+++ b/tests/ApiCoreTest.php
@@ -3,11 +3,10 @@
 use Engine\App;
 use Engine\Controller;
 use Engine\Error\HttpError;
-use Engine\JsonResponse;
+use Engine\Modules\ModuleLoader;
 use Engine\Request;
-use Engine\ResponseEmitter;
-use Engine\Router;
-use Engine\ServiceContainer;
+use Engine\Response\JsonResponse;
+use Engine\Response\ResponseEmitter;
 use Engine\Routing\AttributeRouteLoader;
 use Engine\Routing\Attributes\Body;
 use Engine\Routing\Attributes\Get;
@@ -17,7 +16,9 @@
 use Engine\Routing\Attributes\QueryParam;
 use Engine\Routing\Attributes\RoutePrefix;
 use Engine\Routing\Attributes\Status;
-use Engine\Modules\ModuleLoader;
+use Engine\Routing\Router\Route;
+use Engine\Routing\Router\Router;
+use Engine\Service\ServiceContainer;
 use Modules\Health\Services\HealthService;
 
 require_once __DIR__ . '/../bootstrap.php';
@@ -28,7 +29,7 @@ final class CapturingEmitter extends ResponseEmitter
     public array $headers = [];
     public string $content = '';
 
-    public function emit(\Engine\Response $response): void
+    public function emit(\Engine\Response\Response $response): void
     {
         $this->statusCode = $response->getStatusCode();
         $this->headers = $response->getHeaders();
@@ -112,7 +113,7 @@ function makeRequest(string $method, string $uri, string $body = '', array $quer
     (new AttributeRouteLoader())->load($router, [TestAttributeController::class]);
 
     $routes = array_map(
-        static fn (\Engine\Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
+        static fn (Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
         $router->getRoutes()
     );
 
@@ -224,7 +225,7 @@ function makeRequest(string $method, string $uri, string $body = '', array $quer
     assertSameValue(true, $container->has(HealthService::class), 'Health module service should be registered.');
 
     $routes = array_map(
-        static fn (\Engine\Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
+        static fn (Route $route): string => $route->getMethod() . ' ' . $route->getPath(),
         $router->getRoutes()
     );