diff --git a/pom.xml b/pom.xml
index 9963323..7038526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,8 @@
     <spring.version>4.3.18.RELEASE</spring.version>
     <spring.boot.version>1.5.14.RELEASE</spring.boot.version>
     <openfeign.version>1.4.4.RELEASE</openfeign.version>
+    
+    <lombok.version>1.18.0</lombok.version>
   </properties>
   
   <modules>
@@ -22,6 +24,15 @@
   	<module>spring-ddd-infrastructure</module>
   </modules>
   
+  <dependencies>
+    <dependency>
+	  <groupId>org.projectlombok</groupId>
+	  <artifactId>lombok</artifactId>
+	  <version>${lombok.version}</version>
+	  <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
   <dependencyManagement>
   	<dependencies>
       <dependency>
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/entities/Movie.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/entities/Movie.java
similarity index 72%
rename from spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/entities/Movie.java
rename to spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/entities/Movie.java
index fe19f52..c1fcfbc 100644
--- a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/entities/Movie.java
+++ b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/entities/Movie.java
@@ -1,6 +1,6 @@
-package com.rogelioorts.training.spring.ddd.repositories.entities;
+package com.rogelioorts.training.spring.ddd.entities;
 
-import com.rogelioorts.training.spring.ddd.repositories.value.objects.CensoringLevel;
+import com.rogelioorts.training.spring.ddd.value.objects.CensoringLevel;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/factories/FiltersFactory.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/factories/FiltersFactory.java
new file mode 100644
index 0000000..594354d
--- /dev/null
+++ b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/factories/FiltersFactory.java
@@ -0,0 +1,13 @@
+package com.rogelioorts.training.spring.ddd.factories;
+
+import com.rogelioorts.training.spring.ddd.value.objects.CensoringLevel;
+import com.rogelioorts.training.spring.ddd.value.objects.Filter;
+import com.rogelioorts.training.spring.ddd.value.objects.impl.CensoringFilter;
+
+public class FiltersFactory {
+
+	public static Filter censoringFilter(CensoringLevel level) {
+		return new CensoringFilter(level);
+	}
+	
+}
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/MoviesRepository.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/MoviesRepository.java
new file mode 100644
index 0000000..8daeef6
--- /dev/null
+++ b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/MoviesRepository.java
@@ -0,0 +1,11 @@
+package com.rogelioorts.training.spring.ddd.repositories;
+
+import java.util.List;
+
+import com.rogelioorts.training.spring.ddd.entities.Movie;
+
+public interface MoviesRepository {
+
+	List<Movie> findAll();
+	
+}
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/factories/FiltersFactory.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/factories/FiltersFactory.java
deleted file mode 100644
index a4285e1..0000000
--- a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/factories/FiltersFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.rogelioorts.training.spring.ddd.repositories.factories;
-
-import com.rogelioorts.training.spring.ddd.repositories.value.objects.CensoringLevel;
-import com.rogelioorts.training.spring.ddd.repositories.value.objects.Filter;
-import com.rogelioorts.training.spring.ddd.repositories.value.objects.impl.CensoringFilter;
-
-public class FiltersFactory {
-
-	public static Filter censoringFilter(CensoringLevel level) {
-		return new CensoringFilter(level);
-	}
-	
-}
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/CensoringLevel.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/CensoringLevel.java
deleted file mode 100644
index 196c6b2..0000000
--- a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/CensoringLevel.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.rogelioorts.training.spring.ddd.repositories.value.objects;
-
-public enum CensoringLevel {
-
-}
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/Filter.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/Filter.java
deleted file mode 100644
index 7828464..0000000
--- a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/Filter.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.rogelioorts.training.spring.ddd.repositories.value.objects;
-
-import java.util.List;
-
-import com.rogelioorts.training.spring.ddd.repositories.entities.Movie;
-
-public interface Filter {
-
-	List<Movie> apply(List<Movie> movies);
-	
-}
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/CensoringLevel.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/CensoringLevel.java
new file mode 100644
index 0000000..ff60fdc
--- /dev/null
+++ b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/CensoringLevel.java
@@ -0,0 +1,5 @@
+package com.rogelioorts.training.spring.ddd.value.objects;
+
+public enum CensoringLevel {
+
+}
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/Filter.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/Filter.java
new file mode 100644
index 0000000..368c8a2
--- /dev/null
+++ b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/Filter.java
@@ -0,0 +1,11 @@
+package com.rogelioorts.training.spring.ddd.value.objects;
+
+import java.util.List;
+
+import com.rogelioorts.training.spring.ddd.entities.Movie;
+
+public interface Filter {
+
+	List<Movie> apply(List<Movie> movies);
+	
+}
diff --git a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/impl/CensoringFilter.java b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/impl/CensoringFilter.java
similarity index 62%
rename from spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/impl/CensoringFilter.java
rename to spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/impl/CensoringFilter.java
index d3b9f6b..bc9e5e0 100644
--- a/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/repositories/value/objects/impl/CensoringFilter.java
+++ b/spring-ddd-domain/src/main/java/com/rogelioorts/training/spring/ddd/value/objects/impl/CensoringFilter.java
@@ -1,11 +1,11 @@
-package com.rogelioorts.training.spring.ddd.repositories.value.objects.impl;
+package com.rogelioorts.training.spring.ddd.value.objects.impl;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.rogelioorts.training.spring.ddd.repositories.entities.Movie;
-import com.rogelioorts.training.spring.ddd.repositories.value.objects.CensoringLevel;
-import com.rogelioorts.training.spring.ddd.repositories.value.objects.Filter;
+import com.rogelioorts.training.spring.ddd.entities.Movie;
+import com.rogelioorts.training.spring.ddd.value.objects.CensoringLevel;
+import com.rogelioorts.training.spring.ddd.value.objects.Filter;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;