diff --git a/microservices-parent/pom.xml b/account-parent/account-web/pom.xml
similarity index 65%
rename from microservices-parent/pom.xml
rename to account-parent/account-web/pom.xml
index 44c6b2d..a985dec 100644
--- a/microservices-parent/pom.xml
+++ b/account-parent/account-web/pom.xml
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>microservices-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
+    <artifactId>account-web</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>│   │   ├── account-web</name>
 
     <parent>
         <groupId>org.kbastani</groupId>
-        <artifactId>event-stream-processing-microservices</artifactId>
+        <artifactId>account-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
-    <modules>
-        <module>account-service</module>
-        <module>inventory-service</module>
-        <module>invoice-service</module>
-        <module>user-service</module>
-        <module>warehouse-service</module>
-        <module>order-service</module>
-    </modules>
-
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -57,4 +54,14 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/microservices-parent/account-service/src/main/java/demo/AccountServiceApplication.java b/account-parent/account-web/src/main/java/demo/AccountServiceApplication.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/AccountServiceApplication.java
rename to account-parent/account-web/src/main/java/demo/AccountServiceApplication.java
diff --git a/microservices-parent/account-service/src/main/java/demo/account/Account.java b/account-parent/account-web/src/main/java/demo/account/Account.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/account/Account.java
rename to account-parent/account-web/src/main/java/demo/account/Account.java
diff --git a/microservices-parent/account-service/src/main/java/demo/account/AccountController.java b/account-parent/account-web/src/main/java/demo/account/AccountController.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/account/AccountController.java
rename to account-parent/account-web/src/main/java/demo/account/AccountController.java
diff --git a/microservices-parent/account-service/src/main/java/demo/account/AccountEventAction.java b/account-parent/account-web/src/main/java/demo/account/AccountEventAction.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/account/AccountEventAction.java
rename to account-parent/account-web/src/main/java/demo/account/AccountEventAction.java
diff --git a/microservices-parent/account-service/src/main/java/demo/account/AccountEventStatus.java b/account-parent/account-web/src/main/java/demo/account/AccountEventStatus.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/account/AccountEventStatus.java
rename to account-parent/account-web/src/main/java/demo/account/AccountEventStatus.java
diff --git a/microservices-parent/account-service/src/main/java/demo/account/AccountEventType.java b/account-parent/account-web/src/main/java/demo/account/AccountEventType.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/account/AccountEventType.java
rename to account-parent/account-web/src/main/java/demo/account/AccountEventType.java
diff --git a/microservices-parent/account-service/src/main/java/demo/account/AccountRepository.java b/account-parent/account-web/src/main/java/demo/account/AccountRepository.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/account/AccountRepository.java
rename to account-parent/account-web/src/main/java/demo/account/AccountRepository.java
diff --git a/microservices-parent/account-service/src/main/java/demo/account/AccountService.java b/account-parent/account-web/src/main/java/demo/account/AccountService.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/account/AccountService.java
rename to account-parent/account-web/src/main/java/demo/account/AccountService.java
diff --git a/microservices-parent/account-service/src/main/java/demo/domain/BaseEntity.java b/account-parent/account-web/src/main/java/demo/domain/BaseEntity.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/domain/BaseEntity.java
rename to account-parent/account-web/src/main/java/demo/domain/BaseEntity.java
diff --git a/microservices-parent/account-service/src/main/java/demo/event/AccountEvent.java b/account-parent/account-web/src/main/java/demo/event/AccountEvent.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/event/AccountEvent.java
rename to account-parent/account-web/src/main/java/demo/event/AccountEvent.java
diff --git a/microservices-parent/account-service/src/main/java/demo/event/EventController.java b/account-parent/account-web/src/main/java/demo/event/EventController.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/event/EventController.java
rename to account-parent/account-web/src/main/java/demo/event/EventController.java
diff --git a/microservices-parent/account-service/src/main/java/demo/event/EventRepository.java b/account-parent/account-web/src/main/java/demo/event/EventRepository.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/event/EventRepository.java
rename to account-parent/account-web/src/main/java/demo/event/EventRepository.java
diff --git a/microservices-parent/account-service/src/main/java/demo/event/EventService.java b/account-parent/account-web/src/main/java/demo/event/EventService.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/event/EventService.java
rename to account-parent/account-web/src/main/java/demo/event/EventService.java
diff --git a/microservices-parent/account-service/src/main/java/demo/event/ProducerChannels.java b/account-parent/account-web/src/main/java/demo/event/ProducerChannels.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/event/ProducerChannels.java
rename to account-parent/account-web/src/main/java/demo/event/ProducerChannels.java
diff --git a/microservices-parent/account-service/src/main/java/demo/event/StreamConfig.java b/account-parent/account-web/src/main/java/demo/event/StreamConfig.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/event/StreamConfig.java
rename to account-parent/account-web/src/main/java/demo/event/StreamConfig.java
diff --git a/microservices-parent/account-service/src/main/java/demo/log/Log.java b/account-parent/account-web/src/main/java/demo/log/Log.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/log/Log.java
rename to account-parent/account-web/src/main/java/demo/log/Log.java
diff --git a/microservices-parent/account-service/src/main/java/demo/log/LogRepository.java b/account-parent/account-web/src/main/java/demo/log/LogRepository.java
similarity index 100%
rename from microservices-parent/account-service/src/main/java/demo/log/LogRepository.java
rename to account-parent/account-web/src/main/java/demo/log/LogRepository.java
diff --git a/microservices-parent/account-service/src/main/resources/application.properties b/account-parent/account-web/src/main/resources/application.properties
similarity index 100%
rename from microservices-parent/account-service/src/main/resources/application.properties
rename to account-parent/account-web/src/main/resources/application.properties
diff --git a/microservices-parent/account-service/src/test/java/demo/AccountServiceApplicationTests.java b/account-parent/account-web/src/test/java/demo/AccountServiceApplicationTests.java
similarity index 100%
rename from microservices-parent/account-service/src/test/java/demo/AccountServiceApplicationTests.java
rename to account-parent/account-web/src/test/java/demo/AccountServiceApplicationTests.java
diff --git a/stream-modules-parent/pom.xml b/account-parent/account-worker/pom.xml
similarity index 61%
rename from stream-modules-parent/pom.xml
rename to account-parent/account-worker/pom.xml
index b71e240..0a1b01a 100644
--- a/stream-modules-parent/pom.xml
+++ b/account-parent/account-worker/pom.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>stream-modules-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
+    <artifactId>account-worker</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>│   │   └── account-worker</name>
 
     <parent>
         <groupId>org.kbastani</groupId>
