diff --git a/sonar-project.properties b/sonar-project.properties
index 1132fab11..835098274 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,9 +1,9 @@
 sonar.organization=deskflow
 sonar.projectKey=deskflow_deskflow
-sonar.sources=scripts,src/cmd,src/gui,src/lib
+sonar.sources=scripts,src/apps,src/lib
 sonar.tests=src/test
 sonar.exclusions=subprojects/**,build/**
-sonar.coverage.exclusions=subprojects/**,scripts/**,src/test/**,src/gui/**
+sonar.coverage.exclusions=subprojects/**,scripts/**,src/test/**,src/apps/deskflow-gui/**,src/apps/res/**
 sonar.cpd.exclusions=**/*Test*.cpp
 sonar.host.url=https://sonarcloud.io
 sonar.coverageReportPaths=${{ steps.coverage-paths.outputs.csv }}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 765ed04fc..07e1ea4a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,12 +18,7 @@ include_directories(./lib)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/lib)
 
 add_subdirectory(lib)
-add_subdirectory(cmd)
-
-option(BUILD_GUI "Build GUI" ON)
-if(BUILD_GUI)
-  add_subdirectory(gui)
-endif(BUILD_GUI)
+add_subdirectory(apps)
 
 option(BUILD_TESTS "Build tests" ON)
 if(BUILD_TESTS)
diff --git a/src/cmd/CMakeLists.txt b/src/apps/CMakeLists.txt
similarity index 90%
rename from src/cmd/CMakeLists.txt
rename to src/apps/CMakeLists.txt
index 42286e0fa..cd9d7613b 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/apps/CMakeLists.txt
@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 option(BUILD_UNIFIED "Build unified binary" OFF)
-
 if(BUILD_UNIFIED)
   add_subdirectory(deskflow-core)
 else()
@@ -25,3 +24,8 @@ endif(BUILD_UNIFIED)
 
 ## Only used on windows
 add_subdirectory(deskflowd)
