diff --git a/source/dnode/mgmt/container/inc/dndMain.h b/source/dnode/mgmt/container/inc/dndNode.h
similarity index 100%
rename from source/dnode/mgmt/container/inc/dndMain.h
rename to source/dnode/mgmt/container/inc/dndNode.h
diff --git a/source/dnode/mgmt/container/src/dndMain.c b/source/dnode/mgmt/container/src/dndNode.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndMain.c
rename to source/dnode/mgmt/container/src/dndNode.c
diff --git a/source/dnode/mgmt/container/src/dndTransport.c b/source/dnode/mgmt/container/src/dndTransport.c
index 87efcd8c27..b36f4c7d3f 100644
--- a/source/dnode/mgmt/container/src/dndTransport.c
+++ b/source/dnode/mgmt/container/src/dndTransport.c
@@ -17,6 +17,7 @@
 #include "dndTransport.h"
 #include "dmMgmt.h"
 #include "mmInt.h"
+#include "dmHandle.h"
 
 #define INTERNAL_USER   "_dnd"
 #define INTERNAL_CKEY   "_key"
diff --git a/source/dnode/mgmt/dnode/inc/dmMgmt.h b/source/dnode/mgmt/dnode/inc/dmMgmt.h
index f7d7b32ab5..c8649b932b 100644
--- a/source/dnode/mgmt/dnode/inc/dmMgmt.h
+++ b/source/dnode/mgmt/dnode/inc/dmMgmt.h
@@ -32,8 +32,6 @@ void    dndGetDnodeEp(SDnode *pDnode, int32_t dnodeId, char *pEp, char *pFqdn, u
 void    dndGetMnodeEpSet(SDnode *pDnode, SEpSet *pEpSet);
 
 void dndSendRedirectRsp(SDnode *pDnode, SRpcMsg *pMsg);
-void dndSendStatusReq(SDnode *pDnode);
-void dndProcessStartupReq(SDnode *pDnode, SRpcMsg *pMsg);
 
 void dndProcessMgmtMsg(SDnode *pDnode, SMgmtWrapper *pWrapper, SNodeMsg *pMsg) ;
 #ifdef __cplusplus
diff --git a/source/dnode/mgmt/dnode/src/dmMgmt.c b/source/dnode/mgmt/dnode/src/dmMgmt.c
index 17fdc56ebf..51efdb9df6 100644
--- a/source/dnode/mgmt/dnode/src/dmMgmt.c
+++ b/source/dnode/mgmt/dnode/src/dmMgmt.c
@@ -271,83 +271,6 @@ void dndProcessMgmtMsg(SDnode *pDnode, SRpcMsg *pMsg, SEpSet *pEpSet) {
   }
 }
 
-static void dndProcessMgmtQueue(SDnode *pDnode, SRpcMsg *pMsg) {
-  int32_t code = 0;
-
-#if 0
-  switch (pMsg->msgType) {
-    case TDMT_DND_CREATE_MNODE:
-      code = mmProcessCreateMnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_ALTER_MNODE:
-      code = mmProcessAlterMnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_DROP_MNODE:
-      code = mmProcessDropMnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_CREATE_QNODE:
-      code = dndProcessCreateQnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_DROP_QNODE:
-      code = dndProcessDropQnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_CREATE_SNODE:
-      code = dndProcessCreateSnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_DROP_SNODE:
-      code = dndProcessDropSnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_CREATE_BNODE:
-      code = dndProcessCreateBnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_DROP_BNODE:
-      code = dndProcessDropBnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_CONFIG_DNODE:
-      code = dndProcessConfigDnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_MND_STATUS_RSP:
-      dndProcessStatusRsp(pDnode, pMsg);
-      break;
-    case TDMT_MND_AUTH_RSP:
-      dndProcessAuthRsp(pDnode, pMsg);
-      break;
-    case TDMT_MND_GRANT_RSP:
-      dndProcessGrantRsp(pDnode, pMsg);
-      break;
-    case TDMT_DND_CREATE_VNODE:
-      code = dndProcessCreateVnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_ALTER_VNODE:
-      code = dndProcessAlterVnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_DROP_VNODE:
-      code = dndProcessDropVnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_SYNC_VNODE:
-      code = dndProcessSyncVnodeReq(pDnode, pMsg);
-      break;
-    case TDMT_DND_COMPACT_VNODE:
-      code = dndProcessCompactVnodeReq(pDnode, pMsg);
-      break;
-    default:
-      terrno = TSDB_CODE_MSG_NOT_PROCESSED;
-      code = -1;
-      dError("RPC %p, dnode msg:%s not processed", pMsg->handle, TMSG_INFO(pMsg->msgType));
-      break;
-  }
-#endif
-  if (pMsg->msgType & 1u) {
-    if (code != 0) code = terrno;
-    SRpcMsg rsp = {.code = code, .handle = pMsg->handle, .ahandle = pMsg->ahandle};
-    rpcSendResponse(&rsp);
-  }
-
-  rpcFreeCont(pMsg->pCont);
-  pMsg->pCont = NULL;
-  taosFreeQitem(pMsg);
-}
-
 #endif
 
 
diff --git a/source/dnode/mgmt/exec/CMakeLists.txt b/source/dnode/mgmt/main/CMakeLists.txt
similarity index 100%
rename from source/dnode/mgmt/exec/CMakeLists.txt
rename to source/dnode/mgmt/main/CMakeLists.txt
diff --git a/source/dnode/mgmt/exec/inc/dndExec.h b/source/dnode/mgmt/main/inc/dndExec.h
similarity index 100%
rename from source/dnode/mgmt/exec/inc/dndExec.h
rename to source/dnode/mgmt/main/inc/dndExec.h
diff --git a/source/dnode/mgmt/exec/src/dndExec.c b/source/dnode/mgmt/main/src/dndExec.c
similarity index 100%
rename from source/dnode/mgmt/exec/src/dndExec.c
rename to source/dnode/mgmt/main/src/dndExec.c
diff --git a/source/dnode/mgmt/exec/src/dndUtil.c b/source/dnode/mgmt/main/src/dndUtil.c
similarity index 100%
rename from source/dnode/mgmt/exec/src/dndUtil.c
rename to source/dnode/mgmt/main/src/dndUtil.c