diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index 3a1a211a279b7fc8ce325bc3fbf555e891e393d0..be1d35cb22dea59fadcee6dd8bafedf140526957 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -57,36 +57,30 @@ CONFIG(debug, debug|release) {
     DESTDIR = bin/release
 }
 
-SRC_PATH = $$PWD/src/
-INCLUDE_PATH = $${SRC_PATH}/include/
-QML_PATH = $$PWD/screen/
-
 INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/ \
-               $$_PRO_FILE_PWD_/../DapRPCProtocol/ \
-               $${INCLUDE_PATH}/ \
-               $${SRC_PATH}/
+               $$_PRO_FILE_PWD_/../DapRPCProtocol/
 
 SOURCES += \
-    $${SRC_PATH}/DapChainNodeNetworkExplorer.cpp \
-    $${SRC_PATH}/DapChainNodeNetworkModel.cpp \
-    $${SRC_PATH}/DapChainWalletModel.cpp \
-    $${SRC_PATH}/DapClipboard.cpp \
-    $${SRC_PATH}/DapConsoleModel.cpp \
-    $${SRC_PATH}/DapScreenHistoryFilterModel.cpp \
-    $${SRC_PATH}/DapScreenHistoryModel.cpp \
-    $${SRC_PATH}/DapSettingsNetworkModel.cpp \
-    $${SRC_PATH}/DapWalletFilterModel.cpp \
-    $${SRC_PATH}/main.cpp \
-    $${SRC_PATH}/DapScreenDialog.cpp \
-    $${SRC_PATH}/DapScreenDialogChangeWidget.cpp \
-    $${SRC_PATH}/DapServiceClient.cpp \
-    $${SRC_PATH}/DapServiceController.cpp \
-    $${SRC_PATH}/DapCommandController.cpp \
-    $${SRC_PATH}/DapServiceClientNativeAbstract.cpp \
-    $${SRC_PATH}/DapServiceClientNativeLinux.cpp \
-    $${SRC_PATH}/DapServiceClientNativeWin.cpp \
-    $${SRC_PATH}/DapServiceClientNativeMacOS.cpp \
-    $${SRC_PATH}/DapChainWalletsModel.cpp
+    $$PWD/DapChainNodeNetworkExplorer.cpp \
+    $$PWD/DapChainNodeNetworkModel.cpp \
+    $$PWD/DapChainWalletModel.cpp \
+    $$PWD/DapClipboard.cpp \
+    $$PWD/DapConsoleModel.cpp \
+    $$PWD/DapScreenHistoryFilterModel.cpp \
+    $$PWD/DapScreenHistoryModel.cpp \
+    $$PWD/DapSettingsNetworkModel.cpp \
+    $$PWD/DapWalletFilterModel.cpp \
+    $$PWD/main.cpp \
+    $$PWD/DapScreenDialog.cpp \
+    $$PWD/DapScreenDialogChangeWidget.cpp \
+    $$PWD/DapServiceClient.cpp \
+    $$PWD/DapServiceController.cpp \
+    $$PWD/DapCommandController.cpp \
+    $$PWD/DapServiceClientNativeAbstract.cpp \
+    $$PWD/DapServiceClientNativeLinux.cpp \
+    $$PWD/DapServiceClientNativeWin.cpp \
+    $$PWD/DapServiceClientNativeMacOS.cpp \
+    $$PWD/DapChainWalletsModel.cpp
 
 RESOURCES += $$PWD/qml.qrc
 
@@ -96,24 +90,24 @@ else: unix:!android: target.path = /opt/cellframe-dashboard/bin
 !isEmpty(target.path): INSTALLS += target
 
 HEADERS += \
-    $${INCLUDE_PATH}/DapChainNodeNetworkExplorer.h \
-    $${INCLUDE_PATH}/DapChainNodeNetworkModel.h \
-    $${INCLUDE_PATH}/DapChainWalletModel.h \
-    $${INCLUDE_PATH}/DapClipboard.h \
-    $${INCLUDE_PATH}/DapConsoleModel.h \
-    $${INCLUDE_PATH}/DapScreenHistoryFilterModel.h \
-    $${INCLUDE_PATH}/DapScreenHistoryModel.h \
-    $${INCLUDE_PATH}/DapSettingsNetworkModel.h \
-    $${INCLUDE_PATH}/DapScreenDialog.h \
-    $${INCLUDE_PATH}/DapScreenDialogChangeWidget.h \
-    $${INCLUDE_PATH}/DapServiceClient.h \
-    $${INCLUDE_PATH}/DapServiceController.h \
-    $${INCLUDE_PATH}/DapCommandController.h \
-    $${INCLUDE_PATH}/DapServiceClientNativeAbstract.h \
-    $${INCLUDE_PATH}/DapServiceClientNativeLinux.h \
-    $${INCLUDE_PATH}/DapServiceClientNativeWin.h \
-    $${INCLUDE_PATH}/DapChainWalletsModel.h \
-    $${INCLUDE_PATH}/DapWalletFilterModel.h
+    $$PWD/DapChainNodeNetworkExplorer.h \
+    $$PWD/DapChainNodeNetworkModel.h \
+    $$PWD/DapChainWalletModel.h \
+    $$PWD/DapClipboard.h \
+    $$PWD/DapConsoleModel.h \
+    $$PWD/DapScreenHistoryFilterModel.h \
+    $$PWD/DapScreenHistoryModel.h \
+    $$PWD/DapSettingsNetworkModel.h \
+    $$PWD/DapScreenDialog.h \
+    $$PWD/DapScreenDialogChangeWidget.h \
+    $$PWD/DapServiceClient.h \
+    $$PWD/DapServiceController.h \
+    $$PWD/DapCommandController.h \
+    $$PWD/DapServiceClientNativeAbstract.h \
+    $$PWD/DapServiceClientNativeLinux.h \
+    $$PWD/DapServiceClientNativeWin.h \
+    $$PWD/DapChainWalletsModel.h \
+    $$PWD/DapWalletFilterModel.h
 
 include (../libdap/libdap.pri)
 include (../libdap-crypto/libdap-crypto.pri)
