diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml
similarity index 89%
rename from apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml
rename to apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml
index e79259c13..cb03b4324 100644
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml
+++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-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-baseline</artifactId>
+        <artifactId>analysis-baseline</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-baseline-computing-define</artifactId>
+    <artifactId>baseline-computing-define</artifactId>
+    <packaging>jar</packaging>
 
-
-</project>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/baseline/computing/ComputingModule.java b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java
similarity index 75%
rename from apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/baseline/computing/ComputingModule.java
rename to apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java
index e583d7e50..f7cd930b8 100644
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/baseline/computing/ComputingModule.java
+++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java
@@ -16,18 +16,18 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.baseline.computing;
+package org.apache.skywalking.apm.collector.analysis.baseline.computing.define;
 
 import org.apache.skywalking.apm.collector.core.module.Module;
 
 /**
- * The <code>ComputingModule</code> defines the required service interfaces.
+ * The <code>AnalysisBaselineComputingModule</code> defines the required service interfaces.
  *
- * @author wu-sheng
+ * @author wu-sheng, peng-yongsheng
  */
-public class ComputingModule extends Module {
-    public static final String NAME = "baseline-computing";
+public class AnalysisBaselineComputingModule extends Module {
+
+    public static final String NAME = "analysis_baseline-computing";
 
     @Override public String name() {
         return NAME;
diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
new file mode 100644
index 000000000..7b6c22e79
--- /dev/null
+++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+#
+
+org.apache.skywalking.apm.collector.analysis.baseline.computing.define.AnalysisBaselineComputingModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml
similarity index 77%
rename from apm-collector/apm-collector-baseline/pom.xml
rename to apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml
index fe2f9e7c3..361828810 100644
--- a/apm-collector/apm-collector-baseline/pom.xml
+++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml
@@ -21,25 +21,20 @@
          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>analysis-baseline</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>apm-collector-baseline</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>collector-baseline-computing-define</module>
-        <module>collector-baseline-computing-provider</module>
-        <module>collector-baseline-scheduler-define</module>
-    </modules>
+    <artifactId>baseline-computing-provider</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-collector-core</artifactId>
+            <artifactId>baseline-computing-define</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/apache/skywalking/collector/baseline/computing/provider/ComputingProvider.java b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java
similarity index 78%
rename from apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/apache/skywalking/collector/baseline/computing/provider/ComputingProvider.java
rename to apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java
index 8b2b8813c..99742fcaf 100644
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/apache/skywalking/collector/baseline/computing/provider/ComputingProvider.java
+++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java
@@ -16,21 +16,22 @@
  *
  */
 
-
-package org.apache.skywalking.collector.baseline.computing.provider;
+package org.apache.skywalking.apm.collector.analysis.baseline.computing.provider;
 
 import java.util.Properties;
+import org.apache.skywalking.apm.collector.analysis.baseline.computing.define.AnalysisBaselineComputingModule;
+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.baseline.computing.ComputingModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
 
 /**
- * The <code>ComputingProvider</code> is the default implementation of {@link ComputingModule}
+ * The <code>AnalysisBaselineComputingModuleProvider</code> is the default implementation of {@link
+ * AnalysisBaselineComputingModule}
  *
  * @author wu-sheng
  */
-public class ComputingProvider extends ModuleProvider {
+public class AnalysisBaselineComputingModuleProvider extends ModuleProvider {
+
     public static final String NAME = "default";
 
     @Override public String name() {
@@ -38,7 +39,7 @@ public class ComputingProvider extends ModuleProvider {
     }
 
     @Override public Class<? extends Module> module() {
-        return ComputingModule.class;
+        return AnalysisBaselineComputingModule.class;
     }
 
     @Override public void prepare(Properties config) throws ServiceNotProvidedException {
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
similarity index 87%
rename from apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider
rename to apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
index a529caa9d..1dcb74f56 100644
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
@@ -16,4 +16,4 @@
 #
 #
 
-org.apache.skywalking.collector.baseline.computing.provider.ComputingProvider
+org.apache.skywalking.apm.collector.analysis.baseline.computing.provider.AnalysisBaselineComputingModuleProvider
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml
similarity index 81%
rename from apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml
rename to apm-collector/apm-collector-analysis/analysis-baseline/pom.xml
index 148e7a18d..6d7adefd0 100644
--- a/apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml
+++ b/apm-collector/apm-collector-analysis/analysis-baseline/pom.xml
@@ -21,13 +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-baseline</artifactId>
+        <artifactId>apm-collector-analysis</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>collector-baseline-scheduler-define</artifactId>
+    <artifactId>analysis-baseline</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>baseline-computing-define</module>
+        <module>baseline-computing-provider</module>
+    </modules>
 
 
-</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
index 405ef0ff5..62024bccc 100644
--- a/apm-collector/apm-collector-analysis/pom.xml
+++ b/apm-collector/apm-collector-analysis/pom.xml
@@ -33,6 +33,7 @@
         <module>analysis-segment-parser</module>
         <module>analysis-layer-register</module>
         <module>analysis-alarm</module>
+        <module>analysis-baseline</module>
     </modules>
 
     <dependencies>
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
deleted file mode 100644
index 6696bf9a5..000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
+++ /dev/null
@@ -1,2 +0,0 @@
-
-org.apache.skywalking.apm.collector.baseline.computing.ComputingModule
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml b/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
deleted file mode 100644
index effeece71..000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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-baseline</artifactId>
-        <groupId>org.apache.skywalking</groupId>
-        <version>5.0.0-alpha</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>collector-baseline-computing-provider</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-baseline-computing-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-baseline-computing-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>