-        <artifactId>event-stream-processing-microservices</artifactId>
+        <artifactId>account-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
-    <modules>
-        <module>account-stream-module</module>
-    </modules>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -50,6 +53,21 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.2.0</version>
+        </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/AccountStreamModuleApplication.java b/account-parent/account-worker/src/main/java/demo/AccountStreamModuleApplication.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/AccountStreamModuleApplication.java
rename to account-parent/account-worker/src/main/java/demo/AccountStreamModuleApplication.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/account/Account.java b/account-parent/account-worker/src/main/java/demo/account/Account.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/account/Account.java
rename to account-parent/account-worker/src/main/java/demo/account/Account.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEventAction.java b/account-parent/account-worker/src/main/java/demo/account/AccountEventAction.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEventAction.java
rename to account-parent/account-worker/src/main/java/demo/account/AccountEventAction.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEventStatus.java b/account-parent/account-worker/src/main/java/demo/account/AccountEventStatus.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEventStatus.java
rename to account-parent/account-worker/src/main/java/demo/account/AccountEventStatus.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEventType.java b/account-parent/account-worker/src/main/java/demo/account/AccountEventType.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEventType.java
rename to account-parent/account-worker/src/main/java/demo/account/AccountEventType.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEvents.java b/account-parent/account-worker/src/main/java/demo/account/AccountEvents.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/account/AccountEvents.java
rename to account-parent/account-worker/src/main/java/demo/account/AccountEvents.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/domain/BaseEntity.java b/account-parent/account-worker/src/main/java/demo/domain/BaseEntity.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/domain/BaseEntity.java
rename to account-parent/account-worker/src/main/java/demo/domain/BaseEntity.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/event/AccountEvent.java b/account-parent/account-worker/src/main/java/demo/event/AccountEvent.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/event/AccountEvent.java
rename to account-parent/account-worker/src/main/java/demo/event/AccountEvent.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/event/AccountEventStream.java b/account-parent/account-worker/src/main/java/demo/event/AccountEventStream.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/event/AccountEventStream.java
rename to account-parent/account-worker/src/main/java/demo/event/AccountEventStream.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/event/Sink.java b/account-parent/account-worker/src/main/java/demo/event/Sink.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/event/Sink.java
rename to account-parent/account-worker/src/main/java/demo/event/Sink.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/state/StateMachineConfig.java b/account-parent/account-worker/src/main/java/demo/state/StateMachineConfig.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/state/StateMachineConfig.java
rename to account-parent/account-worker/src/main/java/demo/state/StateMachineConfig.java
diff --git a/stream-modules-parent/account-stream-module/src/main/java/demo/state/StateMachineService.java b/account-parent/account-worker/src/main/java/demo/state/StateMachineService.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/java/demo/state/StateMachineService.java
rename to account-parent/account-worker/src/main/java/demo/state/StateMachineService.java
diff --git a/stream-modules-parent/account-stream-module/src/main/resources/application.properties b/account-parent/account-worker/src/main/resources/application.properties
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/main/resources/application.properties
rename to account-parent/account-worker/src/main/resources/application.properties
diff --git a/stream-modules-parent/account-stream-module/src/test/java/demo/AccountStreamModuleApplicationTests.java b/account-parent/account-worker/src/test/java/demo/AccountStreamModuleApplicationTests.java
similarity index 100%
rename from stream-modules-parent/account-stream-module/src/test/java/demo/AccountStreamModuleApplicationTests.java
rename to account-parent/account-worker/src/test/java/demo/AccountStreamModuleApplicationTests.java
diff --git a/account-parent/pom.xml b/account-parent/pom.xml
new file mode 100644
index 0000000..fc166a2
--- /dev/null
+++ b/account-parent/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>account-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>│   ├── account-parent</name>
+
+    <parent>
+        <groupId>org.kbastani</groupId>
+        <artifactId>event-stream-processing-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modules>
+        <module>account-web</module>
+        <module>account-worker</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/microservices-parent/user-service/pom.xml b/inventory-parent/inventory-web/pom.xml
similarity index 84%
rename from microservices-parent/user-service/pom.xml
rename to inventory-parent/inventory-web/pom.xml
index fbc5ea9..e62df8d 100644
--- a/microservices-parent/user-service/pom.xml
+++ b/inventory-parent/inventory-web/pom.xml
@@ -3,16 +3,15 @@
          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>user-service</artifactId>
