diff --git a/apm-collector/apm-collector-agent/agent-jvm/pom.xml b/apm-collector/apm-collector-agent/agent-jvm/pom.xml
new file mode 100644
index 000000000..efdeb599a
--- /dev/null
+++ b/apm-collector/apm-collector-agent/agent-jvm/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-agent</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>agent-jvm</artifactId>
+    <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent/agent-register/pom.xml b/apm-collector/apm-collector-agent/agent-register/pom.xml
new file mode 100644
index 000000000..02757eb1d
--- /dev/null
+++ b/apm-collector/apm-collector-agent/agent-register/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-agent</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>agent-register</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent/agent-tracing/pom.xml b/apm-collector/apm-collector-agent/agent-tracing/pom.xml
new file mode 100644
index 000000000..74854e533
--- /dev/null
+++ b/apm-collector/apm-collector-agent/agent-tracing/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-agent</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>agent-tracing</artifactId>
+    <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent/pom.xml b/apm-collector/apm-collector-agent/pom.xml
new file mode 100644
index 000000000..ea92cd8bf
--- /dev/null
+++ b/apm-collector/apm-collector-agent/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-agent</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>agent-jvm</module>
+        <module>agent-register</module>
+        <module>agent-tracing</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml
index 7fcd04518..9f6b7e9c7 100644
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -28,6 +28,5 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>apm-collector-boot</artifactId>
-
-
+    <packaging>jar</packaging>
 </project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java
index 8f2fa6f38..b6a489fbc 100644
--- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java
+++ b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBoot.java
@@ -18,5 +18,38 @@
 
 package org.skywalking.apm.collector.boot;
 
+import com.google.protobuf.InvalidProtocolBufferException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import org.skywalking.apm.network.proto.TraceSegmentObject;
+import org.skywalking.apm.network.proto.TraceSegmentReference;
+
 public class CollectorBoot {
+
+    public static void main(String[] args) throws InvalidProtocolBufferException, H2ClientException {
+        H2Client client = new H2Client("jdbc:h2:~/h2", "sa", "");
+        client.initialize();
+        try (ResultSet rs = client.executeQuery("select * from segment", null)) {
+            while (rs.next()) {
+                byte[] dataBinary = rs.getBytes("data_binary");
+                try {
+                    parse(dataBinary);
+                } catch (InvalidProtocolBufferException e) {
+                }
+            }
+        } catch (SQLException | H2ClientException e) {
+        }
+    }
+
+    public static void parse(byte[] dataBinary) throws InvalidProtocolBufferException {
+        TraceSegmentObject segmentObject = TraceSegmentObject.parseFrom(dataBinary);
+        for (TraceSegmentReference reference : segmentObject.getRefsList()) {
+            StringBuilder builder = new StringBuilder();
+            builder.append("entry: ").append(reference.getEntryApplicationInstanceId())
+                .append(" ,parent: ").append(reference.getParentApplicationInstanceId())
+                .append(" ,network: ").append(reference.getNetworkAddressId());
+            System.out.println(segmentObject.getApplicationId());
+            System.out.println(builder.toString());
+        }
+    }
 }
