diff --git a/docs/cn/instructions/eventmesh-runtime-quickstart.zh-CN.md b/docs/cn/instructions/eventmesh-runtime-quickstart.zh-CN.md
index cf4b6d5b5b..820d5a01cf 100644
--- a/docs/cn/instructions/eventmesh-runtime-quickstart.zh-CN.md
+++ b/docs/cn/instructions/eventmesh-runtime-quickstart.zh-CN.md
@@ -56,7 +56,7 @@ sh start.sh
 
 **2.3.1 项目结构说明：**
 
-![](../../images/project-structure.png)
+![project-structure](../../images/project-structure.png)
 - eventmesh-common : eventmesh公共类与方法模块
 - eventmesh-connector-api : eventmesh插件接口定义模块
 - eventmesh-connector-rocketmq : eventmesh rocketmq插件模块
@@ -157,15 +157,15 @@ docker run -d -p 10000:10000 -p 10105:10105 -v /data/eventmesh/rocketmq/conf/pro
 
 执行 `docker ps` 来检查容器的运行状况
 
-![image-20210309155917269](..\..\images\docker\docker-ps.png)
+![image-docker-ps](..\..\images\docker\docker-ps.png)
 
 执行 `docker logs [container id]` 可以得到如下结果
 
-![image-20210309195623836](..\..\images\docker\docker-logs.png)
+![image-docker-logs](..\..\images\docker\docker-logs.png)
 
 执行 `docker exec -it [container id] /bin/bash` 可以进入到容器中并查看详细信息
 
-![image-20210309200327627](..\..\images\docker\docker-exec.png)
+![image-docker-exec](..\..\images\docker\docker-exec.png)
 
 ### 3.4 测试
 
diff --git a/docs/cn/instructions/eventmesh-sdk-java-quickstart.zh-CN.md b/docs/cn/instructions/eventmesh-sdk-java-quickstart.zh-CN.md
index a49db89fc1..2fa71ce085 100644
--- a/docs/cn/instructions/eventmesh-sdk-java-quickstart.zh-CN.md
+++ b/docs/cn/instructions/eventmesh-sdk-java-quickstart.zh-CN.md
@@ -10,7 +10,7 @@ TCP 和 Http 示例都在**eventmesh-test**模块下
 
 **注意：**下载了源代码后，需要将`/conf/application.properties` 和 `/conf/log4j2.xml` 复制到 `resources` 目录下
 
-![image-20210311193048090](..\..\images\eventmesh-test-structure.png)
+![image-test-structure](..\..\images\eventmesh-test-structure.png)
 
 ### 1. TCP DEMO
 
@@ -21,14 +21,14 @@ TCP 和 Http 示例都在**eventmesh-test**模块下
 - 启动消费者，订阅上一步骤已经创建的Topic
 
 ```
-运行com.webank.eventmesh.client.tcp.demo.AsyncSubscribe的主要方法
+运行com.webank.eventmesh.tcp.demo.AsyncSubscribe的主要方法
 ```
 
 - 启动发送端，发送消息
 
 
 ```
-运行com.webank.eventmesh.client.tcp.demo.AsyncPublish的主要方法
+运行com.webank.eventmesh.tcp.demo.AsyncPublish的主要方法
 ```
 
 <h4>广播消息</h4>
@@ -38,13 +38,13 @@ TCP 和 Http 示例都在**eventmesh-test**模块下
 - 启动消费端，订阅上一步骤已经创建的Topic
 
 ```
-运行com.webank.eventmesh.client.tcp.demo.AsyncSubscribeBroadcast的主要方法
+运行com.webank.eventmesh.tcp.demo.AsyncSubscribeBroadcast的主要方法
 ```
 
 - 启动发送端，发送广播消息
 
 ```
-运行com.webank.eventmesh.client.tcp.demo.AsyncPublishBroadcast的主要方法
+运行com.webank.eventmesh.tcp.demo.AsyncPublishBroadcast的主要方法
 ```
 
 ### 2. HTTP演示
