diff --git a/pom.xml b/pom.xml
index 1c9a5aec89fb..86ba71a754af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -758,9 +758,6 @@
                 <module>google-protocol-buffer</module>
                 <module>quarkus-modules</module>
                 <module>reactive-systems</module>
-                <module>reactor-core</module>
-                <module>reactor-core-2</module>
-                <module>rsocket</module>
                 <module>rule-engines-modules</module>
                 <module>rxjava-modules</module>
                 <module>saas-modules</module>
@@ -769,7 +766,6 @@
                 <module>spf4j</module>
                 <module>spring-5</module>
                 <module>spring-5-rest-docs</module>
-                <module>spring-6-rsocket</module>
                 <module>spring-activiti</module>
                 <module>spring-actuator</module>
                 <module>spring-ai-modules</module>
@@ -1203,9 +1199,6 @@
                 <module>google-protocol-buffer</module>
                 <module>quarkus-modules</module>
                 <module>reactive-systems</module>
-                <module>reactor-core</module>
-                <module>reactor-core-2</module>
-                <module>rsocket</module>
                 <module>rule-engines-modules</module>
                 <module>rxjava-modules</module>
                 <module>saas-modules</module>
@@ -1214,7 +1207,6 @@
                 <module>spf4j</module>
                 <module>spring-5</module>
                 <module>spring-5-rest-docs</module>
-                <module>spring-6-rsocket</module>
                 <module>spring-activiti</module>
                 <module>spring-actuator</module>
                 <module>spring-ai-modules</module>
diff --git a/spring-reactive-modules/pom.xml b/spring-reactive-modules/pom.xml
index 969ea7e09b74..529e9a8fec95 100644
--- a/spring-reactive-modules/pom.xml
+++ b/spring-reactive-modules/pom.xml
@@ -36,6 +36,10 @@
         <module>spring-reactive-kafka-stream-binder</module>
         <module>spring-reactive-kafka</module>
         <module>spring-reactive-performance</module>
+        <module>reactor-core</module>
+        <module>reactor-core-2</module>
+        <module>rsocket</module>
+        <module>spring-6-rsocket</module>
     </modules>
 
     <dependencyManagement>
diff --git a/reactor-core-2/pom.xml b/spring-reactive-modules/reactor-core-2/pom.xml
similarity index 91%
rename from reactor-core-2/pom.xml
rename to spring-reactive-modules/reactor-core-2/pom.xml
index 95c0745e87ec..39bf3861383b 100644
--- a/reactor-core-2/pom.xml
+++ b/spring-reactive-modules/reactor-core-2/pom.xml
@@ -9,8 +9,8 @@
     <name>reactor-core-2</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.spring.reactive</groupId>
