diff --git a/aggregator-microservices/README.md b/microservices-aggregrator/README.md
similarity index 100%
rename from aggregator-microservices/README.md
rename to microservices-aggregrator/README.md
diff --git a/aggregator-microservices/aggregator-service/etc/aggregator-service.png b/microservices-aggregrator/aggregator-service/etc/aggregator-service.png
similarity index 100%
rename from aggregator-microservices/aggregator-service/etc/aggregator-service.png
rename to microservices-aggregrator/aggregator-service/etc/aggregator-service.png
diff --git a/aggregator-microservices/aggregator-service/etc/aggregator-service.urm.puml b/microservices-aggregrator/aggregator-service/etc/aggregator-service.urm.puml
similarity index 100%
rename from aggregator-microservices/aggregator-service/etc/aggregator-service.urm.puml
rename to microservices-aggregrator/aggregator-service/etc/aggregator-service.urm.puml
diff --git a/aggregator-microservices/aggregator-service/pom.xml b/microservices-aggregrator/aggregator-service/pom.xml
similarity index 98%
rename from aggregator-microservices/aggregator-service/pom.xml
rename to microservices-aggregrator/aggregator-service/pom.xml
index 89584e738..e0f7c2a07 100644
--- a/aggregator-microservices/aggregator-service/pom.xml
+++ b/microservices-aggregrator/aggregator-service/pom.xml
@@ -27,7 +27,7 @@
 -->
 <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>aggregator-microservices</artifactId>
+    <artifactId>microservices-aggregrator</artifactId>
     <groupId>com.iluwatar</groupId>
     <version>1.26.0-SNAPSHOT</version>
   </parent>
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java b/microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java
rename to microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java b/microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java
rename to microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java b/microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java
rename to microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Product.java
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java b/microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java
rename to microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClient.java
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java b/microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java
rename to microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java b/microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java
rename to microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClient.java
diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java b/microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java
rename to microservices-aggregrator/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java
diff --git a/aggregator-microservices/aggregator-service/src/main/resources/application.properties b/microservices-aggregrator/aggregator-service/src/main/resources/application.properties
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/main/resources/application.properties
rename to microservices-aggregrator/aggregator-service/src/main/resources/application.properties
diff --git a/aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java b/microservices-aggregrator/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
similarity index 100%
rename from aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
rename to microservices-aggregrator/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java
diff --git a/aggregator-microservices/etc/aggregator-microservices.urm.puml b/microservices-aggregrator/etc/aggregator-microservices.urm.puml
similarity index 100%
rename from aggregator-microservices/etc/aggregator-microservices.urm.puml
rename to microservices-aggregrator/etc/aggregator-microservices.urm.puml
diff --git a/aggregator-microservices/information-microservice/etc/information-microservice.urm.puml b/microservices-aggregrator/information-microservice/etc/information-microservice.urm.puml
similarity index 100%
rename from aggregator-microservices/information-microservice/etc/information-microservice.urm.puml
rename to microservices-aggregrator/information-microservice/etc/information-microservice.urm.puml
diff --git a/aggregator-microservices/information-microservice/pom.xml b/microservices-aggregrator/information-microservice/pom.xml
similarity index 98%
rename from aggregator-microservices/information-microservice/pom.xml
rename to microservices-aggregrator/information-microservice/pom.xml
index fd4c364a3..69e588bd5 100644
--- a/aggregator-microservices/information-microservice/pom.xml
+++ b/microservices-aggregrator/information-microservice/pom.xml
@@ -27,7 +27,7 @@
 -->
 <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>aggregator-microservices</artifactId>
+    <artifactId>microservices-aggregrator</artifactId>
     <groupId>com.iluwatar</groupId>
     <version>1.26.0-SNAPSHOT</version>
   </parent>
