diff --git a/patterns/.gitignore b/patterns-modules/.gitignore
similarity index 100%
rename from patterns/.gitignore
rename to patterns-modules/.gitignore
diff --git a/patterns/README.md b/patterns-modules/README.md
similarity index 72%
rename from patterns/README.md
rename to patterns-modules/README.md
index bbc48e3f34..86795e7a3f 100644
--- a/patterns/README.md
+++ b/patterns-modules/README.md
@@ -1,3 +1,3 @@
-## Patterns
+## Patterns Modules
 
 This module contains articles about design patterns.
diff --git a/patterns/clean-architecture/README.md b/patterns-modules/clean-architecture/README.md
similarity index 100%
rename from patterns/clean-architecture/README.md
rename to patterns-modules/clean-architecture/README.md
diff --git a/patterns/clean-architecture/pom.xml b/patterns-modules/clean-architecture/pom.xml
similarity index 100%
rename from patterns/clean-architecture/pom.xml
rename to patterns-modules/clean-architecture/pom.xml
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/CleanArchitectureApplication.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/CleanArchitectureApplication.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/CleanArchitectureApplication.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/CleanArchitectureApplication.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUser.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUser.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUser.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUser.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUserFactory.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUserFactory.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUserFactory.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/CommonUserFactory.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUser.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUser.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUser.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUser.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUserRepository.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUserRepository.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUserRepository.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/JpaUserRepository.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/User.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/User.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/User.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/User.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDataMapper.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDataMapper.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDataMapper.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDataMapper.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDsRequestModel.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDsRequestModel.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDsRequestModel.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserDsRequestModel.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserFactory.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserFactory.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserFactory.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserFactory.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserInputBoundary.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserInputBoundary.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserInputBoundary.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserInputBoundary.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserPresenter.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserPresenter.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserPresenter.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserPresenter.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterController.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterController.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterController.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterController.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterDsGateway.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterDsGateway.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterDsGateway.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterDsGateway.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterInteractor.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterInteractor.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterInteractor.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRegisterInteractor.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRequestModel.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRequestModel.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRequestModel.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserRequestModel.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatter.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatter.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatter.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatter.java
diff --git a/patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseModel.java b/patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseModel.java
similarity index 100%
rename from patterns/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseModel.java
rename to patterns-modules/clean-architecture/src/main/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseModel.java
diff --git a/patterns/clean-architecture/src/main/resources/application.properties b/patterns-modules/clean-architecture/src/main/resources/application.properties
similarity index 100%
rename from patterns/clean-architecture/src/main/resources/application.properties
rename to patterns-modules/clean-architecture/src/main/resources/application.properties
diff --git a/patterns/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatterUnitTest.java b/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatterUnitTest.java
similarity index 100%
rename from patterns/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatterUnitTest.java
rename to patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserResponseFormatterUnitTest.java
diff --git a/patterns/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java b/patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java
similarity index 100%
rename from patterns/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java
rename to patterns-modules/clean-architecture/src/test/java/com/baeldung/pattern/cleanarchitecture/usercreation/UserUnitTest.java
diff --git a/patterns/cqrs-es/README.md b/patterns-modules/cqrs-es/README.md
similarity index 100%
rename from patterns/cqrs-es/README.md
rename to patterns-modules/cqrs-es/README.md
diff --git a/patterns/cqrs-es/pom.xml b/patterns-modules/cqrs-es/pom.xml
similarity index 94%
rename from patterns/cqrs-es/pom.xml
rename to patterns-modules/cqrs-es/pom.xml
index 1bd7453ea1..737eb00b9b 100644
--- a/patterns/cqrs-es/pom.xml
+++ b/patterns-modules/cqrs-es/pom.xml
@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/aggregates/UserAggregate.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/CreateUserCommand.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/commands/UpdateUserCommand.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projections/UserProjection.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/projectors/UserProjector.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/AddressByRegionQuery.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/queries/ContactByTypeQuery.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserReadRepository.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/cqrs/repository/UserWriteRepository.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/crud/repository/UserRepository.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/service/UserService.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/crud/service/UserService.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/crud/service/UserService.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/crud/service/UserService.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Address.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/Address.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Address.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/Address.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Contact.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/Contact.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/Contact.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/Contact.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/User.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/User.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/User.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/User.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserAddress.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserAddress.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserAddress.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserAddress.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserContact.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserContact.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserContact.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/domain/UserContact.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/Event.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/Event.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/Event.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/Event.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressAddedEvent.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserAddressRemovedEvent.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactAddedEvent.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserContactRemovedEvent.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/events/UserCreatedEvent.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/repository/EventStore.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/repository/EventStore.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/repository/EventStore.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/repository/EventStore.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserService.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserService.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserService.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserService.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserUtility.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserUtility.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserUtility.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/es/service/UserUtility.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/aggregates/UserAggregate.java
diff --git a/patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java b/patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java
similarity index 100%
rename from patterns/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java
rename to patterns-modules/cqrs-es/src/main/java/com/baeldung/patterns/escqrs/projectors/UserProjector.java
diff --git a/patterns/cqrs-es/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java b/patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
similarity index 100%
rename from patterns/cqrs-es/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
rename to patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/cqrs/ApplicationUnitTest.java
diff --git a/patterns/cqrs-es/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java b/patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
similarity index 100%
rename from patterns/cqrs-es/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
rename to patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/crud/ApplicationUnitTest.java
diff --git a/patterns/cqrs-es/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java b/patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
similarity index 100%
rename from patterns/cqrs-es/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
rename to patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/es/ApplicationUnitTest.java
diff --git a/patterns/cqrs-es/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java b/patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
similarity index 100%
rename from patterns/cqrs-es/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
rename to patterns-modules/cqrs-es/src/test/java/com/baeldung/patterns/escqrs/ApplicationUnitTest.java
diff --git a/patterns/design-patterns-architectural/README.md b/patterns-modules/design-patterns-architectural/README.md
similarity index 100%
rename from patterns/design-patterns-architectural/README.md
rename to patterns-modules/design-patterns-architectural/README.md
diff --git a/patterns/design-patterns-architectural/pom.xml b/patterns-modules/design-patterns-architectural/pom.xml
similarity index 97%
rename from patterns/design-patterns-architectural/pom.xml
rename to patterns-modules/design-patterns-architectural/pom.xml
index fe7bd38df8..5cfe90867b 100644
--- a/patterns/design-patterns-architectural/pom.xml
+++ b/patterns-modules/design-patterns-architectural/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/application/UserApplication.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/application/UserApplication.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/application/UserApplication.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/application/UserApplication.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/JpaEntityManagerFactory.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/JpaEntityManagerFactory.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/JpaEntityManagerFactory.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/JpaEntityManagerFactory.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/PersistenceUnitInfoImpl.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/PersistenceUnitInfoImpl.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/PersistenceUnitInfoImpl.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/config/PersistenceUnitInfoImpl.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/Dao.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/Dao.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/Dao.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/Dao.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/JpaUserDao.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/JpaUserDao.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/JpaUserDao.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/JpaUserDao.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/UserDao.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/UserDao.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/UserDao.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/daos/UserDao.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/entities/User.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/entities/User.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/daopattern/entities/User.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/daopattern/entities/User.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/Main.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/Main.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/Main.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/Main.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/Mapper.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/Mapper.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/Mapper.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/Mapper.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserController.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserController.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserController.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserController.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserCreationDTO.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserCreationDTO.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserCreationDTO.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserCreationDTO.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserDTO.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserDTO.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserDTO.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserDTO.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserIdDTO.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserIdDTO.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserIdDTO.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/api/UserIdDTO.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/InMemoryRepository.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/InMemoryRepository.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/InMemoryRepository.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/InMemoryRepository.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/Role.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/Role.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/Role.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/Role.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleRepository.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleRepository.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleRepository.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleRepository.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleService.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleService.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleService.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/RoleService.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/User.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/User.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/User.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/User.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserRepository.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserRepository.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserRepository.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserRepository.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserService.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserService.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserService.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/dtopattern/domain/UserService.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/MvcMainClass.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/MvcMainClass.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/MvcMainClass.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/MvcMainClass.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/Product.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/Product.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/Product.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/Product.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductController.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductController.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductController.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductController.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductView.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductView.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductView.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvc/ProductView.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/MvpMainClass.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/MvpMainClass.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/MvpMainClass.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/MvpMainClass.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/Product.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/Product.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/Product.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/Product.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductPresenter.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductPresenter.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductPresenter.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductPresenter.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductView.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductView.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductView.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/mvc_mvp/mvp/ProductView.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/Tweet.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/Tweet.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/Tweet.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/Tweet.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDao.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDao.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDao.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDao.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDaoImpl.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDaoImpl.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDaoImpl.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/TweetDaoImpl.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/User.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDao.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDao.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDao.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDao.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDaoImpl.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDaoImpl.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDaoImpl.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserDaoImpl.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepository.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepository.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepository.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepository.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserRepositoryImpl.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserSocialMedia.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserSocialMedia.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserSocialMedia.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/repositoryvsdaopattern/UserSocialMedia.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Cache.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Cache.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Cache.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Cache.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/EmailService.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/EmailService.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/EmailService.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/EmailService.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/InitialContext.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/InitialContext.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/InitialContext.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/InitialContext.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Main.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Main.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Main.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/Main.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/MessagingService.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/MessagingService.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/MessagingService.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/MessagingService.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/SMSService.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/SMSService.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/SMSService.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/SMSService.java
diff --git a/patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/ServiceLocator.java b/patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/ServiceLocator.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/java/com/baeldung/service/locator/ServiceLocator.java
rename to patterns-modules/design-patterns-architectural/src/main/java/com/baeldung/service/locator/ServiceLocator.java
diff --git a/patterns/design-patterns-architectural/src/main/resources/META-INF/persistence.xml b/patterns-modules/design-patterns-architectural/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from patterns/design-patterns-architectural/src/main/resources/META-INF/persistence.xml
rename to patterns-modules/design-patterns-architectural/src/main/resources/META-INF/persistence.xml
diff --git a/patterns/design-patterns-architectural/src/test/java/com/baeldung/daopattern/test/UserDaoUnitTest.java b/patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/daopattern/test/UserDaoUnitTest.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/test/java/com/baeldung/daopattern/test/UserDaoUnitTest.java
rename to patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/daopattern/test/UserDaoUnitTest.java
diff --git a/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/MapperUnitTest.java b/patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/MapperUnitTest.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/MapperUnitTest.java
rename to patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/MapperUnitTest.java
diff --git a/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/UserControllerIntegrationTest.java b/patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/UserControllerIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/UserControllerIntegrationTest.java
rename to patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/api/UserControllerIntegrationTest.java
diff --git a/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/InMemoryRepositoryUnitTest.java b/patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/InMemoryRepositoryUnitTest.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/InMemoryRepositoryUnitTest.java
rename to patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/InMemoryRepositoryUnitTest.java
diff --git a/patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/UserUnitTest.java b/patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/UserUnitTest.java
similarity index 100%
rename from patterns/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/UserUnitTest.java
rename to patterns-modules/design-patterns-architectural/src/test/java/com/baeldung/dtopattern/domain/UserUnitTest.java
diff --git a/patterns/design-patterns-behavioral-2/README.md b/patterns-modules/design-patterns-behavioral-2/README.md
similarity index 100%
rename from patterns/design-patterns-behavioral-2/README.md
rename to patterns-modules/design-patterns-behavioral-2/README.md
diff --git a/patterns/design-patterns-behavioral-2/pom.xml b/patterns-modules/design-patterns-behavioral-2/pom.xml
similarity index 91%
rename from patterns/design-patterns-behavioral-2/pom.xml
rename to patterns-modules/design-patterns-behavioral-2/pom.xml
index da29575526..e484e118eb 100644
--- a/patterns/design-patterns-behavioral-2/pom.xml
+++ b/patterns-modules/design-patterns-behavioral-2/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextEditor.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextEditor.java
similarity index 100%
rename from patterns/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextEditor.java
rename to patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextEditor.java
diff --git a/patterns/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindow.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindow.java
similarity index 100%
rename from patterns/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindow.java
rename to patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindow.java
diff --git a/patterns/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindowState.java b/patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindowState.java
similarity index 100%
rename from patterns/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindowState.java
rename to patterns-modules/design-patterns-behavioral-2/src/main/java/com/baeldung/memento/TextWindowState.java
diff --git a/patterns/design-patterns-behavioral-2/src/test/java/com/baeldung/memento/TextEditorUnitTest.java b/patterns-modules/design-patterns-behavioral-2/src/test/java/com/baeldung/memento/TextEditorUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral-2/src/test/java/com/baeldung/memento/TextEditorUnitTest.java
rename to patterns-modules/design-patterns-behavioral-2/src/test/java/com/baeldung/memento/TextEditorUnitTest.java
diff --git a/patterns/design-patterns-behavioral/README.md b/patterns-modules/design-patterns-behavioral/README.md
similarity index 100%
rename from patterns/design-patterns-behavioral/README.md
rename to patterns-modules/design-patterns-behavioral/README.md
diff --git a/patterns/design-patterns-behavioral/pom.xml b/patterns-modules/design-patterns-behavioral/pom.xml
similarity index 97%
rename from patterns/design-patterns-behavioral/pom.xml
rename to patterns-modules/design-patterns-behavioral/pom.xml
index 3ddbd6f0fc..e2c8b7147b 100644
--- a/patterns/design-patterns-behavioral/pom.xml
+++ b/patterns-modules/design-patterns-behavioral/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProcessor.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/AuthenticationProvider.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthAuthenticationProcessor.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/OAuthTokenProvider.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/SamlAuthenticationProvider.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordAuthenticationProcessor.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/chainofresponsibility/UsernamePasswordProvider.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/client/TextFileApplication.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/client/TextFileApplication.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/client/TextFileApplication.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/client/TextFileApplication.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/command/OpenTextFileOperation.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/command/SaveTextFileOperation.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/command/TextFileOperation.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/command/TextFileOperation.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/command/TextFileOperation.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/command/TextFileOperation.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/invoker/TextFileOperationExecutor.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/receiver/TextFile.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/receiver/TextFile.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/command/receiver/TextFile.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/command/receiver/TextFile.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Context.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Context.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Context.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Context.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Expression.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Expression.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Expression.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Expression.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/From.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/From.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/From.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/From.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/InterpreterDemo.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/InterpreterDemo.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/InterpreterDemo.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/InterpreterDemo.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Row.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Row.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Row.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Row.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Select.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Select.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Select.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Select.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Where.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Where.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Where.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/interpreter/Where.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Button.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Button.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Button.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Button.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Fan.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Fan.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Fan.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Fan.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Mediator.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Mediator.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Mediator.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/Mediator.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/PowerSupplier.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/PowerSupplier.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/mediator/PowerSupplier.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/mediator/PowerSupplier.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/JmsRouter.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/JmsRouter.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/JmsRouter.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/JmsRouter.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Message.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Message.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Message.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Message.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/NullRouter.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/NullRouter.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/NullRouter.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/NullRouter.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Router.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Router.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Router.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/Router.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RouterFactory.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RouterFactory.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RouterFactory.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RouterFactory.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RoutingHandler.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RoutingHandler.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RoutingHandler.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/RoutingHandler.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/SmsRouter.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/SmsRouter.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/SmsRouter.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nullobject/SmsRouter.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/APIContracts.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/APIContracts.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/APIContracts.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/APIContracts.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Assertions.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Assertions.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Assertions.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Assertions.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/EmptyCollections.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/EmptyCollections.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/EmptyCollections.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/EmptyCollections.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/FindBugsAnnotations.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Preconditions.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Preconditions.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Preconditions.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/Preconditions.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/PrimitivesAndWrapper.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingLombok.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingLombok.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingLombok.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingLombok.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingObjects.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingObjects.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingObjects.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingObjects.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingOptional.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingOptional.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingOptional.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingOptional.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingStringUtils.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingStringUtils.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingStringUtils.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/nulls/UsingStringUtils.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/Channel.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/Channel.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/Channel.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/Channel.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsAgency.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsAgency.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsAgency.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsAgency.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsChannel.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsChannel.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsChannel.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/NewsChannel.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsAgency.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsAgency.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsAgency.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsAgency.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsChannel.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsChannel.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsChannel.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/ONewsChannel.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsAgency.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsAgency.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsAgency.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsAgency.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsChannel.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsChannel.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsChannel.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/observer/PCLNewsChannel.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/DeliveredState.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/DeliveredState.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/DeliveredState.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/DeliveredState.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/OrderedState.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/OrderedState.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/OrderedState.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/OrderedState.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/Package.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/Package.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/Package.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/Package.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/PackageState.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/PackageState.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/PackageState.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/PackageState.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/ReceivedState.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/ReceivedState.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/ReceivedState.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/ReceivedState.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/StateDemo.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/StateDemo.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/state/StateDemo.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/state/StateDemo.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/application/Application.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/application/Application.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/application/Application.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/application/Application.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/Computer.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/Computer.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/Computer.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/Computer.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/ComputerBuilder.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputer.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/HighEndComputerBuilder.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputer.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/templatemethod/model/StandardComputerBuilder.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Document.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Document.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Document.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Document.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Element.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Element.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Element.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Element.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/ElementVisitor.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/ElementVisitor.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/ElementVisitor.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/ElementVisitor.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/JsonElement.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/JsonElement.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/JsonElement.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/JsonElement.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Visitor.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Visitor.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Visitor.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/Visitor.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/VisitorDemo.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/VisitorDemo.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/VisitorDemo.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/VisitorDemo.java
diff --git a/patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/XmlElement.java b/patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/XmlElement.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/main/java/com/baeldung/visitor/XmlElement.java
rename to patterns-modules/design-patterns-behavioral/src/main/java/com/baeldung/visitor/XmlElement.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/chainofresponsibility/ChainOfResponsibilityIntegrationTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/OpenTextFileOperationUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/SaveTextFileOperationUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileOperationExecutorUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/command/test/TextFileUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/mediator/MediatorIntegrationTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/mediator/MediatorIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/mediator/MediatorIntegrationTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/mediator/MediatorIntegrationTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/PrimitivesAndWrapperUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingLombokUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingObjectsUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingOptionalUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/nulls/UsingStringUtilsUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/observer/ObserverIntegrationTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/observer/ObserverIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/observer/ObserverIntegrationTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/observer/ObserverIntegrationTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/state/StatePatternUnitTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/state/StatePatternUnitTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/state/StatePatternUnitTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/state/StatePatternUnitTest.java
diff --git a/patterns/design-patterns-behavioral/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java b/patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-behavioral/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java
rename to patterns-modules/design-patterns-behavioral/src/test/java/com/baeldung/templatemethod/test/TemplateMethodPatternIntegrationTest.java
diff --git a/patterns/design-patterns-cloud/README.md b/patterns-modules/design-patterns-cloud/README.md
similarity index 100%
rename from patterns/design-patterns-cloud/README.md
rename to patterns-modules/design-patterns-cloud/README.md
diff --git a/patterns/design-patterns-cloud/pom.xml b/patterns-modules/design-patterns-cloud/pom.xml
similarity index 100%
rename from patterns/design-patterns-cloud/pom.xml
rename to patterns-modules/design-patterns-cloud/pom.xml
diff --git a/patterns/design-patterns-cloud/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java b/patterns-modules/design-patterns-cloud/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
similarity index 100%
rename from patterns/design-patterns-cloud/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
rename to patterns-modules/design-patterns-cloud/src/test/java/com/baeldung/backoff/jitter/BackoffWithJitterTest.java
diff --git a/patterns/design-patterns-creational/README.md b/patterns-modules/design-patterns-creational/README.md
similarity index 100%
rename from patterns/design-patterns-creational/README.md
rename to patterns-modules/design-patterns-creational/README.md
diff --git a/patterns/design-patterns-creational/pom.xml b/patterns-modules/design-patterns-creational/pom.xml
similarity index 96%
rename from patterns/design-patterns-creational/pom.xml
rename to patterns-modules/design-patterns-creational/pom.xml
index de854d260e..8945b83d23 100644
--- a/patterns/design-patterns-creational/pom.xml
+++ b/patterns-modules/design-patterns-creational/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/application/Application.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/application/Application.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/application/Application.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/application/Application.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/entities/User.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/entities/User.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/entities/User.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/constructorsstaticfactorymethods/entities/User.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Animal.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Animal.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Animal.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Animal.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Brown.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Brown.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Brown.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Brown.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Color.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Color.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Color.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Color.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Dog.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Dog.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Dog.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Dog.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Duck.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Duck.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Duck.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/Duck.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/FactoryProvider.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/FactoryProvider.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/FactoryProvider.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/FactoryProvider.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/White.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/White.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/White.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/abstractfactory/White.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BankAccount.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BankAccount.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BankAccount.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BankAccount.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BuilderPatternDriver.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BuilderPatternDriver.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BuilderPatternDriver.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/builder/BuilderPatternDriver.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/FactoryDriver.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/FactoryDriver.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/FactoryDriver.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/FactoryDriver.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Heptagon.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Heptagon.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Heptagon.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Heptagon.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Octagon.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Octagon.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Octagon.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Octagon.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Pentagon.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Pentagon.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Pentagon.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Pentagon.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Polygon.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Polygon.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Polygon.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Polygon.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/PolygonFactory.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/PolygonFactory.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/PolygonFactory.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/PolygonFactory.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Square.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Square.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Square.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Square.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Triangle.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Triangle.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Triangle.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/factory/Triangle.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/Singleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/Singleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/Singleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/Singleton.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/SingletonDriver.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/SingletonDriver.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/SingletonDriver.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/creational/singleton/SingletonDriver.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/Car.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/Car.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/Car.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/Car.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/Engine.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/Engine.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/Engine.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/Engine.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/Vehicle.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/Vehicle.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/Vehicle.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/Vehicle.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/VehicleFactory.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/VehicleFactory.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/flyweight/VehicleFactory.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/flyweight/VehicleFactory.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Address.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Address.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Address.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Address.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Employee.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Employee.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Employee.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/freebuilder/Employee.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/freebuilder/builder/Employee.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/freebuilder/builder/Employee.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/freebuilder/builder/Employee.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/freebuilder/builder/Employee.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PineTree.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/PineTree.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PineTree.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/PineTree.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PlasticTree.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/PlasticTree.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PlasticTree.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/PlasticTree.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Position.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/Position.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Position.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/Position.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddCommand.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddCommand.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddRule.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddRule.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddRule.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/AddRule.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Addition.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Addition.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Addition.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Addition.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Calculator.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Calculator.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Calculator.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Calculator.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Command.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Command.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Command.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Command.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Division.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Division.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Division.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Division.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Expression.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Expression.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Expression.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Expression.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Modulo.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Modulo.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Modulo.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Modulo.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Multiplication.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Multiplication.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operation.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operation.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operation.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operation.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operator.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operator.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operator.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Operator.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/OperatorFactory.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Result.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Result.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Result.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Result.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Rule.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Rule.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Rule.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Rule.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/RuleEngine.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Subtraction.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/reducingIfElse/Subtraction.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/ClassSingleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/ClassSingleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/ClassSingleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/ClassSingleton.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/EnumSingleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/EnumSingleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/EnumSingleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/EnumSingleton.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/Sandbox.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/Sandbox.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/Sandbox.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/Sandbox.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DclSingleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DclSingleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DclSingleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DclSingleton.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DraconianSingleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DraconianSingleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DraconianSingleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/DraconianSingleton.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EarlyInitSingleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EarlyInitSingleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EarlyInitSingleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EarlyInitSingleton.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EnumSingleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EnumSingleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EnumSingleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/EnumSingleton.java
diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/InitOnDemandSingleton.java b/patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/InitOnDemandSingleton.java
similarity index 100%
rename from patterns/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/InitOnDemandSingleton.java
rename to patterns-modules/design-patterns-creational/src/main/java/com/baeldung/singleton/synchronization/InitOnDemandSingleton.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/constructorsstaticfactorymethods/UserUnitTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/creational/builder/BuilderPatternIntegrationTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/builder/BuilderPatternIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/creational/builder/BuilderPatternIntegrationTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/builder/BuilderPatternIntegrationTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/creational/factory/FactoryIntegrationTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/factory/FactoryIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/creational/factory/FactoryIntegrationTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/factory/FactoryIntegrationTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/creational/singleton/SingletonIntegrationTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/singleton/SingletonIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/creational/singleton/SingletonIntegrationTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/creational/singleton/SingletonIntegrationTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/flyweight/FlyweightUnitTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/flyweight/FlyweightUnitTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/flyweight/FlyweightUnitTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/flyweight/FlyweightUnitTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/freebuilder/EmployeeBuilderUnitTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/freebuilder/EmployeeBuilderUnitTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/freebuilder/EmployeeBuilderUnitTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/freebuilder/EmployeeBuilderUnitTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/freebuilder/builder/EmployeeBuilderUnitTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/freebuilder/builder/EmployeeBuilderUnitTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/freebuilder/builder/EmployeeBuilderUnitTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/freebuilder/builder/EmployeeBuilderUnitTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/CalculatorUnitTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/reduceIfelse/RuleEngineUnitTest.java
diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/singleton/synchronization/SingletonSynchronizationIntegrationTest.java b/patterns-modules/design-patterns-creational/src/test/java/com/baeldung/singleton/synchronization/SingletonSynchronizationIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-creational/src/test/java/com/baeldung/singleton/synchronization/SingletonSynchronizationIntegrationTest.java
rename to patterns-modules/design-patterns-creational/src/test/java/com/baeldung/singleton/synchronization/SingletonSynchronizationIntegrationTest.java
diff --git a/patterns/design-patterns-functional/README.md b/patterns-modules/design-patterns-functional/README.md
similarity index 100%
rename from patterns/design-patterns-functional/README.md
rename to patterns-modules/design-patterns-functional/README.md
diff --git a/patterns/design-patterns-functional/pom.xml b/patterns-modules/design-patterns-functional/pom.xml
similarity index 91%
rename from patterns/design-patterns-functional/pom.xml
rename to patterns-modules/design-patterns-functional/pom.xml
index b801781564..f86d2e8cd7 100644
--- a/patterns/design-patterns-functional/pom.xml
+++ b/patterns-modules/design-patterns-functional/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/design-patterns-functional/src/main/java/com/baeldung/currying/Letter.java b/patterns-modules/design-patterns-functional/src/main/java/com/baeldung/currying/Letter.java
similarity index 100%
rename from patterns/design-patterns-functional/src/main/java/com/baeldung/currying/Letter.java
rename to patterns-modules/design-patterns-functional/src/main/java/com/baeldung/currying/Letter.java
diff --git a/patterns/design-patterns-functional/src/test/java/com/baeldung/currying/LetterUnitTest.java b/patterns-modules/design-patterns-functional/src/test/java/com/baeldung/currying/LetterUnitTest.java
similarity index 100%
rename from patterns/design-patterns-functional/src/test/java/com/baeldung/currying/LetterUnitTest.java
rename to patterns-modules/design-patterns-functional/src/test/java/com/baeldung/currying/LetterUnitTest.java
diff --git a/patterns/design-patterns-structural/README.md b/patterns-modules/design-patterns-structural/README.md
similarity index 100%
rename from patterns/design-patterns-structural/README.md
rename to patterns-modules/design-patterns-structural/README.md
diff --git a/patterns/design-patterns-structural/pom.xml b/patterns-modules/design-patterns-structural/pom.xml
similarity index 93%
rename from patterns/design-patterns-structural/pom.xml
rename to patterns-modules/design-patterns-structural/pom.xml
index f0bcb824b5..e9b7194b73 100644
--- a/patterns/design-patterns-structural/pom.xml
+++ b/patterns-modules/design-patterns-structural/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AdapterPatternDriver.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/AstonMartin.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AstonMartin.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/AstonMartin.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/AstonMartin.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/BugattiVeyron.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/BugattiVeyron.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/BugattiVeyron.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/BugattiVeyron.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/McLaren.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/McLaren.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/McLaren.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/McLaren.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/Movable.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/Movable.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/Movable.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/Movable.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapter.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapter.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapter.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapter.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/adapter/MovableAdapterImpl.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Blue.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Blue.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Blue.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Blue.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/BridgePatternDriver.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/BridgePatternDriver.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/BridgePatternDriver.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/BridgePatternDriver.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Color.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Color.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Color.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Color.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Red.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Red.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Red.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Red.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Shape.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Shape.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Shape.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Shape.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Square.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Square.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Square.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Square.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Triangle.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Triangle.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/bridge/Triangle.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/bridge/Triangle.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/composite/CompositeDemo.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/CompositeDemo.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/composite/CompositeDemo.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/CompositeDemo.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/composite/Department.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/Department.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/composite/Department.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/Department.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/composite/FinancialDepartment.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/FinancialDepartment.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/composite/FinancialDepartment.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/FinancialDepartment.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/composite/HeadDepartment.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/HeadDepartment.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/composite/HeadDepartment.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/HeadDepartment.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/composite/SalesDepartment.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/SalesDepartment.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/composite/SalesDepartment.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/composite/SalesDepartment.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/BubbleLights.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/BubbleLights.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/BubbleLights.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/BubbleLights.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTree.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTree.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTree.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTree.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTreeImpl.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTreeImpl.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTreeImpl.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/ChristmasTreeImpl.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/DecoratorPatternDriver.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/DecoratorPatternDriver.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/DecoratorPatternDriver.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/DecoratorPatternDriver.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/Garland.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/Garland.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/Garland.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/Garland.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/TreeDecorator.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/TreeDecorator.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/decorator/TreeDecorator.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/decorator/TreeDecorator.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/CarEngineFacade.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/CarEngineFacade.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/CarEngineFacade.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/CarEngineFacade.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowController.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowController.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowController.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowController.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowMeter.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowMeter.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowMeter.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/AirFlowMeter.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CatalyticConverter.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CatalyticConverter.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CatalyticConverter.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CatalyticConverter.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CoolingController.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CoolingController.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CoolingController.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/CoolingController.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelInjector.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelInjector.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelInjector.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelInjector.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelPump.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelPump.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelPump.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/FuelPump.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Radiator.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Radiator.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Radiator.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Radiator.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Starter.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Starter.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Starter.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/Starter.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/TemperatureSensor.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/TemperatureSensor.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/TemperatureSensor.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/facade/carsystem/TemperatureSensor.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObject.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObject.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObject.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObject.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectImpl.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectImpl.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectImpl.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectImpl.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectProxy.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectProxy.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectProxy.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ExpensiveObjectProxy.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ProxyPatternDriver.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ProxyPatternDriver.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/proxy/ProxyPatternDriver.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/proxy/ProxyPatternDriver.java
diff --git a/patterns/design-patterns-structural/src/main/java/com/baeldung/util/LoggerUtil.java b/patterns-modules/design-patterns-structural/src/main/java/com/baeldung/util/LoggerUtil.java
similarity index 100%
rename from patterns/design-patterns-structural/src/main/java/com/baeldung/util/LoggerUtil.java
rename to patterns-modules/design-patterns-structural/src/main/java/com/baeldung/util/LoggerUtil.java
diff --git a/patterns/design-patterns-structural/src/main/resources/log4jstructuraldp.properties b/patterns-modules/design-patterns-structural/src/main/resources/log4jstructuraldp.properties
similarity index 100%
rename from patterns/design-patterns-structural/src/main/resources/log4jstructuraldp.properties
rename to patterns-modules/design-patterns-structural/src/main/resources/log4jstructuraldp.properties
diff --git a/patterns/design-patterns-structural/src/test/java/com/baeldung/adapter/AdapterPatternIntegrationTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/AdapterPatternIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-structural/src/test/java/com/baeldung/adapter/AdapterPatternIntegrationTest.java
rename to patterns-modules/design-patterns-structural/src/test/java/com/baeldung/adapter/AdapterPatternIntegrationTest.java
diff --git a/patterns/design-patterns-structural/src/test/java/com/baeldung/bridge/BridgePatternIntegrationTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/bridge/BridgePatternIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-structural/src/test/java/com/baeldung/bridge/BridgePatternIntegrationTest.java
rename to patterns-modules/design-patterns-structural/src/test/java/com/baeldung/bridge/BridgePatternIntegrationTest.java
diff --git a/patterns/design-patterns-structural/src/test/java/com/baeldung/decorator/DecoratorPatternIntegrationTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/decorator/DecoratorPatternIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-structural/src/test/java/com/baeldung/decorator/DecoratorPatternIntegrationTest.java
rename to patterns-modules/design-patterns-structural/src/test/java/com/baeldung/decorator/DecoratorPatternIntegrationTest.java
diff --git a/patterns/design-patterns-structural/src/test/java/com/baeldung/facade/CarEngineFacadeIntegrationTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/facade/CarEngineFacadeIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-structural/src/test/java/com/baeldung/facade/CarEngineFacadeIntegrationTest.java
rename to patterns-modules/design-patterns-structural/src/test/java/com/baeldung/facade/CarEngineFacadeIntegrationTest.java
diff --git a/patterns/design-patterns-structural/src/test/java/com/baeldung/proxy/ProxyPatternIntegrationTest.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/proxy/ProxyPatternIntegrationTest.java
similarity index 100%
rename from patterns/design-patterns-structural/src/test/java/com/baeldung/proxy/ProxyPatternIntegrationTest.java
rename to patterns-modules/design-patterns-structural/src/test/java/com/baeldung/proxy/ProxyPatternIntegrationTest.java
diff --git a/patterns/design-patterns-structural/src/test/java/com/baeldung/proxy/TestAppenderDP.java b/patterns-modules/design-patterns-structural/src/test/java/com/baeldung/proxy/TestAppenderDP.java
similarity index 100%
rename from patterns/design-patterns-structural/src/test/java/com/baeldung/proxy/TestAppenderDP.java
rename to patterns-modules/design-patterns-structural/src/test/java/com/baeldung/proxy/TestAppenderDP.java
diff --git a/patterns/dip/README.md b/patterns-modules/dip/README.md
similarity index 100%
rename from patterns/dip/README.md
rename to patterns-modules/dip/README.md
diff --git a/patterns/dip/pom.xml b/patterns-modules/dip/pom.xml
similarity index 91%
rename from patterns/dip/pom.xml
rename to patterns-modules/dip/pom.xml
index 3618791b97..a216c4fb12 100644
--- a/patterns/dip/pom.xml
+++ b/patterns-modules/dip/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/dip/src/main/java/com/baeldung/dip/application/Application.java b/patterns-modules/dip/src/main/java/com/baeldung/dip/application/Application.java
similarity index 100%
rename from patterns/dip/src/main/java/com/baeldung/dip/application/Application.java
rename to patterns-modules/dip/src/main/java/com/baeldung/dip/application/Application.java
diff --git a/patterns/dip/src/main/java/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java b/patterns-modules/dip/src/main/java/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java
similarity index 100%
rename from patterns/dip/src/main/java/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java
rename to patterns-modules/dip/src/main/java/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java
diff --git a/patterns/dip/src/main/java/com/baeldung/dip/daointerfaces/CustomerDao.java b/patterns-modules/dip/src/main/java/com/baeldung/dip/daointerfaces/CustomerDao.java
similarity index 100%
rename from patterns/dip/src/main/java/com/baeldung/dip/daointerfaces/CustomerDao.java
rename to patterns-modules/dip/src/main/java/com/baeldung/dip/daointerfaces/CustomerDao.java
diff --git a/patterns/dip/src/main/java/com/baeldung/dip/entities/Customer.java b/patterns-modules/dip/src/main/java/com/baeldung/dip/entities/Customer.java
similarity index 100%
rename from patterns/dip/src/main/java/com/baeldung/dip/entities/Customer.java
rename to patterns-modules/dip/src/main/java/com/baeldung/dip/entities/Customer.java
diff --git a/patterns/dip/src/main/java/com/baeldung/dip/services/CustomerService.java b/patterns-modules/dip/src/main/java/com/baeldung/dip/services/CustomerService.java
similarity index 100%
rename from patterns/dip/src/main/java/com/baeldung/dip/services/CustomerService.java
rename to patterns-modules/dip/src/main/java/com/baeldung/dip/services/CustomerService.java
diff --git a/patterns/dip/src/test/java/com/baeldung/dip/tests/CustomerDaoUnitTest.java b/patterns-modules/dip/src/test/java/com/baeldung/dip/tests/CustomerDaoUnitTest.java
similarity index 100%
rename from patterns/dip/src/test/java/com/baeldung/dip/tests/CustomerDaoUnitTest.java
rename to patterns-modules/dip/src/test/java/com/baeldung/dip/tests/CustomerDaoUnitTest.java
diff --git a/patterns/dip/src/test/java/com/baeldung/dip/tests/CustomerServiceUnitTest.java b/patterns-modules/dip/src/test/java/com/baeldung/dip/tests/CustomerServiceUnitTest.java
similarity index 100%
rename from patterns/dip/src/test/java/com/baeldung/dip/tests/CustomerServiceUnitTest.java
rename to patterns-modules/dip/src/test/java/com/baeldung/dip/tests/CustomerServiceUnitTest.java
diff --git a/patterns/dipmodular/README.md b/patterns-modules/dipmodular/README.md
similarity index 100%
rename from patterns/dipmodular/README.md
rename to patterns-modules/dipmodular/README.md
diff --git a/patterns/dipmodular/com.baeldung.dip.daoimplementations/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java b/patterns-modules/dipmodular/com.baeldung.dip.daoimplementations/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.daoimplementations/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java
rename to patterns-modules/dipmodular/com.baeldung.dip.daoimplementations/com/baeldung/dip/daoimplementations/SimpleCustomerDao.java
diff --git a/patterns/dipmodular/com.baeldung.dip.daoimplementations/module-info.java b/patterns-modules/dipmodular/com.baeldung.dip.daoimplementations/module-info.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.daoimplementations/module-info.java
rename to patterns-modules/dipmodular/com.baeldung.dip.daoimplementations/module-info.java
diff --git a/patterns/dipmodular/com.baeldung.dip.daos/com/baeldung/dip/daos/CustomerDao.java b/patterns-modules/dipmodular/com.baeldung.dip.daos/com/baeldung/dip/daos/CustomerDao.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.daos/com/baeldung/dip/daos/CustomerDao.java
rename to patterns-modules/dipmodular/com.baeldung.dip.daos/com/baeldung/dip/daos/CustomerDao.java
diff --git a/patterns/dipmodular/com.baeldung.dip.daos/module-info.java b/patterns-modules/dipmodular/com.baeldung.dip.daos/module-info.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.daos/module-info.java
rename to patterns-modules/dipmodular/com.baeldung.dip.daos/module-info.java
diff --git a/patterns/dipmodular/com.baeldung.dip.entities/com/baeldung/dip/entities/Customer.java b/patterns-modules/dipmodular/com.baeldung.dip.entities/com/baeldung/dip/entities/Customer.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.entities/com/baeldung/dip/entities/Customer.java
rename to patterns-modules/dipmodular/com.baeldung.dip.entities/com/baeldung/dip/entities/Customer.java
diff --git a/patterns/dipmodular/com.baeldung.dip.entities/module-info.java b/patterns-modules/dipmodular/com.baeldung.dip.entities/module-info.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.entities/module-info.java
rename to patterns-modules/dipmodular/com.baeldung.dip.entities/module-info.java
diff --git a/patterns/dipmodular/com.baeldung.dip.mainapp/com/baeldung/dip/mainapp/MainApplication.java b/patterns-modules/dipmodular/com.baeldung.dip.mainapp/com/baeldung/dip/mainapp/MainApplication.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.mainapp/com/baeldung/dip/mainapp/MainApplication.java
rename to patterns-modules/dipmodular/com.baeldung.dip.mainapp/com/baeldung/dip/mainapp/MainApplication.java
diff --git a/patterns/dipmodular/com.baeldung.dip.mainapp/module-info.java b/patterns-modules/dipmodular/com.baeldung.dip.mainapp/module-info.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.mainapp/module-info.java
rename to patterns-modules/dipmodular/com.baeldung.dip.mainapp/module-info.java
diff --git a/patterns/dipmodular/com.baeldung.dip.services/com/baeldung/dip/services/CustomerService.java b/patterns-modules/dipmodular/com.baeldung.dip.services/com/baeldung/dip/services/CustomerService.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.services/com/baeldung/dip/services/CustomerService.java
rename to patterns-modules/dipmodular/com.baeldung.dip.services/com/baeldung/dip/services/CustomerService.java
diff --git a/patterns/dipmodular/com.baeldung.dip.services/module-info.java b/patterns-modules/dipmodular/com.baeldung.dip.services/module-info.java
similarity index 100%
rename from patterns/dipmodular/com.baeldung.dip.services/module-info.java
rename to patterns-modules/dipmodular/com.baeldung.dip.services/module-info.java
diff --git a/patterns/enterprise-patterns/pom.xml b/patterns-modules/enterprise-patterns/pom.xml
similarity index 98%
rename from patterns/enterprise-patterns/pom.xml
rename to patterns-modules/enterprise-patterns/pom.xml
index 2228cc9505..aee56c04ff 100644
--- a/patterns/enterprise-patterns/pom.xml
+++ b/patterns-modules/enterprise-patterns/pom.xml
@@ -8,7 +8,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/enterprise-patterns/wire-tap/README.md b/patterns-modules/enterprise-patterns/wire-tap/README.md
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/README.md
rename to patterns-modules/enterprise-patterns/wire-tap/README.md
diff --git a/patterns/enterprise-patterns/wire-tap/pom.xml b/patterns-modules/enterprise-patterns/wire-tap/pom.xml
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/pom.xml
rename to patterns-modules/enterprise-patterns/wire-tap/pom.xml
diff --git a/patterns/enterprise-patterns/wire-tap/src/data/.camel/msg1.xml b/patterns-modules/enterprise-patterns/wire-tap/src/data/.camel/msg1.xml
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/src/data/.camel/msg1.xml
rename to patterns-modules/enterprise-patterns/wire-tap/src/data/.camel/msg1.xml
diff --git a/patterns/enterprise-patterns/wire-tap/src/data/msg.xml b/patterns-modules/enterprise-patterns/wire-tap/src/data/msg.xml
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/src/data/msg.xml
rename to patterns-modules/enterprise-patterns/wire-tap/src/data/msg.xml
diff --git a/patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/AmqApplication.java b/patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/AmqApplication.java
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/AmqApplication.java
rename to patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/AmqApplication.java
diff --git a/patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyBean.java b/patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyBean.java
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyBean.java
rename to patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyBean.java
diff --git a/patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayload.java b/patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayload.java
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayload.java
rename to patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayload.java
diff --git a/patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayloadClonePrepare.java b/patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayloadClonePrepare.java
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayloadClonePrepare.java
rename to patterns-modules/enterprise-patterns/wire-tap/src/main/java/com/baeldung/MyPayloadClonePrepare.java
diff --git a/patterns/enterprise-patterns/wire-tap/src/main/resources/application.properties b/patterns-modules/enterprise-patterns/wire-tap/src/main/resources/application.properties
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/src/main/resources/application.properties
rename to patterns-modules/enterprise-patterns/wire-tap/src/main/resources/application.properties
diff --git a/patterns/enterprise-patterns/wire-tap/src/main/resources/log4j.properties b/patterns-modules/enterprise-patterns/wire-tap/src/main/resources/log4j.properties
similarity index 97%
rename from patterns/enterprise-patterns/wire-tap/src/main/resources/log4j.properties
rename to patterns-modules/enterprise-patterns/wire-tap/src/main/resources/log4j.properties
index 28aa51259a..f62f1da96f 100644
--- a/patterns/enterprise-patterns/wire-tap/src/main/resources/log4j.properties
+++ b/patterns-modules/enterprise-patterns/wire-tap/src/main/resources/log4j.properties
@@ -1,16 +1,16 @@
-# Root logger option
-log4j.rootLogger=INFO, file, console
-
-log4j.logger.com.javarticles=INFO, file
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=javarticles.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d | %p | %F %L | %m%n
- 
-# Direct log messages to stdout
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Target=System.out
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
+# Root logger option
+log4j.rootLogger=INFO, file, console
+
+log4j.logger.com.javarticles=INFO, file
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=javarticles.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d | %p | %F %L | %m%n
+ 
+# Direct log messages to stdout
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Target=System.out
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%d{HH:mm}| %p | %F %L | %m%n
\ No newline at end of file
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-10-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-10-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-10-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-10-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-11-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-11-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-11-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-11-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-2-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-2-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-2-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-2-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-3-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-3-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-3-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-3-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-4-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-4-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-4-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-4-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-5-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-5-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-5-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-5-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-6-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-6-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-6-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-6-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-7-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-7-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-7-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-7-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-8-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-8-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-8-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-8-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-9-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-9-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-9-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-34209-1621429668568-4-9-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-10-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-10-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-10-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-10-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-11-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-11-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-11-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-11-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-2-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-2-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-2-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-2-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-3-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-3-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-3-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-3-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-4-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-4-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-4-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-4-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-5-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-5-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-5-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-5-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-6-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-6-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-6-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-6-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-7-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-7-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-7-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-7-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-8-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-8-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-8-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-8-1-1-1
diff --git a/patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-9-1-1-1 b/patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-9-1-1-1
similarity index 100%
rename from patterns/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-9-1-1-1
rename to patterns-modules/enterprise-patterns/wire-tap/test/ID-PRINHYLTPDL1209-46717-1621429562728-4-9-1-1-1
diff --git a/patterns/front-controller/README.md b/patterns-modules/front-controller/README.md
similarity index 100%
rename from patterns/front-controller/README.md
rename to patterns-modules/front-controller/README.md
diff --git a/patterns/front-controller/pom.xml b/patterns-modules/front-controller/pom.xml
similarity index 96%
rename from patterns/front-controller/pom.xml
rename to patterns-modules/front-controller/pom.xml
index d25bd774c6..84de94cee3 100644
--- a/patterns/front-controller/pom.xml
+++ b/patterns-modules/front-controller/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/FrontControllerServlet.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/FrontControllerServlet.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/FrontControllerServlet.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/FrontControllerServlet.java
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/FrontCommand.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/FrontCommand.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/FrontCommand.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/FrontCommand.java
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/SearchCommand.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/SearchCommand.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/SearchCommand.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/SearchCommand.java
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/UnknownCommand.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/UnknownCommand.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/UnknownCommand.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/commands/UnknownCommand.java
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Book.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Book.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Book.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Book.java
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookImpl.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookImpl.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookImpl.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookImpl.java
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Bookshelf.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Bookshelf.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Bookshelf.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/Bookshelf.java
diff --git a/patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookshelfImpl.java b/patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookshelfImpl.java
similarity index 100%
rename from patterns/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookshelfImpl.java
rename to patterns-modules/front-controller/src/main/java/com/baeldung/patterns/front/controller/data/BookshelfImpl.java
diff --git a/patterns/front-controller/src/main/resources/front controller.png b/patterns-modules/front-controller/src/main/resources/front controller.png
similarity index 100%
rename from patterns/front-controller/src/main/resources/front controller.png
rename to patterns-modules/front-controller/src/main/resources/front controller.png
diff --git a/patterns/front-controller/src/main/resources/front controller.puml b/patterns-modules/front-controller/src/main/resources/front controller.puml
similarity index 100%
rename from patterns/front-controller/src/main/resources/front controller.puml
rename to patterns-modules/front-controller/src/main/resources/front controller.puml
diff --git a/patterns/front-controller/src/main/resources/logback.xml b/patterns-modules/front-controller/src/main/resources/logback.xml
similarity index 100%
rename from patterns/front-controller/src/main/resources/logback.xml
rename to patterns-modules/front-controller/src/main/resources/logback.xml
diff --git a/patterns/front-controller/src/main/webapp/WEB-INF/jsp/book-found.jsp b/patterns-modules/front-controller/src/main/webapp/WEB-INF/jsp/book-found.jsp
similarity index 100%
rename from patterns/front-controller/src/main/webapp/WEB-INF/jsp/book-found.jsp
rename to patterns-modules/front-controller/src/main/webapp/WEB-INF/jsp/book-found.jsp
diff --git a/patterns/front-controller/src/main/webapp/WEB-INF/jsp/book-notfound.jsp b/patterns-modules/front-controller/src/main/webapp/WEB-INF/jsp/book-notfound.jsp
similarity index 100%
rename from patterns/front-controller/src/main/webapp/WEB-INF/jsp/book-notfound.jsp
rename to patterns-modules/front-controller/src/main/webapp/WEB-INF/jsp/book-notfound.jsp
diff --git a/patterns/front-controller/src/main/webapp/WEB-INF/jsp/unknown.jsp b/patterns-modules/front-controller/src/main/webapp/WEB-INF/jsp/unknown.jsp
similarity index 100%
rename from patterns/front-controller/src/main/webapp/WEB-INF/jsp/unknown.jsp
rename to patterns-modules/front-controller/src/main/webapp/WEB-INF/jsp/unknown.jsp
diff --git a/patterns/front-controller/src/main/webapp/WEB-INF/web.xml b/patterns-modules/front-controller/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from patterns/front-controller/src/main/webapp/WEB-INF/web.xml
rename to patterns-modules/front-controller/src/main/webapp/WEB-INF/web.xml
diff --git a/patterns/hexagonal-architecture/pom.xml b/patterns-modules/hexagonal-architecture/pom.xml
similarity index 100%
rename from patterns/hexagonal-architecture/pom.xml
rename to patterns-modules/hexagonal-architecture/pom.xml
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/HexArchApplicationDemo.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/HexArchApplicationDemo.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/HexArchApplicationDemo.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/HexArchApplicationDemo.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/AppConfig.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/AppConfig.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/AppConfig.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/AppConfig.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/MongoConfig.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/MongoConfig.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/MongoConfig.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/config/MongoConfig.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/controller/EmployeeController.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/controller/EmployeeController.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/controller/EmployeeController.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/controller/EmployeeController.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/model/Employee.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/model/Employee.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/model/Employee.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/model/Employee.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeService.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeService.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeService.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeService.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImpl.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImpl.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImpl.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImpl.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/EmployeeRepository.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/EmployeeRepository.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/EmployeeRepository.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/EmployeeRepository.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoDBRepository.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoDBRepository.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoDBRepository.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoDBRepository.java
diff --git a/patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoRepoEx.java b/patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoRepoEx.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoRepoEx.java
rename to patterns-modules/hexagonal-architecture/src/main/java/com/baeldung/pattern/hexagonal/persistence/MongoRepoEx.java
diff --git a/patterns/hexagonal-architecture/src/main/resources/application.properties b/patterns-modules/hexagonal-architecture/src/main/resources/application.properties
similarity index 100%
rename from patterns/hexagonal-architecture/src/main/resources/application.properties
rename to patterns-modules/hexagonal-architecture/src/main/resources/application.properties
diff --git a/patterns/hexagonal-architecture/src/test/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImplUnitTest.java b/patterns-modules/hexagonal-architecture/src/test/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImplUnitTest.java
similarity index 100%
rename from patterns/hexagonal-architecture/src/test/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImplUnitTest.java
rename to patterns-modules/hexagonal-architecture/src/test/java/com/baeldung/pattern/hexagonal/domain/services/EmployeeServiceImplUnitTest.java
diff --git a/patterns/intercepting-filter/README.md b/patterns-modules/intercepting-filter/README.md
similarity index 100%
rename from patterns/intercepting-filter/README.md
rename to patterns-modules/intercepting-filter/README.md
diff --git a/patterns/intercepting-filter/pom.xml b/patterns-modules/intercepting-filter/pom.xml
similarity index 96%
rename from patterns/intercepting-filter/pom.xml
rename to patterns-modules/intercepting-filter/pom.xml
index ffc3309ddb..8028454ee2 100644
--- a/patterns/intercepting-filter/pom.xml
+++ b/patterns-modules/intercepting-filter/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/FrontControllerServlet.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/FrontControllerServlet.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/FrontControllerServlet.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/FrontControllerServlet.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/CheckoutCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/CheckoutCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/CheckoutCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/CheckoutCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/FrontCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/FrontCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/FrontCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/FrontCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/HomeCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/HomeCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/HomeCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/HomeCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LoginCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LoginCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LoginCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LoginCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LogoutCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LogoutCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LogoutCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/LogoutCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/OrderCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/OrderCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/OrderCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/OrderCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/SearchCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/SearchCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/SearchCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/SearchCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/ShowCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/ShowCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/ShowCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/ShowCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/UnknownCommand.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/UnknownCommand.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/UnknownCommand.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/commands/UnknownCommand.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Book.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Book.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Book.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Book.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookImpl.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookImpl.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookImpl.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookImpl.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Bookshelf.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Bookshelf.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Bookshelf.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Bookshelf.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookshelfImpl.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookshelfImpl.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookshelfImpl.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/BookshelfImpl.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Order.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Order.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Order.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/Order.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/OrderImpl.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/OrderImpl.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/OrderImpl.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/data/OrderImpl.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/AuthenticationFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/AuthenticationFilter.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/AuthenticationFilter.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/AuthenticationFilter.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/BaseFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/BaseFilter.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/BaseFilter.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/BaseFilter.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/EncodingFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/EncodingFilter.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/EncodingFilter.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/EncodingFilter.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterChainImpl.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterChainImpl.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterChainImpl.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterChainImpl.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterManager.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterManager.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterManager.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/FilterManager.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/LoggingFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/LoggingFilter.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/LoggingFilter.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/LoggingFilter.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/OnIntercept.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/OnIntercept.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/OnIntercept.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/OnIntercept.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/TemplateFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/TemplateFilter.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/TemplateFilter.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/TemplateFilter.java
diff --git a/patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/VisitorCounterFilter.java b/patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/VisitorCounterFilter.java
similarity index 100%
rename from patterns/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/VisitorCounterFilter.java
rename to patterns-modules/intercepting-filter/src/main/java/com/baeldung/patterns/intercepting/filter/filters/VisitorCounterFilter.java
diff --git a/patterns/intercepting-filter/src/main/resources/front_controller.png b/patterns-modules/intercepting-filter/src/main/resources/front_controller.png
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/front_controller.png
rename to patterns-modules/intercepting-filter/src/main/resources/front_controller.png
diff --git a/patterns/intercepting-filter/src/main/resources/front_controller.puml b/patterns-modules/intercepting-filter/src/main/resources/front_controller.puml
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/front_controller.puml
rename to patterns-modules/intercepting-filter/src/main/resources/front_controller.puml
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.png b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.png
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.png
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.png
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.puml b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.puml
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.puml
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-custom_strategy.puml
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.png b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.png
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.png
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.png
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.puml b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.puml
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.puml
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-standard_strategy.puml
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.png b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.png
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.png
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.png
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.puml b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.puml
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.puml
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter-template_strategy.puml
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter.png b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter.png
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter.png
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter.png
diff --git a/patterns/intercepting-filter/src/main/resources/intercepting_filter.puml b/patterns-modules/intercepting-filter/src/main/resources/intercepting_filter.puml
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/intercepting_filter.puml
rename to patterns-modules/intercepting-filter/src/main/resources/intercepting_filter.puml
diff --git a/patterns/intercepting-filter/src/main/resources/logback.xml b/patterns-modules/intercepting-filter/src/main/resources/logback.xml
similarity index 100%
rename from patterns/intercepting-filter/src/main/resources/logback.xml
rename to patterns-modules/intercepting-filter/src/main/resources/logback.xml
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-found.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-found.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-found.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-found.jsp
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-notfound.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-notfound.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-notfound.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/book-notfound.jsp
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/home.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/home.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/home.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/login.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/login.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/login.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/login.jsp
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart-hint.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart-hint.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart-hint.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart-hint.jsp
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/shopping-cart.jsp
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/unknown.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/unknown.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/unknown.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/unknown.jsp
diff --git a/patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/visitor-counter.jsp b/patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/visitor-counter.jsp
similarity index 100%
rename from patterns/intercepting-filter/src/main/webapp/WEB-INF/jsp/visitor-counter.jsp
rename to patterns-modules/intercepting-filter/src/main/webapp/WEB-INF/jsp/visitor-counter.jsp
diff --git a/patterns/pom.xml b/patterns-modules/pom.xml
similarity index 96%
rename from patterns/pom.xml
rename to patterns-modules/pom.xml
index 3c93f00478..87292dd7eb 100644
--- a/patterns/pom.xml
+++ b/patterns-modules/pom.xml
@@ -3,8 +3,8 @@
     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>patterns</artifactId>
