diff --git a/src/Application/Handlers/RegisterCarrierHandler.php b/src/Application/Handlers/RegisterCarrierHandler.php
index 6084706..90b1d3b 100644
--- a/src/Application/Handlers/RegisterCarrierHandler.php
+++ b/src/Application/Handlers/RegisterCarrierHandler.php
@@ -4,7 +4,7 @@ namespace DistributingCarriers\Application\Handlers;
 
 use DistributingCarriers\Application\Commands\RegisterCarrierCommand;
 use DistributingCarriers\Domain\Carrier;
-use DistributingCarriers\Infrastructure\EventStore;
+use DistributingCarriers\Infrastructure\EventSourcing\EventStore;
 
 class RegisterCarrierHandler
 {
diff --git a/src/Infrastructure/CassandraEventStore.php b/src/Infrastructure/EventSourcing/CassandraEventStore.php
similarity index 97%
rename from src/Infrastructure/CassandraEventStore.php
rename to src/Infrastructure/EventSourcing/CassandraEventStore.php
index 8a9e09a..ca54981 100644
--- a/src/Infrastructure/CassandraEventStore.php
+++ b/src/Infrastructure/EventSourcing/CassandraEventStore.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DistributingCarriers\Infrastructure;
+namespace DistributingCarriers\Infrastructure\EventSourcing;
 
 use Cassandra;
 
diff --git a/src/Infrastructure/EventStore.php b/src/Infrastructure/EventSourcing/EventStore.php
similarity index 76%
rename from src/Infrastructure/EventStore.php
rename to src/Infrastructure/EventSourcing/EventStore.php
index ec512cd..b7a8cf7 100644
--- a/src/Infrastructure/EventStore.php
+++ b/src/Infrastructure/EventSourcing/EventStore.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DistributingCarriers\Infrastructure;
+namespace DistributingCarriers\Infrastructure\EventSourcing;
 
 interface EventStore
 {
diff --git a/src/Infrastructure/CommandBus.php b/src/Infrastructure/Messaging/CommandBus.php
similarity index 78%
rename from src/Infrastructure/CommandBus.php
rename to src/Infrastructure/Messaging/CommandBus.php
index 05a0126..82c1de6 100644
--- a/src/Infrastructure/CommandBus.php
+++ b/src/Infrastructure/Messaging/CommandBus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DistributingCarriers\Infrastructure;
+namespace DistributingCarriers\Infrastructure\Messaging;
 
 class CommandBus
 {
@@ -13,9 +13,9 @@ class CommandBus
 
     public function dispatch(object $command): void
     {
-        $commandClass = get_class($command);
+        $commandClass = \get_class($command);
         if (!isset($this->handlers[$commandClass])) {
-            throw new \Exception("No handler registered for command: " . $commandClass);
+            throw new \Exception("No handler registered for command: $commandClass");
         }
 
         $handler = $this->handlers[$commandClass];
diff --git a/src/Infrastructure/Router.php b/src/Infrastructure/Router.php
deleted file mode 100644
index 7b45e2c..0000000
--- a/src/Infrastructure/Router.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace DistributingCarriers\Infrastructure;
-
-class Router
-{
-    private $routes = [];
-
-    public function add(string $method, string $path, callable $handler): void
-    {
-        $this->routes[] = [
-            'method' => $method,
-            'path' => $path,
-            'handler' => $handler
-        ];
-    }
-
-    public function dispatch(string $method, string $uri)
-    {
-        foreach ($this->routes as $route) {
-            if ($route['method'] === $method && $route['path'] === $uri) {
-                return \call_user_func($route['handler']);
-            }
-        }
-
-        http_response_code(404);
-        header('Content-Type: application/json');
-        echo json_encode(['error' => 'Not Found']);
-    }
-}
diff --git a/src/Infrastructure/Routing/IMiddleware.php b/src/Infrastructure/Routing/IMiddleware.php
new file mode 100644
index 0000000..0b3a0a1
--- /dev/null
+++ b/src/Infrastructure/Routing/IMiddleware.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DistributingCarriers\Infrastructure\Routing;
+
+interface IMiddleware
+{
+    public function process(IRequestHandler $handler): void;
+}
diff --git a/src/Infrastructure/Routing/IRequestHandler.php b/src/Infrastructure/Routing/IRequestHandler.php
new file mode 100644
index 0000000..229d57c
--- /dev/null
+++ b/src/Infrastructure/Routing/IRequestHandler.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DistributingCarriers\Infrastructure\Routing;
+
+interface IRequestHandler
+{
+    public function handle(): void;
+}
diff --git a/src/Infrastructure/Routing/IRoute.php b/src/Infrastructure/Routing/IRoute.php
new file mode 100644
index 0000000..4d1ea03
--- /dev/null
+++ b/src/Infrastructure/Routing/IRoute.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace DistributingCarriers\Infrastructure\Routing;
+
+interface IRoute
+{
+    public function getMethod(): string;
+    public function getPath(): string;
+    public function getHandler(): IRequestHandler;
+    public function getMiddlewares(): array;
+}
diff --git a/src/Infrastructure/Routing/Route.php b/src/Infrastructure/Routing/Route.php
new file mode 100644
index 0000000..552ff8b
--- /dev/null
+++ b/src/Infrastructure/Routing/Route.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace DistributingCarriers\Infrastructure\Routing;
+
+class Route implements IRoute
+{
+    private string $method;
+    private string $path;
+    private IRequestHandler $handler;
+    private array $middlewares;
+
+    public function __construct(string $method, string $path, IRequestHandler $handler, array $middlewares = [])
+    {
+        $this->method = $method;
+        $this->path = $path;
+        $this->handler = $handler;
+        $this->middlewares = $middlewares;
+    }
+
+    public function getMethod(): string
+    {
+        return $this->method;
+    }
+
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    public function getHandler(): IRequestHandler
+    {
+        return $this->handler;
+    }
+
+    public function getMiddlewares(): array
+    {
+        return $this->middlewares;
+    }
+}
diff --git a/src/Infrastructure/Routing/Router.php b/src/Infrastructure/Routing/Router.php
new file mode 100644
index 0000000..83d0864
--- /dev/null
+++ b/src/Infrastructure/Routing/Router.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace DistributingCarriers\Infrastructure\Routing;
+
+class Router
+{
+    private array $routes = [];
+    private array $globalMiddlewares = [];
+
+    public function add(string $method, string $path, IRequestHandler $handler, array $middlewares = []): self
+    {
+        $this->routes[] = new Route($method, $path, $handler, $middlewares);
+        
+        return $this;
+    }
+
+    public function addGlobalMiddleware(IMiddleware $middleware): self
+    {
+        $this->globalMiddlewares[] = $middleware;
+        
+        return $this;
+    }
+
+    public function dispatch(string $method, string $uri): void
+    {
+        foreach ($this->routes as $route) {
+            if ($route->getMethod() === $method && $route->getPath() === $uri) {
+                $middlewares = array_merge($this->globalMiddlewares, $route->getMiddlewares());
+                $this->executeMiddlewareStack($middlewares, $route->getHandler());
+                return;
+            }
+        }
+
+        http_response_code(404);
+        header('Content-Type: application/json');
+        echo json_encode(['error' => 'Not Found']);
+    }
+
+    private function executeMiddlewareStack(array $middlewares, IRequestHandler $handler): void
+    {
+        $next = $handler;
+
+        foreach (array_reverse($middlewares) as $middleware) {
+            $next = new class($middleware, $next) implements IRequestHandler {
+                private $middleware;
+                private $next;
+
+                public function __construct(IMiddleware $middleware, IRequestHandler $next)
+                {
+                    $this->middleware = $middleware;
+                    $this->next = $next;
+                }
+
+                public function handle(): void
+                {
+                    $this->middleware->process($this->next);
+                }
+            };
+        }
+
+        $next->handle();
+    }
+}
diff --git a/src/index.php b/src/index.php
index 27d029b..7a18061 100644
--- a/src/index.php
+++ b/src/index.php
@@ -2,9 +2,9 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-use DistributingCarriers\Infrastructure\CommandBus;
-use DistributingCarriers\Infrastructure\Router;
-use DistributingCarriers\Infrastructure\CassandraEventStore;
+use DistributingCarriers\Infrastructure\Messaging\CommandBus;
+use DistributingCarriers\Infrastructure\Routing\Router;
+use DistributingCarriers\Infrastructure\EventSourcing\CassandraEventStore;
 use DistributingCarriers\Application\Commands\RegisterCarrierCommand;
 use DistributingCarriers\Application\Handlers\RegisterCarrierHandler;