+
+option(BUILD_GUI "Build GUI" ON)
+if(BUILD_GUI)
+  add_subdirectory(deskflow-gui)
+endif(BUILD_GUI)
diff --git a/src/cmd/deskflow-core/CMakeLists.txt b/src/apps/deskflow-core/CMakeLists.txt
similarity index 100%
rename from src/cmd/deskflow-core/CMakeLists.txt
rename to src/apps/deskflow-core/CMakeLists.txt
diff --git a/src/cmd/deskflow-core/deskflow-core.cpp b/src/apps/deskflow-core/deskflow-core.cpp
similarity index 100%
rename from src/cmd/deskflow-core/deskflow-core.cpp
rename to src/apps/deskflow-core/deskflow-core.cpp
diff --git a/src/cmd/deskflow-core/deskflow-core.exe.manifest b/src/apps/deskflow-core/deskflow-core.exe.manifest
similarity index 100%
rename from src/cmd/deskflow-core/deskflow-core.exe.manifest
rename to src/apps/deskflow-core/deskflow-core.exe.manifest
diff --git a/src/gui/src/Action.cpp b/src/apps/deskflow-gui/Action.cpp
similarity index 100%
rename from src/gui/src/Action.cpp
rename to src/apps/deskflow-gui/Action.cpp
diff --git a/src/gui/src/Action.h b/src/apps/deskflow-gui/Action.h
similarity index 100%
rename from src/gui/src/Action.h
rename to src/apps/deskflow-gui/Action.h
diff --git a/src/gui/src/AppDelegate.h b/src/apps/deskflow-gui/AppDelegate.h
similarity index 100%
rename from src/gui/src/AppDelegate.h
rename to src/apps/deskflow-gui/AppDelegate.h
diff --git a/src/gui/src/AppDelegate.mm b/src/apps/deskflow-gui/AppDelegate.mm
similarity index 100%
rename from src/gui/src/AppDelegate.mm
rename to src/apps/deskflow-gui/AppDelegate.mm
diff --git a/src/gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt
similarity index 88%
rename from src/gui/CMakeLists.txt
rename to src/apps/deskflow-gui/CMakeLists.txt
index 6a57b1529..ce28d309e 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/apps/deskflow-gui/CMakeLists.txt
@@ -27,25 +27,22 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 file(
   GLOB
   sources
-  res/deskflow.qrc
-  src/*.cpp
-  src/*.h
-  src/dialogs/*.h
-  src/dialogs/*.cpp
-  src/validators/*
-  src/widgets/*)
-file(GLOB ui_files src/*.ui src/dialogs/*.ui)
+  ../res/deskflow.qrc
+  *.cpp
+  *.h
+  dialogs/*.h
+  dialogs/*.cpp
+  validators/*
+  widgets/*)
+file(GLOB ui_files *.ui dialogs/*.ui)
 
 if(WIN32)
-  set(platform_extra src/deskflow.rc ${PROJECT_BINARY_DIR}/src/version.rc)
+  set(platform_extra deskflow.rc ${PROJECT_BINARY_DIR}/src/version.rc)
 elseif(APPLE)
-  set(platform_extra src/Deskflow.icns ${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION)
+  set(platform_extra Deskflow.icns ${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/LICENSE_EXCEPTION)
   set_source_files_properties(${platform_extra} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 endif()
 
-# regular exe headers
-include_directories(./src)
-
 # gui library autogen headers:
 # qt doesn't seem to auto include the autogen headers for libraries.
 include_directories(${PROJECT_BINARY_DIR}/src/lib/gui/gui_autogen/include)
diff --git a/src/gui/src/DataDownloader.cpp b/src/apps/deskflow-gui/DataDownloader.cpp
similarity index 100%
rename from src/gui/src/DataDownloader.cpp
rename to src/apps/deskflow-gui/DataDownloader.cpp
diff --git a/src/gui/src/DataDownloader.h b/src/apps/deskflow-gui/DataDownloader.h
similarity index 100%
rename from src/gui/src/DataDownloader.h
rename to src/apps/deskflow-gui/DataDownloader.h
diff --git a/src/gui/src/Deskflow.icns b/src/apps/deskflow-gui/Deskflow.icns
similarity index 100%
rename from src/gui/src/Deskflow.icns
rename to src/apps/deskflow-gui/Deskflow.icns
diff --git a/src/gui/src/Hotkey.cpp b/src/apps/deskflow-gui/Hotkey.cpp
similarity index 100%
rename from src/gui/src/Hotkey.cpp
rename to src/apps/deskflow-gui/Hotkey.cpp
diff --git a/src/gui/src/Hotkey.h b/src/apps/deskflow-gui/Hotkey.h
similarity index 100%
rename from src/gui/src/Hotkey.h
rename to src/apps/deskflow-gui/Hotkey.h
diff --git a/src/gui/src/KeySequence.cpp b/src/apps/deskflow-gui/KeySequence.cpp
similarity index 100%
rename from src/gui/src/KeySequence.cpp
rename to src/apps/deskflow-gui/KeySequence.cpp
diff --git a/src/gui/src/KeySequence.h b/src/apps/deskflow-gui/KeySequence.h
similarity index 100%
rename from src/gui/src/KeySequence.h
rename to src/apps/deskflow-gui/KeySequence.h
diff --git a/src/gui/src/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
similarity index 100%
rename from src/gui/src/MainWindow.cpp
rename to src/apps/deskflow-gui/MainWindow.cpp
diff --git a/src/gui/src/MainWindow.h b/src/apps/deskflow-gui/MainWindow.h
similarity index 100%
rename from src/gui/src/MainWindow.h
rename to src/apps/deskflow-gui/MainWindow.h
diff --git a/src/gui/src/MainWindow.ui b/src/apps/deskflow-gui/MainWindow.ui
similarity index 100%
rename from src/gui/src/MainWindow.ui
rename to src/apps/deskflow-gui/MainWindow.ui
diff --git a/src/gui/src/ProcessorArch.h b/src/apps/deskflow-gui/ProcessorArch.h
similarity index 100%
rename from src/gui/src/ProcessorArch.h
rename to src/apps/deskflow-gui/ProcessorArch.h
diff --git a/src/gui/src/QUtility.cpp b/src/apps/deskflow-gui/QUtility.cpp
similarity index 100%
rename from src/gui/src/QUtility.cpp
rename to src/apps/deskflow-gui/QUtility.cpp
diff --git a/src/gui/src/QUtility.h b/src/apps/deskflow-gui/QUtility.h
similarity index 100%
rename from src/gui/src/QUtility.h
rename to src/apps/deskflow-gui/QUtility.h
diff --git a/src/gui/src/ScreenSetupModel.cpp b/src/apps/deskflow-gui/ScreenSetupModel.cpp
similarity index 100%
rename from src/gui/src/ScreenSetupModel.cpp
rename to src/apps/deskflow-gui/ScreenSetupModel.cpp
diff --git a/src/gui/src/ScreenSetupModel.h b/src/apps/deskflow-gui/ScreenSetupModel.h
similarity index 100%
rename from src/gui/src/ScreenSetupModel.h
rename to src/apps/deskflow-gui/ScreenSetupModel.h
diff --git a/src/gui/src/ServerConfig.cpp b/src/apps/deskflow-gui/ServerConfig.cpp
similarity index 100%
rename from src/gui/src/ServerConfig.cpp
rename to src/apps/deskflow-gui/ServerConfig.cpp
diff --git a/src/gui/src/ServerConfig.h b/src/apps/deskflow-gui/ServerConfig.h
similarity index 100%
rename from src/gui/src/ServerConfig.h
rename to src/apps/deskflow-gui/ServerConfig.h
diff --git a/src/gui/src/SetupWizard.cpp b/src/apps/deskflow-gui/SetupWizard.cpp
similarity index 100%
rename from src/gui/src/SetupWizard.cpp
rename to src/apps/deskflow-gui/SetupWizard.cpp
diff --git a/src/gui/src/SetupWizard.h b/src/apps/deskflow-gui/SetupWizard.h
similarity index 100%
rename from src/gui/src/SetupWizard.h
rename to src/apps/deskflow-gui/SetupWizard.h
diff --git a/src/gui/src/TrayIcon.cpp b/src/apps/deskflow-gui/TrayIcon.cpp
similarity index 100%
rename from src/gui/src/TrayIcon.cpp
rename to src/apps/deskflow-gui/TrayIcon.cpp
diff --git a/src/gui/src/TrayIcon.h b/src/apps/deskflow-gui/TrayIcon.h
similarity index 100%
rename from src/gui/src/TrayIcon.h
rename to src/apps/deskflow-gui/TrayIcon.h
diff --git a/src/gui/src/VersionChecker.cpp b/src/apps/deskflow-gui/VersionChecker.cpp
similarity index 100%
rename from src/gui/src/VersionChecker.cpp
rename to src/apps/deskflow-gui/VersionChecker.cpp
diff --git a/src/gui/src/VersionChecker.h b/src/apps/deskflow-gui/VersionChecker.h
similarity index 100%
rename from src/gui/src/VersionChecker.h
rename to src/apps/deskflow-gui/VersionChecker.h
diff --git a/src/gui/src/deskflow.ico b/src/apps/deskflow-gui/deskflow.ico
similarity index 100%
rename from src/gui/src/deskflow.ico
rename to src/apps/deskflow-gui/deskflow.ico
diff --git a/src/gui/src/deskflow.rc b/src/apps/deskflow-gui/deskflow.rc
similarity index 100%
rename from src/gui/src/deskflow.rc
rename to src/apps/deskflow-gui/deskflow.rc
diff --git a/src/gui/src/dialogs/AboutDialog.cpp b/src/apps/deskflow-gui/dialogs/AboutDialog.cpp
similarity index 100%
rename from src/gui/src/dialogs/AboutDialog.cpp
rename to src/apps/deskflow-gui/dialogs/AboutDialog.cpp
diff --git a/src/gui/src/dialogs/AboutDialog.h b/src/apps/deskflow-gui/dialogs/AboutDialog.h
similarity index 100%
rename from src/gui/src/dialogs/AboutDialog.h
rename to src/apps/deskflow-gui/dialogs/AboutDialog.h
diff --git a/src/gui/src/dialogs/ActionDialog.cpp b/src/apps/deskflow-gui/dialogs/ActionDialog.cpp
similarity index 100%
rename from src/gui/src/dialogs/ActionDialog.cpp
rename to src/apps/deskflow-gui/dialogs/ActionDialog.cpp
diff --git a/src/gui/src/dialogs/ActionDialog.h b/src/apps/deskflow-gui/dialogs/ActionDialog.h
similarity index 100%
rename from src/gui/src/dialogs/ActionDialog.h
rename to src/apps/deskflow-gui/dialogs/ActionDialog.h
diff --git a/src/gui/src/dialogs/ActionDialog.ui b/src/apps/deskflow-gui/dialogs/ActionDialog.ui
similarity index 100%
rename from src/gui/src/dialogs/ActionDialog.ui
rename to src/apps/deskflow-gui/dialogs/ActionDialog.ui
diff --git a/src/gui/src/dialogs/AddClientDialog.cpp b/src/apps/deskflow-gui/dialogs/AddClientDialog.cpp
similarity index 100%
rename from src/gui/src/dialogs/AddClientDialog.cpp
rename to src/apps/deskflow-gui/dialogs/AddClientDialog.cpp
diff --git a/src/gui/src/dialogs/AddClientDialog.h b/src/apps/deskflow-gui/dialogs/AddClientDialog.h
similarity index 100%
rename from src/gui/src/dialogs/AddClientDialog.h
rename to src/apps/deskflow-gui/dialogs/AddClientDialog.h
diff --git a/src/gui/src/dialogs/AddClientDialog.ui b/src/apps/deskflow-gui/dialogs/AddClientDialog.ui
similarity index 100%
rename from src/gui/src/dialogs/AddClientDialog.ui
rename to src/apps/deskflow-gui/dialogs/AddClientDialog.ui
diff --git a/src/gui/src/dialogs/HotkeyDialog.cpp b/src/apps/deskflow-gui/dialogs/HotkeyDialog.cpp
similarity index 100%
rename from src/gui/src/dialogs/HotkeyDialog.cpp
rename to src/apps/deskflow-gui/dialogs/HotkeyDialog.cpp
diff --git a/src/gui/src/dialogs/HotkeyDialog.h b/src/apps/deskflow-gui/dialogs/HotkeyDialog.h
similarity index 100%
rename from src/gui/src/dialogs/HotkeyDialog.h
rename to src/apps/deskflow-gui/dialogs/HotkeyDialog.h
diff --git a/src/gui/src/dialogs/HotkeyDialog.ui b/src/apps/deskflow-gui/dialogs/HotkeyDialog.ui
similarity index 100%
rename from src/gui/src/dialogs/HotkeyDialog.ui
rename to src/apps/deskflow-gui/dialogs/HotkeyDialog.ui
diff --git a/src/gui/src/dialogs/ScreenSettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp
similarity index 100%
rename from src/gui/src/dialogs/ScreenSettingsDialog.cpp
rename to src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.cpp
diff --git a/src/gui/src/dialogs/ScreenSettingsDialog.h b/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.h
similarity index 100%
rename from src/gui/src/dialogs/ScreenSettingsDialog.h
rename to src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.h
diff --git a/src/gui/src/dialogs/ScreenSettingsDialog.ui b/src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.ui
similarity index 100%
rename from src/gui/src/dialogs/ScreenSettingsDialog.ui
rename to src/apps/deskflow-gui/dialogs/ScreenSettingsDialog.ui
diff --git a/src/gui/src/dialogs/ServerConfigDialog.cpp b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp
similarity index 100%
rename from src/gui/src/dialogs/ServerConfigDialog.cpp
rename to src/apps/deskflow-gui/dialogs/ServerConfigDialog.cpp
diff --git a/src/gui/src/dialogs/ServerConfigDialog.h b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.h
similarity index 100%
rename from src/gui/src/dialogs/ServerConfigDialog.h
rename to src/apps/deskflow-gui/dialogs/ServerConfigDialog.h
diff --git a/src/gui/src/dialogs/ServerConfigDialog.ui b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
similarity index 100%
rename from src/gui/src/dialogs/ServerConfigDialog.ui
rename to src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
diff --git a/src/gui/src/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
similarity index 100%
rename from src/gui/src/dialogs/SettingsDialog.cpp
rename to src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
diff --git a/src/gui/src/dialogs/SettingsDialog.h b/src/apps/deskflow-gui/dialogs/SettingsDialog.h
similarity index 100%
rename from src/gui/src/dialogs/SettingsDialog.h
rename to src/apps/deskflow-gui/dialogs/SettingsDialog.h
diff --git a/src/gui/src/dialogs/SettingsDialog.ui b/src/apps/deskflow-gui/dialogs/SettingsDialog.ui
similarity index 100%
rename from src/gui/src/dialogs/SettingsDialog.ui
rename to src/apps/deskflow-gui/dialogs/SettingsDialog.ui
diff --git a/src/gui/src/main.cpp b/src/apps/deskflow-gui/main.cpp
similarity index 100%
rename from src/gui/src/main.cpp
rename to src/apps/deskflow-gui/main.cpp
diff --git a/src/gui/src/widgets/ClientStateLabel.cpp b/src/apps/deskflow-gui/widgets/ClientStateLabel.cpp
similarity index 100%
rename from src/gui/src/widgets/ClientStateLabel.cpp
rename to src/apps/deskflow-gui/widgets/ClientStateLabel.cpp
diff --git a/src/gui/src/widgets/ClientStateLabel.h b/src/apps/deskflow-gui/widgets/ClientStateLabel.h
similarity index 100%
rename from src/gui/src/widgets/ClientStateLabel.h
rename to src/apps/deskflow-gui/widgets/ClientStateLabel.h
diff --git a/src/gui/src/widgets/KeySequenceWidget.cpp b/src/apps/deskflow-gui/widgets/KeySequenceWidget.cpp
similarity index 100%
rename from src/gui/src/widgets/KeySequenceWidget.cpp
rename to src/apps/deskflow-gui/widgets/KeySequenceWidget.cpp
diff --git a/src/gui/src/widgets/KeySequenceWidget.h b/src/apps/deskflow-gui/widgets/KeySequenceWidget.h
similarity index 100%
rename from src/gui/src/widgets/KeySequenceWidget.h
rename to src/apps/deskflow-gui/widgets/KeySequenceWidget.h
diff --git a/src/gui/src/widgets/ScreenSetupView.cpp b/src/apps/deskflow-gui/widgets/ScreenSetupView.cpp
similarity index 100%
rename from src/gui/src/widgets/ScreenSetupView.cpp
rename to src/apps/deskflow-gui/widgets/ScreenSetupView.cpp
diff --git a/src/gui/src/widgets/ScreenSetupView.h b/src/apps/deskflow-gui/widgets/ScreenSetupView.h
similarity index 100%
rename from src/gui/src/widgets/ScreenSetupView.h
rename to src/apps/deskflow-gui/widgets/ScreenSetupView.h
diff --git a/src/gui/src/widgets/ServerStateLabel.cpp b/src/apps/deskflow-gui/widgets/ServerStateLabel.cpp
similarity index 100%
rename from src/gui/src/widgets/ServerStateLabel.cpp
rename to src/apps/deskflow-gui/widgets/ServerStateLabel.cpp
diff --git a/src/gui/src/widgets/ServerStateLabel.h b/src/apps/deskflow-gui/widgets/ServerStateLabel.h
similarity index 100%
rename from src/gui/src/widgets/ServerStateLabel.h
rename to src/apps/deskflow-gui/widgets/ServerStateLabel.h
diff --git a/src/gui/src/widgets/TrashScreenWidget.cpp b/src/apps/deskflow-gui/widgets/TrashScreenWidget.cpp
similarity index 100%
rename from src/gui/src/widgets/TrashScreenWidget.cpp
rename to src/apps/deskflow-gui/widgets/TrashScreenWidget.cpp
diff --git a/src/gui/src/widgets/TrashScreenWidget.h b/src/apps/deskflow-gui/widgets/TrashScreenWidget.h
similarity index 100%
rename from src/gui/src/widgets/TrashScreenWidget.h
rename to src/apps/deskflow-gui/widgets/TrashScreenWidget.h
diff --git a/src/cmd/deskflowc/.gitignore b/src/apps/deskflowc/.gitignore
similarity index 100%
rename from src/cmd/deskflowc/.gitignore
rename to src/apps/deskflowc/.gitignore
diff --git a/src/cmd/deskflowc/CMakeLists.txt b/src/apps/deskflowc/CMakeLists.txt
similarity index 100%
rename from src/cmd/deskflowc/CMakeLists.txt
rename to src/apps/deskflowc/CMakeLists.txt
diff --git a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp b/src/apps/deskflowc/MSWindowsClientTaskBarReceiver.cpp
similarity index 100%
rename from src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.cpp
rename to src/apps/deskflowc/MSWindowsClientTaskBarReceiver.cpp
diff --git a/src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h b/src/apps/deskflowc/MSWindowsClientTaskBarReceiver.h
similarity index 100%
rename from src/cmd/deskflowc/MSWindowsClientTaskBarReceiver.h
rename to src/apps/deskflowc/MSWindowsClientTaskBarReceiver.h
diff --git a/src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp b/src/apps/deskflowc/OSXClientTaskBarReceiver.cpp
similarity index 100%
rename from src/cmd/deskflowc/OSXClientTaskBarReceiver.cpp
rename to src/apps/deskflowc/OSXClientTaskBarReceiver.cpp
diff --git a/src/cmd/deskflowc/OSXClientTaskBarReceiver.h b/src/apps/deskflowc/OSXClientTaskBarReceiver.h
similarity index 100%
rename from src/cmd/deskflowc/OSXClientTaskBarReceiver.h
rename to src/apps/deskflowc/OSXClientTaskBarReceiver.h
diff --git a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp b/src/apps/deskflowc/XWindowsClientTaskBarReceiver.cpp
similarity index 100%
rename from src/cmd/deskflowc/XWindowsClientTaskBarReceiver.cpp
rename to src/apps/deskflowc/XWindowsClientTaskBarReceiver.cpp
diff --git a/src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h b/src/apps/deskflowc/XWindowsClientTaskBarReceiver.h
similarity index 100%
rename from src/cmd/deskflowc/XWindowsClientTaskBarReceiver.h
rename to src/apps/deskflowc/XWindowsClientTaskBarReceiver.h
diff --git a/src/cmd/deskflowc/deskflowc.cpp b/src/apps/deskflowc/deskflowc.cpp
similarity index 100%
rename from src/cmd/deskflowc/deskflowc.cpp
rename to src/apps/deskflowc/deskflowc.cpp
diff --git a/src/cmd/deskflowc/deskflowc.exe.manifest b/src/apps/deskflowc/deskflowc.exe.manifest
similarity index 100%
rename from src/cmd/deskflowc/deskflowc.exe.manifest
rename to src/apps/deskflowc/deskflowc.exe.manifest
diff --git a/src/cmd/deskflowc/deskflowc.ico b/src/apps/deskflowc/deskflowc.ico
similarity index 100%
rename from src/cmd/deskflowc/deskflowc.ico
rename to src/apps/deskflowc/deskflowc.ico
diff --git a/src/cmd/deskflowc/deskflowc.rc b/src/apps/deskflowc/deskflowc.rc
similarity index 100%
rename from src/cmd/deskflowc/deskflowc.rc
rename to src/apps/deskflowc/deskflowc.rc
diff --git a/src/cmd/deskflowc/resource.h b/src/apps/deskflowc/resource.h
similarity index 100%
rename from src/cmd/deskflowc/resource.h
rename to src/apps/deskflowc/resource.h
diff --git a/src/cmd/deskflowc/tb_error.ico b/src/apps/deskflowc/tb_error.ico
similarity index 100%
rename from src/cmd/deskflowc/tb_error.ico
rename to src/apps/deskflowc/tb_error.ico
diff --git a/src/cmd/deskflowc/tb_idle.ico b/src/apps/deskflowc/tb_idle.ico
similarity index 100%
rename from src/cmd/deskflowc/tb_idle.ico
rename to src/apps/deskflowc/tb_idle.ico
diff --git a/src/cmd/deskflowc/tb_run.ico b/src/apps/deskflowc/tb_run.ico
similarity index 100%
rename from src/cmd/deskflowc/tb_run.ico
rename to src/apps/deskflowc/tb_run.ico
diff --git a/src/cmd/deskflowc/tb_wait.ico b/src/apps/deskflowc/tb_wait.ico
similarity index 100%
rename from src/cmd/deskflowc/tb_wait.ico
rename to src/apps/deskflowc/tb_wait.ico
diff --git a/src/cmd/deskflowd/CMakeLists.txt b/src/apps/deskflowd/CMakeLists.txt
similarity index 100%
rename from src/cmd/deskflowd/CMakeLists.txt
rename to src/apps/deskflowd/CMakeLists.txt
diff --git a/src/cmd/deskflowd/deskflowd.cpp b/src/apps/deskflowd/deskflowd.cpp
similarity index 100%
rename from src/cmd/deskflowd/deskflowd.cpp
rename to src/apps/deskflowd/deskflowd.cpp
diff --git a/src/cmd/deskflows/.gitignore b/src/apps/deskflows/.gitignore
similarity index 100%
rename from src/cmd/deskflows/.gitignore
rename to src/apps/deskflows/.gitignore
diff --git a/src/cmd/deskflows/CMakeLists.txt b/src/apps/deskflows/CMakeLists.txt
similarity index 100%
rename from src/cmd/deskflows/CMakeLists.txt
rename to src/apps/deskflows/CMakeLists.txt
diff --git a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp b/src/apps/deskflows/MSWindowsServerTaskBarReceiver.cpp
similarity index 100%
rename from src/cmd/deskflows/MSWindowsServerTaskBarReceiver.cpp
rename to src/apps/deskflows/MSWindowsServerTaskBarReceiver.cpp
diff --git a/src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h b/src/apps/deskflows/MSWindowsServerTaskBarReceiver.h
similarity index 100%
rename from src/cmd/deskflows/MSWindowsServerTaskBarReceiver.h
rename to src/apps/deskflows/MSWindowsServerTaskBarReceiver.h
diff --git a/src/cmd/deskflows/OSXServerTaskBarReceiver.cpp b/src/apps/deskflows/OSXServerTaskBarReceiver.cpp
similarity index 100%
rename from src/cmd/deskflows/OSXServerTaskBarReceiver.cpp
rename to src/apps/deskflows/OSXServerTaskBarReceiver.cpp
diff --git a/src/cmd/deskflows/OSXServerTaskBarReceiver.h b/src/apps/deskflows/OSXServerTaskBarReceiver.h
similarity index 100%
rename from src/cmd/deskflows/OSXServerTaskBarReceiver.h
rename to src/apps/deskflows/OSXServerTaskBarReceiver.h
diff --git a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp b/src/apps/deskflows/XWindowsServerTaskBarReceiver.cpp
similarity index 100%
rename from src/cmd/deskflows/XWindowsServerTaskBarReceiver.cpp
rename to src/apps/deskflows/XWindowsServerTaskBarReceiver.cpp
diff --git a/src/cmd/deskflows/XWindowsServerTaskBarReceiver.h b/src/apps/deskflows/XWindowsServerTaskBarReceiver.h
similarity index 100%
rename from src/cmd/deskflows/XWindowsServerTaskBarReceiver.h
rename to src/apps/deskflows/XWindowsServerTaskBarReceiver.h
diff --git a/src/cmd/deskflows/deskflows.cpp b/src/apps/deskflows/deskflows.cpp
similarity index 100%
rename from src/cmd/deskflows/deskflows.cpp
rename to src/apps/deskflows/deskflows.cpp
diff --git a/src/cmd/deskflows/deskflows.exe.manifest b/src/apps/deskflows/deskflows.exe.manifest
similarity index 100%
rename from src/cmd/deskflows/deskflows.exe.manifest
rename to src/apps/deskflows/deskflows.exe.manifest
diff --git a/src/cmd/deskflows/deskflows.ico b/src/apps/deskflows/deskflows.ico
similarity index 100%
rename from src/cmd/deskflows/deskflows.ico
rename to src/apps/deskflows/deskflows.ico
diff --git a/src/cmd/deskflows/deskflows.rc b/src/apps/deskflows/deskflows.rc
similarity index 100%
rename from src/cmd/deskflows/deskflows.rc
rename to src/apps/deskflows/deskflows.rc
diff --git a/src/cmd/deskflows/resource.h b/src/apps/deskflows/resource.h
similarity index 100%
rename from src/cmd/deskflows/resource.h
rename to src/apps/deskflows/resource.h
diff --git a/src/cmd/deskflows/tb_error.ico b/src/apps/deskflows/tb_error.ico
similarity index 100%
rename from src/cmd/deskflows/tb_error.ico
rename to src/apps/deskflows/tb_error.ico
diff --git a/src/cmd/deskflows/tb_idle.ico b/src/apps/deskflows/tb_idle.ico
similarity index 100%
rename from src/cmd/deskflows/tb_idle.ico
rename to src/apps/deskflows/tb_idle.ico
diff --git a/src/cmd/deskflows/tb_run.ico b/src/apps/deskflows/tb_run.ico
similarity index 100%
rename from src/cmd/deskflows/tb_run.ico
rename to src/apps/deskflows/tb_run.ico
diff --git a/src/cmd/deskflows/tb_wait.ico b/src/apps/deskflows/tb_wait.ico
similarity index 100%
rename from src/cmd/deskflows/tb_wait.ico
rename to src/apps/deskflows/tb_wait.ico
diff --git a/src/gui/res/deskflow.qrc b/src/apps/res/deskflow.qrc
similarity index 100%
rename from src/gui/res/deskflow.qrc
rename to src/apps/res/deskflow.qrc
diff --git a/src/gui/res/icons/128x128/tray-dark.png b/src/apps/res/icons/128x128/tray-dark.png
similarity index 100%
rename from src/gui/res/icons/128x128/tray-dark.png
rename to src/apps/res/icons/128x128/tray-dark.png
diff --git a/src/gui/res/icons/128x128/tray-light.png b/src/apps/res/icons/128x128/tray-light.png
similarity index 100%
rename from src/gui/res/icons/128x128/tray-light.png
rename to src/apps/res/icons/128x128/tray-light.png
diff --git a/src/gui/res/icons/128x128/tray.png b/src/apps/res/icons/128x128/tray.png
similarity index 100%
rename from src/gui/res/icons/128x128/tray.png
rename to src/apps/res/icons/128x128/tray.png
diff --git a/src/gui/res/icons/64x64/copy-dark.png b/src/apps/res/icons/64x64/copy-dark.png
similarity index 100%
rename from src/gui/res/icons/64x64/copy-dark.png
rename to src/apps/res/icons/64x64/copy-dark.png
diff --git a/src/gui/res/icons/64x64/copy-light.png b/src/apps/res/icons/64x64/copy-light.png
similarity index 100%
rename from src/gui/res/icons/64x64/copy-light.png
rename to src/apps/res/icons/64x64/copy-light.png
diff --git a/src/gui/res/icons/64x64/folder.png b/src/apps/res/icons/64x64/folder.png
similarity index 100%
rename from src/gui/res/icons/64x64/folder.png
rename to src/apps/res/icons/64x64/folder.png
diff --git a/src/gui/res/icons/64x64/padlock.png b/src/apps/res/icons/64x64/padlock.png
similarity index 100%
rename from src/gui/res/icons/64x64/padlock.png
rename to src/apps/res/icons/64x64/padlock.png
diff --git a/src/gui/res/icons/64x64/user-trash.png b/src/apps/res/icons/64x64/user-trash.png
similarity index 100%
rename from src/gui/res/icons/64x64/user-trash.png
rename to src/apps/res/icons/64x64/user-trash.png
diff --git a/src/gui/res/icons/64x64/video-display.png b/src/apps/res/icons/64x64/video-display.png
similarity index 100%
rename from src/gui/res/icons/64x64/video-display.png
rename to src/apps/res/icons/64x64/video-display.png
diff --git a/src/gui/res/image/logo-dark.png b/src/apps/res/image/logo-dark.png
similarity index 100%
rename from src/gui/res/image/logo-dark.png
rename to src/apps/res/image/logo-dark.png
diff --git a/src/gui/res/image/logo-light.png b/src/apps/res/image/logo-light.png
similarity index 100%
rename from src/gui/res/image/logo-light.png
rename to src/apps/res/image/logo-light.png
diff --git a/src/gui/res/image/placeholder.png b/src/apps/res/image/placeholder.png
similarity index 100%
rename from src/gui/res/image/placeholder.png
rename to src/apps/res/image/placeholder.png
diff --git a/src/gui/res/image/welcome.png b/src/apps/res/image/welcome.png
similarity index 100%
rename from src/gui/res/image/welcome.png
rename to src/apps/res/image/welcome.png
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 56f28695b..de799cf28 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -80,7 +80,7 @@ macro(set_sources)
     list(APPEND sources ${PROJECT_BINARY_DIR}/src/version.rc)
   endif()
 
-  list(APPEND sources ${PROJECT_SOURCE_DIR}/src/gui/res/deskflow.qrc)
+  list(APPEND sources ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.qrc)
 
   replace_platform_sources()
   replace_arch_sources()