diff --git a/apm-collector/apm-collector-cache/pom.xml b/apm-collector/apm-collector-cache/pom.xml
new file mode 100644
index 000000000..5bc4af159
--- /dev/null
+++ b/apm-collector/apm-collector-cache/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-cache</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/pom.xml b/apm-collector/apm-collector-cluster/pom.xml
new file mode 100644
index 000000000..5b169089d
--- /dev/null
+++ b/apm-collector/apm-collector-cluster/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-cluster</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/client-component/pom.xml b/apm-collector/apm-collector-component/client-component/pom.xml
new file mode 100644
index 000000000..612a3a585
--- /dev/null
+++ b/apm-collector/apm-collector-component/client-component/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-component</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>client-component</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/persistence-component/pom.xml b/apm-collector/apm-collector-component/persistence-component/pom.xml
new file mode 100644
index 000000000..8095e0b1f
--- /dev/null
+++ b/apm-collector/apm-collector-component/persistence-component/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-component</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>persistence-component</artifactId>
+    <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/pom.xml b/apm-collector/apm-collector-component/pom.xml
new file mode 100644
index 000000000..353200d10
--- /dev/null
+++ b/apm-collector/apm-collector-component/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-component</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>client-component</module>
+        <module>server-component</module>
+        <module>queue-component</module>
+        <module>persistence-component</module>
+        <module>stream-component</module>
+        <module>remote-component</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/queue-component/pom.xml b/apm-collector/apm-collector-component/queue-component/pom.xml
new file mode 100644
index 000000000..166d4fcaa
--- /dev/null
+++ b/apm-collector/apm-collector-component/queue-component/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-component</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>queue-component</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/remote-component/pom.xml b/apm-collector/apm-collector-component/remote-component/pom.xml
new file mode 100644
index 000000000..5c17047d5
--- /dev/null
+++ b/apm-collector/apm-collector-component/remote-component/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-component</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>remote-component</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/server-component/pom.xml b/apm-collector/apm-collector-component/server-component/pom.xml
new file mode 100644
index 000000000..1664b0c9b
--- /dev/null
+++ b/apm-collector/apm-collector-component/server-component/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-component</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>server-component</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/stream-component/pom.xml b/apm-collector/apm-collector-component/stream-component/pom.xml
new file mode 100644
index 000000000..bb71c7470
--- /dev/null
+++ b/apm-collector/apm-collector-component/stream-component/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-component</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>stream-component</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-core/pom.xml b/apm-collector/apm-collector-core/pom.xml
new file mode 100644
index 000000000..92e2cf6af
--- /dev/null
+++ b/apm-collector/apm-collector-core/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-core</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ApplicationConfiguration.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ApplicationConfiguration.java
similarity index 97%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ApplicationConfiguration.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ApplicationConfiguration.java
index d0a7db7e4..9acba5a05 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ApplicationConfiguration.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ApplicationConfiguration.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.HashMap;
 import java.util.Properties;
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/DuplicateProviderException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/DuplicateProviderException.java
similarity index 94%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/DuplicateProviderException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/DuplicateProviderException.java
index 7997b0daf..a689dc415 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/DuplicateProviderException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/DuplicateProviderException.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 public class DuplicateProviderException extends Exception {
     public DuplicateProviderException(String message) {
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java
similarity index 98%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java
index 291a63eed..29f823c6d 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Module.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Module.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleManager.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleManager.java
similarity index 98%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleManager.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleManager.java
index 411eb830a..1a10e13cb 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleManager.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleManager.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleNotFoundException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleNotFoundException.java
similarity index 94%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleNotFoundException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleNotFoundException.java
index d08820fda..6c6ad4a49 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleNotFoundException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleNotFoundException.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 public class ModuleNotFoundException extends Exception {
 
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java
similarity index 98%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java
index 6c82aced2..5c3315bdf 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ModuleProvider.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ProviderNotFoundException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ProviderNotFoundException.java
similarity index 94%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ProviderNotFoundException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ProviderNotFoundException.java
index a19b75ad8..aa037fbc6 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ProviderNotFoundException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ProviderNotFoundException.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 public class ProviderNotFoundException extends Exception {
     public ProviderNotFoundException(String message) {
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Service.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Service.java
similarity index 94%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Service.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Service.java
index 14666f2a4..18a1f4f08 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/Service.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/Service.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 /**
  * The <code>Service</code> implementation is a service provided by its own modules.
diff --git a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ServiceNotProvidedException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ServiceNotProvidedException.java
similarity index 94%
rename from apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ServiceNotProvidedException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ServiceNotProvidedException.java
index 3ca550332..1f97914d3 100644
--- a/apm-collector/apm-collector-modulization-core/src/main/java/org/skywalking/apm/collector/modulization/ServiceNotProvidedException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ServiceNotProvidedException.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 public class ServiceNotProvidedException extends Exception {
     public ServiceNotProvidedException(String message) {
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ApplicationConfigurationTest.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ApplicationConfigurationTest.java
similarity index 97%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ApplicationConfigurationTest.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ApplicationConfigurationTest.java
index 73296d370..0899c9165 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ApplicationConfigurationTest.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ApplicationConfigurationTest.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.Properties;
 import org.junit.Assert;
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleA.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleA.java
similarity index 95%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleA.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleA.java
index 18f9638e0..8ea63822c 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleA.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleA.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 /**
  * @author wu-sheng
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleB.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleB.java
similarity index 95%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleB.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleB.java
index bfe412a03..6313b0bd1 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/BaseModuleB.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/BaseModuleB.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 /**
  * @author wu-sheng
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleAProvider.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleAProvider.java
similarity index 96%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleAProvider.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleAProvider.java
index 54ee3f02d..2dd062278 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleAProvider.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleAProvider.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.Properties;
 
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleBProvider.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleBProvider.java
similarity index 96%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleBProvider.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleBProvider.java
index e49c75035..ea4725188 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleBProvider.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleBProvider.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.Properties;
 
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleManagerTest.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java
similarity index 96%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleManagerTest.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java
index 30e33969a..2d96c8c25 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/ModuleManagerTest.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleManagerTest.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import org.junit.Test;
 
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModule.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModule.java
similarity index 94%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModule.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModule.java
index fe59136bf..de78800c1 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModule.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModule.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 /**
  * @author wu-sheng
diff --git a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModuleProvider.java b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModuleProvider.java
similarity index 96%
rename from apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModuleProvider.java
rename to apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModuleProvider.java
index 590f5c7b3..8e665cae9 100644
--- a/apm-collector/apm-collector-modulization-core/src/test/java/org/skywalking/apm/collector/modulization/TestModuleProvider.java
+++ b/apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/TestModuleProvider.java
@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.modulization;
+package org.skywalking.apm.collector.core.module;
 
 import java.util.Properties;
 
diff --git a/apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module b/apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module
similarity index 100%
rename from apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module
rename to apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.Module
diff --git a/apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider b/apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider
similarity index 100%
rename from apm-collector/apm-collector-modulization-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider
rename to apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.skywalking.apm.collector.modulization.ModuleProvider
diff --git a/apm-collector/apm-collector-modulization-core/pom.xml b/apm-collector/apm-collector-modulization-core/pom.xml
deleted file mode 100644
index d3a428da8..000000000
--- a/apm-collector/apm-collector-modulization-core/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
-  ~
-  ~ Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-  -->
-
-<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.skywalking</groupId>
-        <version>3.2.3-2017</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>apm-collector-modulization-core</artifactId>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-naming/pom.xml b/apm-collector/apm-collector-naming/pom.xml
new file mode 100644
index 000000000..1127f73e4
--- /dev/null
+++ b/apm-collector/apm-collector-naming/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-naming</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-storage/pom.xml b/apm-collector/apm-collector-storage/pom.xml
new file mode 100644
index 000000000..bce8904c0
--- /dev/null
+++ b/apm-collector/apm-collector-storage/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-storage</artifactId>
+    <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-ui/pom.xml b/apm-collector/apm-collector-ui/pom.xml
new file mode 100644
index 000000000..e6f94973b
--- /dev/null
+++ b/apm-collector/apm-collector-ui/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-ui</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file
diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml
index e38082b08..36b573086 100644
--- a/apm-collector/pom.xml
+++ b/apm-collector/pom.xml
@@ -32,7 +32,14 @@
     <packaging>pom</packaging>
     <modules>
         <module>apm-collector-boot</module>
-        <module>apm-collector-modulization-core</module>
+        <module>apm-collector-ui</module>
+        <module>apm-collector-agent</module>
+        <module>apm-collector-core</module>
+        <module>apm-collector-component</module>
+        <module>apm-collector-cluster</module>
+        <module>apm-collector-cache</module>
+        <module>apm-collector-storage</module>
+        <module>apm-collector-naming</module>
     </modules>
 
     <properties>