+    <artifactId>inventory-web</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>user-service</name>
-    <description>Demo project for Spring Boot</description>
+    <name>│   │   └── inventory-web</name>
 
     <parent>
         <groupId>org.kbastani</groupId>
-        <artifactId>microservices-parent</artifactId>
+        <artifactId>inventory-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
diff --git a/microservices-parent/inventory-service/src/main/java/demo/InventoryServiceApplication.java b/inventory-parent/inventory-web/src/main/java/demo/InventoryServiceApplication.java
similarity index 100%
rename from microservices-parent/inventory-service/src/main/java/demo/InventoryServiceApplication.java
rename to inventory-parent/inventory-web/src/main/java/demo/InventoryServiceApplication.java
diff --git a/microservices-parent/inventory-service/src/main/resources/application.properties b/inventory-parent/inventory-web/src/main/resources/application.properties
similarity index 100%
rename from microservices-parent/inventory-service/src/main/resources/application.properties
rename to inventory-parent/inventory-web/src/main/resources/application.properties
diff --git a/microservices-parent/inventory-service/src/test/java/demo/InventoryServiceApplicationTests.java b/inventory-parent/inventory-web/src/test/java/demo/InventoryServiceApplicationTests.java
similarity index 100%
rename from microservices-parent/inventory-service/src/test/java/demo/InventoryServiceApplicationTests.java
rename to inventory-parent/inventory-web/src/test/java/demo/InventoryServiceApplicationTests.java
diff --git a/inventory-parent/pom.xml b/inventory-parent/pom.xml
new file mode 100644
index 0000000..2a08cbf
--- /dev/null
+++ b/inventory-parent/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>inventory-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>│   ├── inventory-parent</name>
+
+    <parent>
+        <groupId>org.kbastani</groupId>
+        <artifactId>event-stream-processing-microservices</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modules>
+        <module>inventory-web</module>
+    </modules>
+
+
+    <dependencies>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/microservices-parent/order-service/pom.xml b/invoice-parent/invoice-web/pom.xml
similarity index 84%
rename from microservices-parent/order-service/pom.xml
rename to invoice-parent/invoice-web/pom.xml
index c863995..d4e8a30 100644
--- a/microservices-parent/order-service/pom.xml
+++ b/invoice-parent/invoice-web/pom.xml
@@ -3,16 +3,15 @@
          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>order-service</artifactId>