-    <name>patterns</name>
+    <artifactId>patterns-modules</artifactId>
+    <name>patterns-modules</name>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/patterns/solid/README.md b/patterns-modules/solid/README.md
similarity index 100%
rename from patterns/solid/README.md
rename to patterns-modules/solid/README.md
diff --git a/patterns/solid/pom.xml b/patterns-modules/solid/pom.xml
similarity index 91%
rename from patterns/solid/pom.xml
rename to patterns-modules/solid/pom.xml
index 76ab54cbb2..0e4921c566 100644
--- a/patterns/solid/pom.xml
+++ b/patterns-modules/solid/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>patterns</artifactId>
+        <artifactId>patterns-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/patterns/solid/src/main/java/com/baeldung/d/Keyboard.java b/patterns-modules/solid/src/main/java/com/baeldung/d/Keyboard.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/d/Keyboard.java
rename to patterns-modules/solid/src/main/java/com/baeldung/d/Keyboard.java
diff --git a/patterns/solid/src/main/java/com/baeldung/d/Monitor.java b/patterns-modules/solid/src/main/java/com/baeldung/d/Monitor.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/d/Monitor.java
rename to patterns-modules/solid/src/main/java/com/baeldung/d/Monitor.java
diff --git a/patterns/solid/src/main/java/com/baeldung/d/StandardKeyboard.java b/patterns-modules/solid/src/main/java/com/baeldung/d/StandardKeyboard.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/d/StandardKeyboard.java
rename to patterns-modules/solid/src/main/java/com/baeldung/d/StandardKeyboard.java
diff --git a/patterns/solid/src/main/java/com/baeldung/d/Windows98Machine.java b/patterns-modules/solid/src/main/java/com/baeldung/d/Windows98Machine.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/d/Windows98Machine.java
rename to patterns-modules/solid/src/main/java/com/baeldung/d/Windows98Machine.java
diff --git a/patterns/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java b/patterns-modules/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java
rename to patterns-modules/solid/src/main/java/com/baeldung/d/Windows98MachineDI.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/BearCarer.java b/patterns-modules/solid/src/main/java/com/baeldung/i/BearCarer.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/BearCarer.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/BearCarer.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/BearCleaner.java b/patterns-modules/solid/src/main/java/com/baeldung/i/BearCleaner.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/BearCleaner.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/BearCleaner.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/BearFeeder.java b/patterns-modules/solid/src/main/java/com/baeldung/i/BearFeeder.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/BearFeeder.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/BearFeeder.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/BearKeeper.java b/patterns-modules/solid/src/main/java/com/baeldung/i/BearKeeper.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/BearKeeper.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/BearKeeper.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/BearPetter.java b/patterns-modules/solid/src/main/java/com/baeldung/i/BearPetter.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/BearPetter.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/BearPetter.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/CrazyPerson.java b/patterns-modules/solid/src/main/java/com/baeldung/i/CrazyPerson.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/CrazyPerson.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/CrazyPerson.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/fixed/Bank.java b/patterns-modules/solid/src/main/java/com/baeldung/i/fixed/Bank.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/fixed/Bank.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/fixed/Bank.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/fixed/BankPayment.java b/patterns-modules/solid/src/main/java/com/baeldung/i/fixed/BankPayment.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/fixed/BankPayment.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/fixed/BankPayment.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/fixed/Loan.java b/patterns-modules/solid/src/main/java/com/baeldung/i/fixed/Loan.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/fixed/Loan.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/fixed/Loan.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/fixed/LoanPayment.java b/patterns-modules/solid/src/main/java/com/baeldung/i/fixed/LoanPayment.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/fixed/LoanPayment.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/fixed/LoanPayment.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/fixed/Payment.java b/patterns-modules/solid/src/main/java/com/baeldung/i/fixed/Payment.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/fixed/Payment.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/fixed/Payment.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/polluted/BankPayment.java b/patterns-modules/solid/src/main/java/com/baeldung/i/polluted/BankPayment.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/polluted/BankPayment.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/polluted/BankPayment.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/polluted/LoanPayment.java b/patterns-modules/solid/src/main/java/com/baeldung/i/polluted/LoanPayment.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/polluted/LoanPayment.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/polluted/LoanPayment.java
diff --git a/patterns/solid/src/main/java/com/baeldung/i/polluted/Payment.java b/patterns-modules/solid/src/main/java/com/baeldung/i/polluted/Payment.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/i/polluted/Payment.java
rename to patterns-modules/solid/src/main/java/com/baeldung/i/polluted/Payment.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/Car.java b/patterns-modules/solid/src/main/java/com/baeldung/l/Car.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/Car.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/Car.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/ElectricCar.java b/patterns-modules/solid/src/main/java/com/baeldung/l/ElectricCar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/ElectricCar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/ElectricCar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/Engine.java b/patterns-modules/solid/src/main/java/com/baeldung/l/Engine.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/Engine.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/Engine.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/MotorCar.java b/patterns-modules/solid/src/main/java/com/baeldung/l/MotorCar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/MotorCar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/MotorCar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/Account.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Account.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/Account.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Account.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/BankingAppWithdrawalService.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/BankingAppWithdrawalService.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/BankingAppWithdrawalService.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/BankingAppWithdrawalService.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/Bar.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Bar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/Bar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Bar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/Car.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Car.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/Car.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Car.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/CurrentAccount.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/CurrentAccount.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/CurrentAccount.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/CurrentAccount.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/ElectricCar.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/ElectricCar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/ElectricCar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/ElectricCar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/FilePurgingJob.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/FilePurgingJob.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/FilePurgingJob.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/FilePurgingJob.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/FileSystem.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/FileSystem.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/FileSystem.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/FileSystem.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/FixedTermDepositAccount.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/FixedTermDepositAccount.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/FixedTermDepositAccount.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/FixedTermDepositAccount.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/Foo.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Foo.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/Foo.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/Foo.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/HybridCar.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/HybridCar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/HybridCar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/HybridCar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/MotorCar.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/MotorCar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/MotorCar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/MotorCar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/ReadOnlyFileSystem.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/ReadOnlyFileSystem.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/ReadOnlyFileSystem.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/ReadOnlyFileSystem.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/SavingsAccount.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/SavingsAccount.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/SavingsAccount.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/SavingsAccount.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/ToyCar.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/ToyCar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/ToyCar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/ToyCar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/Account.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/Account.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/Account.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/Account.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/BankingAppWithdrawalService.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/BankingAppWithdrawalService.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/BankingAppWithdrawalService.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/BankingAppWithdrawalService.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/CurrentAccount.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/CurrentAccount.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/CurrentAccount.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/CurrentAccount.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/FixedTermDepositAccount.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/FixedTermDepositAccount.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/FixedTermDepositAccount.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/FixedTermDepositAccount.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/SavingsAccount.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/SavingsAccount.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/SavingsAccount.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/SavingsAccount.java
diff --git a/patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/WithdrawableAccount.java b/patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/WithdrawableAccount.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/l/advanced/refactored/WithdrawableAccount.java
rename to patterns-modules/solid/src/main/java/com/baeldung/l/advanced/refactored/WithdrawableAccount.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/AbstractCalculatorOperation.java b/patterns-modules/solid/src/main/java/com/baeldung/o/AbstractCalculatorOperation.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/AbstractCalculatorOperation.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/AbstractCalculatorOperation.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/Addition.java b/patterns-modules/solid/src/main/java/com/baeldung/o/Addition.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/Addition.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/Addition.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/Calculator.java b/patterns-modules/solid/src/main/java/com/baeldung/o/Calculator.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/Calculator.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/Calculator.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/CalculatorOperation.java b/patterns-modules/solid/src/main/java/com/baeldung/o/CalculatorOperation.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/CalculatorOperation.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/CalculatorOperation.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/Division.java b/patterns-modules/solid/src/main/java/com/baeldung/o/Division.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/Division.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/Division.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/Guitar.java b/patterns-modules/solid/src/main/java/com/baeldung/o/Guitar.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/Guitar.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/Guitar.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/Subtraction.java b/patterns-modules/solid/src/main/java/com/baeldung/o/Subtraction.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/Subtraction.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/Subtraction.java
diff --git a/patterns/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java b/patterns-modules/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java
rename to patterns-modules/solid/src/main/java/com/baeldung/o/SuperCoolGuitarWithFlames.java
diff --git a/patterns/solid/src/main/java/com/baeldung/s/BadBook.java b/patterns-modules/solid/src/main/java/com/baeldung/s/BadBook.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/s/BadBook.java
rename to patterns-modules/solid/src/main/java/com/baeldung/s/BadBook.java
diff --git a/patterns/solid/src/main/java/com/baeldung/s/BookPrinter.java b/patterns-modules/solid/src/main/java/com/baeldung/s/BookPrinter.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/s/BookPrinter.java
rename to patterns-modules/solid/src/main/java/com/baeldung/s/BookPrinter.java
diff --git a/patterns/solid/src/main/java/com/baeldung/s/GoodBook.java b/patterns-modules/solid/src/main/java/com/baeldung/s/GoodBook.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/s/GoodBook.java
rename to patterns-modules/solid/src/main/java/com/baeldung/s/GoodBook.java
diff --git a/patterns/solid/src/main/java/com/baeldung/s/TextManipulator.java b/patterns-modules/solid/src/main/java/com/baeldung/s/TextManipulator.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/s/TextManipulator.java
rename to patterns-modules/solid/src/main/java/com/baeldung/s/TextManipulator.java
diff --git a/patterns/solid/src/main/java/com/baeldung/s/TextPrinter.java b/patterns-modules/solid/src/main/java/com/baeldung/s/TextPrinter.java
similarity index 100%
rename from patterns/solid/src/main/java/com/baeldung/s/TextPrinter.java
rename to patterns-modules/solid/src/main/java/com/baeldung/s/TextPrinter.java
diff --git a/patterns/solid/src/main/test/com/baeldung/o/CalculatorUnitTest.java b/patterns-modules/solid/src/main/test/com/baeldung/o/CalculatorUnitTest.java
similarity index 100%
rename from patterns/solid/src/main/test/com/baeldung/o/CalculatorUnitTest.java
rename to patterns-modules/solid/src/main/test/com/baeldung/o/CalculatorUnitTest.java
diff --git a/pom.xml b/pom.xml
index 09997241e4..47481bb056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -472,7 +472,7 @@
                 <module>orika</module>
                 <module>osgi</module>
 
-                <module>patterns</module>
+                <module>patterns-modules</module>
                 <module>pdf</module>
                 <module>performance-tests</module>
                 <module>persistence-modules</module>
@@ -875,7 +875,7 @@
                 <module>orika</module>
                 <module>osgi</module>
 
-                <module>patterns</module>
+                <module>patterns-modules</module>
                 <module>pdf</module>
                 <module>performance-tests</module>
                 <module>persistence-modules</module>