diff --git a/java-es-cqrs/pom.xml b/patterns/cqrs-es/pom.xml
similarity index 88%
rename from java-es-cqrs/pom.xml
rename to patterns/cqrs-es/pom.xml
index 8760a38262..3c54038837 100644
--- a/java-es-cqrs/pom.xml
+++ b/patterns/cqrs-es/pom.xml
@@ -2,12 +2,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">	
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>java-es-cqrs</artifactId>
+    <artifactId>cqrs-es</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <name>java-es-cqrs</name>
+    <name>cqrs-es</name>
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>patterns</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <properties>
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/crud/service/UserService.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/service/UserService.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/crud/service/UserService.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/service/UserService.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/domain/Address.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Address.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/domain/Address.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Address.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/domain/Contact.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Contact.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/domain/Contact.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Contact.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/domain/User.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/User.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/domain/User.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/User.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/domain/UserAddress.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserAddress.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/domain/UserAddress.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserAddress.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/domain/UserContact.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserContact.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/domain/UserContact.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserContact.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/Event.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/Event.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/Event.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/Event.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/repository/EventStore.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/repository/EventStore.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/repository/EventStore.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/repository/EventStore.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/service/UserService.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserService.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/service/UserService.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserService.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/es/service/UserUtility.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserUtility.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/es/service/UserUtility.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserUtility.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java
diff --git a/java-es-cqrs/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java b/patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java
similarity index 100%
rename from java-es-cqrs/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java
rename to patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java
diff --git a/java-es-cqrs/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
similarity index 96%
rename from java-es-cqrs/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
rename to patterns/cqrs-es/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
index 4a324e72f6..7f68a64274 100644
--- a/java-es-cqrs/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
+++ b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
@@ -40,7 +40,7 @@ public class ApplicationUnitTest {
     }
 
     @Test
-    public void testApplication() throws Exception {
+    public void givenCQRSApplication_whenCommandRun_thenQueryShouldReturnResult() throws Exception {
         String userId = UUID.randomUUID()
             .toString();
         User user = null;
diff --git a/java-es-cqrs/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
similarity index 95%
rename from java-es-cqrs/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
rename to patterns/cqrs-es/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
index 28c113bf46..3fabfe405d 100644
--- a/java-es-cqrs/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
+++ b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
@@ -24,7 +24,7 @@ public class ApplicationUnitTest {
     }
 
     @Test
-    public void testApplication() throws Exception {
+    public void givenCRUDApplication_whenDataCreated_thenDataCanBeFetched() throws Exception {
         UserService service = new UserService(repository);
         String userId = UUID.randomUUID()
             .toString();
diff --git a/java-es-cqrs/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
similarity index 95%
rename from java-es-cqrs/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
rename to patterns/cqrs-es/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
index 52bdde449f..61e7b4c05a 100644
--- a/java-es-cqrs/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
+++ b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
@@ -26,7 +26,7 @@ public class ApplicationUnitTest {
     }
 
     @Test
-    public void testApplication() throws Exception {
+    public void givenCRUDApplication_whenDataCreated_thenDataCanBeFetched() throws Exception {
         String userId = UUID.randomUUID()
             .toString();
 
diff --git a/java-es-cqrs/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
similarity index 97%
rename from java-es-cqrs/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
rename to patterns/cqrs-es/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
index 22cb5235d1..e0460b2f12 100644
--- a/java-es-cqrs/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
+++ b/patterns/cqrs-es/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
@@ -41,7 +41,7 @@ public class ApplicationUnitTest {
     }
 
     @Test
-    public void testApplication() throws Exception {
+    public void givenCQRSApplication_whenCommandRun_thenQueryShouldReturnResult() throws Exception {
         String userId = UUID.randomUUID()
             .toString();
         List<Event> events = null;
diff --git a/patterns/pom.xml b/patterns/pom.xml
index 4c17055231..fa46a79f5a 100644
--- a/patterns/pom.xml
+++ b/patterns/pom.xml
@@ -21,6 +21,7 @@
         <module>design-patterns-functional</module>
         <module>design-patterns-structural</module>
         <module>dip</module>
+		<module>cqrs-es</module>
         <module>front-controller</module>
         <module>intercepting-filter</module>
         <module>solid</module>
diff --git a/pom.xml b/pom.xml
index 9a4b40b950..2f4579c999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -568,7 +568,6 @@
                 <module>rxjava-operators</module>
 
 				<module>atomikos</module>
-				<module>java-es-cqrs</module>
             </modules>
 
         </profile>
@@ -1084,7 +1083,6 @@
                 <module>rxjava-operators</module>
 
 				<module>atomikos</module>
-				<module>java-es-cqrs</module>
             </modules>
 
         </profile>