+    <artifactId>invoice-web</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>order-service</name>
-    <description>Demo project for Spring Boot</description>
+    <name>│   │   └── invoice-web</name>
 
     <parent>
         <groupId>org.kbastani</groupId>
-        <artifactId>microservices-parent</artifactId>
+        <artifactId>invoice-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
diff --git a/microservices-parent/invoice-service/src/main/java/demo/InvoiceServiceApplication.java b/invoice-parent/invoice-web/src/main/java/demo/InvoiceServiceApplication.java
similarity index 100%
rename from microservices-parent/invoice-service/src/main/java/demo/InvoiceServiceApplication.java
rename to invoice-parent/invoice-web/src/main/java/demo/InvoiceServiceApplication.java
diff --git a/microservices-parent/invoice-service/src/main/resources/application.properties b/invoice-parent/invoice-web/src/main/resources/application.properties
similarity index 100%
rename from microservices-parent/invoice-service/src/main/resources/application.properties
rename to invoice-parent/invoice-web/src/main/resources/application.properties
diff --git a/microservices-parent/invoice-service/src/test/java/demo/InvoiceServiceApplicationTests.java b/invoice-parent/invoice-web/src/test/java/demo/InvoiceServiceApplicationTests.java
similarity index 100%
rename from microservices-parent/invoice-service/src/test/java/demo/InvoiceServiceApplicationTests.java
rename to invoice-parent/invoice-web/src/test/java/demo/InvoiceServiceApplicationTests.java
diff --git a/invoice-parent/pom.xml b/invoice-parent/pom.xml
new file mode 100644
index 0000000..6ceb6e4
--- /dev/null
+++ b/invoice-parent/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>invoice-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>│   ├── invoice-parent</name>
+
+    <parent>
+        <groupId>org.kbastani</groupId>
+        <artifactId>event-stream-processing-microservices</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modules>
+        <module>invoice-web</module>
+    </modules>
+
+
+    <dependencies>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/microservices-parent/inventory-service/pom.xml b/microservices-parent/inventory-service/pom.xml
deleted file mode 100644
index 97649f8..0000000
--- a/microservices-parent/inventory-service/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>inventory-service</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>inventory-service</name>
-    <description>Demo project for Spring Boot</description>
-
-    <parent>
-        <groupId>org.kbastani</groupId>
-        <artifactId>microservices-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/microservices-parent/warehouse-service/pom.xml b/microservices-parent/warehouse-service/pom.xml
deleted file mode 100644
index d421e78..0000000
--- a/microservices-parent/warehouse-service/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>warehouse-service</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>warehouse-service</name>
-    <description>Demo project for Spring Boot</description>
-
-    <parent>
-        <groupId>org.kbastani</groupId>
-        <artifactId>microservices-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/microservices-parent/account-service/pom.xml b/order-parent/order-web/pom.xml
similarity index 84%
rename from microservices-parent/account-service/pom.xml
rename to order-parent/order-web/pom.xml
index bda3fa2..08bd92e 100644
--- a/microservices-parent/account-service/pom.xml
+++ b/order-parent/order-web/pom.xml
@@ -3,16 +3,15 @@
          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>account-service</artifactId>