diff --git a/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java b/microservices-aggregrator/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java
similarity index 100%
rename from aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java
rename to microservices-aggregrator/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationApplication.java
diff --git a/aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java b/microservices-aggregrator/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java
similarity index 100%
rename from aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java
rename to microservices-aggregrator/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java
diff --git a/aggregator-microservices/information-microservice/src/main/resources/application.properties b/microservices-aggregrator/information-microservice/src/main/resources/application.properties
similarity index 100%
rename from aggregator-microservices/information-microservice/src/main/resources/application.properties
rename to microservices-aggregrator/information-microservice/src/main/resources/application.properties
diff --git a/aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java b/microservices-aggregrator/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java
similarity index 100%
rename from aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java
rename to microservices-aggregrator/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java
diff --git a/aggregator-microservices/inventory-microservice/etc/inventory-microservice.urm.puml b/microservices-aggregrator/inventory-microservice/etc/inventory-microservice.urm.puml
similarity index 100%
rename from aggregator-microservices/inventory-microservice/etc/inventory-microservice.urm.puml
rename to microservices-aggregrator/inventory-microservice/etc/inventory-microservice.urm.puml
diff --git a/aggregator-microservices/inventory-microservice/pom.xml b/microservices-aggregrator/inventory-microservice/pom.xml
similarity index 98%
rename from aggregator-microservices/inventory-microservice/pom.xml
rename to microservices-aggregrator/inventory-microservice/pom.xml
index 7f52bcc4a..4d563a2a1 100644
--- a/aggregator-microservices/inventory-microservice/pom.xml
+++ b/microservices-aggregrator/inventory-microservice/pom.xml
@@ -27,7 +27,7 @@
 -->
 <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>aggregator-microservices</artifactId>
+    <artifactId>microservices-aggregrator</artifactId>
     <groupId>com.iluwatar</groupId>
     <version>1.26.0-SNAPSHOT</version>
   </parent>
diff --git a/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java b/microservices-aggregrator/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java
similarity index 100%
rename from aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java
rename to microservices-aggregrator/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryApplication.java
diff --git a/aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java b/microservices-aggregrator/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java
similarity index 100%
rename from aggregator-microservices/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java
rename to microservices-aggregrator/inventory-microservice/src/main/java/com/iluwatar/inventory/microservice/InventoryController.java
diff --git a/aggregator-microservices/inventory-microservice/src/main/resources/application.properties b/microservices-aggregrator/inventory-microservice/src/main/resources/application.properties
similarity index 100%
rename from aggregator-microservices/inventory-microservice/src/main/resources/application.properties
rename to microservices-aggregrator/inventory-microservice/src/main/resources/application.properties
diff --git a/aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java b/microservices-aggregrator/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java
similarity index 100%
rename from aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java
rename to microservices-aggregrator/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java
diff --git a/aggregator-microservices/pom.xml b/microservices-aggregrator/pom.xml
similarity index 97%
rename from aggregator-microservices/pom.xml
rename to microservices-aggregrator/pom.xml
index e083c8911..1463af072 100644
--- a/aggregator-microservices/pom.xml
+++ b/microservices-aggregrator/pom.xml
@@ -32,7 +32,7 @@
     <version>1.26.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>aggregator-microservices</artifactId>
+  <artifactId>microservices-aggregrator</artifactId>
   <packaging>pom</packaging>
     <dependencyManagement>
         <dependencies>
diff --git a/api-gateway/README.md b/microservices-api-gateway/README.md
similarity index 100%
rename from api-gateway/README.md
rename to microservices-api-gateway/README.md
diff --git a/api-gateway/api-gateway-service/etc/api-gateway-service.urm.puml b/microservices-api-gateway/api-gateway-service/etc/api-gateway-service.urm.puml
similarity index 100%
rename from api-gateway/api-gateway-service/etc/api-gateway-service.urm.puml
rename to microservices-api-gateway/api-gateway-service/etc/api-gateway-service.urm.puml
diff --git a/api-gateway/api-gateway-service/pom.xml b/microservices-api-gateway/api-gateway-service/pom.xml
similarity index 98%
rename from api-gateway/api-gateway-service/pom.xml
rename to microservices-api-gateway/api-gateway-service/pom.xml
index b997c5d98..f1133ec3c 100644
--- a/api-gateway/api-gateway-service/pom.xml
+++ b/microservices-api-gateway/api-gateway-service/pom.xml
@@ -27,7 +27,7 @@
 -->
 <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>api-gateway</artifactId>
