diff --git a/pom.xml b/pom.xml
index b64c8ccaea..0536a536c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,6 +445,7 @@
 				<module>spark-java</module>
 				<module>spring-4</module>
 				<module>spring-5</module>
+				<module>spring-5-data-reactive</module>
 				<module>spring-5-reactive</module>
 				<module>spring-5-reactive-security</module>
 				<module>spring-5-reactive-client</module>
@@ -463,6 +464,7 @@
 				<module>spring-boot-keycloak</module>
 				<module>spring-boot-bootstrap</module>
 				<module>spring-boot-admin</module>
+				<module>spring-boot-camel</module>
 				<module>spring-boot-ops</module>
 				<module>spring-boot-persistence</module>
 				<module>spring-boot-security</module>
@@ -553,6 +555,7 @@
 				<module>spring-thymeleaf</module>
 				<module>spring-userservice</module>
 				<module>spring-zuul</module>
+				<module>spring-remoting</module>
 				<module>spring-reactor</module>
 				<module>spring-vertx</module>
 				<module>spring-jinq</module>
@@ -708,6 +711,7 @@
 				<module>spark-java</module>
 				<module>spring-4</module>
 				<module>spring-5</module>
+				<module>spring-5-data-reactive</module>
 				<module>spring-5-reactive</module>
 				<module>spring-5-reactive-security</module>
 				<module>spring-5-reactive-client</module>
@@ -732,6 +736,7 @@
 				<module>spring-boot-keycloak</module>
 				<module>spring-boot-bootstrap</module>
 				<module>spring-boot-admin</module>
+				<module>spring-boot-camel</module>
 				<module>spring-boot-ops</module>
 				<module>spring-boot-persistence</module>
 				<module>spring-boot-security</module>
@@ -995,6 +1000,7 @@
 				<module>persistence-modules/solr</module>
 				<module>spark-java</module>
 				<module>spring-4</module>
+				<module>spring-5-data-reactive</module>
 				<module>spring-5-reactive</module>
 				<module>spring-5-reactive-security</module>
 				<module>spring-5-reactive-client</module>
@@ -1011,6 +1017,7 @@
 				<module>spring-boot-keycloak</module>
 				<module>spring-boot-bootstrap</module>
 				<module>spring-boot-admin</module>
+				<module>spring-boot-camel</module>
 				<module>spring-boot-persistence</module>
 				<module>spring-boot-security</module>
 				<module>spring-boot-mvc</module>
@@ -1095,6 +1102,7 @@
 				<module>spring-thymeleaf</module>
 				<module>spring-userservice</module>
 				<module>spring-zuul</module>
+				<module>spring-remoting</module>
 				<module>spring-reactor</module>
 				<module>spring-vertx</module>
 				<module>spring-jinq</module>
diff --git a/spring-data-5-reactive/README.md b/spring-5-data-reactive/README.md
similarity index 100%
rename from spring-data-5-reactive/README.md
rename to spring-5-data-reactive/README.md
diff --git a/spring-data-5-reactive/pom.xml b/spring-5-data-reactive/pom.xml
similarity index 96%
rename from spring-data-5-reactive/pom.xml
rename to spring-5-data-reactive/pom.xml
index 36ace53da2..e4dd454635 100644
--- a/spring-data-5-reactive/pom.xml
+++ b/spring-5-data-reactive/pom.xml
@@ -2,9 +2,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
     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>
-    <groupId>com.baeldung</groupId>
     <artifactId>spring-5-data-reactive</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -44,11 +42,6 @@
             <artifactId>reactor-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test</artifactId>
@@ -101,6 +94,7 @@
             </plugin>
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin-maven-plugin.version}</version>
                <executions>
                     <execution>
                         <id>compile</id>
@@ -204,6 +198,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <kotlin.version>1.2.40</kotlin.version>
+        <kotlin-maven-plugin.version>1.2.40</kotlin-maven-plugin.version>
         <junit.platform.version>1.0.0</junit.platform.version>
         <junit.jupiter.version>5.0.2</junit.jupiter.version>
     </properties>
