diff --git a/exchange-service/pom.xml b/exchange-service/pom.xml
index 33198a153..7b4969d96 100644
--- a/exchange-service/pom.xml
+++ b/exchange-service/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.intellibucket.onnetwork</groupId>
+    <groupId>com.intellibucket.onnetwork.exchange</groupId>
     <artifactId>exchange-service</artifactId>
 
     <properties>
@@ -47,14 +47,14 @@
             <artifactId>connect-json</artifactId>
             <version>3.5.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.slf4j</groupId>-->
+        <!--            <artifactId>slf4j-simple</artifactId>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.slf4j</groupId>-->
+        <!--            <artifactId>slf4j-api</artifactId>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>az.rock.lib</groupId>
             <artifactId>rock-exception</artifactId>
@@ -63,5 +63,15 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <version>1.62.2</version>
+        </dependency>
+        <dependency>
+            <groupId>net.devh</groupId>
+            <artifactId>grpc-client-spring-boot-starter</artifactId>
+            <version>3.0.0.RELEASE</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/application/api/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/application/api/package-info.java
deleted file mode 100644
index 41d3694df..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/application/api/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.application.api;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/application/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/application/package-info.java
deleted file mode 100644
index 87d5349d6..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/application/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.application;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/application/spec/ExchangeSpec.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/application/spec/ExchangeSpec.java
deleted file mode 100644
index 14bf0d195..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/application/spec/ExchangeSpec.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.intellibucket.onnetwork.application.spec;
-
-public interface ExchangeSpec {
-}
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/dataaccess/model/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/dataaccess/model/package-info.java
deleted file mode 100644
index ab6b59c27..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/dataaccess/model/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.dataaccess.model;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/dataaccess/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/dataaccess/package-info.java
deleted file mode 100644
index 8e954f28f..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/dataaccess/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.dataaccess;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/core/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/core/package-info.java
deleted file mode 100644
index 603383dee..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/core/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.domain.core;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/package-info.java
deleted file mode 100644
index 5689ecd1a..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.domain;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/config/AsyncConfig.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/config/AsyncConfig.java
deleted file mode 100644
index 24df77d9b..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/config/AsyncConfig.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.intellibucket.onnetwork.domain.presentation.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-@Configuration
-@EnableAsync
-public class AsyncConfig {
-}
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/config/SchedulerConfig.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/config/SchedulerConfig.java
deleted file mode 100644
index 6212b4509..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/config/SchedulerConfig.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.intellibucket.onnetwork.domain.presentation.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@Configuration
-@EnableScheduling
-public class SchedulerConfig {
-}
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/exception/ExchangeJRuntimeException.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/exception/ExchangeJRuntimeException.java
deleted file mode 100644
index db36e429d..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/exception/ExchangeJRuntimeException.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.intellibucket.onnetwork.domain.presentation.exception;
-
-import az.rock.lib.jexception.JRuntimeException;
-
-public class ExchangeJRuntimeException extends JRuntimeException {
-}
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/package-info.java
deleted file mode 100644
index edfecf194..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.domain.presentation;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/input/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/input/package-info.java
deleted file mode 100644
index 9ffa85099..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/input/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.domain.presentation.ports.input;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/input/services/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/input/services/package-info.java
deleted file mode 100644
index a1b163952..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/input/services/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.domain.presentation.ports.input.services;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/package-info.java
deleted file mode 100644
index c2e9803fa..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/domain/presentation/ports/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.domain.presentation.ports;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/ExchangeServiceApplication.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/ExchangeServiceApplication.java
similarity index 75%
rename from exchange-service/src/main/java/com/intellibucket/onnetwork/ExchangeServiceApplication.java
rename to exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/ExchangeServiceApplication.java
index 2b2b2d4e0..e74308915 100644
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/ExchangeServiceApplication.java
+++ b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/ExchangeServiceApplication.java
@@ -1,11 +1,13 @@
-package com.intellibucket.onnetwork;
+package com.intellibucket.onnetwork.exchange;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
 @EnableDiscoveryClient
+@ServletComponentScan
 public class ExchangeServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(ExchangeServiceApplication.class, args);
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/abstracts/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/abstracts/package-info.java
new file mode 100644
index 000000000..477d6f214
--- /dev/null
+++ b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/abstracts/package-info.java
@@ -0,0 +1 @@
+package com.intellibucket.onnetwork.exchange.messaging.abstracts;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/concretes/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/concretes/package-info.java
new file mode 100644
index 000000000..d8e86c750
--- /dev/null
+++ b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/concretes/package-info.java
@@ -0,0 +1 @@
+package com.intellibucket.onnetwork.exchange.messaging.concretes;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/package-info.java
new file mode 100644
index 000000000..2e2a5a77c
--- /dev/null
+++ b/exchange-service/src/main/java/com/intellibucket/onnetwork/exchange/messaging/package-info.java
@@ -0,0 +1 @@
+package com.intellibucket.onnetwork.exchange.messaging;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/abstracts/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/abstracts/package-info.java
deleted file mode 100644
index 20211e862..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/abstracts/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.messaging.abstracts;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/concretes/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/concretes/package-info.java
deleted file mode 100644
index 84f95015d..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/concretes/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.messaging.concretes;
\ No newline at end of file
diff --git a/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/package-info.java b/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/package-info.java
deleted file mode 100644
index 25e5afb1c..000000000
--- a/exchange-service/src/main/java/com/intellibucket/onnetwork/messaging/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.intellibucket.onnetwork.messaging;
\ No newline at end of file