+    <artifactId>microservices-api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
     <version>1.26.0-SNAPSHOT</version>
   </parent>
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ApiGateway.java
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/App.java
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/DesktopProduct.java
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClient.java
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/ImageClientImpl.java
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/MobileProduct.java
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClient.java
diff --git a/api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java b/microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java
rename to microservices-api-gateway/api-gateway-service/src/main/java/com/iluwatar/api/gateway/PriceClientImpl.java
diff --git a/api-gateway/api-gateway-service/src/main/resources/application.properties b/microservices-api-gateway/api-gateway-service/src/main/resources/application.properties
similarity index 100%
rename from api-gateway/api-gateway-service/src/main/resources/application.properties
rename to microservices-api-gateway/api-gateway-service/src/main/resources/application.properties
diff --git a/api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java b/microservices-api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
similarity index 100%
rename from api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
rename to microservices-api-gateway/api-gateway-service/src/test/java/com/iluwatar/api/gateway/ApiGatewayTest.java
diff --git a/api-gateway/etc/api-gateway.png b/microservices-api-gateway/etc/api-gateway.png
similarity index 100%
rename from api-gateway/etc/api-gateway.png
rename to microservices-api-gateway/etc/api-gateway.png
diff --git a/api-gateway/etc/api-gateway.ucls b/microservices-api-gateway/etc/api-gateway.ucls
similarity index 100%
rename from api-gateway/etc/api-gateway.ucls
rename to microservices-api-gateway/etc/api-gateway.ucls
diff --git a/api-gateway/etc/api-gateway.urm.puml b/microservices-api-gateway/etc/api-gateway.urm.puml
similarity index 100%
rename from api-gateway/etc/api-gateway.urm.puml
rename to microservices-api-gateway/etc/api-gateway.urm.puml
diff --git a/api-gateway/image-microservice/etc/image-microservice.png b/microservices-api-gateway/image-microservice/etc/image-microservice.png
similarity index 100%
rename from api-gateway/image-microservice/etc/image-microservice.png
rename to microservices-api-gateway/image-microservice/etc/image-microservice.png
diff --git a/api-gateway/image-microservice/etc/image-microservice.ucls b/microservices-api-gateway/image-microservice/etc/image-microservice.ucls
similarity index 100%
rename from api-gateway/image-microservice/etc/image-microservice.ucls
rename to microservices-api-gateway/image-microservice/etc/image-microservice.ucls
diff --git a/api-gateway/image-microservice/etc/image-microservice.urm.puml b/microservices-api-gateway/image-microservice/etc/image-microservice.urm.puml
similarity index 100%
rename from api-gateway/image-microservice/etc/image-microservice.urm.puml
rename to microservices-api-gateway/image-microservice/etc/image-microservice.urm.puml
diff --git a/api-gateway/image-microservice/pom.xml b/microservices-api-gateway/image-microservice/pom.xml
similarity index 98%
rename from api-gateway/image-microservice/pom.xml
rename to microservices-api-gateway/image-microservice/pom.xml
index 4abaf32d4..7f27eb515 100644
--- a/api-gateway/image-microservice/pom.xml
+++ b/microservices-api-gateway/image-microservice/pom.xml
@@ -27,7 +27,7 @@
 -->
 <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>api-gateway</artifactId>
+    <artifactId>microservices-api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
     <version>1.26.0-SNAPSHOT</version>
   </parent>
diff --git a/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java b/microservices-api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java
similarity index 100%
rename from api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java
rename to microservices-api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageApplication.java
diff --git a/api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java b/microservices-api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java
similarity index 100%
rename from api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java
rename to microservices-api-gateway/image-microservice/src/main/java/com/iluwatar/image/microservice/ImageController.java
diff --git a/api-gateway/image-microservice/src/main/resources/application.properties b/microservices-api-gateway/image-microservice/src/main/resources/application.properties
similarity index 100%
rename from api-gateway/image-microservice/src/main/resources/application.properties
rename to microservices-api-gateway/image-microservice/src/main/resources/application.properties
diff --git a/api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java b/microservices-api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java
similarity index 100%
rename from api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java
rename to microservices-api-gateway/image-microservice/src/test/java/com/iluwatar/image/microservice/ImageControllerTest.java
diff --git a/api-gateway/pom.xml b/microservices-api-gateway/pom.xml
similarity index 97%
rename from api-gateway/pom.xml
rename to microservices-api-gateway/pom.xml
index d7a9a9a3b..762295876 100644
--- a/api-gateway/pom.xml
+++ b/microservices-api-gateway/pom.xml
@@ -32,7 +32,7 @@
     <version>1.26.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>api-gateway</artifactId>