diff --git a/spring-data-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java b/spring-5-data-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java
similarity index 100%
rename from spring-data-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java
rename to spring-5-data-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java
diff --git a/spring-data-5-reactive/src/main/java/com/baeldung/reactive/model/Account.java b/spring-5-data-reactive/src/main/java/com/baeldung/reactive/model/Account.java
similarity index 100%
rename from spring-data-5-reactive/src/main/java/com/baeldung/reactive/model/Account.java
rename to spring-5-data-reactive/src/main/java/com/baeldung/reactive/model/Account.java
diff --git a/spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java b/spring-5-data-reactive/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java
similarity index 100%
rename from spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java
rename to spring-5-data-reactive/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java
diff --git a/spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java b/spring-5-data-reactive/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java
similarity index 100%
rename from spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java
rename to spring-5-data-reactive/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java
diff --git a/spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java b/spring-5-data-reactive/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java
similarity index 100%
rename from spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java
rename to spring-5-data-reactive/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java
diff --git a/spring-data-5-reactive/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java b/spring-5-data-reactive/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java
similarity index 100%
rename from spring-data-5-reactive/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java
rename to spring-5-data-reactive/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java
diff --git a/spring-data-5-reactive/src/main/kotlin/com/baeldung/Application.kt b/spring-5-data-reactive/src/main/kotlin/com/baeldung/Application.kt
similarity index 100%
rename from spring-data-5-reactive/src/main/kotlin/com/baeldung/Application.kt
rename to spring-5-data-reactive/src/main/kotlin/com/baeldung/Application.kt
diff --git a/spring-data-5-reactive/src/main/kotlin/com/baeldung/Event.kt b/spring-5-data-reactive/src/main/kotlin/com/baeldung/Event.kt
similarity index 100%
rename from spring-data-5-reactive/src/main/kotlin/com/baeldung/Event.kt
rename to spring-5-data-reactive/src/main/kotlin/com/baeldung/Event.kt
diff --git a/spring-data-5-reactive/src/main/kotlin/com/baeldung/EventRepository.kt b/spring-5-data-reactive/src/main/kotlin/com/baeldung/EventRepository.kt
similarity index 100%
rename from spring-data-5-reactive/src/main/kotlin/com/baeldung/EventRepository.kt
rename to spring-5-data-reactive/src/main/kotlin/com/baeldung/EventRepository.kt
diff --git a/spring-data-5-reactive/src/main/kotlin/com/baeldung/MongoConfig.kt b/spring-5-data-reactive/src/main/kotlin/com/baeldung/MongoConfig.kt
similarity index 100%
rename from spring-data-5-reactive/src/main/kotlin/com/baeldung/MongoConfig.kt
rename to spring-5-data-reactive/src/main/kotlin/com/baeldung/MongoConfig.kt
diff --git a/spring-data-5-reactive/src/main/kotlin/com/baeldung/SendEmitter.kt b/spring-5-data-reactive/src/main/kotlin/com/baeldung/SendEmitter.kt
similarity index 100%
rename from spring-data-5-reactive/src/main/kotlin/com/baeldung/SendEmitter.kt
rename to spring-5-data-reactive/src/main/kotlin/com/baeldung/SendEmitter.kt
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/src/main/resources/logback.xml b/spring-5-data-reactive/src/main/resources/logback.xml
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/src/main/resources/logback.xml
rename to spring-5-data-reactive/src/main/resources/logback.xml
diff --git a/spring-data-5-reactive/src/main/resources/static/index.html b/spring-5-data-reactive/src/main/resources/static/index.html
similarity index 100%
rename from spring-data-5-reactive/src/main/resources/static/index.html
rename to spring-5-data-reactive/src/main/resources/static/index.html
diff --git a/spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java
similarity index 100%
rename from spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java
rename to spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java
diff --git a/spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java
similarity index 100%
rename from spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java
rename to spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java
diff --git a/spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java
similarity index 100%
rename from spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java
rename to spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java
diff --git a/spring-data-5-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java b/spring-5-data-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java
similarity index 100%
rename from spring-data-5-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java
rename to spring-5-data-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java
diff --git a/camel-api/README.md b/spring-boot-camel/README.md
similarity index 100%
rename from camel-api/README.md
rename to spring-boot-camel/README.md
diff --git a/camel-api/pom.xml b/spring-boot-camel/pom.xml
similarity index 100%
rename from camel-api/pom.xml
rename to spring-boot-camel/pom.xml
diff --git a/camel-api/src/main/java/com/baeldung/camel/Application.java b/spring-boot-camel/src/main/java/com/baeldung/camel/Application.java
similarity index 100%
rename from camel-api/src/main/java/com/baeldung/camel/Application.java
rename to spring-boot-camel/src/main/java/com/baeldung/camel/Application.java
diff --git a/camel-api/src/main/java/com/baeldung/camel/ExampleServices.java b/spring-boot-camel/src/main/java/com/baeldung/camel/ExampleServices.java
similarity index 100%
rename from camel-api/src/main/java/com/baeldung/camel/ExampleServices.java
rename to spring-boot-camel/src/main/java/com/baeldung/camel/ExampleServices.java
diff --git a/camel-api/src/main/java/com/baeldung/camel/MyBean.java b/spring-boot-camel/src/main/java/com/baeldung/camel/MyBean.java
similarity index 100%
rename from camel-api/src/main/java/com/baeldung/camel/MyBean.java
rename to spring-boot-camel/src/main/java/com/baeldung/camel/MyBean.java
diff --git a/camel-api/src/main/resources/application.properties b/spring-boot-camel/src/main/resources/application.properties
similarity index 100%
rename from camel-api/src/main/resources/application.properties
rename to spring-boot-camel/src/main/resources/application.properties
diff --git a/camel-api/src/main/resources/application.yml b/spring-boot-camel/src/main/resources/application.yml
similarity index 100%
rename from camel-api/src/main/resources/application.yml
rename to spring-boot-camel/src/main/resources/application.yml
diff --git a/camel-api/src/main/resources/logback.xml b/spring-boot-camel/src/main/resources/logback.xml
similarity index 100%
rename from camel-api/src/main/resources/logback.xml
rename to spring-boot-camel/src/main/resources/logback.xml
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 1fdab4213c..7d180047de 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -25,6 +25,7 @@
         <module>spring-cloud-zookeeper</module>
         <module>spring-cloud-gateway</module>
         <module>spring-cloud-stream</module>