diff --git a/CellFrameDashboardGUI/src/DapChainNodeNetworkExplorer.cpp b/CellFrameDashboardGUI/DapChainNodeNetworkExplorer.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapChainNodeNetworkExplorer.cpp
rename to CellFrameDashboardGUI/DapChainNodeNetworkExplorer.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapChainNodeNetworkExplorer.h b/CellFrameDashboardGUI/DapChainNodeNetworkExplorer.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapChainNodeNetworkExplorer.h
rename to CellFrameDashboardGUI/DapChainNodeNetworkExplorer.h
diff --git a/CellFrameDashboardGUI/src/DapChainNodeNetworkModel.cpp b/CellFrameDashboardGUI/DapChainNodeNetworkModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapChainNodeNetworkModel.cpp
rename to CellFrameDashboardGUI/DapChainNodeNetworkModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapChainNodeNetworkModel.h b/CellFrameDashboardGUI/DapChainNodeNetworkModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapChainNodeNetworkModel.h
rename to CellFrameDashboardGUI/DapChainNodeNetworkModel.h
diff --git a/CellFrameDashboardGUI/src/DapChainWalletModel.cpp b/CellFrameDashboardGUI/DapChainWalletModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapChainWalletModel.cpp
rename to CellFrameDashboardGUI/DapChainWalletModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapChainWalletModel.h b/CellFrameDashboardGUI/DapChainWalletModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapChainWalletModel.h
rename to CellFrameDashboardGUI/DapChainWalletModel.h
diff --git a/CellFrameDashboardGUI/src/DapChainWalletsModel.cpp b/CellFrameDashboardGUI/DapChainWalletsModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapChainWalletsModel.cpp
rename to CellFrameDashboardGUI/DapChainWalletsModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapChainWalletsModel.h b/CellFrameDashboardGUI/DapChainWalletsModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapChainWalletsModel.h
rename to CellFrameDashboardGUI/DapChainWalletsModel.h
diff --git a/CellFrameDashboardGUI/src/DapClipboard.cpp b/CellFrameDashboardGUI/DapClipboard.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapClipboard.cpp
rename to CellFrameDashboardGUI/DapClipboard.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapClipboard.h b/CellFrameDashboardGUI/DapClipboard.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapClipboard.h
rename to CellFrameDashboardGUI/DapClipboard.h
diff --git a/CellFrameDashboardGUI/src/DapCommandController.cpp b/CellFrameDashboardGUI/DapCommandController.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapCommandController.cpp
rename to CellFrameDashboardGUI/DapCommandController.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapCommandController.h b/CellFrameDashboardGUI/DapCommandController.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapCommandController.h
rename to CellFrameDashboardGUI/DapCommandController.h
diff --git a/CellFrameDashboardGUI/src/DapConsoleModel.cpp b/CellFrameDashboardGUI/DapConsoleModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapConsoleModel.cpp
rename to CellFrameDashboardGUI/DapConsoleModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapConsoleModel.h b/CellFrameDashboardGUI/DapConsoleModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapConsoleModel.h
rename to CellFrameDashboardGUI/DapConsoleModel.h
diff --git a/CellFrameDashboardGUI/src/DapScreenDialog.cpp b/CellFrameDashboardGUI/DapScreenDialog.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapScreenDialog.cpp
rename to CellFrameDashboardGUI/DapScreenDialog.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapScreenDialog.h b/CellFrameDashboardGUI/DapScreenDialog.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapScreenDialog.h
rename to CellFrameDashboardGUI/DapScreenDialog.h
diff --git a/CellFrameDashboardGUI/src/DapScreenDialogChangeWidget.cpp b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapScreenDialogChangeWidget.cpp
rename to CellFrameDashboardGUI/DapScreenDialogChangeWidget.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapScreenDialogChangeWidget.h b/CellFrameDashboardGUI/DapScreenDialogChangeWidget.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapScreenDialogChangeWidget.h
rename to CellFrameDashboardGUI/DapScreenDialogChangeWidget.h
diff --git a/CellFrameDashboardGUI/src/DapScreenHistoryFilterModel.cpp b/CellFrameDashboardGUI/DapScreenHistoryFilterModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapScreenHistoryFilterModel.cpp
rename to CellFrameDashboardGUI/DapScreenHistoryFilterModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapScreenHistoryFilterModel.h b/CellFrameDashboardGUI/DapScreenHistoryFilterModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapScreenHistoryFilterModel.h
rename to CellFrameDashboardGUI/DapScreenHistoryFilterModel.h
diff --git a/CellFrameDashboardGUI/src/DapScreenHistoryModel.cpp b/CellFrameDashboardGUI/DapScreenHistoryModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapScreenHistoryModel.cpp
rename to CellFrameDashboardGUI/DapScreenHistoryModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapScreenHistoryModel.h b/CellFrameDashboardGUI/DapScreenHistoryModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapScreenHistoryModel.h
rename to CellFrameDashboardGUI/DapScreenHistoryModel.h
diff --git a/CellFrameDashboardGUI/src/DapServiceClient.cpp b/CellFrameDashboardGUI/DapServiceClient.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapServiceClient.cpp
rename to CellFrameDashboardGUI/DapServiceClient.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapServiceClient.h b/CellFrameDashboardGUI/DapServiceClient.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapServiceClient.h
rename to CellFrameDashboardGUI/DapServiceClient.h
diff --git a/CellFrameDashboardGUI/src/DapServiceClientNativeAbstract.cpp b/CellFrameDashboardGUI/DapServiceClientNativeAbstract.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapServiceClientNativeAbstract.cpp
rename to CellFrameDashboardGUI/DapServiceClientNativeAbstract.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapServiceClientNativeAbstract.h b/CellFrameDashboardGUI/DapServiceClientNativeAbstract.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapServiceClientNativeAbstract.h
rename to CellFrameDashboardGUI/DapServiceClientNativeAbstract.h
diff --git a/CellFrameDashboardGUI/src/DapServiceClientNativeLinux.cpp b/CellFrameDashboardGUI/DapServiceClientNativeLinux.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapServiceClientNativeLinux.cpp
rename to CellFrameDashboardGUI/DapServiceClientNativeLinux.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapServiceClientNativeLinux.h b/CellFrameDashboardGUI/DapServiceClientNativeLinux.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapServiceClientNativeLinux.h
rename to CellFrameDashboardGUI/DapServiceClientNativeLinux.h
diff --git a/CellFrameDashboardGUI/src/DapServiceClientNativeMacOS.cpp b/CellFrameDashboardGUI/DapServiceClientNativeMacOS.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapServiceClientNativeMacOS.cpp
rename to CellFrameDashboardGUI/DapServiceClientNativeMacOS.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapServiceClientNativeMacOS.h b/CellFrameDashboardGUI/DapServiceClientNativeMacOS.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapServiceClientNativeMacOS.h
rename to CellFrameDashboardGUI/DapServiceClientNativeMacOS.h
diff --git a/CellFrameDashboardGUI/src/DapServiceClientNativeWin.cpp b/CellFrameDashboardGUI/DapServiceClientNativeWin.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapServiceClientNativeWin.cpp
rename to CellFrameDashboardGUI/DapServiceClientNativeWin.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapServiceClientNativeWin.h b/CellFrameDashboardGUI/DapServiceClientNativeWin.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapServiceClientNativeWin.h
rename to CellFrameDashboardGUI/DapServiceClientNativeWin.h
diff --git a/CellFrameDashboardGUI/src/DapServiceController.cpp b/CellFrameDashboardGUI/DapServiceController.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapServiceController.cpp
rename to CellFrameDashboardGUI/DapServiceController.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapServiceController.h b/CellFrameDashboardGUI/DapServiceController.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapServiceController.h
rename to CellFrameDashboardGUI/DapServiceController.h
diff --git a/CellFrameDashboardGUI/src/DapSettingsNetworkModel.cpp b/CellFrameDashboardGUI/DapSettingsNetworkModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapSettingsNetworkModel.cpp
rename to CellFrameDashboardGUI/DapSettingsNetworkModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapSettingsNetworkModel.h b/CellFrameDashboardGUI/DapSettingsNetworkModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapSettingsNetworkModel.h
rename to CellFrameDashboardGUI/DapSettingsNetworkModel.h
diff --git a/CellFrameDashboardGUI/src/DapWalletFilterModel.cpp b/CellFrameDashboardGUI/DapWalletFilterModel.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/DapWalletFilterModel.cpp
rename to CellFrameDashboardGUI/DapWalletFilterModel.cpp
diff --git a/CellFrameDashboardGUI/src/include/DapWalletFilterModel.h b/CellFrameDashboardGUI/DapWalletFilterModel.h
similarity index 100%
rename from CellFrameDashboardGUI/src/include/DapWalletFilterModel.h
rename to CellFrameDashboardGUI/DapWalletFilterModel.h
diff --git a/CellFrameDashboardGUI/src/main.cpp b/CellFrameDashboardGUI/main.cpp
similarity index 100%
rename from CellFrameDashboardGUI/src/main.cpp
rename to CellFrameDashboardGUI/main.cpp