+  <artifactId>microservices-api-gateway</artifactId>
   <packaging>pom</packaging>
   <dependencyManagement>
     <dependencies>
diff --git a/api-gateway/price-microservice/etc/price-microservice.png b/microservices-api-gateway/price-microservice/etc/price-microservice.png
similarity index 100%
rename from api-gateway/price-microservice/etc/price-microservice.png
rename to microservices-api-gateway/price-microservice/etc/price-microservice.png
diff --git a/api-gateway/price-microservice/etc/price-microservice.ucls b/microservices-api-gateway/price-microservice/etc/price-microservice.ucls
similarity index 100%
rename from api-gateway/price-microservice/etc/price-microservice.ucls
rename to microservices-api-gateway/price-microservice/etc/price-microservice.ucls
diff --git a/api-gateway/price-microservice/etc/price-microservice.urm.puml b/microservices-api-gateway/price-microservice/etc/price-microservice.urm.puml
similarity index 100%
rename from api-gateway/price-microservice/etc/price-microservice.urm.puml
rename to microservices-api-gateway/price-microservice/etc/price-microservice.urm.puml
diff --git a/api-gateway/price-microservice/pom.xml b/microservices-api-gateway/price-microservice/pom.xml
similarity index 98%
rename from api-gateway/price-microservice/pom.xml
rename to microservices-api-gateway/price-microservice/pom.xml
index 8cf51376e..6dedbd398 100644
--- a/api-gateway/price-microservice/pom.xml
+++ b/microservices-api-gateway/price-microservice/pom.xml
@@ -27,7 +27,7 @@
 -->
 <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>api-gateway</artifactId>
+    <artifactId>microservices-api-gateway</artifactId>
     <groupId>com.iluwatar</groupId>
     <version>1.26.0-SNAPSHOT</version>
   </parent>
diff --git a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java b/microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java
similarity index 100%
rename from api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java
rename to microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceApplication.java
diff --git a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java b/microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java
similarity index 100%
rename from api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java
rename to microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceController.java
diff --git a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceService.java b/microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceService.java
similarity index 100%
rename from api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceService.java
rename to microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceService.java
diff --git a/api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceServiceImpl.java b/microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceServiceImpl.java
similarity index 100%
rename from api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceServiceImpl.java
rename to microservices-api-gateway/price-microservice/src/main/java/com/iluwatar/price/microservice/PriceServiceImpl.java
diff --git a/api-gateway/price-microservice/src/main/resources/application.properties b/microservices-api-gateway/price-microservice/src/main/resources/application.properties
similarity index 100%
rename from api-gateway/price-microservice/src/main/resources/application.properties
rename to microservices-api-gateway/price-microservice/src/main/resources/application.properties
diff --git a/api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java b/microservices-api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java
similarity index 100%
rename from api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java
rename to microservices-api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceControllerTest.java
diff --git a/api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceServiceTest.java b/microservices-api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceServiceTest.java
similarity index 100%
rename from api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceServiceTest.java
rename to microservices-api-gateway/price-microservice/src/test/java/com/iluwatar/price/microservice/PriceServiceTest.java
diff --git a/log-aggregation/README.md b/microservices-log-aggregation/README.md
similarity index 100%
rename from log-aggregation/README.md
rename to microservices-log-aggregation/README.md
diff --git a/log-aggregation/etc/log-aggregation.png b/microservices-log-aggregation/etc/log-aggregation.png
similarity index 100%
rename from log-aggregation/etc/log-aggregation.png
rename to microservices-log-aggregation/etc/log-aggregation.png
diff --git a/log-aggregation/etc/log-aggregation.puml b/microservices-log-aggregation/etc/log-aggregation.puml
similarity index 100%
rename from log-aggregation/etc/log-aggregation.puml
rename to microservices-log-aggregation/etc/log-aggregation.puml
diff --git a/log-aggregation/etc/log-aggregation.urm.puml b/microservices-log-aggregation/etc/log-aggregation.urm.puml
similarity index 100%
rename from log-aggregation/etc/log-aggregation.urm.puml
rename to microservices-log-aggregation/etc/log-aggregation.urm.puml
diff --git a/log-aggregation/pom.xml b/microservices-log-aggregation/pom.xml
similarity index 97%
rename from log-aggregation/pom.xml
rename to microservices-log-aggregation/pom.xml
index cd6140980..b10760e37 100644
--- a/log-aggregation/pom.xml
+++ b/microservices-log-aggregation/pom.xml
@@ -35,7 +35,7 @@
     <version>1.26.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>log-aggregation</artifactId>
