diff --git a/dependency-exclusion/README.md b/maven-modules/dependency-exclusion/README.md
similarity index 100%
rename from dependency-exclusion/README.md
rename to maven-modules/dependency-exclusion/README.md
diff --git a/dependency-exclusion/core-java-exclusions/pom.xml b/maven-modules/dependency-exclusion/core-java-exclusions/pom.xml
similarity index 100%
rename from dependency-exclusion/core-java-exclusions/pom.xml
rename to maven-modules/dependency-exclusion/core-java-exclusions/pom.xml
diff --git a/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java b/maven-modules/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java
similarity index 100%
rename from dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java
rename to maven-modules/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java
diff --git a/dependency-exclusion/dummy-surefire-junit47/pom.xml b/maven-modules/dependency-exclusion/dummy-surefire-junit47/pom.xml
similarity index 100%
rename from dependency-exclusion/dummy-surefire-junit47/pom.xml
rename to maven-modules/dependency-exclusion/dummy-surefire-junit47/pom.xml
diff --git a/dependency-exclusion/pom.xml b/maven-modules/dependency-exclusion/pom.xml
similarity index 96%
rename from dependency-exclusion/pom.xml
rename to maven-modules/dependency-exclusion/pom.xml
index ac83cc161a..13de16a57c 100644
--- a/dependency-exclusion/pom.xml
+++ b/maven-modules/dependency-exclusion/pom.xml
@@ -10,9 +10,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
+        <artifactId>maven-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
     </parent>
 
     <properties>
diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml
index a7a3522ca8..f7bba3a8ff 100644
--- a/maven-modules/pom.xml
+++ b/maven-modules/pom.xml
@@ -16,33 +16,35 @@
 
     <modules>
         <module>animal-sniffer-mvn-plugin</module>
-        <module>maven-archetype</module>
         <module>compiler-plugin-java-9</module>
+        <module>dependency-exclusion</module>
+        <module>host-maven-repo-example</module>
+        <module>maven-archetype</module>
+        <module>maven-builder-plugin</module>
+        <module>maven-classifier</module>
         <module>maven-copy-files</module>
         <module>maven-custom-plugin</module>
         <module>maven-exec-plugin</module>
         <module>maven-generate-war</module>
         <module>maven-integration-test</module>
         <module>maven-multi-source</module>
+        <module>maven-parent-pom-resolution</module>
         <module>maven-plugins</module>
         <module>maven-polyglot</module>
+        <module>maven-printing-plugins</module>
         <module>maven-properties</module>
         <!-- <module>maven-proxy</module> --> <!-- Not a maven project -->
+        <module>maven-reactor</module>
+        <module>maven-repositories</module>
+        <module>maven-simple</module>
+        <module>maven-surefire-plugin</module>
         <module>maven-unused-dependencies</module>
         <module>maven-war-plugin</module>
+        <module>spring-bom</module>
         <module>optional-dependencies</module>
         <module>version-collision</module>
         <module>version-overriding-plugins</module>
         <module>versions-maven-plugin</module>
-        <module>maven-printing-plugins</module>
-        <module>maven-builder-plugin</module>
-        <module>host-maven-repo-example</module>
-        <module>maven-surefire-plugin</module>
-        <module>maven-parent-pom-resolution</module>
-        <module>maven-simple</module>
-        <module>maven-classifier</module>
-        <module>maven-repositories</module>
-        <module>maven-reactor</module>
     </modules>
 
     <dependencyManagement>
@@ -62,4 +64,18 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/spring-bom/README.md b/maven-modules/spring-bom/README.md
similarity index 100%
rename from spring-bom/README.md
rename to maven-modules/spring-bom/README.md
diff --git a/spring-bom/pom.xml b/maven-modules/spring-bom/pom.xml
similarity index 93%
rename from spring-bom/pom.xml
rename to maven-modules/spring-bom/pom.xml
index 7ba21ee285..93d0bdc458 100644
--- a/spring-bom/pom.xml
+++ b/maven-modules/spring-bom/pom.xml
@@ -10,8 +10,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>maven-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>
diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java
similarity index 100%
rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java
rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java
diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java
similarity index 100%
rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java
rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java
diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java
similarity index 100%
rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java
rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java
diff --git a/spring-bom/src/main/resources/logback.xml b/maven-modules/spring-bom/src/main/resources/logback.xml
similarity index 100%
rename from spring-bom/src/main/resources/logback.xml
rename to maven-modules/spring-bom/src/main/resources/logback.xml
diff --git a/spring-bom/src/test/java/com/baeldung/SpringContextTest.java b/maven-modules/spring-bom/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-bom/src/test/java/com/baeldung/SpringContextTest.java
rename to maven-modules/spring-bom/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/apache-rocketmq/README.md b/messaging-modules/apache-rocketmq/README.md
similarity index 100%
rename from apache-rocketmq/README.md
rename to messaging-modules/apache-rocketmq/README.md
diff --git a/apache-rocketmq/pom.xml b/messaging-modules/apache-rocketmq/pom.xml
similarity index 90%
rename from apache-rocketmq/pom.xml
rename to messaging-modules/apache-rocketmq/pom.xml
index 48399b6d51..a362644de3 100644
--- a/apache-rocketmq/pom.xml
+++ b/messaging-modules/apache-rocketmq/pom.xml
@@ -9,8 +9,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>messaging-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java
diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java
similarity index 100%
rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java
rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java
diff --git a/apache-rocketmq/src/main/resources/application.properties b/messaging-modules/apache-rocketmq/src/main/resources/application.properties
similarity index 100%
rename from apache-rocketmq/src/main/resources/application.properties
rename to messaging-modules/apache-rocketmq/src/main/resources/application.properties
diff --git a/messaging-modules/pom.xml b/messaging-modules/pom.xml
index 47e0730148..71ff25d71b 100644
--- a/messaging-modules/pom.xml
+++ b/messaging-modules/pom.xml
@@ -16,6 +16,7 @@
 
     <modules>
         <module>apache-camel</module>