@@ -62,13 +62,13 @@ TCP 和 Http 示例都在**eventmesh-test**模块下
   异步事件消费端为spring boot demo，运行demo即可启动服务并完成Topic订阅
 
 ```
-运行com.webank.eventmesh.client.http.demo.sub.SpringBootDemoApplication的主要方法
+运行com.webank.eventmesh.http.demo.sub.SpringBootDemoApplication的主要方法
 ```
 
 - 启动发送端，发送消息
 
 ```
-运行com.webank.eventmesh.client.http.demo.AsyncPublishInstance的主要方法
+运行com.webank.eventmesh.http.demo.AsyncPublishInstance的主要方法
 ```
 
 
diff --git a/docs/en/instructions/eventmesh-runtime-quickstart.md b/docs/en/instructions/eventmesh-runtime-quickstart.md
index 7c44827d21..78896445c5 100644
--- a/docs/en/instructions/eventmesh-runtime-quickstart.md
+++ b/docs/en/instructions/eventmesh-runtime-quickstart.md
@@ -56,7 +56,7 @@ Same with 1.2
 
 **2.3.1 Project structure：**
 
-![](..\..\images\project-structure.png)
+![project-structure.png](../../images/project-structure.png)
 
 - eventmesh-common : eventmesh common classes and method module
 - eventmesh-connector-api : eventmesh connector api definition module
@@ -156,15 +156,15 @@ docker run -d -p 10000:10000 -p 10105:10105 -v /data/eventmesh/rocketmq/conf/pro
 
 execute `docker ps` to check the container health
 
-![image-20210309155917269](..\..\images\docker\docker-ps.png)
+![image-docker-ps](..\..\images\docker\docker-ps.png)
 
 execute `docker logs [container id]` you will get following result:
 
-![image-20210309195623836](..\..\images\docker\docker-logs.png)
+![image-docker-logs](..\..\images\docker\docker-logs.png)
 
 execute `docker exec -it [container id] /bin/bash` you will go into the container and see the details:
 
-![image-20210309200327627](..\..\images\docker\docker-exec.png)
+![image-docker-exec](..\..\images\docker\docker-exec.png)
 
 ### 3.4 Test
 
diff --git a/docs/en/instructions/eventmesh-sdk-java-quickstart.md b/docs/en/instructions/eventmesh-sdk-java-quickstart.md
index 92d8951f6a..3f76714cbf 100644
--- a/docs/en/instructions/eventmesh-sdk-java-quickstart.md
+++ b/docs/en/instructions/eventmesh-sdk-java-quickstart.md
@@ -10,7 +10,7 @@ TCP demos and Http demos are both under the **eventmesh-test** module.
 
 **prerequisite**：after download the source code you should copy `/conf/application.properties` and `/conf/log4j2.xml` to the `resources` directory
 
-![image-20210311193048090](..\..\images\eventmesh-test-structure.png)
+![image-test-structure](..\..\images\eventmesh-test-structure.png)
 
 ###  1. TCP DEMO
 
@@ -21,34 +21,30 @@ TCP demos and Http demos are both under the **eventmesh-test** module.
 - start consumer ,subscribe topic in previous step. 
 
 ```
-Run the main method of com.webank.eventmesh.client.tcp.demo.AsyncSubscribe
+Run the main method of com.webank.eventmesh.tcp.demo.AsyncSubscribe
 ```
 
 - start producer, send  message
 
 
 ```
-Run the main method of com.webank.eventmesh.client.tcp.demo.AsyncPublish
+Run the main method of com.webank.eventmesh.tcp.demo.AsyncPublish
 ```
 
 #### Broadcast msg 
 
 - create topic FT0-e-80030000-01-3 on rocketmq-console
 
-```
-sh runadmin.sh updateTopic  -c ${ClusterName} -t ${topic} -n ${namesrvAddr}
-```
-
 - start consumer ,subscribe topic in previous step. 
 
 ```
-Run the main method of com.webank.eventmesh.client.tcp.demo.AsyncSubscribeBroadcast
+Run the main method of com.webank.eventmesh.tcp.demo.AsyncSubscribeBroadcast
 ```
 
 * start producer, send broadcast message
 
 ```
-Run the main method of com.webank.eventmesh.client.tcp.demo.AsyncPublishBroadcast
+Run the main method of com.webank.eventmesh.tcp.demo.AsyncPublishBroadcast
 ```
 
 ### 2. HTTP DEMO