+  <artifactId>microservices-log-aggregation</artifactId>
 
   <dependencies>
     <dependency>
diff --git a/log-aggregation/src/main/java/com/iluwatar/logaggregation/App.java b/microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/App.java
similarity index 100%
rename from log-aggregation/src/main/java/com/iluwatar/logaggregation/App.java
rename to microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/App.java
diff --git a/log-aggregation/src/main/java/com/iluwatar/logaggregation/CentralLogStore.java b/microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/CentralLogStore.java
similarity index 100%
rename from log-aggregation/src/main/java/com/iluwatar/logaggregation/CentralLogStore.java
rename to microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/CentralLogStore.java
diff --git a/log-aggregation/src/main/java/com/iluwatar/logaggregation/LogAggregator.java b/microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogAggregator.java
similarity index 100%
rename from log-aggregation/src/main/java/com/iluwatar/logaggregation/LogAggregator.java
rename to microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogAggregator.java
diff --git a/log-aggregation/src/main/java/com/iluwatar/logaggregation/LogEntry.java b/microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogEntry.java
similarity index 100%
rename from log-aggregation/src/main/java/com/iluwatar/logaggregation/LogEntry.java
rename to microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogEntry.java
diff --git a/log-aggregation/src/main/java/com/iluwatar/logaggregation/LogLevel.java b/microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogLevel.java
similarity index 100%
rename from log-aggregation/src/main/java/com/iluwatar/logaggregation/LogLevel.java
rename to microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogLevel.java
diff --git a/log-aggregation/src/main/java/com/iluwatar/logaggregation/LogProducer.java b/microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogProducer.java
similarity index 100%
rename from log-aggregation/src/main/java/com/iluwatar/logaggregation/LogProducer.java
rename to microservices-log-aggregation/src/main/java/com/iluwatar/logaggregation/LogProducer.java
diff --git a/log-aggregation/src/test/java/com/iluwatar/logaggregation/LogAggregatorTest.java b/microservices-log-aggregation/src/test/java/com/iluwatar/logaggregation/LogAggregatorTest.java
similarity index 100%
rename from log-aggregation/src/test/java/com/iluwatar/logaggregation/LogAggregatorTest.java
rename to microservices-log-aggregation/src/test/java/com/iluwatar/logaggregation/LogAggregatorTest.java
diff --git a/pom.xml b/pom.xml
index 4898fa441..aa4ba29f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
     <module>caching</module>
     <module>delegation</module>
     <module>event-driven-architecture</module>
-    <module>api-gateway</module>
+    <module>microservices-api-gateway</module>
     <module>factory-kit</module>
     <module>feature-toggle</module>
     <module>value-object</module>
@@ -133,7 +133,7 @@
     <module>mute-idiom</module>
     <module>hexagonal</module>
     <module>abstract-document</module>
-    <module>aggregator-microservices</module>
+    <module>microservices-aggregrator</module>
     <module>promise</module>
     <module>page-controller</module>
     <module>page-object</module>
@@ -205,7 +205,7 @@
     <module>context-object</module>
     <module>optimistic-offline-lock</module>
     <module>curiously-recurring-template-pattern</module>
-    <module>log-aggregation</module>
+    <module>microservices-log-aggregation</module>
     <module>anti-corruption-layer</module>
     <module>health-check</module>
     <module>notification</module>