diff --git a/source/dnode/mgmt/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt
index 6a93aaf6dd..81c434eb27 100644
--- a/source/dnode/mgmt/CMakeLists.txt
+++ b/source/dnode/mgmt/CMakeLists.txt
@@ -1,9 +1,9 @@
-aux_source_directory(dnode/src DNODE_SRC)
-aux_source_directory(qnode/src DNODE_SRC)
-aux_source_directory(bnode/src DNODE_SRC)
-aux_source_directory(snode/src DNODE_SRC)
-aux_source_directory(vnode/src DNODE_SRC)
-aux_source_directory(mnode/src DNODE_SRC)
+aux_source_directory(dm/src DNODE_SRC)
+aux_source_directory(qm/src DNODE_SRC)
+aux_source_directory(bm/src DNODE_SRC)
+aux_source_directory(sm/src DNODE_SRC)
+aux_source_directory(vm/src DNODE_SRC)
+aux_source_directory(mm/src DNODE_SRC)
 aux_source_directory(main/src DNODE_SRC)
 add_library(dnode STATIC ${DNODE_SRC})
 target_link_libraries(
@@ -12,12 +12,12 @@ target_link_libraries(
 target_include_directories(
     dnode
     PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mgmt"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/dnode/inc"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qnode/inc"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/bnode/inc"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/snode/inc"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/vnode/inc"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mnode/inc"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/dm/inc"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qm/inc"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/bm/inc"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/sm/inc"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/vm/inc"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mm/inc"
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/main/inc"
 )
 
diff --git a/source/dnode/mgmt/bnode/inc/bm.h b/source/dnode/mgmt/bm/inc/bm.h
similarity index 100%
rename from source/dnode/mgmt/bnode/inc/bm.h
rename to source/dnode/mgmt/bm/inc/bm.h
diff --git a/source/dnode/mgmt/bnode/inc/bmInt.h b/source/dnode/mgmt/bm/inc/bmInt.h
similarity index 100%
rename from source/dnode/mgmt/bnode/inc/bmInt.h
rename to source/dnode/mgmt/bm/inc/bmInt.h
diff --git a/source/dnode/mgmt/bnode/src/bmInt.c b/source/dnode/mgmt/bm/src/bmInt.c
similarity index 100%
rename from source/dnode/mgmt/bnode/src/bmInt.c
rename to source/dnode/mgmt/bm/src/bmInt.c
diff --git a/source/dnode/mgmt/bnode/src/bmMsg.c b/source/dnode/mgmt/bm/src/bmMsg.c
similarity index 100%
rename from source/dnode/mgmt/bnode/src/bmMsg.c
rename to source/dnode/mgmt/bm/src/bmMsg.c
diff --git a/source/dnode/mgmt/bnode/src/bmWorker.c b/source/dnode/mgmt/bm/src/bmWorker.c
similarity index 100%
rename from source/dnode/mgmt/bnode/src/bmWorker.c
rename to source/dnode/mgmt/bm/src/bmWorker.c
diff --git a/source/dnode/mgmt/dnode/inc/dm.h b/source/dnode/mgmt/dm/inc/dm.h
similarity index 100%
rename from source/dnode/mgmt/dnode/inc/dm.h
rename to source/dnode/mgmt/dm/inc/dm.h
diff --git a/source/dnode/mgmt/dnode/inc/dmInt.h b/source/dnode/mgmt/dm/inc/dmInt.h
similarity index 100%
rename from source/dnode/mgmt/dnode/inc/dmInt.h
rename to source/dnode/mgmt/dm/inc/dmInt.h
diff --git a/source/dnode/mgmt/dnode/src/dmFile.c b/source/dnode/mgmt/dm/src/dmFile.c
similarity index 100%
rename from source/dnode/mgmt/dnode/src/dmFile.c
rename to source/dnode/mgmt/dm/src/dmFile.c
diff --git a/source/dnode/mgmt/dnode/src/dmInt.c b/source/dnode/mgmt/dm/src/dmInt.c
similarity index 100%
rename from source/dnode/mgmt/dnode/src/dmInt.c
rename to source/dnode/mgmt/dm/src/dmInt.c
diff --git a/source/dnode/mgmt/dnode/src/dmMsg.c b/source/dnode/mgmt/dm/src/dmMsg.c
similarity index 100%
rename from source/dnode/mgmt/dnode/src/dmMsg.c
rename to source/dnode/mgmt/dm/src/dmMsg.c
diff --git a/source/dnode/mgmt/dnode/src/dmWorker.c b/source/dnode/mgmt/dm/src/dmWorker.c
similarity index 100%
rename from source/dnode/mgmt/dnode/src/dmWorker.c
rename to source/dnode/mgmt/dm/src/dmWorker.c
diff --git a/source/dnode/mgmt/main/CMakeLists.txt b/source/dnode/mgmt/main/CMakeLists.txt
deleted file mode 100644
index baa486b91f..0000000000
--- a/source/dnode/mgmt/main/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-aux_source_directory(src EXEC_SRC)
-add_executable(taosd ${EXEC_SRC})
-
-target_include_directories(
-    taosd
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
-
-target_link_libraries(taosd dnode)
diff --git a/source/dnode/mgmt/mnode/inc/mm.h b/source/dnode/mgmt/mm/inc/mm.h
similarity index 100%
rename from source/dnode/mgmt/mnode/inc/mm.h
rename to source/dnode/mgmt/mm/inc/mm.h
diff --git a/source/dnode/mgmt/mnode/inc/mmInt.h b/source/dnode/mgmt/mm/inc/mmInt.h
similarity index 100%
rename from source/dnode/mgmt/mnode/inc/mmInt.h
rename to source/dnode/mgmt/mm/inc/mmInt.h
diff --git a/source/dnode/mgmt/mnode/src/mmFile.c b/source/dnode/mgmt/mm/src/mmFile.c
similarity index 100%
rename from source/dnode/mgmt/mnode/src/mmFile.c
rename to source/dnode/mgmt/mm/src/mmFile.c
diff --git a/source/dnode/mgmt/mnode/src/mmInt.c b/source/dnode/mgmt/mm/src/mmInt.c
similarity index 100%
rename from source/dnode/mgmt/mnode/src/mmInt.c
rename to source/dnode/mgmt/mm/src/mmInt.c
diff --git a/source/dnode/mgmt/mnode/src/mmMsg.c b/source/dnode/mgmt/mm/src/mmMsg.c
similarity index 100%
rename from source/dnode/mgmt/mnode/src/mmMsg.c
rename to source/dnode/mgmt/mm/src/mmMsg.c
diff --git a/source/dnode/mgmt/mnode/src/mmWorker.c b/source/dnode/mgmt/mm/src/mmWorker.c
similarity index 100%
rename from source/dnode/mgmt/mnode/src/mmWorker.c
rename to source/dnode/mgmt/mm/src/mmWorker.c
diff --git a/source/dnode/mgmt/qnode/inc/qm.h b/source/dnode/mgmt/qm/inc/qm.h
similarity index 100%
rename from source/dnode/mgmt/qnode/inc/qm.h
rename to source/dnode/mgmt/qm/inc/qm.h
diff --git a/source/dnode/mgmt/qnode/inc/qmInt.h b/source/dnode/mgmt/qm/inc/qmInt.h
similarity index 100%
rename from source/dnode/mgmt/qnode/inc/qmInt.h
rename to source/dnode/mgmt/qm/inc/qmInt.h
diff --git a/source/dnode/mgmt/qnode/src/qmInt.c b/source/dnode/mgmt/qm/src/qmInt.c
similarity index 100%
rename from source/dnode/mgmt/qnode/src/qmInt.c
rename to source/dnode/mgmt/qm/src/qmInt.c
diff --git a/source/dnode/mgmt/qnode/src/qmMsg.c b/source/dnode/mgmt/qm/src/qmMsg.c
similarity index 100%
rename from source/dnode/mgmt/qnode/src/qmMsg.c
rename to source/dnode/mgmt/qm/src/qmMsg.c
diff --git a/source/dnode/mgmt/qnode/src/qmWorker.c b/source/dnode/mgmt/qm/src/qmWorker.c
similarity index 100%
rename from source/dnode/mgmt/qnode/src/qmWorker.c
rename to source/dnode/mgmt/qm/src/qmWorker.c
diff --git a/source/dnode/mgmt/snode/inc/sm.h b/source/dnode/mgmt/sm/inc/sm.h
similarity index 100%
rename from source/dnode/mgmt/snode/inc/sm.h
rename to source/dnode/mgmt/sm/inc/sm.h
diff --git a/source/dnode/mgmt/snode/inc/smInt.h b/source/dnode/mgmt/sm/inc/smInt.h
similarity index 100%
rename from source/dnode/mgmt/snode/inc/smInt.h
rename to source/dnode/mgmt/sm/inc/smInt.h
diff --git a/source/dnode/mgmt/snode/src/smInt.c b/source/dnode/mgmt/sm/src/smInt.c
similarity index 100%
rename from source/dnode/mgmt/snode/src/smInt.c
rename to source/dnode/mgmt/sm/src/smInt.c
diff --git a/source/dnode/mgmt/snode/src/smMsg.c b/source/dnode/mgmt/sm/src/smMsg.c
similarity index 100%
rename from source/dnode/mgmt/snode/src/smMsg.c
rename to source/dnode/mgmt/sm/src/smMsg.c
diff --git a/source/dnode/mgmt/snode/src/smWorker.c b/source/dnode/mgmt/sm/src/smWorker.c
similarity index 100%
rename from source/dnode/mgmt/snode/src/smWorker.c
rename to source/dnode/mgmt/sm/src/smWorker.c
diff --git a/source/dnode/mgmt/vnode/inc/vm.h b/source/dnode/mgmt/vm/inc/vm.h
similarity index 100%
rename from source/dnode/mgmt/vnode/inc/vm.h
rename to source/dnode/mgmt/vm/inc/vm.h
diff --git a/source/dnode/mgmt/vnode/inc/vmInt.h b/source/dnode/mgmt/vm/inc/vmInt.h
similarity index 100%
rename from source/dnode/mgmt/vnode/inc/vmInt.h
rename to source/dnode/mgmt/vm/inc/vmInt.h
diff --git a/source/dnode/mgmt/vnode/src/vmFile.c b/source/dnode/mgmt/vm/src/vmFile.c
similarity index 100%
rename from source/dnode/mgmt/vnode/src/vmFile.c
rename to source/dnode/mgmt/vm/src/vmFile.c
diff --git a/source/dnode/mgmt/vnode/src/vmInt.c b/source/dnode/mgmt/vm/src/vmInt.c
similarity index 100%
rename from source/dnode/mgmt/vnode/src/vmInt.c
rename to source/dnode/mgmt/vm/src/vmInt.c
diff --git a/source/dnode/mgmt/vnode/src/vmMsg.c b/source/dnode/mgmt/vm/src/vmMsg.c
similarity index 100%
rename from source/dnode/mgmt/vnode/src/vmMsg.c
rename to source/dnode/mgmt/vm/src/vmMsg.c
diff --git a/source/dnode/mgmt/vnode/src/vmWorker.c b/source/dnode/mgmt/vm/src/vmWorker.c
similarity index 100%
rename from source/dnode/mgmt/vnode/src/vmWorker.c
rename to source/dnode/mgmt/vm/src/vmWorker.c