diff --git a/CargoBackend/src/Container/Application/Action/BookingActionFactory.php b/CargoBackend/src/Infrastructure/Container/Application/Action/BookingActionFactory.php
similarity index 90%
rename from CargoBackend/src/Container/Application/Action/BookingActionFactory.php
rename to CargoBackend/src/Infrastructure/Container/Application/Action/BookingActionFactory.php
index e278f61..405fa13 100644
--- a/CargoBackend/src/Container/Application/Action/BookingActionFactory.php
+++ b/CargoBackend/src/Infrastructure/Container/Application/Action/BookingActionFactory.php
@@ -8,7 +8,7 @@
  * 
  * Date: 06.12.2015 - 11:13 PM
  */
-namespace Codeliner\CargoBackend\Container\Application\Action;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Application\Action;
 
 use Assert\Assertion;
 use Codeliner\CargoBackend\Application\Booking\BookingService;
diff --git a/CargoBackend/src/Container/Application/Action/PayloadParserFactory.php b/CargoBackend/src/Infrastructure/Container/Application/Action/PayloadParserFactory.php
similarity index 85%
rename from CargoBackend/src/Container/Application/Action/PayloadParserFactory.php
rename to CargoBackend/src/Infrastructure/Container/Application/Action/PayloadParserFactory.php
index 68125dc..f7a9679 100644
--- a/CargoBackend/src/Container/Application/Action/PayloadParserFactory.php
+++ b/CargoBackend/src/Infrastructure/Container/Application/Action/PayloadParserFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Application\Action;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Application\Action;
 
 use Psr7Middlewares\Middleware;
 
diff --git a/CargoBackend/src/Container/Application/Booking/BookingServiceFactory.php b/CargoBackend/src/Infrastructure/Container/Application/Booking/BookingServiceFactory.php
similarity index 94%
rename from CargoBackend/src/Container/Application/Booking/BookingServiceFactory.php
rename to CargoBackend/src/Infrastructure/Container/Application/Booking/BookingServiceFactory.php
index d3ee84e..8f5bbac 100644
--- a/CargoBackend/src/Container/Application/Booking/BookingServiceFactory.php
+++ b/CargoBackend/src/Infrastructure/Container/Application/Booking/BookingServiceFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Application\Booking;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Application\Booking;
 
 use Codeliner\CargoBackend\Application\Booking\BookingService;
 use Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager;
diff --git a/CargoBackend/src/Container/Infrastructure/DoctrineCargoRepositoryFactory.php b/CargoBackend/src/Infrastructure/Container/Infrastructure/DoctrineCargoRepositoryFactory.php
similarity index 92%
rename from CargoBackend/src/Container/Infrastructure/DoctrineCargoRepositoryFactory.php
rename to CargoBackend/src/Infrastructure/Container/Infrastructure/DoctrineCargoRepositoryFactory.php
index 3f36cfc..e43fa5f 100644
--- a/CargoBackend/src/Container/Infrastructure/DoctrineCargoRepositoryFactory.php
+++ b/CargoBackend/src/Infrastructure/Container/Infrastructure/DoctrineCargoRepositoryFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Persistence\Doctrine\DoctrineCargoRepository;
 use Codeliner\CargoBackend\Model\Cargo\Cargo;
diff --git a/CargoBackend/src/Container/Infrastructure/DoctrineEntityManagerFactory.php b/CargoBackend/src/Infrastructure/Container/Infrastructure/DoctrineEntityManagerFactory.php
similarity index 96%
rename from CargoBackend/src/Container/Infrastructure/DoctrineEntityManagerFactory.php
rename to CargoBackend/src/Infrastructure/Container/Infrastructure/DoctrineEntityManagerFactory.php
index 2fd7f7f..f9a2a7b 100644
--- a/CargoBackend/src/Container/Infrastructure/DoctrineEntityManagerFactory.php
+++ b/CargoBackend/src/Infrastructure/Container/Infrastructure/DoctrineEntityManagerFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Persistence\Doctrine\Type\LegsDoctrineType;
 use Codeliner\CargoBackend\Infrastructure\Persistence\Doctrine\Type\TrackingIdDoctrineType;
diff --git a/CargoBackend/src/Container/Infrastructure/ExternalRoutingServiceFactory.php b/CargoBackend/src/Infrastructure/Container/Infrastructure/ExternalRoutingServiceFactory.php
similarity index 92%
rename from CargoBackend/src/Container/Infrastructure/ExternalRoutingServiceFactory.php
rename to CargoBackend/src/Infrastructure/Container/Infrastructure/ExternalRoutingServiceFactory.php
index f2955f7..70dc88b 100644
--- a/CargoBackend/src/Container/Infrastructure/ExternalRoutingServiceFactory.php
+++ b/CargoBackend/src/Infrastructure/Container/Infrastructure/ExternalRoutingServiceFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Routing\ExternalRoutingService;
 use Codeliner\GraphTraversalBackend\GraphTraversalServiceInterface;
