diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f5219477700ea4adcc456f21d4bf62828a454bee..590dba01a3a40ac23ec38534425d90b47f197800 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,8 @@ ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(rpc)
 ADD_SUBDIRECTORY(client)
 ADD_SUBDIRECTORY(kit)
-ADD_SUBDIRECTORY(sdb)
 ADD_SUBDIRECTORY(modules)
-ADD_SUBDIRECTORY(system)
+ADD_SUBDIRECTORY(mnode)
+ADD_SUBDIRECTORY(dnode)
+ADD_SUBDIRECTORY(vnode)
 ADD_SUBDIRECTORY(connector/jdbc)
diff --git a/src/system/CMakeLists.txt b/src/dnode/CMakeLists.txt
similarity index 100%
rename from src/system/CMakeLists.txt
rename to src/dnode/CMakeLists.txt
diff --git a/src/system/detail/inc/dnodeSystem.h b/src/dnode/detail/inc/dnodeSystem.h
similarity index 100%
rename from src/system/detail/inc/dnodeSystem.h
rename to src/dnode/detail/inc/dnodeSystem.h
diff --git a/src/system/detail/src/dnodeMgmt.c b/src/dnode/detail/src/dnodeMgmt.c
similarity index 100%
rename from src/system/detail/src/dnodeMgmt.c
rename to src/dnode/detail/src/dnodeMgmt.c
diff --git a/src/system/detail/src/dnodeService.c b/src/dnode/detail/src/dnodeService.c
similarity index 100%
rename from src/system/detail/src/dnodeService.c
rename to src/dnode/detail/src/dnodeService.c
diff --git a/src/system/detail/src/dnodeSystem.c b/src/dnode/detail/src/dnodeSystem.c
similarity index 100%
rename from src/system/detail/src/dnodeSystem.c
rename to src/dnode/detail/src/dnodeSystem.c
diff --git a/src/system/lite/src/dnodeMgmt.spec.c b/src/dnode/lite/src/dnodeMgmt.spec.c
similarity index 100%
rename from src/system/lite/src/dnodeMgmt.spec.c
rename to src/dnode/lite/src/dnodeMgmt.spec.c
diff --git a/src/system/lite/src/dnodeSystem.spec.c b/src/dnode/lite/src/dnodeSystem.spec.c
similarity index 100%
rename from src/system/lite/src/dnodeSystem.spec.c
rename to src/dnode/lite/src/dnodeSystem.spec.c
diff --git a/src/system/detail/inc/mgmt.h b/src/mnode/detail/inc/mgmt.h
similarity index 100%
rename from src/system/detail/inc/mgmt.h
rename to src/mnode/detail/inc/mgmt.h
diff --git a/src/system/detail/inc/mgmtBalance.h b/src/mnode/detail/inc/mgmtBalance.h
similarity index 100%
rename from src/system/detail/inc/mgmtBalance.h
rename to src/mnode/detail/inc/mgmtBalance.h
diff --git a/src/system/detail/inc/mgmtProfile.h b/src/mnode/detail/inc/mgmtProfile.h
similarity index 100%
rename from src/system/detail/inc/mgmtProfile.h
rename to src/mnode/detail/inc/mgmtProfile.h
diff --git a/src/system/detail/inc/mgmtSystem.h b/src/mnode/detail/inc/mgmtSystem.h
similarity index 100%
rename from src/system/detail/inc/mgmtSystem.h
rename to src/mnode/detail/inc/mgmtSystem.h
diff --git a/src/system/detail/inc/mgmtUtil.h b/src/mnode/detail/inc/mgmtUtil.h
similarity index 100%
rename from src/system/detail/inc/mgmtUtil.h
rename to src/mnode/detail/inc/mgmtUtil.h
diff --git a/src/system/detail/src/mgmtAcct.c b/src/mnode/detail/src/mgmtAcct.c
similarity index 100%
rename from src/system/detail/src/mgmtAcct.c
rename to src/mnode/detail/src/mgmtAcct.c
diff --git a/src/system/detail/src/mgmtConn.c b/src/mnode/detail/src/mgmtConn.c
similarity index 100%
rename from src/system/detail/src/mgmtConn.c
rename to src/mnode/detail/src/mgmtConn.c
diff --git a/src/system/detail/src/mgmtDb.c b/src/mnode/detail/src/mgmtDb.c
similarity index 100%
rename from src/system/detail/src/mgmtDb.c
rename to src/mnode/detail/src/mgmtDb.c
diff --git a/src/system/detail/src/mgmtDnode.c b/src/mnode/detail/src/mgmtDnode.c
similarity index 100%
rename from src/system/detail/src/mgmtDnode.c
rename to src/mnode/detail/src/mgmtDnode.c
diff --git a/src/system/detail/src/mgmtDnodeInt.c b/src/mnode/detail/src/mgmtDnodeInt.c
similarity index 100%
rename from src/system/detail/src/mgmtDnodeInt.c
rename to src/mnode/detail/src/mgmtDnodeInt.c
diff --git a/src/system/detail/src/mgmtMeter.c b/src/mnode/detail/src/mgmtMeter.c
similarity index 100%
rename from src/system/detail/src/mgmtMeter.c
rename to src/mnode/detail/src/mgmtMeter.c
diff --git a/src/system/detail/src/mgmtProfile.c b/src/mnode/detail/src/mgmtProfile.c
similarity index 100%
rename from src/system/detail/src/mgmtProfile.c
rename to src/mnode/detail/src/mgmtProfile.c
diff --git a/src/system/detail/src/mgmtShell.c b/src/mnode/detail/src/mgmtShell.c
similarity index 100%
rename from src/system/detail/src/mgmtShell.c
rename to src/mnode/detail/src/mgmtShell.c
diff --git a/src/system/detail/src/mgmtSupertableQuery.c b/src/mnode/detail/src/mgmtSupertableQuery.c
similarity index 100%
rename from src/system/detail/src/mgmtSupertableQuery.c
rename to src/mnode/detail/src/mgmtSupertableQuery.c
diff --git a/src/system/detail/src/mgmtSystem.c b/src/mnode/detail/src/mgmtSystem.c
similarity index 100%
rename from src/system/detail/src/mgmtSystem.c
rename to src/mnode/detail/src/mgmtSystem.c
diff --git a/src/system/detail/src/mgmtUser.c b/src/mnode/detail/src/mgmtUser.c
similarity index 100%
rename from src/system/detail/src/mgmtUser.c
rename to src/mnode/detail/src/mgmtUser.c
diff --git a/src/system/detail/src/mgmtUtil.c b/src/mnode/detail/src/mgmtUtil.c
similarity index 100%
rename from src/system/detail/src/mgmtUtil.c
rename to src/mnode/detail/src/mgmtUtil.c
diff --git a/src/system/detail/src/mgmtVgroup.c b/src/mnode/detail/src/mgmtVgroup.c
similarity index 100%
rename from src/system/detail/src/mgmtVgroup.c
rename to src/mnode/detail/src/mgmtVgroup.c
diff --git a/src/system/lite/src/mgmtAcct.spec.c b/src/mnode/lite/src/mgmtAcct.spec.c
similarity index 100%
rename from src/system/lite/src/mgmtAcct.spec.c
rename to src/mnode/lite/src/mgmtAcct.spec.c
diff --git a/src/system/lite/src/mgmtBalance.spec.c b/src/mnode/lite/src/mgmtBalance.spec.c
similarity index 100%
rename from src/system/lite/src/mgmtBalance.spec.c
rename to src/mnode/lite/src/mgmtBalance.spec.c
diff --git a/src/system/lite/src/mgmtDnode.spec.c b/src/mnode/lite/src/mgmtDnode.spec.c
similarity index 100%
rename from src/system/lite/src/mgmtDnode.spec.c
rename to src/mnode/lite/src/mgmtDnode.spec.c
diff --git a/src/system/lite/src/mgmtDnodeInt.spec.c b/src/mnode/lite/src/mgmtDnodeInt.spec.c
similarity index 100%
rename from src/system/lite/src/mgmtDnodeInt.spec.c
rename to src/mnode/lite/src/mgmtDnodeInt.spec.c
diff --git a/src/system/lite/src/mgmtMnode.spec.c b/src/mnode/lite/src/mgmtMnode.spec.c
similarity index 100%
rename from src/system/lite/src/mgmtMnode.spec.c
rename to src/mnode/lite/src/mgmtMnode.spec.c
diff --git a/src/system/lite/src/mgmtShell.spec.c b/src/mnode/lite/src/mgmtShell.spec.c
similarity index 100%
rename from src/system/lite/src/mgmtShell.spec.c
rename to src/mnode/lite/src/mgmtShell.spec.c
diff --git a/src/system/lite/src/mgmtSystem.spec.c b/src/mnode/lite/src/mgmtSystem.spec.c
similarity index 100%
rename from src/system/lite/src/mgmtSystem.spec.c
rename to src/mnode/lite/src/mgmtSystem.spec.c
diff --git a/src/sdb/CMakeLists.txt b/src/mnode/sdb/CMakeLists.txt
similarity index 100%
rename from src/sdb/CMakeLists.txt
rename to src/mnode/sdb/CMakeLists.txt
diff --git a/src/sdb/inc/hashint.h b/src/mnode/sdb/inc/hashint.h
similarity index 100%
rename from src/sdb/inc/hashint.h
rename to src/mnode/sdb/inc/hashint.h
diff --git a/src/sdb/inc/hashstr.h b/src/mnode/sdb/inc/hashstr.h
similarity index 100%
rename from src/sdb/inc/hashstr.h
rename to src/mnode/sdb/inc/hashstr.h
diff --git a/src/sdb/inc/sdbint.h b/src/mnode/sdb/inc/sdbint.h
similarity index 100%
rename from src/sdb/inc/sdbint.h
rename to src/mnode/sdb/inc/sdbint.h
diff --git a/src/sdb/src/hashint.c b/src/mnode/sdb/src/hashint.c
similarity index 100%
rename from src/sdb/src/hashint.c
rename to src/mnode/sdb/src/hashint.c
diff --git a/src/sdb/src/hashstr.c b/src/mnode/sdb/src/hashstr.c
similarity index 100%
rename from src/sdb/src/hashstr.c
rename to src/mnode/sdb/src/hashstr.c
diff --git a/src/sdb/src/sdbEngine.c b/src/mnode/sdb/src/sdbEngine.c
similarity index 100%
rename from src/sdb/src/sdbEngine.c
rename to src/mnode/sdb/src/sdbEngine.c
diff --git a/src/sdb/src/sdbstr.c b/src/mnode/sdb/src/sdbstr.c
similarity index 100%
rename from src/sdb/src/sdbstr.c
rename to src/mnode/sdb/src/sdbstr.c
diff --git a/src/system/detail/CMakeLists.txt b/src/vnode/detail/CMakeLists.txt
similarity index 100%
rename from src/system/detail/CMakeLists.txt
rename to src/vnode/detail/CMakeLists.txt
diff --git a/src/system/detail/inc/vnode.h b/src/vnode/detail/inc/vnode.h
similarity index 100%
rename from src/system/detail/inc/vnode.h
rename to src/vnode/detail/inc/vnode.h
diff --git a/src/system/detail/inc/vnodeCache.h b/src/vnode/detail/inc/vnodeCache.h
similarity index 100%
rename from src/system/detail/inc/vnodeCache.h
rename to src/vnode/detail/inc/vnodeCache.h
diff --git a/src/system/detail/inc/vnodeDataFilterFunc.h b/src/vnode/detail/inc/vnodeDataFilterFunc.h
similarity index 100%
rename from src/system/detail/inc/vnodeDataFilterFunc.h
rename to src/vnode/detail/inc/vnodeDataFilterFunc.h
diff --git a/src/system/detail/inc/vnodeFile.h b/src/vnode/detail/inc/vnodeFile.h
similarity index 100%
rename from src/system/detail/inc/vnodeFile.h
rename to src/vnode/detail/inc/vnodeFile.h
diff --git a/src/system/detail/inc/vnodeMgmt.h b/src/vnode/detail/inc/vnodeMgmt.h
similarity index 100%
rename from src/system/detail/inc/vnodeMgmt.h
rename to src/vnode/detail/inc/vnodeMgmt.h
diff --git a/src/system/detail/inc/vnodePeer.h b/src/vnode/detail/inc/vnodePeer.h
similarity index 100%
rename from src/system/detail/inc/vnodePeer.h
rename to src/vnode/detail/inc/vnodePeer.h
diff --git a/src/system/detail/inc/vnodeQueryImpl.h b/src/vnode/detail/inc/vnodeQueryImpl.h
similarity index 100%
rename from src/system/detail/inc/vnodeQueryImpl.h
rename to src/vnode/detail/inc/vnodeQueryImpl.h
diff --git a/src/system/detail/inc/vnodeRead.h b/src/vnode/detail/inc/vnodeRead.h
similarity index 100%
rename from src/system/detail/inc/vnodeRead.h
rename to src/vnode/detail/inc/vnodeRead.h
diff --git a/src/system/detail/inc/vnodeShell.h b/src/vnode/detail/inc/vnodeShell.h
similarity index 100%
rename from src/system/detail/inc/vnodeShell.h
rename to src/vnode/detail/inc/vnodeShell.h
diff --git a/src/system/detail/inc/vnodeStatus.h b/src/vnode/detail/inc/vnodeStatus.h
similarity index 100%
rename from src/system/detail/inc/vnodeStatus.h
rename to src/vnode/detail/inc/vnodeStatus.h
diff --git a/src/system/detail/inc/vnodeStore.h b/src/vnode/detail/inc/vnodeStore.h
similarity index 100%
rename from src/system/detail/inc/vnodeStore.h
rename to src/vnode/detail/inc/vnodeStore.h
diff --git a/src/system/detail/inc/vnodeSystem.h b/src/vnode/detail/inc/vnodeSystem.h
similarity index 100%
rename from src/system/detail/inc/vnodeSystem.h
rename to src/vnode/detail/inc/vnodeSystem.h
diff --git a/src/system/detail/inc/vnodeTagMgmt.h b/src/vnode/detail/inc/vnodeTagMgmt.h
similarity index 100%
rename from src/system/detail/inc/vnodeTagMgmt.h
rename to src/vnode/detail/inc/vnodeTagMgmt.h
diff --git a/src/system/detail/inc/vnodeUtil.h b/src/vnode/detail/inc/vnodeUtil.h
similarity index 100%
rename from src/system/detail/inc/vnodeUtil.h
rename to src/vnode/detail/inc/vnodeUtil.h
diff --git a/src/system/detail/src/vnodeCache.c b/src/vnode/detail/src/vnodeCache.c
similarity index 100%
rename from src/system/detail/src/vnodeCache.c
rename to src/vnode/detail/src/vnodeCache.c
diff --git a/src/system/detail/src/vnodeCommit.c b/src/vnode/detail/src/vnodeCommit.c
similarity index 100%
rename from src/system/detail/src/vnodeCommit.c
rename to src/vnode/detail/src/vnodeCommit.c
diff --git a/src/system/detail/src/vnodeFile.c b/src/vnode/detail/src/vnodeFile.c
similarity index 100%
rename from src/system/detail/src/vnodeFile.c
rename to src/vnode/detail/src/vnodeFile.c
diff --git a/src/system/detail/src/vnodeFileUtil.c b/src/vnode/detail/src/vnodeFileUtil.c
similarity index 100%
rename from src/system/detail/src/vnodeFileUtil.c
rename to src/vnode/detail/src/vnodeFileUtil.c
diff --git a/src/system/detail/src/vnodeFilterFunc.c b/src/vnode/detail/src/vnodeFilterFunc.c
similarity index 100%
rename from src/system/detail/src/vnodeFilterFunc.c
rename to src/vnode/detail/src/vnodeFilterFunc.c
diff --git a/src/system/detail/src/vnodeImport.c b/src/vnode/detail/src/vnodeImport.c
similarity index 100%
rename from src/system/detail/src/vnodeImport.c
rename to src/vnode/detail/src/vnodeImport.c
diff --git a/src/system/detail/src/vnodeMeter.c b/src/vnode/detail/src/vnodeMeter.c
similarity index 100%
rename from src/system/detail/src/vnodeMeter.c
rename to src/vnode/detail/src/vnodeMeter.c
diff --git a/src/system/detail/src/vnodeQueryImpl.c b/src/vnode/detail/src/vnodeQueryImpl.c
similarity index 100%
rename from src/system/detail/src/vnodeQueryImpl.c
rename to src/vnode/detail/src/vnodeQueryImpl.c
diff --git a/src/system/detail/src/vnodeQueryProcess.c b/src/vnode/detail/src/vnodeQueryProcess.c
similarity index 100%
rename from src/system/detail/src/vnodeQueryProcess.c
rename to src/vnode/detail/src/vnodeQueryProcess.c
diff --git a/src/system/detail/src/vnodeRead.c b/src/vnode/detail/src/vnodeRead.c
similarity index 100%
rename from src/system/detail/src/vnodeRead.c
rename to src/vnode/detail/src/vnodeRead.c
diff --git a/src/system/detail/src/vnodeShell.c b/src/vnode/detail/src/vnodeShell.c
similarity index 100%
rename from src/system/detail/src/vnodeShell.c
rename to src/vnode/detail/src/vnodeShell.c
diff --git a/src/system/detail/src/vnodeStatus.c b/src/vnode/detail/src/vnodeStatus.c
similarity index 100%
rename from src/system/detail/src/vnodeStatus.c
rename to src/vnode/detail/src/vnodeStatus.c
diff --git a/src/system/detail/src/vnodeStore.c b/src/vnode/detail/src/vnodeStore.c
similarity index 100%
rename from src/system/detail/src/vnodeStore.c
rename to src/vnode/detail/src/vnodeStore.c
diff --git a/src/system/detail/src/vnodeStream.c b/src/vnode/detail/src/vnodeStream.c
similarity index 100%
rename from src/system/detail/src/vnodeStream.c
rename to src/vnode/detail/src/vnodeStream.c
diff --git a/src/system/detail/src/vnodeSystem.c b/src/vnode/detail/src/vnodeSystem.c
similarity index 100%
rename from src/system/detail/src/vnodeSystem.c
rename to src/vnode/detail/src/vnodeSystem.c
diff --git a/src/system/detail/src/vnodeTagMgmt.c b/src/vnode/detail/src/vnodeTagMgmt.c
similarity index 100%
rename from src/system/detail/src/vnodeTagMgmt.c
rename to src/vnode/detail/src/vnodeTagMgmt.c
diff --git a/src/system/detail/src/vnodeUtil.c b/src/vnode/detail/src/vnodeUtil.c
similarity index 100%
rename from src/system/detail/src/vnodeUtil.c
rename to src/vnode/detail/src/vnodeUtil.c
diff --git a/src/system/lite/CMakeLists.txt b/src/vnode/lite/CMakeLists.txt
similarity index 100%
rename from src/system/lite/CMakeLists.txt
rename to src/vnode/lite/CMakeLists.txt
diff --git a/src/system/lite/src/vnodeFile.spec.c b/src/vnode/lite/src/vnodeFile.spec.c
similarity index 100%
rename from src/system/lite/src/vnodeFile.spec.c
rename to src/vnode/lite/src/vnodeFile.spec.c
diff --git a/src/system/lite/src/vnodePeer.spec.c b/src/vnode/lite/src/vnodePeer.spec.c
similarity index 100%
rename from src/system/lite/src/vnodePeer.spec.c
rename to src/vnode/lite/src/vnodePeer.spec.c
diff --git a/src/system/lite/src/vnodeStore.spec.c b/src/vnode/lite/src/vnodeStore.spec.c
similarity index 100%
rename from src/system/lite/src/vnodeStore.spec.c
rename to src/vnode/lite/src/vnodeStore.spec.c