diff --git a/source/server/CMakeLists.txt b/source/dnode/CMakeLists.txt similarity index 100% rename from source/server/CMakeLists.txt rename to source/dnode/CMakeLists.txt diff --git a/source/server/dnode/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt similarity index 100% rename from source/server/dnode/CMakeLists.txt rename to source/dnode/mgmt/CMakeLists.txt diff --git a/source/server/dnode/inc/dnodeCheck.h b/source/dnode/mgmt/inc/dnodeCheck.h similarity index 100% rename from source/server/dnode/inc/dnodeCheck.h rename to source/dnode/mgmt/inc/dnodeCheck.h diff --git a/source/server/dnode/inc/dnodeEps.h b/source/dnode/mgmt/inc/dnodeEps.h similarity index 100% rename from source/server/dnode/inc/dnodeEps.h rename to source/dnode/mgmt/inc/dnodeEps.h diff --git a/source/server/dnode/inc/dnodeInt.h b/source/dnode/mgmt/inc/dnodeInt.h similarity index 100% rename from source/server/dnode/inc/dnodeInt.h rename to source/dnode/mgmt/inc/dnodeInt.h diff --git a/source/server/dnode/inc/dnodeMsg.h b/source/dnode/mgmt/inc/dnodeMsg.h similarity index 100% rename from source/server/dnode/inc/dnodeMsg.h rename to source/dnode/mgmt/inc/dnodeMsg.h diff --git a/source/server/dnode/inc/dnodeTrans.h b/source/dnode/mgmt/inc/dnodeTrans.h similarity index 100% rename from source/server/dnode/inc/dnodeTrans.h rename to source/dnode/mgmt/inc/dnodeTrans.h diff --git a/source/server/dnode/src/dnodeCheck.c b/source/dnode/mgmt/src/dnodeCheck.c similarity index 100% rename from source/server/dnode/src/dnodeCheck.c rename to source/dnode/mgmt/src/dnodeCheck.c diff --git a/source/server/dnode/src/dnodeEps.c b/source/dnode/mgmt/src/dnodeEps.c similarity index 100% rename from source/server/dnode/src/dnodeEps.c rename to source/dnode/mgmt/src/dnodeEps.c diff --git a/source/server/dnode/src/dnodeInt.c b/source/dnode/mgmt/src/dnodeInt.c similarity index 100% rename from source/server/dnode/src/dnodeInt.c rename to source/dnode/mgmt/src/dnodeInt.c diff --git a/source/server/dnode/src/dnodeMsg.c b/source/dnode/mgmt/src/dnodeMsg.c similarity index 100% rename from source/server/dnode/src/dnodeMsg.c rename to source/dnode/mgmt/src/dnodeMsg.c diff --git a/source/server/dnode/src/dnodeTrans.c b/source/dnode/mgmt/src/dnodeTrans.c similarity index 100% rename from source/server/dnode/src/dnodeTrans.c rename to source/dnode/mgmt/src/dnodeTrans.c diff --git a/source/server/mnode/CMakeLists.txt b/source/dnode/mnode/CMakeLists.txt similarity index 100% rename from source/server/mnode/CMakeLists.txt rename to source/dnode/mnode/CMakeLists.txt diff --git a/source/server/mnode/inc/mnodeAcct.h b/source/dnode/mnode/inc/mnodeAcct.h similarity index 100% rename from source/server/mnode/inc/mnodeAcct.h rename to source/dnode/mnode/inc/mnodeAcct.h diff --git a/source/server/mnode/inc/mnodeAuth.h b/source/dnode/mnode/inc/mnodeAuth.h similarity index 100% rename from source/server/mnode/inc/mnodeAuth.h rename to source/dnode/mnode/inc/mnodeAuth.h diff --git a/source/server/mnode/inc/mnodeBalance.h b/source/dnode/mnode/inc/mnodeBalance.h similarity index 100% rename from source/server/mnode/inc/mnodeBalance.h rename to source/dnode/mnode/inc/mnodeBalance.h diff --git a/source/server/mnode/inc/mnodeCluster.h b/source/dnode/mnode/inc/mnodeCluster.h similarity index 100% rename from source/server/mnode/inc/mnodeCluster.h rename to source/dnode/mnode/inc/mnodeCluster.h diff --git a/source/server/mnode/inc/mnodeDb.h b/source/dnode/mnode/inc/mnodeDb.h similarity index 100% rename from source/server/mnode/inc/mnodeDb.h rename to source/dnode/mnode/inc/mnodeDb.h diff --git a/source/server/mnode/inc/mnodeDef.h b/source/dnode/mnode/inc/mnodeDef.h similarity index 100% rename from source/server/mnode/inc/mnodeDef.h rename to source/dnode/mnode/inc/mnodeDef.h diff --git a/source/server/mnode/inc/mnodeDnode.h b/source/dnode/mnode/inc/mnodeDnode.h similarity index 100% rename from source/server/mnode/inc/mnodeDnode.h rename to source/dnode/mnode/inc/mnodeDnode.h diff --git a/source/server/mnode/inc/mnodeFunc.h b/source/dnode/mnode/inc/mnodeFunc.h similarity index 100% rename from source/server/mnode/inc/mnodeFunc.h rename to source/dnode/mnode/inc/mnodeFunc.h diff --git a/source/server/mnode/inc/mnodeInt.h b/source/dnode/mnode/inc/mnodeInt.h similarity index 100% rename from source/server/mnode/inc/mnodeInt.h rename to source/dnode/mnode/inc/mnodeInt.h diff --git a/source/server/mnode/inc/mnodeMnode.h b/source/dnode/mnode/inc/mnodeMnode.h similarity index 100% rename from source/server/mnode/inc/mnodeMnode.h rename to source/dnode/mnode/inc/mnodeMnode.h diff --git a/source/server/mnode/inc/mnodeOper.h b/source/dnode/mnode/inc/mnodeOper.h similarity index 100% rename from source/server/mnode/inc/mnodeOper.h rename to source/dnode/mnode/inc/mnodeOper.h diff --git a/source/server/mnode/inc/mnodeProfile.h b/source/dnode/mnode/inc/mnodeProfile.h similarity index 100% rename from source/server/mnode/inc/mnodeProfile.h rename to source/dnode/mnode/inc/mnodeProfile.h diff --git a/source/server/mnode/inc/mnodeSdb.h b/source/dnode/mnode/inc/mnodeSdb.h similarity index 100% rename from source/server/mnode/inc/mnodeSdb.h rename to source/dnode/mnode/inc/mnodeSdb.h diff --git a/source/server/mnode/inc/mnodeShow.h b/source/dnode/mnode/inc/mnodeShow.h similarity index 100% rename from source/server/mnode/inc/mnodeShow.h rename to source/dnode/mnode/inc/mnodeShow.h diff --git a/source/server/mnode/inc/mnodeStable.h b/source/dnode/mnode/inc/mnodeStable.h similarity index 100% rename from source/server/mnode/inc/mnodeStable.h rename to source/dnode/mnode/inc/mnodeStable.h diff --git a/source/server/mnode/inc/mnodeSync.h b/source/dnode/mnode/inc/mnodeSync.h similarity index 100% rename from source/server/mnode/inc/mnodeSync.h rename to source/dnode/mnode/inc/mnodeSync.h diff --git a/source/server/mnode/inc/mnodeTelem.h b/source/dnode/mnode/inc/mnodeTelem.h similarity index 100% rename from source/server/mnode/inc/mnodeTelem.h rename to source/dnode/mnode/inc/mnodeTelem.h diff --git a/source/server/mnode/inc/mnodeUser.h b/source/dnode/mnode/inc/mnodeUser.h similarity index 100% rename from source/server/mnode/inc/mnodeUser.h rename to source/dnode/mnode/inc/mnodeUser.h diff --git a/source/server/mnode/inc/mnodeVgroup.h b/source/dnode/mnode/inc/mnodeVgroup.h similarity index 100% rename from source/server/mnode/inc/mnodeVgroup.h rename to source/dnode/mnode/inc/mnodeVgroup.h diff --git a/source/server/mnode/inc/mnodeWorker.h b/source/dnode/mnode/inc/mnodeWorker.h similarity index 100% rename from source/server/mnode/inc/mnodeWorker.h rename to source/dnode/mnode/inc/mnodeWorker.h diff --git a/source/server/mnode/src/mnodeAcct.c b/source/dnode/mnode/src/mnodeAcct.c similarity index 100% rename from source/server/mnode/src/mnodeAcct.c rename to source/dnode/mnode/src/mnodeAcct.c diff --git a/source/server/mnode/src/mnodeAuth.c b/source/dnode/mnode/src/mnodeAuth.c similarity index 100% rename from source/server/mnode/src/mnodeAuth.c rename to source/dnode/mnode/src/mnodeAuth.c diff --git a/source/server/mnode/src/mnodeBalance.c b/source/dnode/mnode/src/mnodeBalance.c similarity index 100% rename from source/server/mnode/src/mnodeBalance.c rename to source/dnode/mnode/src/mnodeBalance.c diff --git a/source/server/mnode/src/mnodeCluster.c b/source/dnode/mnode/src/mnodeCluster.c similarity index 100% rename from source/server/mnode/src/mnodeCluster.c rename to source/dnode/mnode/src/mnodeCluster.c diff --git a/source/server/mnode/src/mnodeDb.c b/source/dnode/mnode/src/mnodeDb.c similarity index 100% rename from source/server/mnode/src/mnodeDb.c rename to source/dnode/mnode/src/mnodeDb.c diff --git a/source/server/mnode/src/mnodeDnode.c b/source/dnode/mnode/src/mnodeDnode.c similarity index 100% rename from source/server/mnode/src/mnodeDnode.c rename to source/dnode/mnode/src/mnodeDnode.c diff --git a/source/server/mnode/src/mnodeFunc.c b/source/dnode/mnode/src/mnodeFunc.c similarity index 100% rename from source/server/mnode/src/mnodeFunc.c rename to source/dnode/mnode/src/mnodeFunc.c diff --git a/source/server/mnode/src/mnodeMnode.c b/source/dnode/mnode/src/mnodeMnode.c similarity index 100% rename from source/server/mnode/src/mnodeMnode.c rename to source/dnode/mnode/src/mnodeMnode.c diff --git a/source/server/mnode/src/mnodeOper.c b/source/dnode/mnode/src/mnodeOper.c similarity index 100% rename from source/server/mnode/src/mnodeOper.c rename to source/dnode/mnode/src/mnodeOper.c diff --git a/source/server/mnode/src/mnodeProfile.c b/source/dnode/mnode/src/mnodeProfile.c similarity index 100% rename from source/server/mnode/src/mnodeProfile.c rename to source/dnode/mnode/src/mnodeProfile.c diff --git a/source/server/mnode/src/mnodeSdb.c b/source/dnode/mnode/src/mnodeSdb.c similarity index 100% rename from source/server/mnode/src/mnodeSdb.c rename to source/dnode/mnode/src/mnodeSdb.c diff --git a/source/server/mnode/src/mnodeShow.c b/source/dnode/mnode/src/mnodeShow.c similarity index 100% rename from source/server/mnode/src/mnodeShow.c rename to source/dnode/mnode/src/mnodeShow.c diff --git a/source/server/mnode/src/mnodeStable.c b/source/dnode/mnode/src/mnodeStable.c similarity index 100% rename from source/server/mnode/src/mnodeStable.c rename to source/dnode/mnode/src/mnodeStable.c diff --git a/source/server/mnode/src/mnodeSync.c b/source/dnode/mnode/src/mnodeSync.c similarity index 100% rename from source/server/mnode/src/mnodeSync.c rename to source/dnode/mnode/src/mnodeSync.c diff --git a/source/server/mnode/src/mnodeTelem.c b/source/dnode/mnode/src/mnodeTelem.c similarity index 100% rename from source/server/mnode/src/mnodeTelem.c rename to source/dnode/mnode/src/mnodeTelem.c diff --git a/source/server/mnode/src/mnodeUser.c b/source/dnode/mnode/src/mnodeUser.c similarity index 100% rename from source/server/mnode/src/mnodeUser.c rename to source/dnode/mnode/src/mnodeUser.c diff --git a/source/server/mnode/src/mnodeVgroup.c b/source/dnode/mnode/src/mnodeVgroup.c similarity index 100% rename from source/server/mnode/src/mnodeVgroup.c rename to source/dnode/mnode/src/mnodeVgroup.c diff --git a/source/server/mnode/src/mnodeWorker.c b/source/dnode/mnode/src/mnodeWorker.c similarity index 100% rename from source/server/mnode/src/mnodeWorker.c rename to source/dnode/mnode/src/mnodeWorker.c diff --git a/source/server/mnode/src/mondeInt.c b/source/dnode/mnode/src/mondeInt.c similarity index 100% rename from source/server/mnode/src/mondeInt.c rename to source/dnode/mnode/src/mondeInt.c diff --git a/source/server/mnode/test/mnodeTests.cpp b/source/dnode/mnode/test/mnodeTests.cpp similarity index 100% rename from source/server/mnode/test/mnodeTests.cpp rename to source/dnode/mnode/test/mnodeTests.cpp diff --git a/source/server/qnode/CMakeLists.txt b/source/dnode/qnode/CMakeLists.txt similarity index 100% rename from source/server/qnode/CMakeLists.txt rename to source/dnode/qnode/CMakeLists.txt diff --git a/source/server/qnode/inc/qnodeInt.h b/source/dnode/qnode/inc/qnodeInt.h similarity index 100% rename from source/server/qnode/inc/qnodeInt.h rename to source/dnode/qnode/inc/qnodeInt.h diff --git a/source/server/qnode/src/qnode.c b/source/dnode/qnode/src/qnode.c similarity index 100% rename from source/server/qnode/src/qnode.c rename to source/dnode/qnode/src/qnode.c diff --git a/source/server/qnode/test/qnodeTests.cpp b/source/dnode/qnode/test/qnodeTests.cpp similarity index 100% rename from source/server/qnode/test/qnodeTests.cpp rename to source/dnode/qnode/test/qnodeTests.cpp diff --git a/source/server/server.c b/source/dnode/server.c similarity index 100% rename from source/server/server.c rename to source/dnode/server.c diff --git a/source/server/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt similarity index 100% rename from source/server/vnode/CMakeLists.txt rename to source/dnode/vnode/CMakeLists.txt diff --git a/source/server/vnode/impl/CMakeLists.txt b/source/dnode/vnode/impl/CMakeLists.txt similarity index 100% rename from source/server/vnode/impl/CMakeLists.txt rename to source/dnode/vnode/impl/CMakeLists.txt diff --git a/source/server/vnode/impl/inc/vnodeCommit.h b/source/dnode/vnode/impl/inc/vnodeCommit.h similarity index 100% rename from source/server/vnode/impl/inc/vnodeCommit.h rename to source/dnode/vnode/impl/inc/vnodeCommit.h diff --git a/source/server/vnode/impl/inc/vnodeInt.h b/source/dnode/vnode/impl/inc/vnodeInt.h similarity index 100% rename from source/server/vnode/impl/inc/vnodeInt.h rename to source/dnode/vnode/impl/inc/vnodeInt.h diff --git a/source/server/vnode/impl/inc/vnodeMemAllocator.h b/source/dnode/vnode/impl/inc/vnodeMemAllocator.h similarity index 100% rename from source/server/vnode/impl/inc/vnodeMemAllocator.h rename to source/dnode/vnode/impl/inc/vnodeMemAllocator.h diff --git a/source/server/vnode/impl/inc/vnodeRead.h b/source/dnode/vnode/impl/inc/vnodeRead.h similarity index 100% rename from source/server/vnode/impl/inc/vnodeRead.h rename to source/dnode/vnode/impl/inc/vnodeRead.h diff --git a/source/server/vnode/impl/inc/vnodeWrite.h b/source/dnode/vnode/impl/inc/vnodeWrite.h similarity index 100% rename from source/server/vnode/impl/inc/vnodeWrite.h rename to source/dnode/vnode/impl/inc/vnodeWrite.h diff --git a/source/server/vnode/impl/src/vnodeCommit.c b/source/dnode/vnode/impl/src/vnodeCommit.c similarity index 100% rename from source/server/vnode/impl/src/vnodeCommit.c rename to source/dnode/vnode/impl/src/vnodeCommit.c diff --git a/source/server/vnode/impl/src/vnodeInt.c b/source/dnode/vnode/impl/src/vnodeInt.c similarity index 100% rename from source/server/vnode/impl/src/vnodeInt.c rename to source/dnode/vnode/impl/src/vnodeInt.c diff --git a/source/server/vnode/impl/src/vnodeMemAllocator.c b/source/dnode/vnode/impl/src/vnodeMemAllocator.c similarity index 100% rename from source/server/vnode/impl/src/vnodeMemAllocator.c rename to source/dnode/vnode/impl/src/vnodeMemAllocator.c diff --git a/source/server/vnode/impl/src/vnodeRead.c b/source/dnode/vnode/impl/src/vnodeRead.c similarity index 100% rename from source/server/vnode/impl/src/vnodeRead.c rename to source/dnode/vnode/impl/src/vnodeRead.c diff --git a/source/server/vnode/impl/src/vnodeWrite.c b/source/dnode/vnode/impl/src/vnodeWrite.c similarity index 100% rename from source/server/vnode/impl/src/vnodeWrite.c rename to source/dnode/vnode/impl/src/vnodeWrite.c diff --git a/source/server/vnode/impl/test/CMakeLists.txt b/source/dnode/vnode/impl/test/CMakeLists.txt similarity index 100% rename from source/server/vnode/impl/test/CMakeLists.txt rename to source/dnode/vnode/impl/test/CMakeLists.txt diff --git a/source/server/vnode/impl/test/vnodeMemAllocatorTest.cpp b/source/dnode/vnode/impl/test/vnodeMemAllocatorTest.cpp similarity index 100% rename from source/server/vnode/impl/test/vnodeMemAllocatorTest.cpp rename to source/dnode/vnode/impl/test/vnodeMemAllocatorTest.cpp diff --git a/source/server/vnode/impl/test/vnodeTests.cpp b/source/dnode/vnode/impl/test/vnodeTests.cpp similarity index 100% rename from source/server/vnode/impl/test/vnodeTests.cpp rename to source/dnode/vnode/impl/test/vnodeTests.cpp diff --git a/source/server/vnode/meta/CMakeLists.txt b/source/dnode/vnode/meta/CMakeLists.txt similarity index 100% rename from source/server/vnode/meta/CMakeLists.txt rename to source/dnode/vnode/meta/CMakeLists.txt diff --git a/source/server/vnode/meta/inc/metaDef.h b/source/dnode/vnode/meta/inc/metaDef.h similarity index 100% rename from source/server/vnode/meta/inc/metaDef.h rename to source/dnode/vnode/meta/inc/metaDef.h diff --git a/source/server/vnode/meta/inc/metaUid.h b/source/dnode/vnode/meta/inc/metaUid.h similarity index 100% rename from source/server/vnode/meta/inc/metaUid.h rename to source/dnode/vnode/meta/inc/metaUid.h diff --git a/source/server/vnode/meta/src/metaMain.c b/source/dnode/vnode/meta/src/metaMain.c similarity index 100% rename from source/server/vnode/meta/src/metaMain.c rename to source/dnode/vnode/meta/src/metaMain.c diff --git a/source/server/vnode/meta/src/metaUid.c b/source/dnode/vnode/meta/src/metaUid.c similarity index 100% rename from source/server/vnode/meta/src/metaUid.c rename to source/dnode/vnode/meta/src/metaUid.c diff --git a/source/server/vnode/meta/test/CMakeLists.txt b/source/dnode/vnode/meta/test/CMakeLists.txt similarity index 100% rename from source/server/vnode/meta/test/CMakeLists.txt rename to source/dnode/vnode/meta/test/CMakeLists.txt diff --git a/source/server/vnode/meta/test/metaTests.cpp b/source/dnode/vnode/meta/test/metaTests.cpp similarity index 100% rename from source/server/vnode/meta/test/metaTests.cpp rename to source/dnode/vnode/meta/test/metaTests.cpp diff --git a/source/server/vnode/tq/CMakeLists.txt b/source/dnode/vnode/tq/CMakeLists.txt similarity index 100% rename from source/server/vnode/tq/CMakeLists.txt rename to source/dnode/vnode/tq/CMakeLists.txt diff --git a/source/server/vnode/tq/inc/tqCommit.h b/source/dnode/vnode/tq/inc/tqCommit.h similarity index 100% rename from source/server/vnode/tq/inc/tqCommit.h rename to source/dnode/vnode/tq/inc/tqCommit.h diff --git a/source/server/vnode/tq/inc/tqInt.h b/source/dnode/vnode/tq/inc/tqInt.h similarity index 100% rename from source/server/vnode/tq/inc/tqInt.h rename to source/dnode/vnode/tq/inc/tqInt.h diff --git a/source/server/vnode/tq/inc/tqMetaStore.h b/source/dnode/vnode/tq/inc/tqMetaStore.h similarity index 100% rename from source/server/vnode/tq/inc/tqMetaStore.h rename to source/dnode/vnode/tq/inc/tqMetaStore.h diff --git a/source/server/vnode/tq/src/tq.c b/source/dnode/vnode/tq/src/tq.c similarity index 100% rename from source/server/vnode/tq/src/tq.c rename to source/dnode/vnode/tq/src/tq.c diff --git a/source/server/vnode/tq/src/tqCommit.c b/source/dnode/vnode/tq/src/tqCommit.c similarity index 100% rename from source/server/vnode/tq/src/tqCommit.c rename to source/dnode/vnode/tq/src/tqCommit.c diff --git a/source/server/vnode/tq/src/tqMetaStore.c b/source/dnode/vnode/tq/src/tqMetaStore.c similarity index 100% rename from source/server/vnode/tq/src/tqMetaStore.c rename to source/dnode/vnode/tq/src/tqMetaStore.c diff --git a/source/server/vnode/tq/test/tqTests.cpp b/source/dnode/vnode/tq/test/tqTests.cpp similarity index 100% rename from source/server/vnode/tq/test/tqTests.cpp rename to source/dnode/vnode/tq/test/tqTests.cpp diff --git a/source/server/vnode/tsdb/CMakeLists.txt b/source/dnode/vnode/tsdb/CMakeLists.txt similarity index 100% rename from source/server/vnode/tsdb/CMakeLists.txt rename to source/dnode/vnode/tsdb/CMakeLists.txt diff --git a/source/server/vnode/tsdb/inc/tsdbInt.h b/source/dnode/vnode/tsdb/inc/tsdbInt.h similarity index 100% rename from source/server/vnode/tsdb/inc/tsdbInt.h rename to source/dnode/vnode/tsdb/inc/tsdbInt.h diff --git a/source/server/vnode/tsdb/inc/tsdbMemTable.h b/source/dnode/vnode/tsdb/inc/tsdbMemTable.h similarity index 100% rename from source/server/vnode/tsdb/inc/tsdbMemTable.h rename to source/dnode/vnode/tsdb/inc/tsdbMemTable.h diff --git a/source/server/vnode/tsdb/inc/tsdbWriteBatch.h b/source/dnode/vnode/tsdb/inc/tsdbWriteBatch.h similarity index 100% rename from source/server/vnode/tsdb/inc/tsdbWriteBatch.h rename to source/dnode/vnode/tsdb/inc/tsdbWriteBatch.h diff --git a/source/server/vnode/tsdb/src/tsdb.c b/source/dnode/vnode/tsdb/src/tsdb.c similarity index 100% rename from source/server/vnode/tsdb/src/tsdb.c rename to source/dnode/vnode/tsdb/src/tsdb.c diff --git a/source/server/vnode/tsdb/src/tsdbMemTable.c b/source/dnode/vnode/tsdb/src/tsdbMemTable.c similarity index 100% rename from source/server/vnode/tsdb/src/tsdbMemTable.c rename to source/dnode/vnode/tsdb/src/tsdbMemTable.c diff --git a/source/server/vnode/tsdb/src/tsdbSMA.c b/source/dnode/vnode/tsdb/src/tsdbSMA.c similarity index 100% rename from source/server/vnode/tsdb/src/tsdbSMA.c rename to source/dnode/vnode/tsdb/src/tsdbSMA.c diff --git a/source/server/vnode/tsdb/test/tsdbTests.cpp b/source/dnode/vnode/tsdb/test/tsdbTests.cpp similarity index 100% rename from source/server/vnode/tsdb/test/tsdbTests.cpp rename to source/dnode/vnode/tsdb/test/tsdbTests.cpp