+        <artifactId>spring-reactive-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
@@ -53,6 +53,7 @@
     <properties>
         <reactor.version>3.6.0</reactor.version>
         <reactor-extra.version>3.5.1</reactor-extra.version>
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/AsyncApiCall.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/AsyncApiCall.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/AsyncApiCall.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/AsyncApiCall.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureDemo.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureDemo.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureDemo.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureDemo.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/MonoDemo.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/MonoDemo.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/MonoDemo.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/completablefuturevsmono/MonoDemo.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/convertlistoflux/Callback.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/convertlistoflux/Callback.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/convertlistoflux/Callback.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/convertlistoflux/Callback.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/creation/FibonacciState.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/FibonacciState.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/creation/FibonacciState.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/FibonacciState.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceCreator.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceCreator.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceCreator.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceCreator.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceGenerator.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceGenerator.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceGenerator.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceGenerator.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceHandler.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceHandler.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceHandler.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/creation/SequenceHandler.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/Fibonacci.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/Fibonacci.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/Fibonacci.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/Fibonacci.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/FibonacciFluxParallelFluxBenchmark.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/FibonacciFluxParallelFluxBenchmark.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/FibonacciFluxParallelFluxBenchmark.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/flux/parallelflux/FibonacciFluxParallelFluxBenchmark.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java
diff --git a/reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java b/spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java
similarity index 100%
rename from reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java
rename to spring-reactive-modules/reactor-core-2/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java
diff --git a/reactor-core-2/src/main/resources/logback.xml b/spring-reactive-modules/reactor-core-2/src/main/resources/logback.xml
similarity index 100%
rename from reactor-core-2/src/main/resources/logback.xml
rename to spring-reactive-modules/reactor-core-2/src/main/resources/logback.xml
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/CompletableFutureUnitTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/MonoUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/MonoUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/MonoUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/completablefuturevsmono/MonoUnitTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/convertlistoflux/ListToFluxUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/convertlistoflux/ListToFluxUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/convertlistoflux/ListToFluxUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/convertlistoflux/ListToFluxUnitTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/creation/SequenceUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/creation/SequenceUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/creation/SequenceUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/creation/SequenceUnitTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/exception/ExceptionUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/exception/ExceptionUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/exception/ExceptionUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/exception/ExceptionUnitTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/FluxManualTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/FluxManualTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/FluxManualTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/FluxManualTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/ParallelFluxManualTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/ParallelFluxManualTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/ParallelFluxManualTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/flux/parallelflux/ParallelFluxManualTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/fromcallable/justempty/FromCallableJustEmptyUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/fromcallable/justempty/FromCallableJustEmptyUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/fromcallable/justempty/FromCallableJustEmptyUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/fromcallable/justempty/FromCallableJustEmptyUnitTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java
diff --git a/reactor-core-2/src/test/java/com/baeldung/reactor/math/MathFluxOperationsUnitTest.java b/spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/math/MathFluxOperationsUnitTest.java
similarity index 100%
rename from reactor-core-2/src/test/java/com/baeldung/reactor/math/MathFluxOperationsUnitTest.java
rename to spring-reactive-modules/reactor-core-2/src/test/java/com/baeldung/reactor/math/MathFluxOperationsUnitTest.java
diff --git a/reactor-core/pom.xml b/spring-reactive-modules/reactor-core/pom.xml
similarity index 89%
rename from reactor-core/pom.xml
rename to spring-reactive-modules/reactor-core/pom.xml
index d83cf90dd3f5..ede747c74124 100644
--- a/reactor-core/pom.xml
+++ b/spring-reactive-modules/reactor-core/pom.xml
@@ -9,8 +9,8 @@
     <name>reactor-core</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.spring.reactive</groupId>
