diff --git a/rocketmq-broker/pom.xml b/broker/pom.xml
similarity index 100%
rename from rocketmq-broker/pom.xml
rename to broker/pom.xml
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java b/broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerPathConfigHelper.java b/broker/src/main/java/com/alibaba/rocketmq/broker/BrokerPathConfigHelper.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerPathConfigHelper.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/BrokerPathConfigHelper.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/com/alibaba/rocketmq/broker/BrokerStartup.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerStartup.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/BrokerStartup.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientChannelInfo.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientChannelInfo.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientChannelInfo.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientChannelInfo.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientHousekeepingService.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientHousekeepingService.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientHousekeepingService.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/ClientHousekeepingService.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerGroupInfo.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerGroupInfo.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerGroupInfo.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerGroupInfo.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerIdsChangeListener.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerIdsChangeListener.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerIdsChangeListener.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerIdsChangeListener.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerManager.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerManager.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerManager.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/ConsumerManager.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/DefaultConsumerIdsChangeListener.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/DefaultConsumerIdsChangeListener.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/DefaultConsumerIdsChangeListener.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/DefaultConsumerIdsChangeListener.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ProducerManager.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/ProducerManager.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/ProducerManager.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/ProducerManager.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/net/Broker2Client.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/net/Broker2Client.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/net/Broker2Client.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/net/Broker2Client.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/rebalance/RebalanceLockManager.java b/broker/src/main/java/com/alibaba/rocketmq/broker/client/rebalance/RebalanceLockManager.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/client/rebalance/RebalanceLockManager.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/client/rebalance/RebalanceLockManager.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerManager.java b/broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerManager.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerManager.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerManager.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerUtil.java b/broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerUtil.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerUtil.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/filtersrv/FilterServerUtil.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFastFailure.java b/broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFastFailure.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFastFailure.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFastFailure.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFixedThreadPoolExecutor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFixedThreadPoolExecutor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFixedThreadPoolExecutor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/latency/BrokerFixedThreadPoolExecutor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/latency/FutureTaskExt.java b/broker/src/main/java/com/alibaba/rocketmq/broker/latency/FutureTaskExt.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/latency/FutureTaskExt.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/latency/FutureTaskExt.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/ManyPullRequest.java b/broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/ManyPullRequest.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/ManyPullRequest.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/ManyPullRequest.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/NotifyMessageArrivingListener.java b/broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/NotifyMessageArrivingListener.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/NotifyMessageArrivingListener.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/NotifyMessageArrivingListener.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequest.java b/broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequest.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequest.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequest.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequestHoldService.java b/broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequestHoldService.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequestHoldService.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/longpolling/PullRequestHoldService.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageContext.java b/broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageContext.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageContext.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageContext.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageHook.java b/broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageHook.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageHook.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/ConsumeMessageHook.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageContext.java b/broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageContext.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageContext.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageContext.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageHook.java b/broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageHook.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageHook.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/mqtrace/SendMessageHook.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManager.java b/broker/src/main/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManager.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManager.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManager.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/out/BrokerOuterAPI.java b/broker/src/main/java/com/alibaba/rocketmq/broker/out/BrokerOuterAPI.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/out/BrokerOuterAPI.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/out/BrokerOuterAPI.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/ManyMessageTransfer.java b/broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/ManyMessageTransfer.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/ManyMessageTransfer.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/ManyMessageTransfer.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/OneMessageTransfer.java b/broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/OneMessageTransfer.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/OneMessageTransfer.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/OneMessageTransfer.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/QueryMessageTransfer.java b/broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/QueryMessageTransfer.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/QueryMessageTransfer.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/pagecache/QueryMessageTransfer.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/plugin/AbstractPluginMessageStore.java b/broker/src/main/java/com/alibaba/rocketmq/broker/plugin/AbstractPluginMessageStore.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/plugin/AbstractPluginMessageStore.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/plugin/AbstractPluginMessageStore.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStoreFactory.java b/broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStoreFactory.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStoreFactory.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStoreFactory.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStorePluginContext.java b/broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStorePluginContext.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStorePluginContext.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/plugin/MessageStorePluginContext.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/AbstractSendMessageProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/AbstractSendMessageProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/AbstractSendMessageProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/AbstractSendMessageProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/AdminBrokerProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/AdminBrokerProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/AdminBrokerProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/AdminBrokerProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/ClientManageProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/ClientManageProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/ClientManageProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/ClientManageProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/ConsumerManageProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/ConsumerManageProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/ConsumerManageProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/ConsumerManageProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/EndTransactionProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/EndTransactionProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/EndTransactionProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/EndTransactionProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/ForwardRequestProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/ForwardRequestProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/ForwardRequestProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/ForwardRequestProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/QueryMessageProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/QueryMessageProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/QueryMessageProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/QueryMessageProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/SendMessageProcessor.java b/broker/src/main/java/com/alibaba/rocketmq/broker/processor/SendMessageProcessor.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/SendMessageProcessor.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/processor/SendMessageProcessor.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/slave/SlaveSynchronize.java b/broker/src/main/java/com/alibaba/rocketmq/broker/slave/SlaveSynchronize.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/slave/SlaveSynchronize.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/slave/SlaveSynchronize.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/subscription/SubscriptionGroupManager.java b/broker/src/main/java/com/alibaba/rocketmq/broker/subscription/SubscriptionGroupManager.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/subscription/SubscriptionGroupManager.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/subscription/SubscriptionGroupManager.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java b/broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionRecord.java b/broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionRecord.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionRecord.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionRecord.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionStore.java b/broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionStore.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionStore.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/transaction/TransactionStore.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java b/broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStore.java
diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStoreConfig.java b/broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStoreConfig.java
similarity index 100%
rename from rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStoreConfig.java
rename to broker/src/main/java/com/alibaba/rocketmq/broker/transaction/jdbc/JDBCTransactionStoreConfig.java
diff --git a/rocketmq-broker/src/main/resources/transaction.sql b/broker/src/main/resources/transaction.sql
similarity index 100%
rename from rocketmq-broker/src/main/resources/transaction.sql
rename to broker/src/main/resources/transaction.sql
diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java b/broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java
similarity index 100%
rename from rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java
rename to broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java
diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerTestHarness.java b/broker/src/test/java/com/alibaba/rocketmq/broker/BrokerTestHarness.java
similarity index 100%
rename from rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerTestHarness.java
rename to broker/src/test/java/com/alibaba/rocketmq/broker/BrokerTestHarness.java
diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java b/broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java
similarity index 100%
rename from rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java
rename to broker/src/test/java/com/alibaba/rocketmq/broker/api/SendMessageTest.java
diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManagerTest.java b/broker/src/test/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManagerTest.java
similarity index 100%
rename from rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManagerTest.java
rename to broker/src/test/java/com/alibaba/rocketmq/broker/offset/ConsumerOffsetManagerTest.java
diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java b/broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java
similarity index 100%
rename from rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java
rename to broker/src/test/java/com/alibaba/rocketmq/broker/topic/TopicConfigManagerTest.java
diff --git a/rocketmq-broker/src/test/resources/logback-test.xml b/broker/src/test/resources/logback-test.xml
similarity index 100%
rename from rocketmq-broker/src/test/resources/logback-test.xml
rename to broker/src/test/resources/logback-test.xml
diff --git a/rocketmq-client/deploy.bat b/client/deploy.bat
similarity index 100%
rename from rocketmq-client/deploy.bat
rename to client/deploy.bat
diff --git a/rocketmq-client/install.bat b/client/install.bat
similarity index 100%
rename from rocketmq-client/install.bat
rename to client/install.bat
diff --git a/rocketmq-client/pom.xml b/client/pom.xml
similarity index 100%
rename from rocketmq-client/pom.xml
rename to client/pom.xml
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/ClientConfig.java b/client/src/main/java/com/alibaba/rocketmq/client/ClientConfig.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/ClientConfig.java
rename to client/src/main/java/com/alibaba/rocketmq/client/ClientConfig.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/MQAdmin.java b/client/src/main/java/com/alibaba/rocketmq/client/MQAdmin.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/MQAdmin.java
rename to client/src/main/java/com/alibaba/rocketmq/client/MQAdmin.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/MQHelper.java b/client/src/main/java/com/alibaba/rocketmq/client/MQHelper.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/MQHelper.java
rename to client/src/main/java/com/alibaba/rocketmq/client/MQHelper.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/QueryResult.java b/client/src/main/java/com/alibaba/rocketmq/client/QueryResult.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/QueryResult.java
rename to client/src/main/java/com/alibaba/rocketmq/client/QueryResult.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/Validators.java b/client/src/main/java/com/alibaba/rocketmq/client/Validators.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/Validators.java
rename to client/src/main/java/com/alibaba/rocketmq/client/Validators.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/admin/MQAdminExtInner.java b/client/src/main/java/com/alibaba/rocketmq/client/admin/MQAdminExtInner.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/admin/MQAdminExtInner.java
rename to client/src/main/java/com/alibaba/rocketmq/client/admin/MQAdminExtInner.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/common/ClientErrorCode.java b/client/src/main/java/com/alibaba/rocketmq/client/common/ClientErrorCode.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/common/ClientErrorCode.java
rename to client/src/main/java/com/alibaba/rocketmq/client/common/ClientErrorCode.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/common/ThreadLocalIndex.java b/client/src/main/java/com/alibaba/rocketmq/client/common/ThreadLocalIndex.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/common/ThreadLocalIndex.java
rename to client/src/main/java/com/alibaba/rocketmq/client/common/ThreadLocalIndex.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/AllocateMessageQueueStrategy.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/AllocateMessageQueueStrategy.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/AllocateMessageQueueStrategy.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/AllocateMessageQueueStrategy.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPullConsumer.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPullConsumer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPullConsumer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPullConsumer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPushConsumer.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPushConsumer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPushConsumer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/DefaultMQPushConsumer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQConsumer.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/MQConsumer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQConsumer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/MQConsumer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumer.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumerScheduleService.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumerScheduleService.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumerScheduleService.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPullConsumerScheduleService.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPushConsumer.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPushConsumer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPushConsumer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/MQPushConsumer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MessageQueueListener.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/MessageQueueListener.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/MessageQueueListener.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/MessageQueueListener.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullCallback.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/PullCallback.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullCallback.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/PullCallback.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullResult.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/PullResult.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullResult.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/PullResult.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullStatus.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/PullStatus.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullStatus.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/PullStatus.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskCallback.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskCallback.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskCallback.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskCallback.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskContext.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskContext.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskContext.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/PullTaskContext.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyContext.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyContext.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyContext.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyContext.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyStatus.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyStatus.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyStatus.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeConcurrentlyStatus.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyContext.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyStatus.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyStatus.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyStatus.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeOrderlyStatus.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeReturnType.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeReturnType.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeReturnType.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/ConsumeReturnType.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListener.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListener.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListener.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListener.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerConcurrently.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerConcurrently.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerConcurrently.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerConcurrently.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerOrderly.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerOrderly.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerOrderly.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/listener/MessageListenerOrderly.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragely.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragely.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragely.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragely.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyByCircle.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyByCircle.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyByCircle.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueAveragelyByCircle.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByConfig.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByConfig.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByConfig.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByConfig.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/rebalance/AllocateMessageQueueByMachineRoom.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/LocalFileOffsetStore.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/store/LocalFileOffsetStore.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/LocalFileOffsetStore.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/store/LocalFileOffsetStore.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetSerializeWrapper.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetSerializeWrapper.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetSerializeWrapper.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetSerializeWrapper.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetStore.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetStore.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetStore.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/store/OffsetStore.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/ReadOffsetType.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/store/ReadOffsetType.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/ReadOffsetType.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/store/ReadOffsetType.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java b/client/src/main/java/com/alibaba/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java
rename to client/src/main/java/com/alibaba/rocketmq/client/consumer/store/RemoteBrokerOffsetStore.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/exception/MQBrokerException.java b/client/src/main/java/com/alibaba/rocketmq/client/exception/MQBrokerException.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/exception/MQBrokerException.java
rename to client/src/main/java/com/alibaba/rocketmq/client/exception/MQBrokerException.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/exception/MQClientException.java b/client/src/main/java/com/alibaba/rocketmq/client/exception/MQClientException.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/exception/MQClientException.java
rename to client/src/main/java/com/alibaba/rocketmq/client/exception/MQClientException.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenContext.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenContext.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenContext.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenContext.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenHook.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenHook.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenHook.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/CheckForbiddenHook.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageContext.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageContext.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageContext.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageContext.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageHook.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageHook.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageHook.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/ConsumeMessageHook.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageContext.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageContext.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageContext.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageContext.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageHook.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageHook.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageHook.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/FilterMessageHook.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageContext.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageContext.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageContext.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageContext.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageHook.java b/client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageHook.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageHook.java
rename to client/src/main/java/com/alibaba/rocketmq/client/hook/SendMessageHook.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/ClientRemotingProcessor.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/ClientRemotingProcessor.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/ClientRemotingProcessor.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/ClientRemotingProcessor.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/CommunicationMode.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/CommunicationMode.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/CommunicationMode.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/CommunicationMode.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/FindBrokerResult.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/FindBrokerResult.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/FindBrokerResult.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/FindBrokerResult.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/MQAdminImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/MQAdminImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/MQAdminImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/MQAdminImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientAPIImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientAPIImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientAPIImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientAPIImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientManager.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientManager.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientManager.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/MQClientManager.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageService.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageService.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageService.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ConsumeMessageService.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPullConsumerImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/DefaultMQPushConsumerImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MQConsumerInner.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MQConsumerInner.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MQConsumerInner.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MQConsumerInner.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MessageQueueLock.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MessageQueueLock.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MessageQueueLock.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/MessageQueueLock.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ProcessQueue.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ProcessQueue.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ProcessQueue.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/ProcessQueue.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullAPIWrapper.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullAPIWrapper.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullAPIWrapper.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullAPIWrapper.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullMessageService.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullMessageService.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullMessageService.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullMessageService.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullRequest.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullRequest.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullRequest.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullRequest.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullResultExt.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullResultExt.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullResultExt.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/PullResultExt.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePullImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePullImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePullImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePullImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePushImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePushImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePushImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalancePushImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceService.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceService.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceService.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/consumer/RebalanceService.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/factory/MQClientInstance.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/factory/MQClientInstance.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/factory/MQClientInstance.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/factory/MQClientInstance.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/producer/DefaultMQProducerImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/producer/DefaultMQProducerImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/producer/MQProducerInner.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/producer/MQProducerInner.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/producer/MQProducerInner.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/producer/MQProducerInner.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/producer/TopicPublishInfo.java b/client/src/main/java/com/alibaba/rocketmq/client/impl/producer/TopicPublishInfo.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/impl/producer/TopicPublishInfo.java
rename to client/src/main/java/com/alibaba/rocketmq/client/impl/producer/TopicPublishInfo.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultTolerance.java b/client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultTolerance.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultTolerance.java
rename to client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultTolerance.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultToleranceImpl.java b/client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultToleranceImpl.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultToleranceImpl.java
rename to client/src/main/java/com/alibaba/rocketmq/client/latency/LatencyFaultToleranceImpl.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/latency/MQFaultStrategy.java b/client/src/main/java/com/alibaba/rocketmq/client/latency/MQFaultStrategy.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/latency/MQFaultStrategy.java
rename to client/src/main/java/com/alibaba/rocketmq/client/latency/MQFaultStrategy.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/log/ClientLogger.java b/client/src/main/java/com/alibaba/rocketmq/client/log/ClientLogger.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/log/ClientLogger.java
rename to client/src/main/java/com/alibaba/rocketmq/client/log/ClientLogger.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/DefaultMQProducer.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/DefaultMQProducer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/DefaultMQProducer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/DefaultMQProducer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionExecuter.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionExecuter.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionExecuter.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionExecuter.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionState.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionState.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionState.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/LocalTransactionState.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/MQProducer.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/MQProducer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/MQProducer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/MQProducer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/MessageQueueSelector.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/MessageQueueSelector.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/MessageQueueSelector.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/MessageQueueSelector.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/SendCallback.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/SendCallback.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/SendCallback.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/SendCallback.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/SendResult.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/SendResult.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/SendResult.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/SendResult.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/SendStatus.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/SendStatus.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/SendStatus.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/SendStatus.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionCheckListener.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionCheckListener.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionCheckListener.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionCheckListener.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionMQProducer.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionMQProducer.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionMQProducer.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionMQProducer.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionSendResult.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionSendResult.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionSendResult.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/TransactionSendResult.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByHash.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByHash.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByHash.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByHash.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByMachineRoom.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByMachineRoom.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByMachineRoom.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByMachineRoom.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByRandoom.java b/client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByRandoom.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByRandoom.java
rename to client/src/main/java/com/alibaba/rocketmq/client/producer/selector/SelectMessageQueueByRandoom.java
diff --git a/rocketmq-client/src/main/java/com/alibaba/rocketmq/client/stat/ConsumerStatsManager.java b/client/src/main/java/com/alibaba/rocketmq/client/stat/ConsumerStatsManager.java
similarity index 100%
rename from rocketmq-client/src/main/java/com/alibaba/rocketmq/client/stat/ConsumerStatsManager.java
rename to client/src/main/java/com/alibaba/rocketmq/client/stat/ConsumerStatsManager.java
diff --git a/rocketmq-client/src/main/resources/log4j_rocketmq_client.xml b/client/src/main/resources/log4j_rocketmq_client.xml
similarity index 100%
rename from rocketmq-client/src/main/resources/log4j_rocketmq_client.xml
rename to client/src/main/resources/log4j_rocketmq_client.xml
diff --git a/rocketmq-client/src/main/resources/logback_rocketmq_client.xml b/client/src/main/resources/logback_rocketmq_client.xml
similarity index 100%
rename from rocketmq-client/src/main/resources/logback_rocketmq_client.xml
rename to client/src/main/resources/logback_rocketmq_client.xml
diff --git a/rocketmq-client/src/test/java/com/alibaba/rocketmq/client/ValidatorsTest.java b/client/src/test/java/com/alibaba/rocketmq/client/ValidatorsTest.java
similarity index 100%
rename from rocketmq-client/src/test/java/com/alibaba/rocketmq/client/ValidatorsTest.java
rename to client/src/test/java/com/alibaba/rocketmq/client/ValidatorsTest.java
diff --git a/rocketmq-client/src/test/java/com/alibaba/rocketmq/client/consumer/loadbalance/AllocateMessageQueueAveragelyTest.java b/client/src/test/java/com/alibaba/rocketmq/client/consumer/loadbalance/AllocateMessageQueueAveragelyTest.java
similarity index 100%
rename from rocketmq-client/src/test/java/com/alibaba/rocketmq/client/consumer/loadbalance/AllocateMessageQueueAveragelyTest.java
rename to client/src/test/java/com/alibaba/rocketmq/client/consumer/loadbalance/AllocateMessageQueueAveragelyTest.java
diff --git a/rocketmq-common/pom.xml b/common/pom.xml
similarity index 100%
rename from rocketmq-common/pom.xml
rename to common/pom.xml
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java b/common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java
rename to common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfigSingleton.java b/common/src/main/java/com/alibaba/rocketmq/common/BrokerConfigSingleton.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfigSingleton.java
rename to common/src/main/java/com/alibaba/rocketmq/common/BrokerConfigSingleton.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java b/common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java
rename to common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/Configuration.java b/common/src/main/java/com/alibaba/rocketmq/common/Configuration.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/Configuration.java
rename to common/src/main/java/com/alibaba/rocketmq/common/Configuration.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/CountDownLatch.java b/common/src/main/java/com/alibaba/rocketmq/common/CountDownLatch.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/CountDownLatch.java
rename to common/src/main/java/com/alibaba/rocketmq/common/CountDownLatch.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/DataVersion.java b/common/src/main/java/com/alibaba/rocketmq/common/DataVersion.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/DataVersion.java
rename to common/src/main/java/com/alibaba/rocketmq/common/DataVersion.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MQVersion.java b/common/src/main/java/com/alibaba/rocketmq/common/MQVersion.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MQVersion.java
rename to common/src/main/java/com/alibaba/rocketmq/common/MQVersion.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MixAll.java b/common/src/main/java/com/alibaba/rocketmq/common/MixAll.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MixAll.java
rename to common/src/main/java/com/alibaba/rocketmq/common/MixAll.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/Pair.java b/common/src/main/java/com/alibaba/rocketmq/common/Pair.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/Pair.java
rename to common/src/main/java/com/alibaba/rocketmq/common/Pair.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceState.java b/common/src/main/java/com/alibaba/rocketmq/common/ServiceState.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceState.java
rename to common/src/main/java/com/alibaba/rocketmq/common/ServiceState.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java b/common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java
rename to common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/SystemClock.java b/common/src/main/java/com/alibaba/rocketmq/common/SystemClock.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/SystemClock.java
rename to common/src/main/java/com/alibaba/rocketmq/common/SystemClock.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ThreadFactoryImpl.java b/common/src/main/java/com/alibaba/rocketmq/common/ThreadFactoryImpl.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ThreadFactoryImpl.java
rename to common/src/main/java/com/alibaba/rocketmq/common/ThreadFactoryImpl.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/TopicConfig.java b/common/src/main/java/com/alibaba/rocketmq/common/TopicConfig.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/TopicConfig.java
rename to common/src/main/java/com/alibaba/rocketmq/common/TopicConfig.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/TopicFilterType.java b/common/src/main/java/com/alibaba/rocketmq/common/TopicFilterType.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/TopicFilterType.java
rename to common/src/main/java/com/alibaba/rocketmq/common/TopicFilterType.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java b/common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java
rename to common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/ConsumeStats.java b/common/src/main/java/com/alibaba/rocketmq/common/admin/ConsumeStats.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/ConsumeStats.java
rename to common/src/main/java/com/alibaba/rocketmq/common/admin/ConsumeStats.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/OffsetWrapper.java b/common/src/main/java/com/alibaba/rocketmq/common/admin/OffsetWrapper.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/OffsetWrapper.java
rename to common/src/main/java/com/alibaba/rocketmq/common/admin/OffsetWrapper.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/RollbackStats.java b/common/src/main/java/com/alibaba/rocketmq/common/admin/RollbackStats.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/RollbackStats.java
rename to common/src/main/java/com/alibaba/rocketmq/common/admin/RollbackStats.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/TopicOffset.java b/common/src/main/java/com/alibaba/rocketmq/common/admin/TopicOffset.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/TopicOffset.java
rename to common/src/main/java/com/alibaba/rocketmq/common/admin/TopicOffset.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/TopicStatsTable.java b/common/src/main/java/com/alibaba/rocketmq/common/admin/TopicStatsTable.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/admin/TopicStatsTable.java
rename to common/src/main/java/com/alibaba/rocketmq/common/admin/TopicStatsTable.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/annotation/ImportantField.java b/common/src/main/java/com/alibaba/rocketmq/common/annotation/ImportantField.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/annotation/ImportantField.java
rename to common/src/main/java/com/alibaba/rocketmq/common/annotation/ImportantField.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/constant/DBMsgConstants.java b/common/src/main/java/com/alibaba/rocketmq/common/constant/DBMsgConstants.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/constant/DBMsgConstants.java
rename to common/src/main/java/com/alibaba/rocketmq/common/constant/DBMsgConstants.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/constant/LoggerName.java b/common/src/main/java/com/alibaba/rocketmq/common/constant/LoggerName.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/constant/LoggerName.java
rename to common/src/main/java/com/alibaba/rocketmq/common/constant/LoggerName.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/constant/PermName.java b/common/src/main/java/com/alibaba/rocketmq/common/constant/PermName.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/constant/PermName.java
rename to common/src/main/java/com/alibaba/rocketmq/common/constant/PermName.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/consumer/ConsumeFromWhere.java b/common/src/main/java/com/alibaba/rocketmq/common/consumer/ConsumeFromWhere.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/consumer/ConsumeFromWhere.java
rename to common/src/main/java/com/alibaba/rocketmq/common/consumer/ConsumeFromWhere.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/FilterAPI.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/FilterAPI.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/FilterAPI.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/FilterAPI.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/FilterContext.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/FilterContext.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/FilterContext.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/FilterContext.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/MessageFilter.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/MessageFilter.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/MessageFilter.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/MessageFilter.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Op.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Op.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Op.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Op.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operand.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operand.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operand.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operand.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operator.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operator.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operator.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Operator.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/PolishExpr.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/impl/PolishExpr.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/PolishExpr.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/impl/PolishExpr.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Type.java b/common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Type.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Type.java
rename to common/src/main/java/com/alibaba/rocketmq/common/filter/impl/Type.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/help/FAQUrl.java b/common/src/main/java/com/alibaba/rocketmq/common/help/FAQUrl.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/help/FAQUrl.java
rename to common/src/main/java/com/alibaba/rocketmq/common/help/FAQUrl.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/hook/FilterCheckHook.java b/common/src/main/java/com/alibaba/rocketmq/common/hook/FilterCheckHook.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/hook/FilterCheckHook.java
rename to common/src/main/java/com/alibaba/rocketmq/common/hook/FilterCheckHook.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/Message.java b/common/src/main/java/com/alibaba/rocketmq/common/message/Message.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/Message.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/Message.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageAccessor.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageAccessor.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageAccessor.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageAccessor.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientExt.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientExt.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientExt.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientExt.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientIDSetter.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientIDSetter.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientIDSetter.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageClientIDSetter.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageConst.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageConst.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageConst.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageConst.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageDecoder.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageDecoder.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageDecoder.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageDecoder.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageExt.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageExt.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageExt.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageExt.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageId.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageId.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageId.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageId.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueue.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueue.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueue.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueue.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueueForC.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueueForC.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueueForC.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageQueueForC.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageType.java b/common/src/main/java/com/alibaba/rocketmq/common/message/MessageType.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/message/MessageType.java
rename to common/src/main/java/com/alibaba/rocketmq/common/message/MessageType.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java b/common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java
rename to common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvUtil.java b/common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvUtil.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvUtil.java
rename to common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvUtil.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/RegisterBrokerResult.java b/common/src/main/java/com/alibaba/rocketmq/common/namesrv/RegisterBrokerResult.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/RegisterBrokerResult.java
rename to common/src/main/java/com/alibaba/rocketmq/common/namesrv/RegisterBrokerResult.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java b/common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java
rename to common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/RequestCode.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/RequestCode.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/RequestCode.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/RequestCode.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/ResponseCode.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/ResponseCode.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/ResponseCode.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/ResponseCode.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsItem.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsItem.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsItem.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/BrokerStatsItem.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/CMResult.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/CMResult.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/CMResult.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/CMResult.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ClusterInfo.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ClusterInfo.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ClusterInfo.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ClusterInfo.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/Connection.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/Connection.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/Connection.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/Connection.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeByWho.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeByWho.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeByWho.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeByWho.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeMessageDirectlyResult.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeMessageDirectlyResult.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeMessageDirectlyResult.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeMessageDirectlyResult.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatsList.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatsList.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatsList.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatsList.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatus.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatus.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatus.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumeStatus.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerConnection.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerConnection.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerConnection.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerConnection.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerOffsetSerializeWrapper.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerOffsetSerializeWrapper.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerOffsetSerializeWrapper.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerOffsetSerializeWrapper.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerRunningInfo.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerRunningInfo.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerRunningInfo.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ConsumerRunningInfo.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GetConsumerStatusBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GetConsumerStatusBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GetConsumerStatusBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GetConsumerStatusBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GroupList.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GroupList.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GroupList.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/GroupList.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/KVTable.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/KVTable.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/KVTable.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/KVTable.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchRequestBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchRequestBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchRequestBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchRequestBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchResponseBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchResponseBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchResponseBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/LockBatchResponseBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProcessQueueInfo.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProcessQueueInfo.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProcessQueueInfo.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProcessQueueInfo.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProducerConnection.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProducerConnection.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProducerConnection.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ProducerConnection.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryConsumeTimeSpanBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryConsumeTimeSpanBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryConsumeTimeSpanBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryConsumeTimeSpanBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryCorrectionOffsetBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryCorrectionOffsetBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryCorrectionOffsetBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueryCorrectionOffsetBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueueTimeSpan.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueueTimeSpan.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueueTimeSpan.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/QueueTimeSpan.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/RegisterBrokerBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/RegisterBrokerBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/RegisterBrokerBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/RegisterBrokerBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBodyForC.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBodyForC.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBodyForC.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/ResetOffsetBodyForC.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/SubscriptionGroupWrapper.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/SubscriptionGroupWrapper.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/SubscriptionGroupWrapper.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/SubscriptionGroupWrapper.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicConfigSerializeWrapper.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicConfigSerializeWrapper.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicConfigSerializeWrapper.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicConfigSerializeWrapper.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicList.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicList.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicList.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/TopicList.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/UnlockBatchRequestBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/body/UnlockBatchRequestBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/body/UnlockBatchRequestBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/body/UnlockBatchRequestBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CheckTransactionStateResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CloneGroupOffsetRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumeMessageDirectlyResultRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ConsumerSendMsgBackRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CreateTopicRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CreateTopicRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CreateTopicRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/CreateTopicRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteSubscriptionGroupRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteSubscriptionGroupRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteSubscriptionGroupRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteSubscriptionGroupRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteTopicRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteTopicRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteTopicRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/DeleteTopicRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/EndTransactionResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetAllTopicConfigResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetAllTopicConfigResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetAllTopicConfigResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetAllTopicConfigResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetBrokerConfigResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetBrokerConfigResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetBrokerConfigResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetBrokerConfigResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsInBrokerHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsInBrokerHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsInBrokerHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsInBrokerHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumeStatsRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerConnectionListRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerConnectionListRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerConnectionListRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerConnectionListRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseBody.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseBody.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseBody.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseBody.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerListByGroupResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerRunningInfoRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetConsumerStatusRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetEarliestMsgStoretimeResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMaxOffsetResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetMinOffsetResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetProducerConnectionListRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetProducerConnectionListRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetProducerConnectionListRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetProducerConnectionListRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicStatsInfoRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicStatsInfoRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicStatsInfoRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicStatsInfoRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicsByClusterRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicsByClusterRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicsByClusterRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/GetTopicsByClusterRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/NotifyConsumerIdsChangedRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/NotifyConsumerIdsChangedRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/NotifyConsumerIdsChangedRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/NotifyConsumerIdsChangedRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/PullMessageResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumeTimeSpanRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumeTimeSpanRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumeTimeSpanRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumeTimeSpanRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryConsumerOffsetResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryCorrectionOffsetHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryCorrectionOffsetHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryCorrectionOffsetHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryCorrectionOffsetHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryMessageResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryTopicConsumeByWhoRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryTopicConsumeByWhoRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryTopicConsumeByWhoRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/QueryTopicConsumeByWhoRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ResetOffsetRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ResetOffsetRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ResetOffsetRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ResetOffsetRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SearchOffsetResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/SendMessageResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/UpdateConsumerOffsetResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewBrokerStatsDataRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewBrokerStatsDataRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewBrokerStatsDataRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewBrokerStatsDataRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/ViewMessageResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterFilterServerResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterMessageFilterClassRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterMessageFilterClassRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterMessageFilterClassRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/filtersrv/RegisterMessageFilterClassRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteKVConfigRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteKVConfigRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteKVConfigRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteKVConfigRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteTopicInNamesrvRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteTopicInNamesrvRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteTopicInNamesrvRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/DeleteTopicInNamesrvRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVConfigResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVListByNamespaceRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVListByNamespaceRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVListByNamespaceRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetKVListByNamespaceRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/GetRouteInfoResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/PutKVConfigRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/PutKVConfigRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/PutKVConfigRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/PutKVConfigRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterBrokerResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterOrderTopicRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterOrderTopicRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterOrderTopicRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/RegisterOrderTopicRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/UnRegisterBrokerRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/UnRegisterBrokerRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/UnRegisterBrokerRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/UnRegisterBrokerRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerRequestHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerRequestHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerRequestHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerRequestHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerResponseHeader.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerResponseHeader.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerResponseHeader.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/header/namesrv/WipeWritePermOfBrokerResponseHeader.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumeType.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumeType.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumeType.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumeType.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumerData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumerData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumerData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ConsumerData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/HeartbeatData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/HeartbeatData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/HeartbeatData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/HeartbeatData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/MessageModel.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/MessageModel.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/MessageModel.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/MessageModel.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ProducerData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ProducerData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ProducerData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/ProducerData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/SubscriptionData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/SubscriptionData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/SubscriptionData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/heartbeat/SubscriptionData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/route/BrokerData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/route/BrokerData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/route/BrokerData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/route/BrokerData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/route/QueueData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/route/QueueData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/route/QueueData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/route/QueueData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/route/TopicRouteData.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/route/TopicRouteData.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/route/TopicRouteData.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/route/TopicRouteData.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/topic/OffsetMovedEvent.java b/common/src/main/java/com/alibaba/rocketmq/common/protocol/topic/OffsetMovedEvent.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/topic/OffsetMovedEvent.java
rename to common/src/main/java/com/alibaba/rocketmq/common/protocol/topic/OffsetMovedEvent.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/queue/ConcurrentTreeMap.java b/common/src/main/java/com/alibaba/rocketmq/common/queue/ConcurrentTreeMap.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/queue/ConcurrentTreeMap.java
rename to common/src/main/java/com/alibaba/rocketmq/common/queue/ConcurrentTreeMap.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/queue/RoundQueue.java b/common/src/main/java/com/alibaba/rocketmq/common/queue/RoundQueue.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/queue/RoundQueue.java
rename to common/src/main/java/com/alibaba/rocketmq/common/queue/RoundQueue.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/running/RunningStats.java b/common/src/main/java/com/alibaba/rocketmq/common/running/RunningStats.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/running/RunningStats.java
rename to common/src/main/java/com/alibaba/rocketmq/common/running/RunningStats.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItem.java b/common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItem.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItem.java
rename to common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItem.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItemSet.java b/common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItemSet.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItemSet.java
rename to common/src/main/java/com/alibaba/rocketmq/common/stats/MomentStatsItemSet.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItem.java b/common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItem.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItem.java
rename to common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItem.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItemSet.java b/common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItemSet.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItemSet.java
rename to common/src/main/java/com/alibaba/rocketmq/common/stats/StatsItemSet.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/StatsSnapshot.java b/common/src/main/java/com/alibaba/rocketmq/common/stats/StatsSnapshot.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/stats/StatsSnapshot.java
rename to common/src/main/java/com/alibaba/rocketmq/common/stats/StatsSnapshot.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/subscription/SubscriptionGroupConfig.java b/common/src/main/java/com/alibaba/rocketmq/common/subscription/SubscriptionGroupConfig.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/subscription/SubscriptionGroupConfig.java
rename to common/src/main/java/com/alibaba/rocketmq/common/subscription/SubscriptionGroupConfig.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/MessageSysFlag.java b/common/src/main/java/com/alibaba/rocketmq/common/sysflag/MessageSysFlag.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/MessageSysFlag.java
rename to common/src/main/java/com/alibaba/rocketmq/common/sysflag/MessageSysFlag.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/PullSysFlag.java b/common/src/main/java/com/alibaba/rocketmq/common/sysflag/PullSysFlag.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/PullSysFlag.java
rename to common/src/main/java/com/alibaba/rocketmq/common/sysflag/PullSysFlag.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/SubscriptionSysFlag.java b/common/src/main/java/com/alibaba/rocketmq/common/sysflag/SubscriptionSysFlag.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/SubscriptionSysFlag.java
rename to common/src/main/java/com/alibaba/rocketmq/common/sysflag/SubscriptionSysFlag.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/TopicSysFlag.java b/common/src/main/java/com/alibaba/rocketmq/common/sysflag/TopicSysFlag.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/sysflag/TopicSysFlag.java
rename to common/src/main/java/com/alibaba/rocketmq/common/sysflag/TopicSysFlag.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/utils/ChannelUtil.java b/common/src/main/java/com/alibaba/rocketmq/common/utils/ChannelUtil.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/utils/ChannelUtil.java
rename to common/src/main/java/com/alibaba/rocketmq/common/utils/ChannelUtil.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/utils/HttpTinyClient.java b/common/src/main/java/com/alibaba/rocketmq/common/utils/HttpTinyClient.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/utils/HttpTinyClient.java
rename to common/src/main/java/com/alibaba/rocketmq/common/utils/HttpTinyClient.java
diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/utils/IOTinyUtils.java b/common/src/main/java/com/alibaba/rocketmq/common/utils/IOTinyUtils.java
similarity index 100%
rename from rocketmq-common/src/main/java/com/alibaba/rocketmq/common/utils/IOTinyUtils.java
rename to common/src/main/java/com/alibaba/rocketmq/common/utils/IOTinyUtils.java
diff --git a/rocketmq-common/src/test/java/com/alibaba/rocketmq/common/MixAllTest.java b/common/src/test/java/com/alibaba/rocketmq/common/MixAllTest.java
similarity index 100%
rename from rocketmq-common/src/test/java/com/alibaba/rocketmq/common/MixAllTest.java
rename to common/src/test/java/com/alibaba/rocketmq/common/MixAllTest.java
diff --git a/rocketmq-common/src/test/java/com/alibaba/rocketmq/common/RemotingUtilTest.java b/common/src/test/java/com/alibaba/rocketmq/common/RemotingUtilTest.java
similarity index 100%
rename from rocketmq-common/src/test/java/com/alibaba/rocketmq/common/RemotingUtilTest.java
rename to common/src/test/java/com/alibaba/rocketmq/common/RemotingUtilTest.java
diff --git a/rocketmq-common/src/test/java/com/alibaba/rocketmq/common/UtilAllTest.java b/common/src/test/java/com/alibaba/rocketmq/common/UtilAllTest.java
similarity index 100%
rename from rocketmq-common/src/test/java/com/alibaba/rocketmq/common/UtilAllTest.java
rename to common/src/test/java/com/alibaba/rocketmq/common/UtilAllTest.java
diff --git a/rocketmq-common/src/test/java/com/alibaba/rocketmq/common/filter/FilterAPITest.java b/common/src/test/java/com/alibaba/rocketmq/common/filter/FilterAPITest.java
similarity index 100%
rename from rocketmq-common/src/test/java/com/alibaba/rocketmq/common/filter/FilterAPITest.java
rename to common/src/test/java/com/alibaba/rocketmq/common/filter/FilterAPITest.java
diff --git a/rocketmq-common/src/test/java/com/alibaba/rocketmq/common/filter/PolishExprTest.java b/common/src/test/java/com/alibaba/rocketmq/common/filter/PolishExprTest.java
similarity index 100%
rename from rocketmq-common/src/test/java/com/alibaba/rocketmq/common/filter/PolishExprTest.java
rename to common/src/test/java/com/alibaba/rocketmq/common/filter/PolishExprTest.java
diff --git a/rocketmq-common/src/test/java/com/alibaba/rocketmq/common/protocol/ConsumeStatusTest.java b/common/src/test/java/com/alibaba/rocketmq/common/protocol/ConsumeStatusTest.java
similarity index 100%
rename from rocketmq-common/src/test/java/com/alibaba/rocketmq/common/protocol/ConsumeStatusTest.java
rename to common/src/test/java/com/alibaba/rocketmq/common/protocol/ConsumeStatusTest.java
diff --git a/rocketmq-common/src/test/java/com/alibaba/rocketmq/common/protocol/MQProtosHelperTest.java b/common/src/test/java/com/alibaba/rocketmq/common/protocol/MQProtosHelperTest.java
similarity index 100%
rename from rocketmq-common/src/test/java/com/alibaba/rocketmq/common/protocol/MQProtosHelperTest.java
rename to common/src/test/java/com/alibaba/rocketmq/common/protocol/MQProtosHelperTest.java
diff --git a/rocketmq-example/pom.xml b/example/pom.xml
similarity index 100%
rename from rocketmq-example/pom.xml
rename to example/pom.xml
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/benchmark/Consumer.java b/example/src/main/java/com/alibaba/rocketmq/example/benchmark/Consumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/benchmark/Consumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/benchmark/Consumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/benchmark/Producer.java b/example/src/main/java/com/alibaba/rocketmq/example/benchmark/Producer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/benchmark/Producer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/benchmark/Producer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/benchmark/TransactionProducer.java b/example/src/main/java/com/alibaba/rocketmq/example/benchmark/TransactionProducer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/benchmark/TransactionProducer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/benchmark/TransactionProducer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/broadcast/PushConsumer.java b/example/src/main/java/com/alibaba/rocketmq/example/broadcast/PushConsumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/broadcast/PushConsumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/broadcast/PushConsumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/filter/Consumer.java b/example/src/main/java/com/alibaba/rocketmq/example/filter/Consumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/filter/Consumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/filter/Consumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/filter/Producer.java b/example/src/main/java/com/alibaba/rocketmq/example/filter/Producer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/filter/Producer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/filter/Producer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/operation/Consumer.java b/example/src/main/java/com/alibaba/rocketmq/example/operation/Consumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/operation/Consumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/operation/Consumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/operation/Producer.java b/example/src/main/java/com/alibaba/rocketmq/example/operation/Producer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/operation/Producer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/operation/Producer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Consumer.java b/example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Consumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Consumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Consumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Producer.java b/example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Producer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Producer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/ordermessage/Producer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/quickstart/Consumer.java b/example/src/main/java/com/alibaba/rocketmq/example/quickstart/Consumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/quickstart/Consumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/quickstart/Consumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/quickstart/Producer.java b/example/src/main/java/com/alibaba/rocketmq/example/quickstart/Producer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/quickstart/Producer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/quickstart/Producer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/AsyncProducer.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/AsyncProducer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/AsyncProducer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/AsyncProducer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/CachedQueue.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/CachedQueue.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/CachedQueue.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/CachedQueue.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/Producer.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/Producer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/Producer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/Producer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumer.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumerTest.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumerTest.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumerTest.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/PullConsumerTest.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PullScheduleService.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/PullScheduleService.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PullScheduleService.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/PullScheduleService.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PushConsumer.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/PushConsumer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/PushConsumer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/PushConsumer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/RandomAsyncCommit.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/RandomAsyncCommit.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/RandomAsyncCommit.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/RandomAsyncCommit.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/TestProducer.java b/example/src/main/java/com/alibaba/rocketmq/example/simple/TestProducer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/simple/TestProducer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/simple/TestProducer.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionCheckListenerImpl.java b/example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionCheckListenerImpl.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionCheckListenerImpl.java
rename to example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionCheckListenerImpl.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionExecuterImpl.java b/example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionExecuterImpl.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionExecuterImpl.java
rename to example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionExecuterImpl.java
diff --git a/rocketmq-example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionProducer.java b/example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionProducer.java
similarity index 100%
rename from rocketmq-example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionProducer.java
rename to example/src/main/java/com/alibaba/rocketmq/example/transaction/TransactionProducer.java
diff --git a/rocketmq-example/src/main/resources/MessageFilterImpl.java b/example/src/main/resources/MessageFilterImpl.java
similarity index 100%
rename from rocketmq-example/src/main/resources/MessageFilterImpl.java
rename to example/src/main/resources/MessageFilterImpl.java
diff --git a/rocketmq-filtersrv/pom.xml b/filtersrv/pom.xml
similarity index 100%
rename from rocketmq-filtersrv/pom.xml
rename to filtersrv/pom.xml
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FilterServerOuterAPI.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FilterServerOuterAPI.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FilterServerOuterAPI.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FilterServerOuterAPI.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvConfig.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvConfig.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvConfig.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvConfig.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvController.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvController.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvController.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvController.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvStartup.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvStartup.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvStartup.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/FiltersrvStartup.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassFetchMethod.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassFetchMethod.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassFetchMethod.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassFetchMethod.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassInfo.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassInfo.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassInfo.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassInfo.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassLoader.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassLoader.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassLoader.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassLoader.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassManager.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassManager.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassManager.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/FilterClassManager.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/HttpFilterClassFetchMethod.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/HttpFilterClassFetchMethod.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/HttpFilterClassFetchMethod.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/HttpFilterClassFetchMethod.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/processor/DefaultRequestProcessor.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/processor/DefaultRequestProcessor.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/processor/DefaultRequestProcessor.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/processor/DefaultRequestProcessor.java
diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/stats/FilterServerStatsManager.java b/filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/stats/FilterServerStatsManager.java
similarity index 100%
rename from rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/stats/FilterServerStatsManager.java
rename to filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/stats/FilterServerStatsManager.java
diff --git a/rocketmq-namesrv/pom.xml b/namesrv/pom.xml
similarity index 100%
rename from rocketmq-namesrv/pom.xml
rename to namesrv/pom.xml
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvController.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvController.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvController.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvController.java
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvStartup.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvStartup.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvStartup.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/NamesrvStartup.java
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigManager.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigManager.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigManager.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigManager.java
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigSerializeWrapper.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigSerializeWrapper.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigSerializeWrapper.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/kvconfig/KVConfigSerializeWrapper.java
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/DefaultRequestProcessor.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/DefaultRequestProcessor.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/DefaultRequestProcessor.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/DefaultRequestProcessor.java
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/BrokerHousekeepingService.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/BrokerHousekeepingService.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/BrokerHousekeepingService.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/BrokerHousekeepingService.java
diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/RouteInfoManager.java b/namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/RouteInfoManager.java
similarity index 100%
rename from rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/RouteInfoManager.java
rename to namesrv/src/main/java/com/alibaba/rocketmq/namesrv/routeinfo/RouteInfoManager.java
diff --git a/pom.xml b/pom.xml
index fa4a0be0f3ac9bd625329518ae77fe7d2dca5ccd..8dde1260236e798f3905e39ac99df71d54ed8f6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,16 +160,16 @@
     </properties>
 
     <modules>