+		<module>spring-cloud-stream-starters/twitterhdfs</module>
         <module>spring-cloud-connectors-heroku</module>
         <module>spring-cloud-aws</module>
         <module>spring-cloud-consul</module>
diff --git a/spring-cloud/spring-cloud-stream-starters/twitter/twitter b/spring-cloud/spring-cloud-stream-starters/twitter/twitter
new file mode 160000
index 0000000000..f9673ef0c1
--- /dev/null
+++ b/spring-cloud/spring-cloud-stream-starters/twitter/twitter
@@ -0,0 +1 @@
+Subproject commit f9673ef0c11c51b327555aaca61ee196935f998b
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/.gitignore b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/.gitignore
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/.gitignore
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/.gitignore
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/pom.xml b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/pom.xml
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java
diff --git a/spring-cloud/spring-cloud-stream-starters/boot/src/main/resources/application.properties b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties
similarity index 100%
rename from spring-cloud/spring-cloud-stream-starters/boot/src/main/resources/application.properties
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties
diff --git a/spring-data-5-reactive/src/main/resources/logback.xml b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml
similarity index 100%
rename from spring-data-5-reactive/src/main/resources/logback.xml
rename to spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml
diff --git a/spring-remoting/pom.xml b/spring-remoting/pom.xml
index 8db51e2a16..9f05bc91d2 100644
--- a/spring-remoting/pom.xml
+++ b/spring-remoting/pom.xml
@@ -32,7 +32,7 @@
         <module>remoting-hessian-burlap</module>
         <module>remoting-amqp</module>
         <module>remoting-jms</module>
-        <module>spring-remoting-rmi</module>
+        <module>remoting-rmi</module>
     </modules>
 
 </project>
\ No newline at end of file
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml b/spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml
index b715327c28..98e0bc5df5 100644
--- a/spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml
+++ b/spring-remoting/remoting-amqp/remoting-amqp-client/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml b/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml
index a456ba8d2c..7fe276f824 100644
--- a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml
+++ b/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -25,13 +25,13 @@
         </dependency>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>spring-remoting-http-server</artifactId>
