diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 11193d7185..2833b329a7 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -3,4 +3,4 @@ add_subdirectory(util)
 add_subdirectory(common)
 add_subdirectory(libs)
 add_subdirectory(client)
-add_subdirectory(server)
\ No newline at end of file
+add_subdirectory(dnode)
\ No newline at end of file
diff --git a/source/dnode/CMakeLists.txt b/source/dnode/CMakeLists.txt
index 8afa650d36..d719a2d106 100644
--- a/source/dnode/CMakeLists.txt
+++ b/source/dnode/CMakeLists.txt
@@ -1,12 +1,4 @@
 add_subdirectory(mnode)
 add_subdirectory(vnode)
 add_subdirectory(qnode)
-add_subdirectory(dnode)
-
-aux_source_directory(. TAOSD_SRC)
-add_executable(taosd ${TAOSD_SRC})
-target_link_libraries(
-    taosd
-    PUBLIC dnode
-    PUBLIC util
-)
\ No newline at end of file
+add_subdirectory(mgmt)
diff --git a/source/dnode/mgmt/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt
index e1462ab3c8..74ee422bb0 100644
--- a/source/dnode/mgmt/CMakeLists.txt
+++ b/source/dnode/mgmt/CMakeLists.txt
@@ -1,7 +1,7 @@
 aux_source_directory(src DNODE_SRC)
-add_library(dnode ${DNODE_SRC})
+add_executable(taosd ${DNODE_SRC})
 target_link_libraries(
-    dnode
+    taosd
     PUBLIC cjson
     PUBLIC mnode
     PUBLIC vnode
@@ -10,7 +10,7 @@ target_link_libraries(
     PUBLIC taos
 )
 target_include_directories(
-    dnode
+    taosd
     PUBLIC "${CMAKE_SOURCE_DIR}/include/server/dnode"
     private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
\ No newline at end of file
+)
diff --git a/source/dnode/server.c b/source/dnode/mgmt/src/dnodeMain.c
similarity index 100%
rename from source/dnode/server.c
rename to source/dnode/mgmt/src/dnodeMain.c