+        <module>apache-rocketmq</module>
         <module>jgroups</module>
         <module>rabbitmq</module>
         <module>spring-amqp</module>
diff --git a/pom.xml b/pom.xml
index 4e5970d301..53b5d6a358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -412,7 +412,6 @@
                 <module>spring-4</module>
                 <module>spring-aop</module>
 
-                <module>spring-bom</module>
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
 
@@ -591,7 +590,6 @@
 
                 <module>spring-4</module>
 
-                <module>spring-bom</module>
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
 
@@ -836,7 +834,6 @@
                 <module>apache-olingo</module>
 
                 <module>apache-poi-2</module>
-                <module>apache-rocketmq</module>
                 <module>apache-thrift</module>
                 <module>apache-tika</module>
 
@@ -849,7 +846,6 @@
                 <module>bazel</module>
                 <module>google-auto-project</module>
                 <module>ddd</module>
-                <module>discord4j</module>
                 <module>disruptor</module>
                 <module>dozer</module>
                 <module>dubbo</module>
@@ -906,7 +902,6 @@
                 <module>protobuffer</module>
                 <module>reactor-core</module>
                 <module>rsocket</module>
-                <module>slack</module>
 
 
                 <!--  Modules from default second-->
@@ -1088,7 +1083,6 @@
                 <module>apache-olingo</module>
 
                 <module>apache-poi-2</module>
-                <module>apache-rocketmq</module>
                 <module>apache-thrift</module>
                 <module>apache-tika</module>
 
@@ -1101,7 +1095,6 @@
                 <module>bazel</module>
                 <module>google-auto-project</module>
                 <module>ddd</module>
-                <module>discord4j</module>
                 <module>disruptor</module>
                 <module>dozer</module>
 
@@ -1160,7 +1153,6 @@
                 <module>protobuffer</module>
                 <module>reactor-core</module>
                 <module>rsocket</module>
-                <module>slack</module>
 
 
                 <!--  Modules from default second-->
diff --git a/discord4j/.gitignore b/saas-modules/discord4j/.gitignore
similarity index 100%
rename from discord4j/.gitignore
rename to saas-modules/discord4j/.gitignore
diff --git a/discord4j/README.md b/saas-modules/discord4j/README.md
similarity index 100%
rename from discord4j/README.md
rename to saas-modules/discord4j/README.md
diff --git a/discord4j/pom.xml b/saas-modules/discord4j/pom.xml
similarity index 93%
rename from discord4j/pom.xml
rename to saas-modules/discord4j/pom.xml
index 086adebee5..ff398dd1a3 100644
--- a/discord4j/pom.xml
+++ b/saas-modules/discord4j/pom.xml
@@ -9,9 +9,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <artifactId>saas-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java
diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java
similarity index 100%
rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java
rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java
diff --git a/discord4j/src/main/resources/application.yml b/saas-modules/discord4j/src/main/resources/application.yml
similarity index 100%
rename from discord4j/src/main/resources/application.yml
rename to saas-modules/discord4j/src/main/resources/application.yml
diff --git a/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java b/saas-modules/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java
similarity index 100%
rename from discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java
rename to saas-modules/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java
diff --git a/saas-modules/pom.xml b/saas-modules/pom.xml
index 7e8adebdd9..16ed50918c 100644
--- a/saas-modules/pom.xml
+++ b/saas-modules/pom.xml
@@ -16,11 +16,13 @@
     </parent>
 
     <modules>
+        <module>discord4j</module>
         <module>jira-rest-integration</module>
+        <module>sentry-servlet</module>
+        <module>slack</module>
         <module>stripe</module>
         <module>twilio</module>
         <module>twitter4j</module>
-        <module>sentry-servlet</module>
     </modules>
 
     <build>
diff --git a/slack/README.md b/saas-modules/slack/README.md
similarity index 100%
rename from slack/README.md
rename to saas-modules/slack/README.md
diff --git a/slack/pom.xml b/saas-modules/slack/pom.xml
similarity index 97%
rename from slack/pom.xml
rename to saas-modules/slack/pom.xml
index 690bf5132c..326167c055 100644
--- a/slack/pom.xml
+++ b/saas-modules/slack/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>saas-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/MainClass.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/MainClass.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/MainClass.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/MainClass.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java
diff --git a/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java
similarity index 100%
rename from slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java
rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java
diff --git a/slack/src/main/resources/logback.xml b/saas-modules/slack/src/main/resources/logback.xml
similarity index 100%
rename from slack/src/main/resources/logback.xml
rename to saas-modules/slack/src/main/resources/logback.xml