+    <artifactId>order-web</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>account-service</name>
-    <description>Demo project for Spring Boot</description>
+    <name>│   │   └── order-web</name>
 
     <parent>
         <groupId>org.kbastani</groupId>
-        <artifactId>microservices-parent</artifactId>
+        <artifactId>order-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
diff --git a/microservices-parent/order-service/src/main/java/demo/OrderServiceApplication.java b/order-parent/order-web/src/main/java/demo/OrderServiceApplication.java
similarity index 100%
rename from microservices-parent/order-service/src/main/java/demo/OrderServiceApplication.java
rename to order-parent/order-web/src/main/java/demo/OrderServiceApplication.java
diff --git a/microservices-parent/order-service/src/main/resources/application.properties b/order-parent/order-web/src/main/resources/application.properties
similarity index 100%
rename from microservices-parent/order-service/src/main/resources/application.properties
rename to order-parent/order-web/src/main/resources/application.properties
diff --git a/microservices-parent/order-service/src/test/java/demo/OrderServiceApplicationTests.java b/order-parent/order-web/src/test/java/demo/OrderServiceApplicationTests.java
similarity index 100%
rename from microservices-parent/order-service/src/test/java/demo/OrderServiceApplicationTests.java
rename to order-parent/order-web/src/test/java/demo/OrderServiceApplicationTests.java
diff --git a/order-parent/pom.xml b/order-parent/pom.xml
new file mode 100644
index 0000000..bc3a699
--- /dev/null
+++ b/order-parent/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>order-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>│   ├── order-parent</name>
+
+    <parent>
+        <groupId>org.kbastani</groupId>
+        <artifactId>event-stream-processing-microservices</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modules>
+        <module>order-web</module>
+    </modules>
+
+
+    <dependencies>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8f955e9..2ba004b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.kbastani</groupId>
-    <artifactId>event-stream-processing-microservices</artifactId>
+    <artifactId>event-stream-processing-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <name>├── event-stream-processing-parent</name>
+
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -17,8 +19,12 @@
     </parent>
 
     <modules>
-        <module>microservices-parent</module>
-        <module>stream-modules-parent</module>
+        <module>account-parent</module>
+        <module>inventory-parent</module>
+        <module>invoice-parent</module>
+        <module>order-parent</module>
+        <module>user-parent</module>
+        <module>warehouse-parent</module>
     </modules>
 
     <dependencies>
diff --git a/stream-modules-parent/account-stream-module/pom.xml b/stream-modules-parent/account-stream-module/pom.xml
deleted file mode 100644
index 7156440..0000000
--- a/stream-modules-parent/account-stream-module/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>account-stream-module</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>account-stream-module</name>
-    <description>Demo project for Spring Boot</description>
-
-    <parent>
-        <groupId>org.kbastani</groupId>
-        <artifactId>stream-modules-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
-    </parent>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/user-parent/pom.xml b/user-parent/pom.xml
new file mode 100644
index 0000000..9b774a3
--- /dev/null
+++ b/user-parent/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>user-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>│   ├── user-parent</name>
+
+    <parent>
+        <groupId>org.kbastani</groupId>
+        <artifactId>event-stream-processing-microservices</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modules>
+        <module>user-web</module>
+    </modules>
+
+
+    <dependencies>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/microservices-parent/invoice-service/pom.xml b/user-parent/user-web/pom.xml
similarity index 84%
rename from microservices-parent/invoice-service/pom.xml
rename to user-parent/user-web/pom.xml
index 95f121a..a1369b2 100644
--- a/microservices-parent/invoice-service/pom.xml
+++ b/user-parent/user-web/pom.xml
@@ -3,16 +3,15 @@
          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>invoice-service</artifactId>
