diff --git a/pom.xml b/pom.xml
index d900fb45a3..d149fdc2fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,7 +372,7 @@
                 <module>cloud-foundry-uaa</module>
                 <module>code-generation</module>
 
-                <module>core-groovy-modules</module>                
+                <module>core-groovy-modules</module>
 
                 <module>core-java-modules</module>
 
@@ -652,7 +652,7 @@
                 <module>spring-quartz</module>
 
                 <module>spring-reactor</module>
-                <module>spring-remoting</module>
+                <module>spring-remoting-modules</module>
                 <module>spring-roo</module>
 
                 <module>spring-scheduling</module>
@@ -832,7 +832,7 @@
                 <module>code-generation</module>
 
                 <module>core-groovy-modules</module>
-                
+
                 <module>core-java-modules</module>
 
                 <module>couchbase</module>
@@ -1105,7 +1105,7 @@
                 <module>spring-quartz</module>
 
                 <module>spring-reactor</module>
-                <module>spring-remoting</module>
+                <module>spring-remoting-modules</module>
                 <module>spring-roo</module>
 
                 <module>spring-scheduling</module>
diff --git a/spring-remoting/README.md b/spring-remoting-modules/README.md
similarity index 100%
rename from spring-remoting/README.md
rename to spring-remoting-modules/README.md
diff --git a/spring-remoting/pom.xml b/spring-remoting-modules/pom.xml
similarity index 96%
rename from spring-remoting/pom.xml
rename to spring-remoting-modules/pom.xml
index ba76b56dbd..1981278db8 100644
--- a/spring-remoting/pom.xml
+++ b/spring-remoting-modules/pom.xml
@@ -3,7 +3,7 @@
     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>spring-remoting</artifactId>
+    <artifactId>spring-remoting-modules</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>spring-remoting</name>
     <packaging>pom</packaging>
