diff --git a/adapters/pom.xml b/pigs3/adapters/pom.xml
similarity index 100%
rename from adapters/pom.xml
rename to pigs3/adapters/pom.xml
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/AppConfiguration.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/AppConfiguration.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/AppConfiguration.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/AppConfiguration.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/Jdbc.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/Jdbc.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/Jdbc.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/app/Jdbc.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/console/FairyTaleRunner.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/console/FairyTaleRunner.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/console/FairyTaleRunner.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/console/FairyTaleRunner.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Dto.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Dto.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Dto.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Dto.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Hateoas.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Hateoas.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Hateoas.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/Hateoas.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/RestConfiguration.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/RestConfiguration.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/RestConfiguration.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/RestConfiguration.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/ThreePigsController.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/ThreePigsController.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/ThreePigsController.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/in/rest/ThreePigsController.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/Jdbc.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/Jdbc.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/Jdbc.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/Jdbc.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/ModelConfiguration.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/ModelConfiguration.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/ModelConfiguration.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/model/ModelConfiguration.java
diff --git a/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/out/logging/LoggingAspect.java b/pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/out/logging/LoggingAspect.java
similarity index 100%
rename from adapters/src/main/java/io/github/mat3e/fairytales/pigs3/out/logging/LoggingAspect.java
rename to pigs3/adapters/src/main/java/io/github/mat3e/fairytales/pigs3/out/logging/LoggingAspect.java
diff --git a/adapters/src/main/resources/3Pigs.postman_collection.json b/pigs3/adapters/src/main/resources/3Pigs.postman_collection.json
similarity index 100%
rename from adapters/src/main/resources/3Pigs.postman_collection.json
rename to pigs3/adapters/src/main/resources/3Pigs.postman_collection.json
diff --git a/adapters/src/main/resources/application.yml b/pigs3/adapters/src/main/resources/application.yml
similarity index 89%
rename from adapters/src/main/resources/application.yml
rename to pigs3/adapters/src/main/resources/application.yml
index 04b1a3e..d1c8326 100644
--- a/adapters/src/main/resources/application.yml
+++ b/pigs3/adapters/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
     username: 'sa'
     password: ''
   main:
-    web-application-type: servlet
+    web-application-type: none
 
 ---
 spring:
diff --git a/adapters/src/main/resources/db/migration/V01__init_tables.sql b/pigs3/adapters/src/main/resources/db/migration/V01__init_tables.sql
similarity index 100%
rename from adapters/src/main/resources/db/migration/V01__init_tables.sql
rename to pigs3/adapters/src/main/resources/db/migration/V01__init_tables.sql
diff --git a/adapters/src/test/java/io/github/mat3e/fairytales/TestApp.java b/pigs3/adapters/src/test/java/io/github/mat3e/fairytales/TestApp.java
similarity index 100%
rename from adapters/src/test/java/io/github/mat3e/fairytales/TestApp.java
rename to pigs3/adapters/src/test/java/io/github/mat3e/fairytales/TestApp.java
diff --git a/adapters/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppIntegrationTest.java b/pigs3/adapters/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppIntegrationTest.java
similarity index 100%
rename from adapters/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppIntegrationTest.java
rename to pigs3/adapters/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppIntegrationTest.java
diff --git a/adapters/src/test/java/io/github/mat3e/fairytales/pigs3/model/JdbcAdaptersIntegrationTest.java b/pigs3/adapters/src/test/java/io/github/mat3e/fairytales/pigs3/model/JdbcAdaptersIntegrationTest.java
similarity index 100%
rename from adapters/src/test/java/io/github/mat3e/fairytales/pigs3/model/JdbcAdaptersIntegrationTest.java
rename to pigs3/adapters/src/test/java/io/github/mat3e/fairytales/pigs3/model/JdbcAdaptersIntegrationTest.java
diff --git a/app/pom.xml b/pigs3/app/pom.xml
similarity index 94%
rename from app/pom.xml
rename to pigs3/app/pom.xml
index bbdda9a..c4298e0 100644
--- a/app/pom.xml
+++ b/pigs3/app/pom.xml
@@ -49,8 +49,8 @@
     </dependencies>
 
     <build>
-        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+        <sourceDirectory>src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
@@ -78,7 +78,7 @@
                         </goals>
                         <configuration>
                             <sourceDirs>
-                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                                <sourceDir>src/main/kotlin</sourceDir>
                             </sourceDirs>
                         </configuration>
                     </execution>
@@ -89,7 +89,7 @@
                         </goals>
                         <configuration>
                             <sourceDirs>
-                                <sourceDir>${project.basedir}/src/test/java</sourceDir>
+                                <sourceDir>src/test/java</sourceDir>
                             </sourceDirs>
                         </configuration>
                     </execution>