+    <artifactId>user-web</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>invoice-service</name>
-    <description>Demo project for Spring Boot</description>
+    <name>│   │   └── user-web</name>
 
     <parent>
         <groupId>org.kbastani</groupId>
-        <artifactId>microservices-parent</artifactId>
+        <artifactId>user-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
diff --git a/microservices-parent/user-service/src/main/java/demo/UserServiceApplication.java b/user-parent/user-web/src/main/java/demo/UserServiceApplication.java
similarity index 100%
rename from microservices-parent/user-service/src/main/java/demo/UserServiceApplication.java
rename to user-parent/user-web/src/main/java/demo/UserServiceApplication.java
diff --git a/microservices-parent/user-service/src/main/resources/application.properties b/user-parent/user-web/src/main/resources/application.properties
similarity index 100%
rename from microservices-parent/user-service/src/main/resources/application.properties
rename to user-parent/user-web/src/main/resources/application.properties
diff --git a/microservices-parent/user-service/src/test/java/demo/UserServiceApplicationTests.java b/user-parent/user-web/src/test/java/demo/UserServiceApplicationTests.java
similarity index 100%
rename from microservices-parent/user-service/src/test/java/demo/UserServiceApplicationTests.java
rename to user-parent/user-web/src/test/java/demo/UserServiceApplicationTests.java
diff --git a/warehouse-parent/pom.xml b/warehouse-parent/pom.xml
new file mode 100644
index 0000000..ed5d225
--- /dev/null
+++ b/warehouse-parent/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>warehouse-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>│   ├── warehouse-parent</name>
+
+    <parent>
+        <groupId>org.kbastani</groupId>
+        <artifactId>event-stream-processing-microservices</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <modules>
+        <module>warehouse-web</module>
+    </modules>
+
+
+    <dependencies>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/warehouse-parent/warehouse-web/pom.xml b/warehouse-parent/warehouse-web/pom.xml
new file mode 100644
index 0000000..1d0575a
--- /dev/null
+++ b/warehouse-parent/warehouse-web/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>warehouse-web</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>│   │   └── warehouse-web</name>
+
+    <parent>
+        <groupId>org.kbastani</groupId>
+        <artifactId>warehouse-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/microservices-parent/warehouse-service/src/main/java/demo/WarehouseServiceApplication.java b/warehouse-parent/warehouse-web/src/main/java/demo/WarehouseServiceApplication.java
similarity index 100%
rename from microservices-parent/warehouse-service/src/main/java/demo/WarehouseServiceApplication.java
rename to warehouse-parent/warehouse-web/src/main/java/demo/WarehouseServiceApplication.java
diff --git a/microservices-parent/warehouse-service/src/main/resources/application.properties b/warehouse-parent/warehouse-web/src/main/resources/application.properties
similarity index 100%
rename from microservices-parent/warehouse-service/src/main/resources/application.properties
rename to warehouse-parent/warehouse-web/src/main/resources/application.properties
diff --git a/microservices-parent/warehouse-service/src/test/java/demo/WarehouseServiceApplicationTests.java b/warehouse-parent/warehouse-web/src/test/java/demo/WarehouseServiceApplicationTests.java
similarity index 100%
rename from microservices-parent/warehouse-service/src/test/java/demo/WarehouseServiceApplicationTests.java
rename to warehouse-parent/warehouse-web/src/test/java/demo/WarehouseServiceApplicationTests.java