diff --git a/src/Application/Handlers/RegisterCarrierHandler.php b/src/Application/Handlers/RegisterCarrierHandler.php
index 90b1d3b..15a9e09 100644
--- a/src/Application/Handlers/RegisterCarrierHandler.php
+++ b/src/Application/Handlers/RegisterCarrierHandler.php
@@ -3,7 +3,7 @@
 namespace DistributingCarriers\Application\Handlers;
 
 use DistributingCarriers\Application\Commands\RegisterCarrierCommand;
-use DistributingCarriers\Domain\Carrier;
+use DistributingCarriers\Domain\Aggregates\Carrier;
 use DistributingCarriers\Infrastructure\EventSourcing\EventStore;
 
 class RegisterCarrierHandler
@@ -23,6 +23,6 @@ class RegisterCarrierHandler
         $this->eventStore->save($carrier->getId(), $carrier->getUncommittedChanges(), $carrier->getVersion());
         $carrier->markChangesAsCommitted();
 
-        echo "Carrier registered with ID: " . $carrierId . "\n";
+        echo "Carrier registered with ID: $carrierId\n";
     }
 }
diff --git a/src/Domain/AggregateRoot.php b/src/Domain/Aggregates/AggregateRoot.php
similarity index 95%
rename from src/Domain/AggregateRoot.php
rename to src/Domain/Aggregates/AggregateRoot.php
index 8bbaf90..b9dd080 100644
--- a/src/Domain/AggregateRoot.php
+++ b/src/Domain/Aggregates/AggregateRoot.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DistributingCarriers\Domain;
+namespace DistributingCarriers\Domain\Aggregates;
 
 abstract class AggregateRoot
 {
diff --git a/src/Domain/Carrier.php b/src/Domain/Aggregates/Carrier.php
similarity index 93%
rename from src/Domain/Carrier.php
rename to src/Domain/Aggregates/Carrier.php
index c67a449..b60e873 100644
--- a/src/Domain/Carrier.php
+++ b/src/Domain/Aggregates/Carrier.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DistributingCarriers\Domain;
+namespace DistributingCarriers\Domain\Aggregates;
 
 use DistributingCarriers\Domain\Events\CarrierRegistered;