@@ -66,12 +62,12 @@ Run the main method of com.webank.eventmesh.client.tcp.demo.AsyncPublishBroadcas
   Async consumer demo is a spring boot application demo,  you can easily run this demo to start service and subscribe the topic.
 
 ```
-Run the main method of com.webank.eventmesh.client.http.demo.sub.SpringBootDemoApplication
+Run the main method of com.webank.eventmesh.http.demo.sub.SpringBootDemoApplication
 ```
 
 - start producer, produce msg
 
 ```
-Run the main method of com.webank.eventmesh.client.http.demo.AsyncPublishInstance
+Run the main method of com.webank.eventmesh.http.demo.AsyncPublishInstance
 ```
 
diff --git a/eventmesh-test/bin/http_pub.sh b/eventmesh-test/bin/http_pub.sh
index 9042645a8e..3fdb0b0f65 100644
--- a/eventmesh-test/bin/http_pub.sh
+++ b/eventmesh-test/bin/http_pub.sh
@@ -43,13 +43,13 @@ function get_pid {
 	else
 		if [[ $OS =~ Msys ]]; then
 			# 在Msys上存在可能无法kill识别出的进程的BUG
-			ppid=`jps -v | grep -i "com.webank.eventmesh.client.http.demo.AsyncPublishInstance" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
+			ppid=`jps -v | grep -i "com.webank.eventmesh.http.demo.AsyncPublishInstance" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
 		elif [[ $OS =~ Darwin ]]; then
 			# 已知问题：grep java 可能无法精确识别java进程
-			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.client.http.demo.AsyncPublishInstance" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.http.demo.AsyncPublishInstance" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		else
 			#在Linux服务器上要求尽可能精确识别进程
-			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.client.http.demo.AsyncPublishInstance" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.http.demo.AsyncPublishInstance" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		fi
 	fi
 	echo "$ppid";
@@ -124,7 +124,7 @@ make_logs_dir
 echo "using jdk[$JAVA]" >> ${DEMO_LOG_HOME}/demo_http_pub.out
 
 
-DEMO_MAIN=com.webank.eventmesh.client.http.demo.AsyncPublishInstance
+DEMO_MAIN=com.webank.eventmesh.http.demo.AsyncPublishInstance
 if [ $DOCKER ]
 then
 	$JAVA $JAVA_OPT -classpath ${DEMO_HOME}/conf:${DEMO_HOME}/apps/*:${DEMO_HOME}/lib/* $DEMO_MAIN >> ${DEMO_LOG_HOME}/demo_http_pub.out
diff --git a/eventmesh-test/bin/http_sub.sh b/eventmesh-test/bin/http_sub.sh
index c37ced41e5..444ea97a09 100644
--- a/eventmesh-test/bin/http_sub.sh
+++ b/eventmesh-test/bin/http_sub.sh
@@ -43,13 +43,13 @@ function get_pid {
 	else
 		if [[ $OS =~ Msys ]]; then
 			# 在Msys上存在可能无法kill识别出的进程的BUG
-			ppid=`jps -v | grep -i "com.webank.eventmesh.client.http.demo.sub.SpringBootDemoApplication" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
+			ppid=`jps -v | grep -i "com.webank.eventmesh.http.demo.sub.SpringBootDemoApplication" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
 		elif [[ $OS =~ Darwin ]]; then
 			# 已知问题：grep java 可能无法精确识别java进程
-			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.client.http.demo.sub.SpringBootDemoApplication" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.http.demo.sub.SpringBootDemoApplication" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		else
 			#在Linux服务器上要求尽可能精确识别进程
-			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.client.http.demo.sub.SpringBootDemoApplication" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.http.demo.sub.SpringBootDemoApplication" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		fi
 	fi
 	echo "$ppid";
@@ -124,7 +124,7 @@ make_logs_dir
 echo "using jdk[$JAVA]" >> ${DEMO_LOG_HOME}/demo_http_sub.out
 
 
-DEMO_MAIN=com.webank.eventmesh.client.http.demo.sub.SpringBootDemoApplication
+DEMO_MAIN=com.webank.eventmesh.http.demo.sub.SpringBootDemoApplication
 if [ $DOCKER ]
 then
 	$JAVA $JAVA_OPT -classpath ${DEMO_HOME}/conf:${DEMO_HOME}/apps/*:${DEMO_HOME}/lib/* $DEMO_MAIN >> ${DEMO_LOG_HOME}/demo_http_sub.out
diff --git a/eventmesh-test/bin/tcp_pub.sh b/eventmesh-test/bin/tcp_pub.sh
index b3fd74d919..d805ff868a 100644
--- a/eventmesh-test/bin/tcp_pub.sh
+++ b/eventmesh-test/bin/tcp_pub.sh
@@ -43,13 +43,13 @@ function get_pid {
 	else
 		if [[ $OS =~ Msys ]]; then
 			# 在Msys上存在可能无法kill识别出的进程的BUG
-			ppid=`jps -v | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncPublish" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
+			ppid=`jps -v | grep -i "com.webank.eventmesh.tcp.demo.AsyncPublish" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
 		elif [[ $OS =~ Darwin ]]; then
 			# 已知问题：grep java 可能无法精确识别java进程
-			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncPublish" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.tcp.demo.AsyncPublish" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		else
 			#在Linux服务器上要求尽可能精确识别进程
-			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncPublish" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.tcp.demo.AsyncPublish" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		fi
 	fi
 	echo "ppid";
@@ -124,7 +124,7 @@ make_logs_dir
 echo "using jdk[$JAVA]" >> ${DEMO_LOG_HOME}/demo_tcp_pub.out
 
 
-DEMO_MAIN=com.webank.eventmesh.client.tcp.demo.AsyncPublish
+DEMO_MAIN=com.webank.eventmesh.tcp.demo.AsyncPublish
 if [ $DOCKER ]
 then
 	$JAVA $JAVA_OPT -classpath ${DEMO_HOME}/conf:${DEMO_HOME}/apps/*:${DEMO_HOME}/lib/* $DEMO_MAIN >> ${DEMO_LOG_HOME}/demo_tcp_pub.out
diff --git a/eventmesh-test/bin/tcp_pub_broadcast.sh b/eventmesh-test/bin/tcp_pub_broadcast.sh
index 3814e3aa51..8363dce52d 100644
--- a/eventmesh-test/bin/tcp_pub_broadcast.sh
+++ b/eventmesh-test/bin/tcp_pub_broadcast.sh
@@ -43,13 +43,13 @@ function get_pid {
 	else
 		if [[ $OS =~ Msys ]]; then
 			# 在Msys上存在可能无法kill识别出的进程的BUG
-			ppid=`jps -v | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncPublishBroadcast" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
+			ppid=`jps -v | grep -i "com.webank.eventmesh.tcp.demo.AsyncPublishBroadcast" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
 		elif [[ $OS =~ Darwin ]]; then
 			# 已知问题：grep java 可能无法精确识别java进程
-			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncPublishBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.tcp.demo.AsyncPublishBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		else
 			#在Linux服务器上要求尽可能精确识别进程
-			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $DEMO_HOME | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncPublishBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $DEMO_HOME | grep -i "com.webank.eventmesh.tcp.demo.AsyncPublishBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		fi
 	fi
 	echo "$ppid";
@@ -124,7 +124,7 @@ make_logs_dir
 echo "using jdk[$JAVA]" >> ${DEMO_LOG_HOME}/demo_tcp_pub_broadcast.out
 
 
-DEMO_MAIN=com.webank.eventmesh.client.tcp.demo.AsyncPublishBroadcast
+DEMO_MAIN=com.webank.eventmesh.tcp.demo.AsyncPublishBroadcast
 if [ $DOCKER ]
 then
 	$JAVA $JAVA_OPT -classpath ${DEMO_HOME}/conf:${DEMO_HOME}/apps/*:${DEMO_HOME}/lib/* $DEMO_MAIN >> ${DEMO_LOG_HOME}/demo_tcp_pub_broadcast.out
diff --git a/eventmesh-test/bin/tcp_sub.sh b/eventmesh-test/bin/tcp_sub.sh
index 0454abfe68..c1a864483e 100644
--- a/eventmesh-test/bin/tcp_sub.sh
+++ b/eventmesh-test/bin/tcp_sub.sh
@@ -43,13 +43,13 @@ function get_pid {
 	else
 		if [[ $OS =~ Msys ]]; then
 			# 在Msys上存在可能无法kill识别出的进程的BUG
-			ppid=`jps -v | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncSubscribe" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
+			ppid=`jps -v | grep -i "com.webank.eventmesh.tcp.demo.AsyncSubscribe" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
 		elif [[ $OS =~ Darwin ]]; then
 			# 已知问题：grep java 可能无法精确识别java进程
-			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncSubscribe" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.tcp.demo.AsyncSubscribe" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		else
 			#在Linux服务器上要求尽可能精确识别进程
-			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $DEMO_HOME | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncSubscribe" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $DEMO_HOME | grep -i "com.webank.eventmesh.tcp.demo.AsyncSubscribe" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		fi
 	fi
 	echo "$ppid";
@@ -124,7 +124,7 @@ make_logs_dir
 echo "using jdk[$JAVA]" >> ${DEMO_LOG_HOME}/demo_tcp_sub.out
 
 
-DEMO_MAIN=com.webank.eventmesh.client.tcp.demo.AsyncSubscribe
+DEMO_MAIN=com.webank.eventmesh.tcp.demo.AsyncSubscribe
 if [ $DOCKER ]
 then
 	$JAVA $JAVA_OPT -classpath ${DEMO_HOME}/conf:${DEMO_HOME}/apps/*:${DEMO_HOME}/lib/* $DEMO_MAIN >> ${DEMO_LOG_HOME}/demo_tcp_sub.out
diff --git a/eventmesh-test/bin/tcp_sub_broadcast.sh b/eventmesh-test/bin/tcp_sub_broadcast.sh
index 9d460b0920..b40176b9f6 100644
--- a/eventmesh-test/bin/tcp_sub_broadcast.sh
+++ b/eventmesh-test/bin/tcp_sub_broadcast.sh
@@ -43,13 +43,13 @@ function get_pid {
 	else
 		if [[ $OS =~ Msys ]]; then
 			# 在Msys上存在可能无法kill识别出的进程的BUG
-			ppid=`jps -v | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncSubscribeBroadcast" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
+			ppid=`jps -v | grep -i "com.webank.eventmesh.tcp.demo.AsyncSubscribeBroadcast" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
 		elif [[ $OS =~ Darwin ]]; then
 			# 已知问题：grep java 可能无法精确识别java进程
-			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncSubscribeBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "com.webank.eventmesh.tcp.demo.AsyncSubscribeBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		else
 			#在Linux服务器上要求尽可能精确识别进程
-			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.client.tcp.demo.AsyncSubscribeBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+			ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $PROXY_HOME | grep -i "com.webank.eventmesh.tcp.demo.AsyncSubscribeBroadcast" | grep -Ev "^root" |awk -F ' ' {'print $2'})
 		fi
 	fi
 	echo "$ppid";
@@ -124,7 +124,7 @@ make_logs_dir
 echo "using jdk[$JAVA]" >> ${DEMO_LOG_HOME}/demo_tcp_sub_broadcast.out
 
 
-DEMO_MAIN=com.webank.eventmesh.client.tcp.demo.AsyncSubscribeBroadcast
+DEMO_MAIN=com.webank.eventmesh.tcp.demo.AsyncSubscribeBroadcast
 if [ $DOCKER ]
 then
 	$JAVA $JAVA_OPT -classpath ${DEMO_HOME}/conf:${DEMO_HOME}/apps/*:${DEMO_HOME}/lib/* $DEMO_MAIN >> ${DEMO_LOG_HOME}/demo_tcp_sub_broadcast.out
diff --git a/eventmesh-test/conf/log4j2.xml b/eventmesh-test/conf/log4j2.xml
index 99f79985fb..1483ca35fd 100644
--- a/eventmesh-test/conf/log4j2.xml
+++ b/eventmesh-test/conf/log4j2.xml
@@ -28,7 +28,7 @@
             <AppenderRef ref="console"/>
         </AsyncRoot>
 
-        <AsyncLogger name="com.webank.eventmesh.client" level="debug" additivity="false" includeLocation="true">
+        <AsyncLogger name="com.webank.eventmesh" level="debug" additivity="false" includeLocation="true">
             <AppenderRef ref="console"/>
         </AsyncLogger>
     </Loggers>
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/AsyncPublishInstance.java b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/AsyncPublishInstance.java
similarity index 98%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/AsyncPublishInstance.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/AsyncPublishInstance.java
index 88a9d050f9..89f0cf93c9 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/AsyncPublishInstance.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/AsyncPublishInstance.java
@@ -1,4 +1,4 @@
-package com.webank.eventmesh.client.http.demo;
+package com.webank.eventmesh.http.demo;
 import com.webank.eventmesh.client.http.conf.LiteClientConfig;
 import com.webank.eventmesh.client.http.producer.LiteProducer;
 import com.webank.eventmesh.common.Constants;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/AsyncSyncRequestInstance.java b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/AsyncSyncRequestInstance.java
similarity index 98%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/AsyncSyncRequestInstance.java
index 69ebef2afa..61bbedb04d 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/AsyncSyncRequestInstance.java
@@ -1,4 +1,4 @@
-package com.webank.eventmesh.client.http.demo;
+package com.webank.eventmesh.http.demo;
 import com.webank.eventmesh.client.http.conf.LiteClientConfig;
 import com.webank.eventmesh.client.http.producer.LiteProducer;
 import com.webank.eventmesh.client.http.producer.RRCallback;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/SyncRequestInstance.java b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/SyncRequestInstance.java
similarity index 87%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/SyncRequestInstance.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/SyncRequestInstance.java
index cea7dc20e2..918af24d0b 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/SyncRequestInstance.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/SyncRequestInstance.java
@@ -1,22 +1,14 @@
-package com.webank.eventmesh.client.http.demo;
+package com.webank.eventmesh.http.demo;
 import com.webank.eventmesh.client.http.conf.LiteClientConfig;
 import com.webank.eventmesh.client.http.producer.LiteProducer;
 import com.webank.eventmesh.common.IPUtil;
 import com.webank.eventmesh.common.LiteMessage;
-import com.webank.eventmesh.common.ThreadPoolFactory;
 import com.webank.eventmesh.common.ThreadUtil;
-import com.webank.eventmesh.util.Utils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.LinkedList;
-import java.util.Properties;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-
 public class SyncRequestInstance {
 
     public static Logger logger = LoggerFactory.getLogger(SyncRequestInstance.class);
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/SpringBootDemoApplication.java b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/SpringBootDemoApplication.java
similarity index 91%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/SpringBootDemoApplication.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/SpringBootDemoApplication.java
index cdba0a835f..e8edbfb38e 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/SpringBootDemoApplication.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/SpringBootDemoApplication.java
@@ -1,4 +1,4 @@
-package com.webank.eventmesh.client.http.demo.sub;
+package com.webank.eventmesh.http.demo.sub;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/controller/SubController.java b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/controller/SubController.java
similarity index 93%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/controller/SubController.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/controller/SubController.java
index 75f7e34f39..b268b8b5c7 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/controller/SubController.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/controller/SubController.java
@@ -1,4 +1,4 @@
-package com.webank.eventmesh.client.http.demo.sub.controller;
+package com.webank.eventmesh.http.demo.sub.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/service/SubService.java b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/service/SubService.java
similarity index 90%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/service/SubService.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/service/SubService.java
index 2d77150760..a8fc0fa51a 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/http/demo/sub/service/SubService.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/http/demo/sub/service/SubService.java
@@ -1,6 +1,5 @@
-package com.webank.eventmesh.client.http.demo.sub.service;
+package com.webank.eventmesh.http.demo.sub.service;
 
-import com.webank.eventmesh.client.http.RemotingServer;
 import com.webank.eventmesh.client.http.conf.LiteClientConfig;
 import com.webank.eventmesh.client.http.consumer.LiteConsumer;
 import com.webank.eventmesh.common.IPUtil;
@@ -8,19 +7,14 @@
 import com.webank.eventmesh.common.ThreadUtil;
 import com.webank.eventmesh.util.Utils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.remoting.support.RemotingSupport;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PreDestroy;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 
 @Component
 public class SubService implements InitializingBean {
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/common/AccessTestCaseTopicSet.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/common/AccessTestCaseTopicSet.java
similarity index 92%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/common/AccessTestCaseTopicSet.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/common/AccessTestCaseTopicSet.java
index 694719c610..134c5985a2 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/common/AccessTestCaseTopicSet.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/common/AccessTestCaseTopicSet.java
@@ -1,4 +1,4 @@
-package com.webank.eventmesh.client.tcp.common;
+package com.webank.eventmesh.tcp.common;
 
 /**
  * Testcase set
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/common/AccessTestUtils.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/common/AccessTestUtils.java
similarity index 92%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/common/AccessTestUtils.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/common/AccessTestUtils.java
index 54ca3f8277..7c3203edfe 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/common/AccessTestUtils.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/common/AccessTestUtils.java
@@ -1,14 +1,11 @@
-package com.webank.eventmesh.client.tcp.common;
+package com.webank.eventmesh.tcp.common;
 
-import com.webank.eventmesh.common.protocol.tcp.AccessMessage;
-import com.webank.eventmesh.common.protocol.tcp.Command;
-import com.webank.eventmesh.common.protocol.tcp.Header;
 import com.webank.eventmesh.common.protocol.tcp.Package;
-import com.webank.eventmesh.common.protocol.tcp.UserAgent;
+import com.webank.eventmesh.common.protocol.tcp.*;
 
 import java.util.concurrent.ThreadLocalRandom;
 
-import static com.webank.eventmesh.client.tcp.common.AccessTestCaseTopicSet.*;
+import static com.webank.eventmesh.tcp.common.AccessTestCaseTopicSet.*;
 import static com.webank.eventmesh.common.protocol.tcp.Command.RESPONSE_TO_SERVER;
 
 public class AccessTestUtils {
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncPublish.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncPublish.java
similarity index 94%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncPublish.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncPublish.java
index 5c41901d3f..ec00f95933 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncPublish.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncPublish.java
@@ -1,11 +1,11 @@
-package com.webank.eventmesh.client.tcp.demo;
+package com.webank.eventmesh.tcp.demo;
 
 import com.webank.eventmesh.client.tcp.WemqAccessClient;
-import com.webank.eventmesh.client.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.client.tcp.common.WemqAccessCommon;
 import com.webank.eventmesh.client.tcp.impl.DefaultWemqAccessClient;
 import com.webank.eventmesh.common.protocol.tcp.Package;
 import com.webank.eventmesh.common.protocol.tcp.UserAgent;
+import com.webank.eventmesh.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncPublishBroadcast.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncPublishBroadcast.java
similarity index 93%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncPublishBroadcast.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncPublishBroadcast.java
index 8ddd896fd1..c9324eb5b3 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncPublishBroadcast.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncPublishBroadcast.java
@@ -1,11 +1,11 @@
-package com.webank.eventmesh.client.tcp.demo;
+package com.webank.eventmesh.tcp.demo;
 
 import com.webank.eventmesh.client.tcp.WemqAccessClient;
-import com.webank.eventmesh.client.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.client.tcp.common.WemqAccessCommon;
 import com.webank.eventmesh.client.tcp.impl.DefaultWemqAccessClient;
 import com.webank.eventmesh.common.protocol.tcp.Package;
 import com.webank.eventmesh.common.protocol.tcp.UserAgent;
+import com.webank.eventmesh.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncSubscribe.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncSubscribe.java
similarity index 94%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncSubscribe.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncSubscribe.java
index 580e884c1a..7732942e12 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncSubscribe.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncSubscribe.java
@@ -1,12 +1,12 @@
-package com.webank.eventmesh.client.tcp.demo;
+package com.webank.eventmesh.tcp.demo;
 
 import com.webank.eventmesh.client.tcp.WemqAccessClient;
-import com.webank.eventmesh.client.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.client.tcp.common.ReceiveMsgHook;
 import com.webank.eventmesh.client.tcp.impl.DefaultWemqAccessClient;
 import com.webank.eventmesh.common.protocol.tcp.AccessMessage;
 import com.webank.eventmesh.common.protocol.tcp.Package;
 import com.webank.eventmesh.common.protocol.tcp.UserAgent;
+import com.webank.eventmesh.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.util.Utils;
 import io.netty.channel.ChannelHandlerContext;
 import org.slf4j.Logger;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncSubscribeBroadcast.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncSubscribeBroadcast.java
similarity index 94%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncSubscribeBroadcast.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncSubscribeBroadcast.java
index 23b2425b22..c99eaec520 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/AsyncSubscribeBroadcast.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/AsyncSubscribeBroadcast.java
@@ -1,12 +1,12 @@
-package com.webank.eventmesh.client.tcp.demo;
+package com.webank.eventmesh.tcp.demo;
 
 import com.webank.eventmesh.client.tcp.WemqAccessClient;
-import com.webank.eventmesh.client.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.client.tcp.common.ReceiveMsgHook;
 import com.webank.eventmesh.client.tcp.impl.DefaultWemqAccessClient;
 import com.webank.eventmesh.common.protocol.tcp.AccessMessage;
 import com.webank.eventmesh.common.protocol.tcp.Package;
 import com.webank.eventmesh.common.protocol.tcp.UserAgent;
+import com.webank.eventmesh.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.util.Utils;
 import io.netty.channel.ChannelHandlerContext;
 import org.slf4j.Logger;
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/SyncRequest.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/SyncRequest.java
similarity index 91%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/SyncRequest.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/SyncRequest.java
index 943fb0fe12..50cd188355 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/SyncRequest.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/SyncRequest.java
@@ -1,11 +1,11 @@
-package com.webank.eventmesh.client.tcp.demo;
+package com.webank.eventmesh.tcp.demo;
 
 import com.webank.eventmesh.client.tcp.WemqAccessClient;
-import com.webank.eventmesh.client.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.client.tcp.common.WemqAccessCommon;
 import com.webank.eventmesh.client.tcp.impl.DefaultWemqAccessClient;
 import com.webank.eventmesh.common.protocol.tcp.Package;
 import com.webank.eventmesh.common.protocol.tcp.UserAgent;
+import com.webank.eventmesh.tcp.common.AccessTestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/SyncResponse.java b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/SyncResponse.java
similarity index 93%
rename from eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/SyncResponse.java
rename to eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/SyncResponse.java
index 9bece8e11b..eb30ac94ae 100644
--- a/eventmesh-test/src/main/java/com/webank/eventmesh/client/tcp/demo/SyncResponse.java
+++ b/eventmesh-test/src/main/java/com/webank/eventmesh/tcp/demo/SyncResponse.java
@@ -1,11 +1,11 @@
-package com.webank.eventmesh.client.tcp.demo;
+package com.webank.eventmesh.tcp.demo;
 
 import com.webank.eventmesh.client.tcp.WemqAccessClient;
-import com.webank.eventmesh.client.tcp.common.AccessTestUtils;
 import com.webank.eventmesh.client.tcp.common.ReceiveMsgHook;
 import com.webank.eventmesh.client.tcp.impl.DefaultWemqAccessClient;
 import com.webank.eventmesh.common.protocol.tcp.Package;
 import com.webank.eventmesh.common.protocol.tcp.UserAgent;
+import com.webank.eventmesh.tcp.common.AccessTestUtils;
 import io.netty.channel.ChannelHandlerContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;