diff --git a/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/HouseQueryRepository.kt b/pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/HouseQueryRepository.kt
similarity index 100%
rename from app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/HouseQueryRepository.kt
rename to pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/HouseQueryRepository.kt
diff --git a/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsApp.kt b/pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsApp.kt
similarity index 100%
rename from app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsApp.kt
rename to pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsApp.kt
diff --git a/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandler.kt b/pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandler.kt
similarity index 100%
rename from app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandler.kt
rename to pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandler.kt
diff --git a/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandler.kt b/pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandler.kt
similarity index 100%
rename from app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandler.kt
rename to pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandler.kt
diff --git a/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/command/ThreePigsCommands.kt b/pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/command/ThreePigsCommands.kt
similarity index 100%
rename from app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/command/ThreePigsCommands.kt
rename to pigs3/app/src/main/kotlin/io/github/mat3e/fairytales/pigs3/app/command/ThreePigsCommands.kt
diff --git a/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppTest.java b/pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppTest.java
similarity index 100%
rename from app/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppTest.java
rename to pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/AppTest.java
diff --git a/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandlerTest.java b/pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandlerTest.java
similarity index 100%
rename from app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandlerTest.java
rename to pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsCommandHandlerTest.java
diff --git a/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandlerTest.java b/pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandlerTest.java
similarity index 100%
rename from app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandlerTest.java
rename to pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsEventHandlerTest.java
diff --git a/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsTestApp.java b/pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsTestApp.java
similarity index 100%
rename from app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsTestApp.java
rename to pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/app/ThreePigsTestApp.java
diff --git a/app/src/test/java/io/github/mat3e/fairytales/pigs3/model/InMemoryThreePigsRepository.java b/pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/model/InMemoryThreePigsRepository.java
similarity index 100%
rename from app/src/test/java/io/github/mat3e/fairytales/pigs3/model/InMemoryThreePigsRepository.java
rename to pigs3/app/src/test/java/io/github/mat3e/fairytales/pigs3/model/InMemoryThreePigsRepository.java
diff --git a/domain/pom.xml b/pigs3/domain/pom.xml
similarity index 96%
rename from domain/pom.xml
rename to pigs3/domain/pom.xml
index 68e6c26..fdcc9c3 100644
--- a/domain/pom.xml
+++ b/pigs3/domain/pom.xml
@@ -6,6 +6,7 @@
         <groupId>io.github.mat3e</groupId>
         <artifactId>3pigs</artifactId>
         <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>domain</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -62,7 +63,7 @@
     </dependencies>
 
     <build>
-        <testSourceDirectory>${project.basedir}/src/test/groovy</testSourceDirectory>
+        <testSourceDirectory>src/test/groovy</testSourceDirectory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/BigBadWolfService.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/BigBadWolfService.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/BigBadWolfService.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/BigBadWolfService.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/House.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/House.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/House.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/House.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseFactory.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseFactory.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseFactory.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseFactory.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseRepository.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseRepository.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseRepository.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/HouseRepository.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Policies.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Policies.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Policies.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Policies.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Specifications.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Specifications.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Specifications.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/Specifications.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseAbandoned.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseAbandoned.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseAbandoned.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseAbandoned.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseEvent.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseEvent.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseEvent.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/HouseEvent.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/WolfResignedFromAttacking.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/WolfResignedFromAttacking.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/WolfResignedFromAttacking.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/event/WolfResignedFromAttacking.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseId.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseId.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseId.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseId.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshot.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshot.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshot.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshot.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Material.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Material.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Material.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Material.java
diff --git a/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Pig.java b/pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Pig.java
similarity index 100%
rename from domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Pig.java
rename to pigs3/domain/src/main/java/io/github/mat3e/fairytales/pigs3/model/vo/Pig.java
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BigBadWolfServiceSpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BigBadWolfServiceSpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BigBadWolfServiceSpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BigBadWolfServiceSpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BuildingPolicySpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BuildingPolicySpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BuildingPolicySpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/BuildingPolicySpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/ConstructionSpecificationSpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/ConstructionSpecificationSpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/ConstructionSpecificationSpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/ConstructionSpecificationSpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/DefaultBlowingDownSpecificationSpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/DefaultBlowingDownSpecificationSpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/DefaultBlowingDownSpecificationSpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/DefaultBlowingDownSpecificationSpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseFactorySpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseFactorySpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseFactorySpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseFactorySpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseHelpers.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseHelpers.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseHelpers.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseHelpers.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseSpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseSpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseSpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/HouseSpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseIdSpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseIdSpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseIdSpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseIdSpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshotSpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshotSpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshotSpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/HouseSnapshotSpec.groovy
diff --git a/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/PigSpec.groovy b/pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/PigSpec.groovy
similarity index 100%
rename from domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/PigSpec.groovy
rename to pigs3/domain/src/test/groovy/io/github/mat3e/fairytales/pigs3/model/vo/PigSpec.groovy
diff --git a/pom.xml b/pom.xml
index 3f3fb5d..e6a19cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,9 @@
 
     <modules>
         <module>monolith</module>
-        <module>domain</module>
-        <module>app</module>
-        <module>adapters</module>
+        <module>pigs3/domain</module>
+        <module>pigs3/app</module>
+        <module>pigs3/adapters</module>
         <module>lib</module>
     </modules>