diff --git a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/controllers/MainController.java b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/controllers/MainController.java
similarity index 83%
rename from messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/controllers/MainController.java
rename to messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/controllers/MainController.java
index 8d466de5..75552dcd 100644
--- a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/controllers/MainController.java
+++ b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/controllers/MainController.java
@@ -1,9 +1,9 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.controllers;
+package nawaphon.microservices.messaging.controllers;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import nawaphon.microservices.messaging.event_sourcing.producer.pojo.Message;
-import nawaphon.microservices.messaging.event_sourcing.producer.pojo.ResponseMessage;
+import nawaphon.microservices.messaging.pojo.Message;
+import nawaphon.microservices.messaging.pojo.ResponseMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
diff --git a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Customer.java b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/Customer.java
similarity index 83%
rename from messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Customer.java
rename to messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/Customer.java
index 79911297..cb3fe0c0 100644
--- a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Customer.java
+++ b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/Customer.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.pojo;
import java.util.UUID;
diff --git a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/CustomerDetail.java b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/CustomerDetail.java
similarity index 89%
rename from messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/CustomerDetail.java
rename to messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/CustomerDetail.java
index 30259754..6a4d835a 100644
--- a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/CustomerDetail.java
+++ b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/CustomerDetail.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.pojo;
import java.util.UUID;
diff --git a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Message.java b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/Message.java
similarity index 83%
rename from messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Message.java
rename to messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/Message.java
index ec208f25..97f9712d 100644
--- a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Message.java
+++ b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/Message.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.pojo;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/ResponseMessage.java b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/ResponseMessage.java
similarity index 87%
rename from messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/ResponseMessage.java
rename to messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/ResponseMessage.java
index 8b657a57..459ade2b 100644
--- a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/ResponseMessage.java
+++ b/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/pojo/ResponseMessage.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.pojo;
public class ResponseMessage {
diff --git a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/ReceiverApplication.java b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/ReceiverApplication.java
similarity index 81%
rename from messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/ReceiverApplication.java
rename to messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/ReceiverApplication.java
index 0b67cbc4..17ff6281 100644
--- a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/ReceiverApplication.java
+++ b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/ReceiverApplication.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer;
+package nawaphon.microservices.messaging.rest;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/components/FakeDatabaseComponent.java b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/components/FakeDatabaseComponent.java
similarity index 92%
rename from messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/components/FakeDatabaseComponent.java
rename to messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/components/FakeDatabaseComponent.java
index 0137dfe6..234d81bc 100644
--- a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/components/FakeDatabaseComponent.java
+++ b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/components/FakeDatabaseComponent.java
@@ -1,9 +1,9 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.components;
+package nawaphon.microservices.messaging.rest.components;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import nawaphon.microservices.messaging.event_sourcing.producer.pojo.Customer;
-import nawaphon.microservices.messaging.event_sourcing.producer.pojo.CustomerDetail;
+import nawaphon.microservices.messaging.rest.pojo.Customer;
+import nawaphon.microservices.messaging.rest.pojo.CustomerDetail;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Component;
diff --git a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/controllers/MainController.java b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/controllers/MainController.java
similarity index 78%
rename from messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/controllers/MainController.java
rename to messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/controllers/MainController.java
index b43f39da..7b43844c 100644
--- a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/controllers/MainController.java
+++ b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/controllers/MainController.java
@@ -1,9 +1,9 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.controllers;
+package nawaphon.microservices.messaging.rest.controllers;
-import nawaphon.microservices.messaging.event_sourcing.producer.pojo.Customer;
-import nawaphon.microservices.messaging.event_sourcing.producer.pojo.CustomerDetail;
-import nawaphon.microservices.messaging.event_sourcing.producer.pojo.ResponseMessage;
-import nawaphon.microservices.messaging.event_sourcing.producer.components.FakeDatabaseComponent;
+import nawaphon.microservices.messaging.rest.pojo.Customer;
+import nawaphon.microservices.messaging.rest.pojo.CustomerDetail;
+import nawaphon.microservices.messaging.rest.pojo.ResponseMessage;
+import nawaphon.microservices.messaging.rest.components.FakeDatabaseComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
diff --git a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Customer.java b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/Customer.java
similarity index 83%
rename from messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Customer.java
rename to messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/Customer.java
index 79911297..e07d3431 100644
--- a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Customer.java
+++ b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/Customer.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.rest.pojo;
import java.util.UUID;
diff --git a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/CustomerDetail.java b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/CustomerDetail.java
similarity index 89%
rename from messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/CustomerDetail.java
rename to messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/CustomerDetail.java
index 30259754..52dc1a4e 100644
--- a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/CustomerDetail.java
+++ b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/CustomerDetail.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.rest.pojo;
import java.util.UUID;
diff --git a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Message.java b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/Message.java
similarity index 83%
rename from messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Message.java
rename to messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/Message.java
index ec208f25..cc3f885b 100644
--- a/messaging/event_sourcing/producer/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/Message.java
+++ b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/Message.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.rest.pojo;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/ResponseMessage.java b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/ResponseMessage.java
similarity index 87%
rename from messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/ResponseMessage.java
rename to messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/ResponseMessage.java
index 8b657a57..041bfdc1 100644
--- a/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/event_sourcing/producer/pojo/ResponseMessage.java
+++ b/messaging/rest/receiver/src/main/java/nawaphon/microservices/messaging/rest/pojo/ResponseMessage.java
@@ -1,4 +1,4 @@
-package nawaphon.microservices.messaging.event_sourcing.producer.pojo;
+package nawaphon.microservices.messaging.rest.pojo;
public class ResponseMessage {