diff --git a/spring-remoting/remoting-amqp/pom.xml b/spring-remoting-modules/remoting-amqp/pom.xml
similarity index 91%
rename from spring-remoting/remoting-amqp/pom.xml
rename to spring-remoting-modules/remoting-amqp/pom.xml
index 8ce70f86c2..7e1aa83cc5 100644
--- a/spring-remoting/remoting-amqp/pom.xml
+++ b/spring-remoting-modules/remoting-amqp/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-remoting</artifactId>
+        <artifactId>spring-remoting-modules</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/pom.xml
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/pom.xml
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/java/com/baeldung/client/AmqpClient.java
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/application.properties
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/pom.xml
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/pom.xml
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/java/com/baeldung/server/AmqpServer.java
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/application.properties
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java b/spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java
similarity index 100%
rename from spring-remoting/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java
rename to spring-remoting-modules/remoting-amqp/remoting-amqp-server/src/test/java/org/baeldung/SpringContextManualTest.java
diff --git a/spring-remoting/remoting-hessian-burlap/README.md b/spring-remoting-modules/remoting-hessian-burlap/README.md
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/README.md
rename to spring-remoting-modules/remoting-hessian-burlap/README.md
diff --git a/spring-remoting/remoting-hessian-burlap/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/pom.xml
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/pom.xml
rename to spring-remoting-modules/remoting-hessian-burlap/pom.xml
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-remoting-modules/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-remoting/remoting-http/README.md b/spring-remoting-modules/remoting-http/README.md
similarity index 100%
rename from spring-remoting/remoting-http/README.md
rename to spring-remoting-modules/remoting-http/README.md
diff --git a/spring-remoting/remoting-http/pom.xml b/spring-remoting-modules/remoting-http/pom.xml
similarity index 93%
rename from spring-remoting/remoting-http/pom.xml
rename to spring-remoting-modules/remoting-http/pom.xml
index 22627c638c..e085502626 100644
--- a/spring-remoting/remoting-http/pom.xml
+++ b/spring-remoting-modules/remoting-http/pom.xml
@@ -10,7 +10,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-remoting</artifactId>
+        <artifactId>spring-remoting-modules</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/spring-remoting/remoting-http/remoting-http-api/pom.xml b/spring-remoting-modules/remoting-http/remoting-http-api/pom.xml
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-api/pom.xml
rename to spring-remoting-modules/remoting-http/remoting-http-api/pom.xml
diff --git a/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java b/spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java
rename to spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java
diff --git a/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java b/spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java
rename to spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java
diff --git a/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java b/spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java
rename to spring-remoting-modules/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java
diff --git a/spring-remoting/remoting-http/remoting-http-client/pom.xml b/spring-remoting-modules/remoting-http/remoting-http-client/pom.xml
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-client/pom.xml
rename to spring-remoting-modules/remoting-http/remoting-http-client/pom.xml
diff --git a/spring-remoting/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java b/spring-remoting-modules/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java
rename to spring-remoting-modules/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java
diff --git a/spring-remoting/remoting-http/remoting-http-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-http/remoting-http-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-client/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-http/remoting-http-client/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-http/remoting-http-server/pom.xml b/spring-remoting-modules/remoting-http/remoting-http-server/pom.xml
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-server/pom.xml
rename to spring-remoting-modules/remoting-http/remoting-http-server/pom.xml
diff --git a/spring-remoting/remoting-http/remoting-http-server/readme.md b/spring-remoting-modules/remoting-http/remoting-http-server/readme.md
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-server/readme.md
rename to spring-remoting-modules/remoting-http/remoting-http-server/readme.md
diff --git a/spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
rename to spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
diff --git a/spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java b/spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java
rename to spring-remoting-modules/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java
diff --git a/spring-remoting/remoting-http/remoting-http-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-http/remoting-http-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-server/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-http/remoting-http-server/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-remoting-modules/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-remoting/remoting-jms/README.md b/spring-remoting-modules/remoting-jms/README.md
similarity index 100%
rename from spring-remoting/remoting-jms/README.md
rename to spring-remoting-modules/remoting-jms/README.md
diff --git a/spring-remoting/remoting-jms/pom.xml b/spring-remoting-modules/remoting-jms/pom.xml
similarity index 91%
rename from spring-remoting/remoting-jms/pom.xml
rename to spring-remoting-modules/remoting-jms/pom.xml
index 61bd1d4cfd..1f7acbb84b 100644
--- a/spring-remoting/remoting-jms/pom.xml
+++ b/spring-remoting-modules/remoting-jms/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-remoting</artifactId>
+        <artifactId>spring-remoting-modules</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/spring-remoting/remoting-jms/remoting-jms-client/pom.xml b/spring-remoting-modules/remoting-jms/remoting-jms-client/pom.xml
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-client/pom.xml
rename to spring-remoting-modules/remoting-jms/remoting-jms-client/pom.xml
diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java
rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/java/com/baeldung/client/JmsClient.java
diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/application.properties b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/application.properties
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/application.properties
rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/application.properties
diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-client/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-remoting-modules/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextTest.java
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/pom.xml b/spring-remoting-modules/remoting-jms/remoting-jms-server/pom.xml
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-server/pom.xml
rename to spring-remoting-modules/remoting-jms/remoting-jms-server/pom.xml
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java
rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/java/com/baeldung/server/JmsServer.java
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/application.properties b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/application.properties
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/application.properties
rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/application.properties
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-server/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-remoting-modules/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 100%
rename from spring-remoting/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java
rename to spring-remoting-modules/remoting-jms/remoting-jms-server/src/test/java/com/baeldung/SpringContextLiveTest.java
diff --git a/spring-remoting/remoting-rmi/README.md b/spring-remoting-modules/remoting-rmi/README.md
similarity index 100%
rename from spring-remoting/remoting-rmi/README.md
rename to spring-remoting-modules/remoting-rmi/README.md
diff --git a/spring-remoting/remoting-rmi/pom.xml b/spring-remoting-modules/remoting-rmi/pom.xml
similarity index 91%
rename from spring-remoting/remoting-rmi/pom.xml
rename to spring-remoting-modules/remoting-rmi/pom.xml
index ee65c799a4..aece04a64f 100644
--- a/spring-remoting/remoting-rmi/pom.xml
+++ b/spring-remoting-modules/remoting-rmi/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-remoting</artifactId>
+        <artifactId>spring-remoting-modules</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/pom.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/pom.xml
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-client/pom.xml
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/pom.xml
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-client/src/test/java/com/baeldung/SpringContextLiveTest.java
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/pom.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/pom.xml
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-server/pom.xml
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/pom.xml
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java b/spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java
similarity index 100%
rename from spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java
rename to spring-remoting-modules/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextTest.java