+        <artifactId>spring-reactive-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
@@ -42,6 +42,7 @@
     <properties>
         <reactor.version>3.6.0</reactor.version>
         <reactor-extra.version>3.5.1</reactor-extra.version>
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/reactor-core/src/main/java/com/baeldung/reactor/ItemProducerCreate.java b/spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/ItemProducerCreate.java
similarity index 100%
rename from reactor-core/src/main/java/com/baeldung/reactor/ItemProducerCreate.java
rename to spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/ItemProducerCreate.java
diff --git a/reactor-core/src/main/java/com/baeldung/reactor/NetworkTrafficProducerPush.java b/spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/NetworkTrafficProducerPush.java
similarity index 100%
rename from reactor-core/src/main/java/com/baeldung/reactor/NetworkTrafficProducerPush.java
rename to spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/NetworkTrafficProducerPush.java
diff --git a/reactor-core/src/main/java/com/baeldung/reactor/ProgrammaticSequences.java b/spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/ProgrammaticSequences.java
similarity index 100%
rename from reactor-core/src/main/java/com/baeldung/reactor/ProgrammaticSequences.java
rename to spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/ProgrammaticSequences.java
diff --git a/reactor-core/src/main/java/com/baeldung/reactor/StatelessGenerate.java b/spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/StatelessGenerate.java
similarity index 100%
rename from reactor-core/src/main/java/com/baeldung/reactor/StatelessGenerate.java
rename to spring-reactive-modules/reactor-core/src/main/java/com/baeldung/reactor/StatelessGenerate.java
diff --git a/reactor-core/src/main/resources/logback.xml b/spring-reactive-modules/reactor-core/src/main/resources/logback.xml
similarity index 100%
rename from reactor-core/src/main/resources/logback.xml
rename to spring-reactive-modules/reactor-core/src/main/resources/logback.xml
diff --git a/reactor-core/src/test/java/com/baeldung/mono/MonoUnitTest.java b/spring-reactive-modules/reactor-core/src/test/java/com/baeldung/mono/MonoUnitTest.java
similarity index 100%
rename from reactor-core/src/test/java/com/baeldung/mono/MonoUnitTest.java
rename to spring-reactive-modules/reactor-core/src/test/java/com/baeldung/mono/MonoUnitTest.java
diff --git a/reactor-core/src/test/java/com/baeldung/reactor/ItemProducerCreateUnitTest.java b/spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/ItemProducerCreateUnitTest.java
similarity index 100%
rename from reactor-core/src/test/java/com/baeldung/reactor/ItemProducerCreateUnitTest.java
rename to spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/ItemProducerCreateUnitTest.java
diff --git a/reactor-core/src/test/java/com/baeldung/reactor/NetworkTrafficProducerPushUnitTest.java b/spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/NetworkTrafficProducerPushUnitTest.java
similarity index 100%
rename from reactor-core/src/test/java/com/baeldung/reactor/NetworkTrafficProducerPushUnitTest.java
rename to spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/NetworkTrafficProducerPushUnitTest.java
diff --git a/reactor-core/src/test/java/com/baeldung/reactor/ProgrammaticSequencesUnitTest.java b/spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/ProgrammaticSequencesUnitTest.java
similarity index 100%
rename from reactor-core/src/test/java/com/baeldung/reactor/ProgrammaticSequencesUnitTest.java
rename to spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/ProgrammaticSequencesUnitTest.java
diff --git a/reactor-core/src/test/java/com/baeldung/reactor/core/CombiningPublishersIntegrationTest.java b/spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/core/CombiningPublishersIntegrationTest.java
similarity index 100%
rename from reactor-core/src/test/java/com/baeldung/reactor/core/CombiningPublishersIntegrationTest.java
rename to spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/core/CombiningPublishersIntegrationTest.java
diff --git a/reactor-core/src/test/java/com/baeldung/reactor/core/FluxVsMonoUnitTest.java b/spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/core/FluxVsMonoUnitTest.java
similarity index 100%
rename from reactor-core/src/test/java/com/baeldung/reactor/core/FluxVsMonoUnitTest.java
rename to spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/core/FluxVsMonoUnitTest.java
diff --git a/reactor-core/src/test/java/com/baeldung/reactor/mapping/MappingUnitTest.java b/spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/mapping/MappingUnitTest.java
similarity index 100%
rename from reactor-core/src/test/java/com/baeldung/reactor/mapping/MappingUnitTest.java
rename to spring-reactive-modules/reactor-core/src/test/java/com/baeldung/reactor/mapping/MappingUnitTest.java
diff --git a/rsocket/pom.xml b/spring-reactive-modules/rsocket/pom.xml
similarity index 84%
rename from rsocket/pom.xml
rename to spring-reactive-modules/rsocket/pom.xml
index 57c927253f15..5a8856634c02 100644
--- a/rsocket/pom.xml
+++ b/spring-reactive-modules/rsocket/pom.xml
@@ -9,8 +9,8 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.spring.reactive</groupId>
+        <artifactId>spring-reactive-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
@@ -29,6 +29,7 @@
 
     <properties>
         <rsocket.version>0.11.13</rsocket.version>
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/ChannelClient.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/ChannelClient.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/ChannelClient.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/ChannelClient.java
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/FireNForgetClient.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/FireNForgetClient.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/FireNForgetClient.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/FireNForgetClient.java
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/ReqResClient.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/ReqResClient.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/ReqResClient.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/ReqResClient.java
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/ReqStreamClient.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/ReqStreamClient.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/ReqStreamClient.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/ReqStreamClient.java
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/Server.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/Server.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/Server.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/Server.java
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/support/Constants.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/support/Constants.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/support/Constants.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/support/Constants.java
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/support/DataPublisher.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/support/DataPublisher.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/support/DataPublisher.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/support/DataPublisher.java
diff --git a/rsocket/src/main/java/com/baeldung/rsocket/support/GameController.java b/spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/support/GameController.java
similarity index 100%
rename from rsocket/src/main/java/com/baeldung/rsocket/support/GameController.java
rename to spring-reactive-modules/rsocket/src/main/java/com/baeldung/rsocket/support/GameController.java
diff --git a/rsocket/src/main/resources/logback.xml b/spring-reactive-modules/rsocket/src/main/resources/logback.xml
similarity index 100%
rename from rsocket/src/main/resources/logback.xml
rename to spring-reactive-modules/rsocket/src/main/resources/logback.xml
diff --git a/rsocket/src/test/java/com/baeldung/rsocket/RSocketIntegrationTest.java b/spring-reactive-modules/rsocket/src/test/java/com/baeldung/rsocket/RSocketIntegrationTest.java
similarity index 100%
rename from rsocket/src/test/java/com/baeldung/rsocket/RSocketIntegrationTest.java
rename to spring-reactive-modules/rsocket/src/test/java/com/baeldung/rsocket/RSocketIntegrationTest.java
diff --git a/spring-6-rsocket/pom.xml b/spring-reactive-modules/spring-6-rsocket/pom.xml
similarity index 82%
rename from spring-6-rsocket/pom.xml
rename to spring-reactive-modules/spring-6-rsocket/pom.xml
index 44e3882c17db..5f08e01b919e 100644
--- a/spring-6-rsocket/pom.xml
+++ b/spring-reactive-modules/spring-6-rsocket/pom.xml
@@ -8,10 +8,9 @@
     <name>spring-6-rsocket</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring.reactive</groupId>
