diff --git a/pom.xml b/pom.xml
index 883f5b58f4..2a18379ca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -592,7 +592,6 @@
                 <module>spring-protobuf</module>
                 <module>spring-quartz</module>
 
-                <module>spring-reactor</module>
                 <module>spring-remoting-modules</module>
                 <module>spring-roo</module>
 
@@ -610,7 +609,6 @@
                 <module>spring-vault</module>
 
                 <module>spring-web-modules</module>
-                <module>spring-webflux-amqp</module> <!-- long -->
                 <module>spring-websockets</module>
 
                 <module>static-analysis</module>
@@ -977,7 +975,6 @@
                 <module>spring-protobuf</module>
                 <module>spring-quartz</module>
 
-                <module>spring-reactor</module>
                 <module>spring-remoting-modules</module>
                 <module>spring-roo</module>
 
@@ -995,7 +992,6 @@
                 <module>spring-vault</module>
 
                 <module>spring-web-modules</module>
-                <module>spring-webflux-amqp</module> <!-- long -->
                 <module>spring-websockets</module>
 
                 <module>static-analysis</module>
diff --git a/spring-reactive-modules/pom.xml b/spring-reactive-modules/pom.xml
index 9822642a11..3352a00113 100644
--- a/spring-reactive-modules/pom.xml
+++ b/spring-reactive-modules/pom.xml
@@ -27,6 +27,8 @@
         <module>spring-5-reactive-security</module>
         <module>spring-reactive</module>
         <module>spring-reactive-exceptions</module>
+        <module>spring-reactor</module>
+        <module>spring-webflux-amqp</module>
     </modules>
 
     <build>
@@ -62,4 +64,4 @@
     <properties>
     </properties>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-reactor/README.md b/spring-reactive-modules/spring-reactor/README.md
similarity index 100%
rename from spring-reactor/README.md
rename to spring-reactive-modules/spring-reactor/README.md
diff --git a/spring-reactor/pom.xml b/spring-reactive-modules/spring-reactor/pom.xml
similarity index 100%
rename from spring-reactor/pom.xml
rename to spring-reactive-modules/spring-reactor/pom.xml
diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java
similarity index 100%
rename from spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java
rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java
diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java
similarity index 100%
rename from spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java
rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java
diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java
similarity index 100%
rename from spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java
rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java
diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java
similarity index 100%
rename from spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java
rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java
diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java
similarity index 100%
rename from spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java
rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java
diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java
similarity index 100%
rename from spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java
rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java
diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java
similarity index 100%
rename from spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java
rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java
diff --git a/spring-reactor/src/main/resources/logback.xml b/spring-reactive-modules/spring-reactor/src/main/resources/logback.xml
similarity index 100%
rename from spring-reactor/src/main/resources/logback.xml
rename to spring-reactive-modules/spring-reactor/src/main/resources/logback.xml
diff --git a/spring-reactor/src/test/java/com/baeldung/SpringContextTest.java b/spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-reactor/src/test/java/com/baeldung/SpringContextTest.java
rename to spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/SpringContextTest.java
diff --git a/spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java b/spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java
similarity index 100%
rename from spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java
rename to spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java
diff --git a/spring-webflux-amqp/.gitignore b/spring-reactive-modules/spring-webflux-amqp/.gitignore
similarity index 100%
rename from spring-webflux-amqp/.gitignore
rename to spring-reactive-modules/spring-webflux-amqp/.gitignore
diff --git a/spring-webflux-amqp/README.md b/spring-reactive-modules/spring-webflux-amqp/README.md
similarity index 100%
rename from spring-webflux-amqp/README.md
rename to spring-reactive-modules/spring-webflux-amqp/README.md
diff --git a/spring-webflux-amqp/pom.xml b/spring-reactive-modules/spring-webflux-amqp/pom.xml
similarity index 100%
rename from spring-webflux-amqp/pom.xml
rename to spring-reactive-modules/spring-webflux-amqp/pom.xml
diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
similarity index 100%
rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java
diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
similarity index 100%
rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java
diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
similarity index 100%
rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java
diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
similarity index 100%
rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java
diff --git a/spring-webflux-amqp/src/main/resources/application.yml b/spring-reactive-modules/spring-webflux-amqp/src/main/resources/application.yml
similarity index 100%
rename from spring-webflux-amqp/src/main/resources/application.yml
rename to spring-reactive-modules/spring-webflux-amqp/src/main/resources/application.yml
diff --git a/spring-webflux-amqp/src/main/resources/logback.xml b/spring-reactive-modules/spring-webflux-amqp/src/main/resources/logback.xml
similarity index 100%
rename from spring-webflux-amqp/src/main/resources/logback.xml
rename to spring-reactive-modules/spring-webflux-amqp/src/main/resources/logback.xml
diff --git a/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 100%
rename from spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
rename to spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java
diff --git a/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java b/spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
similarity index 100%
rename from spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java
rename to spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java