-        <module>rocketmq-client</module>
-        <module>rocketmq-common</module>
-        <module>rocketmq-broker</module>
-        <module>rocketmq-tools</module>
-        <module>rocketmq-store</module>
-        <module>rocketmq-namesrv</module>
-        <module>rocketmq-remoting</module>
-        <module>rocketmq-example</module>
-        <module>rocketmq-filtersrv</module>
-        <module>rocketmq-srvutil</module>
+        <module>client</module>
+        <module>common</module>
+        <module>broker</module>
+        <module>tools</module>
+        <module>store</module>
+        <module>namesrv</module>
+        <module>remoting</module>
+        <module>example</module>
+        <module>filtersrv</module>
+        <module>srvutil</module>
     </modules>
 
     <build>
diff --git a/rocketmq-remoting/pom.xml b/remoting/pom.xml
similarity index 100%
rename from rocketmq-remoting/pom.xml
rename to remoting/pom.xml
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/ChannelEventListener.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/ChannelEventListener.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/ChannelEventListener.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/ChannelEventListener.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/CommandCustomHeader.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/CommandCustomHeader.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/CommandCustomHeader.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/CommandCustomHeader.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/InvokeCallback.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/InvokeCallback.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/InvokeCallback.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/InvokeCallback.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RPCHook.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/RPCHook.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RPCHook.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/RPCHook.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingClient.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingClient.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingClient.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingClient.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingServer.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingServer.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingServer.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingServer.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingService.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingService.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingService.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/RemotingService.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNotNull.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNotNull.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNotNull.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNotNull.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNullable.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNullable.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNullable.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/annotation/CFNullable.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/Pair.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/common/Pair.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/Pair.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/common/Pair.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/SemaphoreReleaseOnlyOnce.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/common/SemaphoreReleaseOnlyOnce.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/SemaphoreReleaseOnlyOnce.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/common/SemaphoreReleaseOnlyOnce.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingCommandException.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingCommandException.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingCommandException.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingCommandException.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingConnectException.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingConnectException.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingConnectException.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingConnectException.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingException.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingException.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingException.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingException.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingSendRequestException.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingSendRequestException.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingSendRequestException.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingSendRequestException.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTimeoutException.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTimeoutException.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTimeoutException.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTimeoutException.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTooMuchRequestException.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTooMuchRequestException.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTooMuchRequestException.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/exception/RemotingTooMuchRequestException.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyClientConfig.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyClientConfig.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyClientConfig.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyClientConfig.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEncoder.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEncoder.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEncoder.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEncoder.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEvent.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEvent.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEvent.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEvent.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEventType.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEventType.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEventType.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyEventType.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingClient.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingClient.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingClient.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingClient.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingServer.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingServer.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingServer.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingServer.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRequestProcessor.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRequestProcessor.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRequestProcessor.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRequestProcessor.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyServerConfig.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyServerConfig.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyServerConfig.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyServerConfig.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettySystemConfig.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettySystemConfig.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettySystemConfig.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettySystemConfig.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/RequestTask.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/RequestTask.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/RequestTask.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/RequestTask.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/ResponseFuture.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/ResponseFuture.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/ResponseFuture.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/ResponseFuture.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/LanguageCode.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/LanguageCode.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/LanguageCode.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/LanguageCode.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommand.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommand.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommand.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommand.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommandType.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommandType.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommandType.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingCommandType.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSerializable.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSerializable.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSerializable.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSerializable.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSysResponseCode.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSysResponseCode.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSysResponseCode.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RemotingSysResponseCode.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RocketMQSerializable.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RocketMQSerializable.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RocketMQSerializable.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/RocketMQSerializable.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/SerializeType.java b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/SerializeType.java
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/SerializeType.java
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/SerializeType.java
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.sevialize.txt
diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt b/remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
similarity index 100%
rename from rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
rename to remoting/src/main/java/com/alibaba/rocketmq/remoting/protocol/protocol.txt
diff --git a/rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/ExceptionTest.java b/remoting/src/test/java/com/alibaba/rocketmq/remoting/ExceptionTest.java
similarity index 100%
rename from rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/ExceptionTest.java
rename to remoting/src/test/java/com/alibaba/rocketmq/remoting/ExceptionTest.java
diff --git a/rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/MixTest.java b/remoting/src/test/java/com/alibaba/rocketmq/remoting/MixTest.java
similarity index 100%
rename from rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/MixTest.java
rename to remoting/src/test/java/com/alibaba/rocketmq/remoting/MixTest.java
diff --git a/rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyConnectionTest.java b/remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyConnectionTest.java
similarity index 100%
rename from rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyConnectionTest.java
rename to remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyConnectionTest.java
diff --git a/rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyIdleTest.java b/remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyIdleTest.java
similarity index 100%
rename from rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyIdleTest.java
rename to remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyIdleTest.java
diff --git a/rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyRPCTest.java b/remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyRPCTest.java
similarity index 100%
rename from rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyRPCTest.java
rename to remoting/src/test/java/com/alibaba/rocketmq/remoting/NettyRPCTest.java
diff --git a/rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/SyncInvokeTest.java b/remoting/src/test/java/com/alibaba/rocketmq/remoting/SyncInvokeTest.java
similarity index 100%
rename from rocketmq-remoting/src/test/java/com/alibaba/rocketmq/remoting/SyncInvokeTest.java
rename to remoting/src/test/java/com/alibaba/rocketmq/remoting/SyncInvokeTest.java
diff --git a/rocketmq-remoting/src/test/java/com/alibaba/rocketmq/subclass/TestSubClassAuto.java b/remoting/src/test/java/com/alibaba/rocketmq/subclass/TestSubClassAuto.java
similarity index 100%
rename from rocketmq-remoting/src/test/java/com/alibaba/rocketmq/subclass/TestSubClassAuto.java
rename to remoting/src/test/java/com/alibaba/rocketmq/subclass/TestSubClassAuto.java
diff --git a/rocketmq-srvutil/pom.xml b/srvutil/pom.xml
similarity index 100%
rename from rocketmq-srvutil/pom.xml
rename to srvutil/pom.xml
diff --git a/rocketmq-srvutil/src/main/java/com/alibaba/rocketmq/srvutil/ServerUtil.java b/srvutil/src/main/java/com/alibaba/rocketmq/srvutil/ServerUtil.java
similarity index 100%
rename from rocketmq-srvutil/src/main/java/com/alibaba/rocketmq/srvutil/ServerUtil.java
rename to srvutil/src/main/java/com/alibaba/rocketmq/srvutil/ServerUtil.java
diff --git a/rocketmq-store/pom.xml b/store/pom.xml
similarity index 100%
rename from rocketmq-store/pom.xml
rename to store/pom.xml
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java b/store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java
rename to store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AppendMessageCallback.java b/store/src/main/java/com/alibaba/rocketmq/store/AppendMessageCallback.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AppendMessageCallback.java
rename to store/src/main/java/com/alibaba/rocketmq/store/AppendMessageCallback.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AppendMessageResult.java b/store/src/main/java/com/alibaba/rocketmq/store/AppendMessageResult.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AppendMessageResult.java
rename to store/src/main/java/com/alibaba/rocketmq/store/AppendMessageResult.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AppendMessageStatus.java b/store/src/main/java/com/alibaba/rocketmq/store/AppendMessageStatus.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AppendMessageStatus.java
rename to store/src/main/java/com/alibaba/rocketmq/store/AppendMessageStatus.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java b/store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java
rename to store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java b/store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java
rename to store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageFilter.java b/store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageFilter.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageFilter.java
rename to store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageFilter.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageStore.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageStore.java
rename to store/src/main/java/com/alibaba/rocketmq/store/DefaultMessageStore.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/DispatchRequest.java b/store/src/main/java/com/alibaba/rocketmq/store/DispatchRequest.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/DispatchRequest.java
rename to store/src/main/java/com/alibaba/rocketmq/store/DispatchRequest.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/GetMessageResult.java b/store/src/main/java/com/alibaba/rocketmq/store/GetMessageResult.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/GetMessageResult.java
rename to store/src/main/java/com/alibaba/rocketmq/store/GetMessageResult.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/GetMessageStatus.java b/store/src/main/java/com/alibaba/rocketmq/store/GetMessageStatus.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/GetMessageStatus.java
rename to store/src/main/java/com/alibaba/rocketmq/store/GetMessageStatus.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java b/store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java
rename to store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java b/store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java
rename to store/src/main/java/com/alibaba/rocketmq/store/MappedFileQueue.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageArrivingListener.java b/store/src/main/java/com/alibaba/rocketmq/store/MessageArrivingListener.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageArrivingListener.java
rename to store/src/main/java/com/alibaba/rocketmq/store/MessageArrivingListener.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageExtBrokerInner.java b/store/src/main/java/com/alibaba/rocketmq/store/MessageExtBrokerInner.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageExtBrokerInner.java
rename to store/src/main/java/com/alibaba/rocketmq/store/MessageExtBrokerInner.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageFilter.java b/store/src/main/java/com/alibaba/rocketmq/store/MessageFilter.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageFilter.java
rename to store/src/main/java/com/alibaba/rocketmq/store/MessageFilter.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageStore.java b/store/src/main/java/com/alibaba/rocketmq/store/MessageStore.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MessageStore.java
rename to store/src/main/java/com/alibaba/rocketmq/store/MessageStore.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/PutMessageResult.java b/store/src/main/java/com/alibaba/rocketmq/store/PutMessageResult.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/PutMessageResult.java
rename to store/src/main/java/com/alibaba/rocketmq/store/PutMessageResult.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/PutMessageStatus.java b/store/src/main/java/com/alibaba/rocketmq/store/PutMessageStatus.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/PutMessageStatus.java
rename to store/src/main/java/com/alibaba/rocketmq/store/PutMessageStatus.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/QueryMessageResult.java b/store/src/main/java/com/alibaba/rocketmq/store/QueryMessageResult.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/QueryMessageResult.java
rename to store/src/main/java/com/alibaba/rocketmq/store/QueryMessageResult.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ReferenceResource.java b/store/src/main/java/com/alibaba/rocketmq/store/ReferenceResource.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ReferenceResource.java
rename to store/src/main/java/com/alibaba/rocketmq/store/ReferenceResource.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/RunningFlags.java b/store/src/main/java/com/alibaba/rocketmq/store/RunningFlags.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/RunningFlags.java
rename to store/src/main/java/com/alibaba/rocketmq/store/RunningFlags.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/SelectMappedBufferResult.java b/store/src/main/java/com/alibaba/rocketmq/store/SelectMappedBufferResult.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/SelectMappedBufferResult.java
rename to store/src/main/java/com/alibaba/rocketmq/store/SelectMappedBufferResult.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java b/store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java
rename to store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreStatsService.java b/store/src/main/java/com/alibaba/rocketmq/store/StoreStatsService.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreStatsService.java
rename to store/src/main/java/com/alibaba/rocketmq/store/StoreStatsService.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreUtil.java b/store/src/main/java/com/alibaba/rocketmq/store/StoreUtil.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreUtil.java
rename to store/src/main/java/com/alibaba/rocketmq/store/StoreUtil.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/TransientStorePool.java b/store/src/main/java/com/alibaba/rocketmq/store/TransientStorePool.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/TransientStorePool.java
rename to store/src/main/java/com/alibaba/rocketmq/store/TransientStorePool.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/BrokerRole.java b/store/src/main/java/com/alibaba/rocketmq/store/config/BrokerRole.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/BrokerRole.java
rename to store/src/main/java/com/alibaba/rocketmq/store/config/BrokerRole.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/FlushDiskType.java b/store/src/main/java/com/alibaba/rocketmq/store/config/FlushDiskType.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/FlushDiskType.java
rename to store/src/main/java/com/alibaba/rocketmq/store/config/FlushDiskType.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/MessageStoreConfig.java b/store/src/main/java/com/alibaba/rocketmq/store/config/MessageStoreConfig.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/MessageStoreConfig.java
rename to store/src/main/java/com/alibaba/rocketmq/store/config/MessageStoreConfig.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/StorePathConfigHelper.java b/store/src/main/java/com/alibaba/rocketmq/store/config/StorePathConfigHelper.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/config/StorePathConfigHelper.java
rename to store/src/main/java/com/alibaba/rocketmq/store/config/StorePathConfigHelper.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAConnection.java b/store/src/main/java/com/alibaba/rocketmq/store/ha/HAConnection.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAConnection.java
rename to store/src/main/java/com/alibaba/rocketmq/store/ha/HAConnection.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java b/store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java
rename to store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java b/store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java
rename to store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java b/store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java
rename to store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexHeader.java b/store/src/main/java/com/alibaba/rocketmq/store/index/IndexHeader.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexHeader.java
rename to store/src/main/java/com/alibaba/rocketmq/store/index/IndexHeader.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java b/store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java
rename to store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/QueryOffsetResult.java b/store/src/main/java/com/alibaba/rocketmq/store/index/QueryOffsetResult.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/QueryOffsetResult.java
rename to store/src/main/java/com/alibaba/rocketmq/store/index/QueryOffsetResult.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/DelayOffsetSerializeWrapper.java b/store/src/main/java/com/alibaba/rocketmq/store/schedule/DelayOffsetSerializeWrapper.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/DelayOffsetSerializeWrapper.java
rename to store/src/main/java/com/alibaba/rocketmq/store/schedule/DelayOffsetSerializeWrapper.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java b/store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java
rename to store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java b/store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java
rename to store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStatsManager.java b/store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStatsManager.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStatsManager.java
rename to store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStatsManager.java
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/util/LibC.java b/store/src/main/java/com/alibaba/rocketmq/store/util/LibC.java
similarity index 100%
rename from rocketmq-store/src/main/java/com/alibaba/rocketmq/store/util/LibC.java
rename to store/src/main/java/com/alibaba/rocketmq/store/util/LibC.java
diff --git a/rocketmq-store/src/test/java/com/alibaba/rocketmq/store/DefaultMessageStoreTest.java b/store/src/test/java/com/alibaba/rocketmq/store/DefaultMessageStoreTest.java
similarity index 100%
rename from rocketmq-store/src/test/java/com/alibaba/rocketmq/store/DefaultMessageStoreTest.java
rename to store/src/test/java/com/alibaba/rocketmq/store/DefaultMessageStoreTest.java
diff --git a/rocketmq-store/src/test/java/com/alibaba/rocketmq/store/MappedFileQueueTest.java b/store/src/test/java/com/alibaba/rocketmq/store/MappedFileQueueTest.java
similarity index 100%
rename from rocketmq-store/src/test/java/com/alibaba/rocketmq/store/MappedFileQueueTest.java
rename to store/src/test/java/com/alibaba/rocketmq/store/MappedFileQueueTest.java
diff --git a/rocketmq-store/src/test/java/com/alibaba/rocketmq/store/MappedFileTest.java b/store/src/test/java/com/alibaba/rocketmq/store/MappedFileTest.java
similarity index 100%
rename from rocketmq-store/src/test/java/com/alibaba/rocketmq/store/MappedFileTest.java
rename to store/src/test/java/com/alibaba/rocketmq/store/MappedFileTest.java
diff --git a/rocketmq-store/src/test/java/com/alibaba/rocketmq/store/RecoverTest.java b/store/src/test/java/com/alibaba/rocketmq/store/RecoverTest.java
similarity index 100%
rename from rocketmq-store/src/test/java/com/alibaba/rocketmq/store/RecoverTest.java
rename to store/src/test/java/com/alibaba/rocketmq/store/RecoverTest.java
diff --git a/rocketmq-store/src/test/java/com/alibaba/rocketmq/store/StoreCheckpointTest.java b/store/src/test/java/com/alibaba/rocketmq/store/StoreCheckpointTest.java
similarity index 100%
rename from rocketmq-store/src/test/java/com/alibaba/rocketmq/store/StoreCheckpointTest.java
rename to store/src/test/java/com/alibaba/rocketmq/store/StoreCheckpointTest.java
diff --git a/rocketmq-store/src/test/java/com/alibaba/rocketmq/store/index/IndexFileTest.java b/store/src/test/java/com/alibaba/rocketmq/store/index/IndexFileTest.java
similarity index 100%
rename from rocketmq-store/src/test/java/com/alibaba/rocketmq/store/index/IndexFileTest.java
rename to store/src/test/java/com/alibaba/rocketmq/store/index/IndexFileTest.java
diff --git a/rocketmq-store/src/test/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageTest.java b/store/src/test/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageTest.java
similarity index 100%
rename from rocketmq-store/src/test/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageTest.java
rename to store/src/test/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageTest.java
diff --git a/rocketmq-store/src/test/resources/logback-test.xml b/store/src/test/resources/logback-test.xml
similarity index 100%
rename from rocketmq-store/src/test/resources/logback-test.xml
rename to store/src/test/resources/logback-test.xml
diff --git a/rocketmq-tools/pom.xml b/tools/pom.xml
similarity index 100%
rename from rocketmq-tools/pom.xml
rename to tools/pom.xml
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExt.java b/tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExt.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExt.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExt.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExtImpl.java b/tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/MQAdminExt.java b/tools/src/main/java/com/alibaba/rocketmq/tools/admin/MQAdminExt.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/MQAdminExt.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/admin/MQAdminExt.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/MessageTrack.java b/tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/MessageTrack.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/MessageTrack.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/MessageTrack.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/TrackType.java b/tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/TrackType.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/TrackType.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/admin/api/TrackType.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/CommandUtil.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/CommandUtil.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/CommandUtil.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/CommandUtil.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/MQAdminStartup.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/MQAdminStartup.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/MQAdminStartup.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/MQAdminStartup.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/SubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/SubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/SubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/SubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerConsumeStatsSubCommad.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerStatusSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerStatusSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerStatusSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/BrokerStatusSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanExpiredCQSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanExpiredCQSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanExpiredCQSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanExpiredCQSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanUnusedTopicCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanUnusedTopicCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanUnusedTopicCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/CleanUnusedTopicCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/GetBrokerConfigCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/GetBrokerConfigCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/GetBrokerConfigCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/GetBrokerConfigCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/SendMsgStatusCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/SendMsgStatusCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/SendMsgStatusCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/SendMsgStatusCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/UpdateBrokerConfigSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/UpdateBrokerConfigSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/UpdateBrokerConfigSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/broker/UpdateBrokerConfigSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/CLusterSendMsgRTCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/ClusterListSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/ClusterListSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/ClusterListSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/cluster/ClusterListSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ConsumerConnectionSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ConsumerConnectionSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ConsumerConnectionSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ConsumerConnectionSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ProducerConnectionSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ProducerConnectionSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ProducerConnectionSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/connection/ProducerConnectionSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerProgressSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerStatusSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/ConsumerSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/DeleteSubscriptionGroupCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/StartMonitoringSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/UpdateSubGroupSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/UpdateSubGroupSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/UpdateSubGroupSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/consumer/UpdateSubGroupSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/CheckMsgSendRTCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/CheckMsgSendRTCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/CheckMsgSendRTCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/CheckMsgSendRTCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/DecodeMessageIdCommond.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/DecodeMessageIdCommond.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/DecodeMessageIdCommond.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/DecodeMessageIdCommond.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageByQueueCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageByQueueCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageByQueueCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageByQueueCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/PrintMessageSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByIdSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByKeySubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByKeySubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByKeySubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByKeySubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByOffsetSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByOffsetSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByOffsetSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByOffsetSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/QueryMsgByUniqueKeySubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/Store.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/message/Store.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/message/Store.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/message/Store.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/DeleteKvConfigCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/GetNamesrvConfigCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateKvConfigCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/UpdateNamesrvConfigCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/WipeWritePermSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/WipeWritePermSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/WipeWritePermSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/namesrv/WipeWritePermSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/CloneGroupOffsetCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/GetConsumerStatusCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/GetConsumerStatusCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/GetConsumerStatusCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/GetConsumerStatusCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeOldCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeOldCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeOldCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/offset/ResetOffsetByTimeOldCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/stats/StatsAllSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/stats/StatsAllSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/stats/StatsAllSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/stats/StatsAllSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/AllocateMQSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/AllocateMQSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/AllocateMQSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/AllocateMQSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/DeleteTopicSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/DeleteTopicSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/DeleteTopicSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/DeleteTopicSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/RebalanceResult.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/RebalanceResult.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/RebalanceResult.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/RebalanceResult.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicClusterSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicClusterSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicClusterSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicClusterSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicListSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicListSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicListSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicListSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicRouteSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicRouteSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicRouteSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicRouteSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicStatusSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicStatusSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicStatusSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/TopicStatusSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateOrderConfCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateOrderConfCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateOrderConfCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateOrderConfCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicSubCommand.java b/tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicSubCommand.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicSubCommand.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/command/topic/UpdateTopicSubCommand.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DefaultMonitorListener.java b/tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DefaultMonitorListener.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DefaultMonitorListener.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DefaultMonitorListener.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DeleteMsgsEvent.java b/tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DeleteMsgsEvent.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DeleteMsgsEvent.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/monitor/DeleteMsgsEvent.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/FailedMsgs.java b/tools/src/main/java/com/alibaba/rocketmq/tools/monitor/FailedMsgs.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/FailedMsgs.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/monitor/FailedMsgs.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorConfig.java b/tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorConfig.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorConfig.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorConfig.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorListener.java b/tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorListener.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorListener.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorListener.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorService.java b/tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorService.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorService.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/monitor/MonitorService.java
diff --git a/rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/UndoneMsgs.java b/tools/src/main/java/com/alibaba/rocketmq/tools/monitor/UndoneMsgs.java
similarity index 100%
rename from rocketmq-tools/src/main/java/com/alibaba/rocketmq/tools/monitor/UndoneMsgs.java
rename to tools/src/main/java/com/alibaba/rocketmq/tools/monitor/UndoneMsgs.java