-            <version>${spring-remoting-http-server.version}</version>
+            <artifactId>remoting-http-server</artifactId>
+            <version>${remoting-http-server.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <spring-remoting-http-server.version>1.0-SNAPSHOT</spring-remoting-http-server.version>
+        <remoting-http-server.version>1.0-SNAPSHOT</remoting-http-server.version>
     </properties>
 
 </project>
diff --git a/spring-remoting/remoting-hessian-burlap/pom.xml b/spring-remoting/remoting-hessian-burlap/pom.xml
index 682e460880..6cb5a51812 100644
--- a/spring-remoting/remoting-hessian-burlap/pom.xml
+++ b/spring-remoting/remoting-hessian-burlap/pom.xml
@@ -2,19 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>remoting-hessian-burlap</artifactId>
+    <packaging>pom</packaging>
+	
+	<parent>
         <artifactId>spring-remoting</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <packaging>pom</packaging>
+
     <modules>
-        <module>server</module>
-        <module>client</module>
+        <module>remoting-hessian-burlap-server</module>
+        <module>remoting-hessian-burlap-client</module>
     </modules>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>remoting-hessian-burlap</artifactId>
-
-
 </project>
\ No newline at end of file
diff --git a/spring-remoting/remoting-hessian-burlap/client/pom.xml b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
similarity index 95%
rename from spring-remoting/remoting-hessian-burlap/client/pom.xml
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
index 1ae9b10019..f337d5e51f 100644
--- a/spring-remoting/remoting-hessian-burlap/client/pom.xml
+++ b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/pom.xml
@@ -24,7 +24,8 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.caucho</groupId>
diff --git a/spring-remoting/remoting-hessian-burlap/client/src/main/java/com/baeldung/client/BurlapClient.java b/spring-remoting/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/client/src/main/java/com/baeldung/client/BurlapClient.java
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/BurlapClient.java
diff --git a/spring-remoting/remoting-hessian-burlap/client/src/main/java/com/baeldung/client/HessianClient.java b/spring-remoting/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/client/src/main/java/com/baeldung/client/HessianClient.java
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/java/com/baeldung/client/HessianClient.java
diff --git a/spring-remoting/remoting-hessian-burlap/client/src/main/resources/logback.xml b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/client/src/main/resources/logback.xml
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-hessian-burlap/client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java b/spring-remoting/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/client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/com/baeldung/client/CabBookingServiceIntegrationTest.java
diff --git a/spring-remoting/remoting-hessian-burlap/client/src/test/resources/application.properties b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/client/src/test/resources/application.properties
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/resources/application.properties
diff --git a/spring-remoting/remoting-hessian-burlap/server/pom.xml b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
similarity index 94%
rename from spring-remoting/remoting-hessian-burlap/server/pom.xml
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
index f1fed73ed8..5b6e03348f 100644
--- a/spring-remoting/remoting-hessian-burlap/server/pom.xml
+++ b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>spring-remoting-http-server</artifactId>
+            <artifactId>remoting-http-server</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/spring-remoting/remoting-hessian-burlap/server/src/main/java/com/baeldung/server/Server.java b/spring-remoting/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/server/src/main/java/com/baeldung/server/Server.java
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/java/com/baeldung/server/Server.java
diff --git a/spring-remoting/remoting-hessian-burlap/server/src/main/resources/logback.xml b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-hessian-burlap/server/src/main/resources/logback.xml
rename to spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-http/pom.xml b/spring-remoting/remoting-http/pom.xml
index 95b5ad3e14..3262736ec8 100644
--- a/spring-remoting/remoting-http/pom.xml
+++ b/spring-remoting/remoting-http/pom.xml
@@ -3,17 +3,19 @@
          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>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>remoting-http</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>spring-remoting-http</artifactId>
+    <artifactId>remoting-http</artifactId>
     <description>Parent for all modules related to HTTP Spring Remoting.</description>
     <packaging>pom</packaging>
+    
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>spring-remoting</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
     <modules>
-        <module>server</module>
-        <module>client</module>
-        <module>api</module>
+        <module>remoting-http-server</module>
+        <module>remoting-http-client</module>
+        <module>remoting-http-api</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/spring-remoting/remoting-http/api/pom.xml b/spring-remoting/remoting-http/remoting-http-api/pom.xml
similarity index 77%
rename from spring-remoting/remoting-http/api/pom.xml
rename to spring-remoting/remoting-http/remoting-http-api/pom.xml
index 633217f7de..579255060d 100644
--- a/spring-remoting/remoting-http/api/pom.xml
+++ b/spring-remoting/remoting-http/remoting-http-api/pom.xml
@@ -2,13 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <parent>
-        <artifactId>spring-remoting-http</artifactId>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>remoting-http-api</artifactId>
+    <name>remoting-http-api</name>
+    <description>API definition shared between client and server.</description>
+	
+	<parent>
+        <artifactId>remoting-http</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>api</artifactId>
-    <name>spring-remoting-http-api</name>
-    <description>API definition shared between client and server.</description>
+
 </project>
\ No newline at end of file
diff --git a/spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/Booking.java b/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java
similarity index 100%
rename from spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/Booking.java
rename to spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/Booking.java
diff --git a/spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/BookingException.java b/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java
similarity index 100%
rename from spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/BookingException.java
rename to spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/BookingException.java
diff --git a/spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/CabBookingService.java b/spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java
similarity index 100%
rename from spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/CabBookingService.java
rename to spring-remoting/remoting-http/remoting-http-api/src/main/java/com/baeldung/api/CabBookingService.java
diff --git a/spring-remoting/remoting-http/client/pom.xml b/spring-remoting/remoting-http/remoting-http-client/pom.xml
similarity index 83%
rename from spring-remoting/remoting-http/client/pom.xml
rename to spring-remoting/remoting-http/remoting-http-client/pom.xml
index 94a536fc18..9a6e98ffdd 100644
--- a/spring-remoting/remoting-http/client/pom.xml
+++ b/spring-remoting/remoting-http/remoting-http-client/pom.xml
@@ -3,14 +3,15 @@
          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>remoting-http-client</artifactId>
+    <description>Shows how to invoke a remote service using Spring Remoting HTTP.</description>
+	
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-remoting-http</artifactId>
+        <artifactId>remoting-http</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>spring-remoting-http-client</artifactId>
-    <description>Shows how to invoke a remote service using Spring Remoting HTTP.</description>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -24,7 +25,8 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/Client.java b/spring-remoting/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java
similarity index 100%
rename from spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/Client.java
rename to spring-remoting/remoting-http/remoting-http-client/src/main/java/com/baeldug/client/Client.java
diff --git a/spring-remoting/remoting-http/client/src/main/resources/logback.xml b/spring-remoting/remoting-http/remoting-http-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-http/client/src/main/resources/logback.xml
rename to spring-remoting/remoting-http/remoting-http-client/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-http/server/pom.xml b/spring-remoting/remoting-http/remoting-http-server/pom.xml
similarity index 79%
rename from spring-remoting/remoting-http/server/pom.xml
rename to spring-remoting/remoting-http/remoting-http-server/pom.xml
index 517f4451f7..53d27a5efa 100644
--- a/spring-remoting/remoting-http/server/pom.xml
+++ b/spring-remoting/remoting-http/remoting-http-server/pom.xml
@@ -3,13 +3,15 @@
          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>remoting-http-server</artifactId>
+    <description>Shows how to expose a service using Spring Remoting HTTP.</description>
+	
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>spring-remoting-http</artifactId>
+        <artifactId>remoting-http</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>spring-remoting-http-server</artifactId>
-    <description>Shows how to expose a service using Spring Remoting HTTP.</description>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -17,7 +19,8 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/spring-remoting/remoting-http/server/readme.md b/spring-remoting/remoting-http/remoting-http-server/readme.md
similarity index 100%
rename from spring-remoting/remoting-http/server/readme.md
rename to spring-remoting/remoting-http/remoting-http-server/readme.md
diff --git a/spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
similarity index 100%
rename from spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
rename to spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
diff --git a/spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/Server.java b/spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java
similarity index 100%
rename from spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/Server.java
rename to spring-remoting/remoting-http/remoting-http-server/src/main/java/com/baeldung/server/Server.java
diff --git a/spring-remoting/remoting-http/server/src/main/resources/logback.xml b/spring-remoting/remoting-http/remoting-http-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/remoting-http/server/src/main/resources/logback.xml
rename to spring-remoting/remoting-http/remoting-http-server/src/main/resources/logback.xml
diff --git a/spring-remoting/remoting-jms/remoting-jms-client/pom.xml b/spring-remoting/remoting-jms/remoting-jms-client/pom.xml
index 01b7bea657..ed27282a38 100644
--- a/spring-remoting/remoting-jms/remoting-jms-client/pom.xml
+++ b/spring-remoting/remoting-jms/remoting-jms-client/pom.xml
@@ -28,7 +28,8 @@
         </dependency>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/spring-remoting/remoting-jms/remoting-jms-server/pom.xml b/spring-remoting/remoting-jms/remoting-jms-server/pom.xml
index 8feac4df57..7657267f1d 100644
--- a/spring-remoting/remoting-jms/remoting-jms-server/pom.xml
+++ b/spring-remoting/remoting-jms/remoting-jms-server/pom.xml
@@ -28,11 +28,7 @@
         </dependency>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/spring-remoting/spring-remoting-rmi/pom.xml b/spring-remoting/remoting-rmi/pom.xml
similarity index 88%
rename from spring-remoting/spring-remoting-rmi/pom.xml
rename to spring-remoting/remoting-rmi/pom.xml
index 723158775f..cd15a6ec60 100644
--- a/spring-remoting/spring-remoting-rmi/pom.xml
+++ b/spring-remoting/remoting-rmi/pom.xml
@@ -2,18 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          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">
-    <parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <artifactId>remoting-rmi</artifactId>
+	
+	<parent>
         <artifactId>spring-remoting</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <modules>
+    
+	<modules>
         <module>remoting-rmi-server</module>
         <module>remoting-rmi-client</module>
     </modules>
-    <artifactId>spring-remoting-rmi</artifactId>
-
-
 </project>
\ No newline at end of file
diff --git a/spring-remoting/spring-remoting-rmi/remoting-rmi-client/pom.xml b/spring-remoting/remoting-rmi/remoting-rmi-client/pom.xml
similarity index 86%
rename from spring-remoting/spring-remoting-rmi/remoting-rmi-client/pom.xml
rename to spring-remoting/remoting-rmi/remoting-rmi-client/pom.xml
index 003976dc7b..1e3cd4b977 100644
--- a/spring-remoting/spring-remoting-rmi/remoting-rmi-client/pom.xml
+++ b/spring-remoting/remoting-rmi/remoting-rmi-client/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">
     <parent>
-        <artifactId>spring-remoting-rmi</artifactId>
+        <artifactId>remoting-rmi</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -24,7 +24,8 @@
         </dependency>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/spring-remoting/spring-remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java b/spring-remoting/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java
similarity index 100%
rename from spring-remoting/spring-remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java
rename to spring-remoting/remoting-rmi/remoting-rmi-client/src/main/java/com/baeldung/client/RmiClient.java
diff --git a/spring-remoting/spring-remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml b/spring-remoting/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/spring-remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml
rename to spring-remoting/remoting-rmi/remoting-rmi-client/src/main/resources/logback.xml
diff --git a/spring-remoting/spring-remoting-rmi/remoting-rmi-server/pom.xml b/spring-remoting/remoting-rmi/remoting-rmi-server/pom.xml
similarity index 83%
rename from spring-remoting/spring-remoting-rmi/remoting-rmi-server/pom.xml
rename to spring-remoting/remoting-rmi/remoting-rmi-server/pom.xml
index f1633e5dc2..68b01829e1 100644
--- a/spring-remoting/spring-remoting-rmi/remoting-rmi-server/pom.xml
+++ b/spring-remoting/remoting-rmi/remoting-rmi-server/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">
     <parent>
-        <artifactId>spring-remoting-rmi</artifactId>
+        <artifactId>remoting-rmi</artifactId>
         <groupId>com.baeldung</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -28,11 +28,7 @@
         </dependency>
         <dependency>
             <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baeldung</groupId>
-            <artifactId>api</artifactId>
+            <artifactId>remoting-http-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/spring-remoting/spring-remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
similarity index 100%
rename from spring-remoting/spring-remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
rename to spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java
diff --git a/spring-remoting/spring-remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java b/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java
similarity index 100%
rename from spring-remoting/spring-remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java
rename to spring-remoting/remoting-rmi/remoting-rmi-server/src/main/java/com/baeldung/server/RmiServer.java
diff --git a/spring-remoting/spring-remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml b/spring-remoting/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml
similarity index 100%
rename from spring-remoting/spring-remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml
rename to spring-remoting/remoting-rmi/remoting-rmi-server/src/main/resources/logback.xml