diff --git a/src/Application/Command/Command.php b/src/Application/Contracts/Command/Command.php
similarity index 82%
rename from src/Application/Command/Command.php
rename to src/Application/Contracts/Command/Command.php
index 658b6ad..e87722f 100644
--- a/src/Application/Command/Command.php
+++ b/src/Application/Contracts/Command/Command.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Command;
+namespace ComplexHeart\Application\Contracts\Command;
 
 /**
  * Interface Command
diff --git a/src/Application/Command/CommandBus.php b/src/Application/Contracts/Command/CommandBus.php
similarity index 82%
rename from src/Application/Command/CommandBus.php
rename to src/Application/Contracts/Command/CommandBus.php
index 5ba8995..47a63d1 100644
--- a/src/Application/Command/CommandBus.php
+++ b/src/Application/Contracts/Command/CommandBus.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Command;
+namespace ComplexHeart\Application\Contracts\Command;
 
 /**
  * Interface CommandBus
diff --git a/src/Application/Handler/CommandHandler.php b/src/Application/Contracts/Handler/CommandHandler.php
similarity index 70%
rename from src/Application/Handler/CommandHandler.php
rename to src/Application/Contracts/Handler/CommandHandler.php
index f822032..a94388d 100644
--- a/src/Application/Handler/CommandHandler.php
+++ b/src/Application/Contracts/Handler/CommandHandler.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Handler;
+namespace ComplexHeart\Application\Contracts\Handler;
 
-use ComplexHeart\Application\Command\Command;
+use ComplexHeart\Application\Contracts\Command\Command;
 
 /**
  * Interface CommandHandler
diff --git a/src/Application/Handler/EventHandler.php b/src/Application/Contracts/Handler/EventHandler.php
similarity index 71%
rename from src/Application/Handler/EventHandler.php
rename to src/Application/Contracts/Handler/EventHandler.php
index a681e32..676dedd 100644
--- a/src/Application/Handler/EventHandler.php
+++ b/src/Application/Contracts/Handler/EventHandler.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Handler;
+namespace ComplexHeart\Application\Contracts\Handler;
 
-use ComplexHeart\Domain\Events\Event;
+use ComplexHeart\Domain\Contracts\Events\Event;
 
 /**
  * Interface EventHandler
diff --git a/src/Application/Handler/QueryHandler.php b/src/Application/Contracts/Handler/QueryHandler.php
similarity index 61%
rename from src/Application/Handler/QueryHandler.php
rename to src/Application/Contracts/Handler/QueryHandler.php
index b807f25..ea69f2b 100644
--- a/src/Application/Handler/QueryHandler.php
+++ b/src/Application/Contracts/Handler/QueryHandler.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Handler;
+namespace ComplexHeart\Application\Contracts\Handler;
 
-use ComplexHeart\Application\Query\Query;
-use ComplexHeart\Application\Query\QueryResponse;
+use ComplexHeart\Application\Contracts\Query\Query;
+use ComplexHeart\Application\Contracts\Query\QueryResponse;
 
 /**
  * Interface QueryHandler
diff --git a/src/Application/Query/Query.php b/src/Application/Contracts/Query/Query.php
similarity index 83%
rename from src/Application/Query/Query.php
rename to src/Application/Contracts/Query/Query.php
index 047455f..443c684 100644
--- a/src/Application/Query/Query.php
+++ b/src/Application/Contracts/Query/Query.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Query;
+namespace ComplexHeart\Application\Contracts\Query;
 
 /**
  * Interface Query
diff --git a/src/Application/Query/QueryBus.php b/src/Application/Contracts/Query/QueryBus.php
similarity index 82%
rename from src/Application/Query/QueryBus.php
rename to src/Application/Contracts/Query/QueryBus.php
index a33f445..0a36e28 100644
--- a/src/Application/Query/QueryBus.php
+++ b/src/Application/Contracts/Query/QueryBus.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Query;
+namespace ComplexHeart\Application\Contracts\Query;
 
 /**
  * Interface QueryBus
diff --git a/src/Application/Query/QueryResponse.php b/src/Application/Contracts/Query/QueryResponse.php
similarity index 83%
rename from src/Application/Query/QueryResponse.php
rename to src/Application/Contracts/Query/QueryResponse.php
index dad9c2f..31ef4eb 100644
--- a/src/Application/Query/QueryResponse.php
+++ b/src/Application/Contracts/Query/QueryResponse.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application\Query;
+namespace ComplexHeart\Application\Contracts\Query;
 
 /**
  * Interface QueryResponse
diff --git a/src/Application/ServiceBus.php b/src/Application/Contracts/ServiceBus.php
similarity index 68%
rename from src/Application/ServiceBus.php
rename to src/Application/Contracts/ServiceBus.php
index 2da19bd..bde9af5 100644
--- a/src/Application/ServiceBus.php
+++ b/src/Application/Contracts/ServiceBus.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Application;
+namespace ComplexHeart\Application\Contracts;
 
-use ComplexHeart\Application\Command\CommandBus;
-use ComplexHeart\Application\Query\QueryBus;
-use ComplexHeart\Domain\Events\EventBus;
+use ComplexHeart\Application\Contracts\Command\CommandBus;
+use ComplexHeart\Application\Contracts\Query\QueryBus;
+use ComplexHeart\Domain\Contracts\Events\EventBus;
 
 /**
  * Interface ServiceBus
diff --git a/src/Domain/Events/Event.php b/src/Domain/Contracts/Events/Event.php
similarity index 94%
rename from src/Domain/Events/Event.php
rename to src/Domain/Contracts/Events/Event.php
index e8fbcb2..93a4106 100644
--- a/src/Domain/Events/Event.php
+++ b/src/Domain/Contracts/Events/Event.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Events;
+namespace ComplexHeart\Domain\Contracts\Events;
 
 /**
  * Interface Event
diff --git a/src/Domain/Events/EventBus.php b/src/Domain/Contracts/Events/EventBus.php
similarity index 83%
rename from src/Domain/Events/EventBus.php
rename to src/Domain/Contracts/Events/EventBus.php
index f4d9962..5ab13de 100644
--- a/src/Domain/Events/EventBus.php
+++ b/src/Domain/Contracts/Events/EventBus.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Events;
+namespace ComplexHeart\Domain\Contracts\Events;
 
 /**
  * Interface EventBus
diff --git a/src/Domain/Events/Sourceable.php b/src/Domain/Contracts/Events/Sourceable.php
similarity index 98%
rename from src/Domain/Events/Sourceable.php
rename to src/Domain/Contracts/Events/Sourceable.php
index e9d6a1c..30c2dd9 100644
--- a/src/Domain/Events/Sourceable.php
+++ b/src/Domain/Contracts/Events/Sourceable.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Events;
+namespace ComplexHeart\Domain\Contracts\Events;
 
 /**
  * Interface Sourceable
diff --git a/src/Domain/Events/Traceable.php b/src/Domain/Contracts/Events/Traceable.php
similarity index 97%
rename from src/Domain/Events/Traceable.php
rename to src/Domain/Contracts/Events/Traceable.php
index 966d279..df70f11 100644
--- a/src/Domain/Events/Traceable.php
+++ b/src/Domain/Contracts/Events/Traceable.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Events;
+namespace ComplexHeart\Domain\Contracts\Events;
 
 /**
  * Interface Traceable
diff --git a/src/Domain/Model/Aggregate.php b/src/Domain/Contracts/Model/Aggregate.php
similarity index 81%
rename from src/Domain/Model/Aggregate.php
rename to src/Domain/Contracts/Model/Aggregate.php
index 9d496d7..c8b281f 100644
--- a/src/Domain/Model/Aggregate.php
+++ b/src/Domain/Contracts/Model/Aggregate.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Model;
+namespace ComplexHeart\Domain\Contracts\Model;
 
-use ComplexHeart\Domain\Events\EventBus;
+use ComplexHeart\Domain\Contracts\Events\EventBus;
 
 /**
  * Interface Aggregate
diff --git a/src/Domain/Model/Entity.php b/src/Domain/Contracts/Model/Entity.php
similarity index 83%
rename from src/Domain/Model/Entity.php
rename to src/Domain/Contracts/Model/Entity.php
index 38f57b8..6149972 100644
--- a/src/Domain/Model/Entity.php
+++ b/src/Domain/Contracts/Model/Entity.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Model;
+namespace ComplexHeart\Domain\Contracts\Model;
 
 /**
  * Interface Entity
diff --git a/src/Domain/Model/Identifier.php b/src/Domain/Contracts/Model/Identifier.php
similarity index 89%
rename from src/Domain/Model/Identifier.php
rename to src/Domain/Contracts/Model/Identifier.php
index edffc22..a29a673 100644
--- a/src/Domain/Model/Identifier.php
+++ b/src/Domain/Contracts/Model/Identifier.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Model;
+namespace ComplexHeart\Domain\Contracts\Model;
 
 /**
  * Interface Identifier
diff --git a/src/Domain/Model/ValueObject.php b/src/Domain/Contracts/Model/ValueObject.php
similarity index 89%
rename from src/Domain/Model/ValueObject.php
rename to src/Domain/Contracts/Model/ValueObject.php
index e6d1abe..320463b 100644
--- a/src/Domain/Model/ValueObject.php
+++ b/src/Domain/Contracts/Model/ValueObject.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ComplexHeart\Domain\Model;
+namespace ComplexHeart\Domain\Contracts\Model;
 
 /**
  * Interface ValueObject
diff --git a/tests/ArchTest.php b/tests/ArchTest.php
index 14923c4..f54c857 100644
--- a/tests/ArchTest.php
+++ b/tests/ArchTest.php
@@ -11,16 +11,16 @@
     ->toUse('ComplexHeart\Domain');
 
 arch('Domain Model interfaces are correctly placed')
-    ->expect('ComplexHeart\Domain\Model')
+    ->expect('ComplexHeart\Domain\Contracts\Model')
     ->toBeInterfaces()
     ->toOnlyBeUsedIn([
-        'ComplexHeart\Domain\Model',
-        'ComplexHeart\Domain\Events',
+        'ComplexHeart\Domain\Contracts\Model',
+        'ComplexHeart\Domain\Contracts\Events',
         'ComplexHeart\Application',
     ]);
 
 arch('Domain Event interfaces are correctly placed')
-    ->expect('ComplexHeart\Domain\Events')
+    ->expect('ComplexHeart\Domain\Contracts\Events')
     ->toBeInterfaces()
     ->toOnlyBeUsedIn([
         'ComplexHeart\Domain',
@@ -53,7 +53,7 @@
     ->toBeInterfaces()
     ->toOnlyBeUsedIn([
         'ComplexHeart\Application',
-        'ComplexHeart\Domain\Model', // Aggregate uses EventBus
+        'ComplexHeart\Domain\Contracts\Model', // Aggregate uses EventBus
     ]);
 
 arch('all interfaces are suffixed correctly')