diff --git a/CargoBackend/src/Container/Infrastructure/TransactionManagerFactory.php b/CargoBackend/src/Infrastructure/Container/Infrastructure/TransactionManagerFactory.php
similarity index 92%
rename from CargoBackend/src/Container/Infrastructure/TransactionManagerFactory.php
rename to CargoBackend/src/Infrastructure/Container/Infrastructure/TransactionManagerFactory.php
index 27e984b..45128c6 100644
--- a/CargoBackend/src/Container/Infrastructure/TransactionManagerFactory.php
+++ b/CargoBackend/src/Infrastructure/Container/Infrastructure/TransactionManagerFactory.php
@@ -10,7 +10,7 @@
  */
 declare(strict_types = 1);
 
-namespace Codeliner\CargoBackend\Container\Infrastructure;
+namespace Codeliner\CargoBackend\Infrastructure\Container\Infrastructure;
 
 use Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager;
 use Interop\Container\ContainerInterface;
diff --git a/config/autoload/dependencies.global.php b/config/autoload/dependencies.global.php
index 2506dd1..3a9b2e8 100644
--- a/config/autoload/dependencies.global.php
+++ b/config/autoload/dependencies.global.php
@@ -11,27 +11,27 @@
             'Codeliner\CargoBackend' => \Zend\Expressive\Container\ApplicationFactory::class,
 
               //Actions
-            \Codeliner\CargoBackend\Http\Action\GetLocations::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\GetRouteCandidates::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\CreateCargo::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\GetCargos::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\GetCargo::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
-            \Codeliner\CargoBackend\Http\Action\UpdateCargo::class => \Codeliner\CargoBackend\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetLocations::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetRouteCandidates::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\CreateCargo::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetCargos::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\GetCargo::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
+            \Codeliner\CargoBackend\Http\Action\UpdateCargo::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\BookingActionFactory::class,
 
               //Action Helper middleware
-            \Psr7Middlewares\Middleware\Payload::class => \Codeliner\CargoBackend\Container\Application\Action\PayloadParserFactory::class,
+            \Psr7Middlewares\Middleware\Payload::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Action\PayloadParserFactory::class,
 
               //Application
-            \Codeliner\CargoBackend\Application\Booking\BookingService::class => \Codeliner\CargoBackend\Container\Application\Booking\BookingServiceFactory::class,
+            \Codeliner\CargoBackend\Application\Booking\BookingService::class => \Codeliner\CargoBackend\Infrastructure\Container\Application\Booking\BookingServiceFactory::class,
 
               //Model
-            \Codeliner\CargoBackend\Model\Cargo\CargoRepositoryInterface::class => \Codeliner\CargoBackend\Container\Infrastructure\DoctrineCargoRepositoryFactory::class,
-            \Codeliner\CargoBackend\Model\Routing\RoutingServiceInterface::class => \Codeliner\CargoBackend\Container\Infrastructure\ExternalRoutingServiceFactory::class,
+            \Codeliner\CargoBackend\Model\Cargo\CargoRepositoryInterface::class => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\DoctrineCargoRepositoryFactory::class,
+            \Codeliner\CargoBackend\Model\Routing\RoutingServiceInterface::class => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\ExternalRoutingServiceFactory::class,
 
               //Infrastructure
-            'doctrine.entitymanager.orm_default' => \Codeliner\CargoBackend\Container\Infrastructure\DoctrineEntityManagerFactory::class,
+            'doctrine.entitymanager.orm_default' => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\DoctrineEntityManagerFactory::class,
             \Doctrine\ORM\Mapping\UnderscoreNamingStrategy::class => \Zend\ServiceManager\Factory\InvokableFactory::class,
-            \Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager::class => \Codeliner\CargoBackend\Container\Infrastructure\TransactionManagerFactory::class,
+            \Codeliner\CargoBackend\Infrastructure\Persistence\Transaction\TransactionManager::class => \Codeliner\CargoBackend\Infrastructure\Container\Infrastructure\TransactionManagerFactory::class,
 
             //GraphTraversalBackend
             \Codeliner\GraphTraversalBackend\GraphTraversalServiceInterface::class => \Codeliner\GraphTraversalBackend\GraphTraversalServiceFactory::class,