From 8e02787d33d9892da31b5f7c408e731e318f6abf Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Sun, 17 Dec 2017 11:52:07 +0800
Subject: [PATCH] Move agent grpc and jetty module into apm-collector-agent
 module.

---
 .../json/application-register-consumer.json   |  3 -
 .../json/application-register-provider.json   |  3 -
 .../test/resources/json/dubbox-consumer.json  | 71 -------------------
 .../test/resources/json/dubbox-provider.json  | 67 -----------------
 .../json/instance-register-consumer.json      |  9 ---
 .../json/instance-register-provider.json      |  9 ---
 .../json/servicename-register-consumer.json   |  6 --
 .../json/servicename-register-provider.json   |  6 --
 .../agent-grpc/agent-grpc-define}/pom.xml     |  8 +--
 .../agent/grpc/define}/AgentGRPCModule.java   |  2 +-
 ...kywalking.apm.collector.core.module.Module |  3 +-
 .../agent-grpc/agent-grpc-provider}/pom.xml   | 16 ++---
 .../provider}/AgentModuleGRPCProvider.java    | 27 ++++---
 .../AgentModuleGRPCRegistration.java          |  2 +-
 .../ApplicationRegisterServiceHandler.java    |  2 +-
 ...icationRegisterServiceHandlerTestCase.java |  2 +-
 .../InstanceDiscoveryServiceHandler.java      |  2 +-
 .../handler/JVMMetricsServiceHandler.java     |  2 +-
 .../ServiceNameDiscoveryServiceHandler.java   |  2 +-
 .../handler/TraceSegmentServiceHandler.java   |  2 +-
 .../naming/AgentGRPCNamingHandler.java        |  2 +-
 .../naming/AgentGRPCNamingListener.java       |  4 +-
 ...g.apm.collector.core.module.ModuleProvider |  3 +-
 .../agent-grpc}/pom.xml                       | 17 ++---
 .../agent-jetty/agent-jetty-define}/pom.xml   |  8 +--
 .../agent/jetty/define}/AgentJettyModule.java |  3 +-
 ...kywalking.apm.collector.core.module.Module |  3 +-
 .../agent-jetty/agent-jetty-provider}/pom.xml | 15 ++--
 .../provider}/AgentModuleJettyProvider.java   | 27 ++++---
 .../AgentModuleJettyRegistration.java         |  2 +-
 .../handler/ApplicationRegisterPost.java      |  2 +-
 .../ApplicationRegisterServletHandler.java    |  2 +-
 .../provider}/handler/HttpClientTools.java    |  2 +-
 .../InstanceDiscoveryServletHandler.java      |  2 +-
 .../handler/InstanceRegisterPost.java         |  2 +-
 .../provider}/handler/JsonFileReader.java     |  2 +-
 .../jetty/provider}/handler/SegmentPost.java  |  2 +-
 .../ServiceNameDiscoveryServiceHandler.java   |  2 +-
 .../handler/ServiceNameRegisterPost.java      |  2 +-
 .../handler/TraceSegmentServletHandler.java   |  6 +-
 .../naming/AgentJettyNamingHandler.java       |  2 +-
 .../naming/AgentJettyNamingListener.java      |  4 +-
 .../reader/KeyWithStringValueJsonReader.java  |  2 +-
 .../handler/reader/LogJsonReader.java         |  2 +-
 .../handler/reader/ReferenceJsonReader.java   |  2 +-
 .../handler/reader/SegmentJsonReader.java     |  2 +-
 .../handler/reader/SpanJsonReader.java        |  2 +-
 .../handler/reader/StreamJsonReader.java      |  2 +-
 .../handler/reader/TraceSegment.java          |  2 +-
 .../reader/TraceSegmentJsonReader.java        |  2 +-
 .../handler/reader/UniqueIdJsonReader.java    |  2 +-
 ...g.apm.collector.core.module.ModuleProvider |  3 +-
 .../apm-collector-agent/agent-jetty/pom.xml   | 38 ++++++++++
 .../pom.xml                                   |  8 +--
 apm-collector/apm-collector-analysis/pom.xml  | 33 +++++++++
 .../apm-collector-boot/docker/log4j2.xml      |  2 +-
 apm-collector/apm-collector-boot/pom.xml      |  4 +-
 .../src/main/assembly/log4j2.xml              |  2 +-
 .../src/main/resources/log4j2.xml             |  2 +-
 apm-collector/pom.xml                         |  4 +-
 60 files changed, 172 insertions(+), 300 deletions(-)
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json
 delete mode 100644 apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-define => apm-collector-agent/agent-grpc/agent-grpc-define}/pom.xml (88%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define}/AgentGRPCModule.java (94%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-define => apm-collector-agent/agent-grpc/agent-grpc-define}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module (91%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider => apm-collector-agent/agent-grpc/agent-grpc-provider}/pom.xml (82%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/AgentModuleGRPCProvider.java (81%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/AgentModuleGRPCRegistration.java (95%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/ApplicationRegisterServiceHandler.java (97%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/ApplicationRegisterServiceHandlerTestCase.java (96%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/InstanceDiscoveryServiceHandler.java (98%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/JVMMetricsServiceHandler.java (98%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/ServiceNameDiscoveryServiceHandler.java (97%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/TraceSegmentServiceHandler.java (97%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/naming/AgentGRPCNamingHandler.java (95%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc => apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider}/handler/naming/AgentGRPCNamingListener.java (89%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-provider => apm-collector-agent/agent-grpc/agent-grpc-provider}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider (90%)
 rename apm-collector/{apm-collector-agent-jetty => apm-collector-agent/agent-grpc}/pom.xml (73%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-define => apm-collector-agent/agent-jetty/agent-jetty-define}/pom.xml (88%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define}/AgentJettyModule.java (94%)
 rename apm-collector/{apm-collector-agent-grpc/collector-agent-grpc-define => apm-collector-agent/agent-jetty/agent-jetty-define}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module (91%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider => apm-collector-agent/agent-jetty/agent-jetty-provider}/pom.xml (83%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/AgentModuleJettyProvider.java (83%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/AgentModuleJettyRegistration.java (95%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/ApplicationRegisterPost.java (94%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/ApplicationRegisterServletHandler.java (97%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/HttpClientTools.java (97%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/InstanceDiscoveryServletHandler.java (97%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/InstanceRegisterPost.java (94%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/JsonFileReader.java (95%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/SegmentPost.java (96%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/ServiceNameDiscoveryServiceHandler.java (97%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/ServiceNameRegisterPost.java (94%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/TraceSegmentServletHandler.java (91%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/naming/AgentJettyNamingHandler.java (95%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/naming/AgentJettyNamingListener.java (88%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/KeyWithStringValueJsonReader.java (95%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/LogJsonReader.java (95%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/ReferenceJsonReader.java (97%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/SegmentJsonReader.java (97%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/SpanJsonReader.java (98%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/StreamJsonReader.java (92%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/TraceSegment.java (95%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/TraceSegmentJsonReader.java (96%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider}/handler/reader/UniqueIdJsonReader.java (94%)
 rename apm-collector/{apm-collector-agent-jetty/collector-agent-jetty-provider => apm-collector-agent/agent-jetty/agent-jetty-provider}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider (90%)
 create mode 100644 apm-collector/apm-collector-agent/agent-jetty/pom.xml
 rename apm-collector/{apm-collector-agent-grpc => apm-collector-agent}/pom.xml (90%)
 create mode 100644 apm-collector/apm-collector-analysis/pom.xml

diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json
deleted file mode 100644
index b7f2436357..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-  "dubbox-consumer"
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json
deleted file mode 100644
index 08a2c156bc..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-  "dubbox-provider"
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json
deleted file mode 100644
index 453dce3ebe..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
-  {
-    "gt": [
-      [
-        230150,
-        185809,
-        24040000
-      ]
-    ],
-    "sg": {
-      "ts": [
-        230150,
-        185809,
-        24040000
-      ],
-      "ai": -1,
-      "ii": 1,
-      "rs": [],
-      "ss": [
-        {
-          "si": 1,
-          "tv": 1,
-          "lv": 1,
-          "ps": 0,
-          "st": 1501858094526,
-          "et": 1501858097004,
-          "ci": 3,
-          "cn": "",
-          "oi": 0,
-          "on": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()",
-          "pi": 0,
-          "pn": "172.25.0.4:20880",
-          "ie": false,
-          "to": [
-            {
-              "k": "url",
-              "v": "rest://172.25.0.4:20880/org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
-            }
-          ],
-          "lo": []
-        },
-        {
-          "si": 0,
-          "tv": 0,
-          "lv": 2,
-          "ps": -1,
-          "st": 1501858092409,
-          "et": 1501858097033,
-          "ci": 1,
-          "cn": "",
-          "oi": 0,
-          "on": "/dubbox-case/case/dubbox-rest",
-          "pi": 0,
-          "pn": "",
-          "ie": false,
-          "to": [
-            {
-              "k": "url",
-              "v": "http://localhost:18080/dubbox-case/case/dubbox-rest"
-            },
-            {
-              "k": "http.method",
-              "v": "GET"
-            }
-          ],
-          "lo": []
-        }
-      ]
-    }
-  }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json
deleted file mode 100644
index aba490792c..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  {
-    "gt": [
-      [
-        230150,
-        185809,
-        24040000
-      ]
-    ],
-    "sg": {
-      "ts": [
-        137150,
-        185809,
-        48780000
-      ],
-      "ai": 2,
-      "ii": 2,
-      "ss": [
-        {
-          "si": 0,
-          "tv": 0,
-          "lv": 2,
-          "ps": -1,
-          "st": 1501858094726,
-          "et": 1501858096804,
-          "ci": 3,
-          "cn": "",
-          "oi": 0,
-          "on": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()",
-          "pi": 0,
-          "pn": "",
-          "ie": false,
-          "rs": [
-            {
-              "ts": [
-                230150,
-                185809,
-                24040000
-              ],
-              "ai": -1,
-              "si": 1,
-              "vi": 0,
-              "vn": "/dubbox-case/case/dubbox-rest",
-              "ni": 0,
-              "nn": "172.25.0.4:20880",
-              "ea": 2,
-              "ei": 0,
-              "en": "/dubbox-case/case/dubbox-rest",
-              "rn": 0
-            }
-          ],
-          "to": [
-            {
-              "k": "url",
-              "v": "rest://172.25.0.4:20880/org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
-            },
-            {
-              "k": "http.method",
-              "v": "GET"
-            }
-          ],
-          "lo": []
-        }
-      ]
-    }
-  }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json
deleted file mode 100644
index 139dc57438..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ai": -1,
-  "au": "dubbox-consumer",
-  "rt": 1501858094526,
-  "oi": {
-    "any_name": "any_value",
-    "any_name1": "any_value1"
-  }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json
deleted file mode 100644
index 976928f9ca..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "ai": 2,
-  "au": "dubbox-provider",
-  "rt": 1501858094526,
-  "oi": {
-    "any_name": "any_value",
-    "any_name1": "any_value1"
-  }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json
deleted file mode 100644
index 9cc919204c..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "ai": -1,
-    "sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
-  }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json
deleted file mode 100644
index 0e9a961532..0000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "ai": 2,
-    "sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
-  }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml
similarity index 88%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml
index 7a9fe60c10..cc1cc4269b 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml
@@ -21,13 +21,13 @@
          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>apm-collector-agent-grpc</artifactId>
+        <artifactId>agent-grpc</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-agent-grpc-define</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>agent-grpc-define</artifactId>
 
-</project>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java
similarity index 94%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java
index 02323f3878..8878c3fb9c 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc;
+package org.apache.skywalking.apm.collector.agent.grpc.define;
 
 import org.apache.skywalking.apm.collector.core.module.Module;
 
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
similarity index 91%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
index 1234d192e3..502c70faae 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
@@ -16,5 +16,4 @@
 #
 #
 
-
-org.apache.skywalking.apm.collector.agent.jetty.AgentJettyModule
+org.apache.skywalking.apm.collector.agent.grpc.define.AgentGRPCModule
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
similarity index 82%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
index 83df2b3604..111390e65b 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
@@ -21,24 +21,18 @@
          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>apm-collector-agent-grpc</artifactId>
+        <artifactId>agent-grpc</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-agent-grpc-provider</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>agent-grpc-provider</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-agent-grpc-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-grpc-manager-define</artifactId>
+            <artifactId>agent-grpc-define</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -53,8 +47,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-agent-stream-define</artifactId>
+            <artifactId>collector-grpc-manager-define</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java
similarity index 81%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java
index 114a31f8c4..d349b3ef61 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java
@@ -16,28 +16,27 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.agent.grpc;
+package org.apache.skywalking.apm.collector.agent.grpc.provider;
 
 import java.util.Properties;
-import org.apache.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingListener;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.naming.NamingModule;
-import org.apache.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
-import org.apache.skywalking.apm.collector.agent.grpc.handler.ApplicationRegisterServiceHandler;
-import org.apache.skywalking.apm.collector.agent.grpc.handler.InstanceDiscoveryServiceHandler;
-import org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler;
-import org.apache.skywalking.apm.collector.agent.grpc.handler.ServiceNameDiscoveryServiceHandler;
-import org.apache.skywalking.apm.collector.agent.grpc.handler.TraceSegmentServiceHandler;
-import org.apache.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingHandler;
-import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
+import org.apache.skywalking.apm.collector.agent.grpc.define.AgentGRPCModule;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.ApplicationRegisterServiceHandler;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.InstanceDiscoveryServiceHandler;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.ServiceNameDiscoveryServiceHandler;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.TraceSegmentServiceHandler;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming.AgentGRPCNamingHandler;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming.AgentGRPCNamingListener;
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
 import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
 import org.apache.skywalking.apm.collector.grpc.manager.GRPCManagerModule;
 import org.apache.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
+import org.apache.skywalking.apm.collector.naming.NamingModule;
+import org.apache.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
 import org.apache.skywalking.apm.collector.server.Server;
 
 /**
@@ -86,7 +85,7 @@ public class AgentModuleGRPCProvider extends ModuleProvider {
     }
 
     @Override public String[] requiredModules() {
-        return new String[] {ClusterModule.NAME, NamingModule.NAME, GRPCManagerModule.NAME, AgentStreamModule.NAME};
+        return new String[] {ClusterModule.NAME, NamingModule.NAME, GRPCManagerModule.NAME};
     }
 
     private void addHandlers(Server gRPCServer) {
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistration.java
similarity index 95%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistration.java
index d82f06b3a2..cf49deaa2a 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistration.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc;
+package org.apache.skywalking.apm.collector.agent.grpc.provider;
 
 import org.apache.skywalking.apm.collector.cluster.ModuleRegistration;
 import org.apache.skywalking.apm.collector.core.util.Const;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java
similarity index 97%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java
index b4aab258f7..efb139ee89 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler;
 
 import com.google.protobuf.ProtocolStringList;
 import io.grpc.stub.StreamObserver;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java
similarity index 96%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java
index 4abdd900fb..5e67abdbfd 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java
similarity index 98%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java
index 99fa6565b2..5ff4a26024 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
similarity index 98%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
index 88f3f500e9..079a5c9c56 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler;
 
 import io.grpc.stub.StreamObserver;
 import java.util.List;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
similarity index 97%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
index a83b70d2af..7cf381f60e 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler;
 
 import io.grpc.stub.StreamObserver;
 import java.util.List;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java
similarity index 97%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java
index 6d365f99e2..52bead8c8c 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler;
 
 import io.grpc.stub.StreamObserver;
 import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingHandler.java
similarity index 95%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingHandler.java
index a0bb48ad88..3d5ce31f2f 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler.naming;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java
similarity index 89%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java
index a8be523f73..4125895229 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java
@@ -17,10 +17,10 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.grpc.handler.naming;
+package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming;
 
 import org.apache.skywalking.apm.collector.agent.grpc.AgentGRPCModule;
-import org.apache.skywalking.apm.collector.agent.grpc.AgentModuleGRPCProvider;
+import org.apache.skywalking.apm.collector.agent.grpc.provider.AgentModuleGRPCProvider;
 import org.apache.skywalking.apm.collector.cluster.ClusterModuleListener;
 
 /**
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
similarity index 90%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
index 4eb9a529c0..c32b4c9379 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
@@ -16,5 +16,4 @@
 #
 #
 
-
-org.apache.skywalking.apm.collector.agent.grpc.AgentModuleGRPCProvider
+org.apache.skywalking.apm.collector.agent.grpc.provider.AgentModuleGRPCProvider
diff --git a/apm-collector/apm-collector-agent-jetty/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/pom.xml
similarity index 73%
rename from apm-collector/apm-collector-agent-jetty/pom.xml
rename to apm-collector/apm-collector-agent/agent-grpc/pom.xml
index 887eb259fb..c411f4f72f 100644
--- a/apm-collector/apm-collector-agent-jetty/pom.xml
+++ b/apm-collector/apm-collector-agent/agent-grpc/pom.xml
@@ -21,24 +21,17 @@
          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>apm-collector</artifactId>
+        <artifactId>apm-collector-agent</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>apm-collector-agent-jetty</artifactId>
+    <artifactId>agent-grpc</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>collector-agent-jetty-define</module>
-        <module>collector-agent-jetty-provider</module>
+        <module>agent-grpc-define</module>
+        <module>agent-grpc-provider</module>
     </modules>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-collector-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml
similarity index 88%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml
index 68bae50c05..6a54c7f622 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml
@@ -21,13 +21,13 @@
          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>apm-collector-agent-jetty</artifactId>
+        <artifactId>agent-jetty</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-agent-jetty-define</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>agent-jetty-define</artifactId>
 
-</project>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentJettyModule.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java
similarity index 94%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentJettyModule.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java
index 970b72a265..125baf2ab9 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentJettyModule.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java
@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.agent.jetty;
+package org.apache.skywalking.apm.collector.agent.jetty.define;
 
 import org.apache.skywalking.apm.collector.core.module.Module;
 
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
similarity index 91%
rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
index ec8255a672..24ac5122eb 100644
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
@@ -16,5 +16,4 @@
 #
 #
 
-
-org.apache.skywalking.apm.collector.agent.grpc.AgentGRPCModule
+org.apache.skywalking.apm.collector.agent.jetty.define.AgentJettyModule
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml
similarity index 83%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml
index 6060eadca6..058fc884d2 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml
@@ -21,24 +21,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>apm-collector-agent-jetty</artifactId>
+        <artifactId>agent-jetty</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-agent-jetty-provider</artifactId>
+    <artifactId>agent-jetty-provider</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-agent-jetty-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-jetty-manager-define</artifactId>
+            <artifactId>agent-jetty-define</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -53,8 +48,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-agent-stream-define</artifactId>
+            <artifactId>collector-jetty-manager-define</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java
similarity index 83%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java
index 4ed4cb16a6..8ca30e5851 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java
@@ -16,28 +16,27 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.agent.jetty;
+package org.apache.skywalking.apm.collector.agent.jetty.provider;
 
 import java.util.Properties;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.TraceSegmentServletHandler;
-import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
+import org.apache.skywalking.apm.collector.agent.jetty.define.AgentJettyModule;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.ApplicationRegisterServletHandler;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.InstanceDiscoveryServletHandler;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.ServiceNameDiscoveryServiceHandler;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.TraceSegmentServletHandler;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming.AgentJettyNamingHandler;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming.AgentJettyNamingListener;
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
+import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
+import org.apache.skywalking.apm.collector.core.module.Module;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.jetty.manager.JettyManagerModule;
+import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
 import org.apache.skywalking.apm.collector.naming.NamingModule;
 import org.apache.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
 import org.apache.skywalking.apm.collector.server.Server;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.ApplicationRegisterServletHandler;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.InstanceDiscoveryServletHandler;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.ServiceNameDiscoveryServiceHandler;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingHandler;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingListener;
-import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.jetty.manager.JettyManagerModule;
-import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
 
 /**
  * @author peng-yongsheng
@@ -86,7 +85,7 @@ public class AgentModuleJettyProvider extends ModuleProvider {
     }
 
     @Override public String[] requiredModules() {
-        return new String[] {ClusterModule.NAME, NamingModule.NAME, JettyManagerModule.NAME, AgentStreamModule.NAME};
+        return new String[] {ClusterModule.NAME, NamingModule.NAME, JettyManagerModule.NAME};
     }
 
     private void addHandlers(Server jettyServer) {
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyRegistration.java
similarity index 95%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyRegistration.java
index 11cc7e1229..d8a55c91d0 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyRegistration.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty;
+package org.apache.skywalking.apm.collector.agent.jetty.provider;
 
 import org.apache.skywalking.apm.collector.cluster.ModuleRegistration;
 
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterPost.java
similarity index 94%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterPost.java
index 6169d090e9..b023bc2bd5 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterPost.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.JsonElement;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java
similarity index 97%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java
index ad757598fb..31cb368b28 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/HttpClientTools.java
similarity index 97%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/HttpClientTools.java
index 022c0bf6e5..3dec5869b5 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/HttpClientTools.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java
similarity index 97%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java
index 467227dacb..8839e97c22 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceRegisterPost.java
similarity index 94%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceRegisterPost.java
index dbc1b69479..33cb3f63d0 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceRegisterPost.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.JsonElement;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/JsonFileReader.java
similarity index 95%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/JsonFileReader.java
index a133682196..b8e646dbbb 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/JsonFileReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/SegmentPost.java
similarity index 96%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/SegmentPost.java
index 8551e9c201..40fbf24806 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/SegmentPost.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.JsonElement;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
similarity index 97%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
index fbbfdd31cd..b395682a7c 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameRegisterPost.java
similarity index 94%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameRegisterPost.java
index 66e3d70dcf..7ea2b61226 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameRegisterPost.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.JsonElement;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java
similarity index 91%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java
index 40ff15d53e..495f5bfd54 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java
@@ -17,15 +17,15 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
 
 import com.google.gson.JsonElement;
 import com.google.gson.stream.JsonReader;
 import java.io.BufferedReader;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegment;
-import org.apache.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegmentJsonReader;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader.TraceSegment;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader.TraceSegmentJsonReader;
 import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
 import org.apache.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingHandler.java
similarity index 95%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingHandler.java
index cf64bffc74..cf63350028 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingHandler.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.naming;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java
similarity index 88%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java
index 12253abef0..ada3f16e3f 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java
@@ -17,10 +17,10 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.naming;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming;
 
 import org.apache.skywalking.apm.collector.agent.jetty.AgentJettyModule;
-import org.apache.skywalking.apm.collector.agent.jetty.AgentModuleJettyProvider;
+import org.apache.skywalking.apm.collector.agent.jetty.provider.AgentModuleJettyProvider;
 import org.apache.skywalking.apm.collector.cluster.ClusterModuleListener;
 
 /**
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java
similarity index 95%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java
index 353eb30654..f2b129791b 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java
similarity index 95%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java
index 7a958c4315..be9d718431 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java
similarity index 97%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java
index 7f6bd72172..8ddbfba0fe 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java
similarity index 97%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java
index 21fadb1479..c6d8b98128 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java
similarity index 98%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java
index f8aaea82e7..111ea1a72c 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/StreamJsonReader.java
similarity index 92%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/StreamJsonReader.java
index 725ed10a77..0b757c4ce7 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/StreamJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java
similarity index 95%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java
index 9ebb8f2333..c53c4b6422 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import org.apache.skywalking.apm.network.proto.TraceSegmentObject;
 import org.apache.skywalking.apm.network.proto.UniqueId;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java
similarity index 96%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java
index 333cd950c0..b11125ebb9 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java
similarity index 94%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java
index eb7fb80a63..54d0c32dc7 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
+package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
 
 import com.google.gson.stream.JsonReader;
 import java.io.IOException;
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
similarity index 90%
rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
index b353e54334..d481e10a69 100644
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider
@@ -16,5 +16,4 @@
 #
 #
 
-
-org.apache.skywalking.apm.collector.agent.jetty.AgentModuleJettyProvider
+org.apache.skywalking.apm.collector.agent.jetty.provider.AgentModuleJettyProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent/agent-jetty/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/pom.xml
new file mode 100644
index 0000000000..9ad00a5242
--- /dev/null
+++ b/apm-collector/apm-collector-agent/agent-jetty/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<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>apm-collector-agent</artifactId>
+        <groupId>org.apache.skywalking</groupId>
+        <version>5.0.0-alpha</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>agent-jetty</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>agent-jetty-define</module>
+        <module>agent-jetty-provider</module>
+    </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-grpc/pom.xml b/apm-collector/apm-collector-agent/pom.xml
similarity index 90%
rename from apm-collector/apm-collector-agent-grpc/pom.xml
rename to apm-collector/apm-collector-agent/pom.xml
index 286102764f..72c071e24f 100644
--- a/apm-collector/apm-collector-agent-grpc/pom.xml
+++ b/apm-collector/apm-collector-agent/pom.xml
@@ -27,11 +27,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>apm-collector-agent-grpc</artifactId>
+    <artifactId>apm-collector-agent</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>collector-agent-grpc-define</module>
-        <module>collector-agent-grpc-provider</module>
+        <module>agent-grpc</module>
+        <module>agent-jetty</module>
     </modules>
 
     <dependencies>
@@ -41,4 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-analysis/pom.xml b/apm-collector/apm-collector-analysis/pom.xml
new file mode 100644
index 0000000000..397062a434
--- /dev/null
+++ b/apm-collector/apm-collector-analysis/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<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>apm-collector</artifactId>
+        <groupId>org.apache.skywalking</groupId>
+        <version>5.0.0-alpha</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-analysis</artifactId>
+
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-boot/docker/log4j2.xml b/apm-collector/apm-collector-boot/docker/log4j2.xml
index 50b77b8d75..25f53accdb 100644
--- a/apm-collector/apm-collector-boot/docker/log4j2.xml
+++ b/apm-collector/apm-collector-boot/docker/log4j2.xml
@@ -26,7 +26,7 @@
     <Loggers>
         <logger name="org.eclipse.jetty" level="INFO"/>
         <logger name="org.apache.zookeeper" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler" level="INFO"/>
+        <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
         <logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty" level="INFO"/>
         <Root level="info">
diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml
index 937603435e..f399d3de50 100644
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -87,14 +87,14 @@
         <!-- agent gRPC provider -->
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-agent-grpc-provider</artifactId>
+            <artifactId>agent-grpc-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!-- agent gRPC provider -->
         <!-- agent jetty provider -->
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-agent-jetty-provider</artifactId>
+            <artifactId>agent-jetty-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!-- agent jetty provider -->
diff --git a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
index e85143ff63..8a9358e9d0 100644
--- a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
+++ b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
@@ -36,7 +36,7 @@
     <Loggers>
         <logger name="org.eclipse.jetty" level="INFO"/>
         <logger name="org.apache.zookeeper" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler" level="INFO"/>
+        <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
         <logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty" level="INFO"/>
         <Root level="info">
diff --git a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
index 90ce682c81..c40fb0d4b9 100644
--- a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
+++ b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
@@ -27,7 +27,7 @@
         <logger name="org.eclipse.jetty" level="INFO"/>
         <logger name="org.apache.zookeeper" level="INFO"/>
         <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler" level="INFO"/>
+        <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
         <logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty" level="INFO"/>
         <Root level="debug">
diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml
index 93c9486c2a..7ead1aa570 100644
--- a/apm-collector/pom.xml
+++ b/apm-collector/pom.xml
@@ -46,11 +46,11 @@
         <module>apm-collector-queue</module>
         <module>apm-collector-instrument</module>
         <module>apm-collector-baseline</module>
-        <module>apm-collector-agent-grpc</module>
-        <module>apm-collector-agent-jetty</module>
         <module>apm-collector-agent-stream</module>
         <module>apm-collector-alerting</module>
         <module>apm-collector-configuration</module>
+        <module>apm-collector-agent</module>
+        <module>apm-collector-analysis</module>
     </modules>
 
     <dependencies>
-- 
GitLab