+        <artifactId>spring-reactive-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/spring-6-rsocket/src/main/java/com/baeldung/rsocket/requester/MessageClient.java b/spring-reactive-modules/spring-6-rsocket/src/main/java/com/baeldung/rsocket/requester/MessageClient.java
similarity index 100%
rename from spring-6-rsocket/src/main/java/com/baeldung/rsocket/requester/MessageClient.java
rename to spring-reactive-modules/spring-6-rsocket/src/main/java/com/baeldung/rsocket/requester/MessageClient.java
diff --git a/spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/MessageController.java b/spring-reactive-modules/spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/MessageController.java
similarity index 100%
rename from spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/MessageController.java
rename to spring-reactive-modules/spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/MessageController.java
diff --git a/spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/RSocketApplication.java b/spring-reactive-modules/spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/RSocketApplication.java
similarity index 100%
rename from spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/RSocketApplication.java
rename to spring-reactive-modules/spring-6-rsocket/src/main/java/com/baeldung/rsocket/responder/RSocketApplication.java
diff --git a/spring-6-rsocket/src/main/resources/application.properties b/spring-reactive-modules/spring-6-rsocket/src/main/resources/application.properties
similarity index 100%
rename from spring-6-rsocket/src/main/resources/application.properties
rename to spring-reactive-modules/spring-6-rsocket/src/main/resources/application.properties
diff --git a/spring-6-rsocket/src/test/java/com/baeldung/rsocket/RSocketRequestResponseIntegrationTest.java b/spring-reactive-modules/spring-6-rsocket/src/test/java/com/baeldung/rsocket/RSocketRequestResponseIntegrationTest.java
similarity index 100%
rename from spring-6-rsocket/src/test/java/com/baeldung/rsocket/RSocketRequestResponseIntegrationTest.java
rename to spring-reactive-modules/spring-6-rsocket/src/test/java/com/baeldung/rsocket/RSocketRequestResponseIntegrationTest.java