diff --git a/internal/frontend/CMakeLists.txt b/internal/frontend/CMakeLists.txt
deleted file mode 100644
index 32a3bd4f..00000000
--- a/internal/frontend/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2022 Proton AG
-#
-# This file is part of Proton Mail Bridge.
-#
-# Proton Mail Bridge is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Proton Mail Bridge is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
-
-
-cmake_minimum_required(VERSION 3.22)
-
-
-#*****************************************************************************************************************************************************
-# Project
-#*****************************************************************************************************************************************************
-
-
-set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../extern/vcpkg")
-include("bridge_setup.cmake")
-
-project(frontend)
-
-add_subdirectory(bridgepp)
-add_subdirectory(bridge-gui)
-
diff --git a/internal/frontend/bridge_setup.cmake b/internal/frontend/bridge-gui/BridgeSetup.cmake
similarity index 100%
rename from internal/frontend/bridge_setup.cmake
rename to internal/frontend/bridge-gui/BridgeSetup.cmake
diff --git a/internal/frontend/bridge-gui/CMakeLists.txt b/internal/frontend/bridge-gui/CMakeLists.txt
index 6bd5c6fe..f873fbfe 100644
--- a/internal/frontend/bridge-gui/CMakeLists.txt
+++ b/internal/frontend/bridge-gui/CMakeLists.txt
@@ -17,8 +17,6 @@
 
 
 cmake_minimum_required(VERSION 3.22)
-set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../extern/vcpkg")
-include(../bridge_setup.cmake)
 
 
 #*****************************************************************************************************************************************************
@@ -26,83 +24,11 @@ include(../bridge_setup.cmake)
 #*****************************************************************************************************************************************************
 
 
-project(bridge-gui LANGUAGES CXX)
+set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../extern/vcpkg")
+include("BridgeSetup.cmake")
 
-if (NOT DEFINED BRIDGE_APP_VERSION)
-    message(FATAL_ERROR "BRIDGE_APP_VERSION is not defined.")
-else()
-    message(STATUS "Bridge version is ${BRIDGE_APP_VERSION}")
-endif()
+project(frontend)
 
-configure_file(Version.h.in ${CMAKE_SOURCE_DIR}/Version.h)
-if (APPLE) # On macOS, we have some Objective-C++ code in DockIcon to deal with the dock icon.
-    enable_language(OBJC OBJCXX)
-endif()
+add_subdirectory(bridgepp)
+add_subdirectory(bridge-gui)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-if (APPLE) # We need to link the Cocoa framework for the dock icon.
-    find_library(COCOA_LIBRARY Cocoa REQUIRED)
-endif()
-
-
-#*****************************************************************************************************************************************************
-# Qt
-#*****************************************************************************************************************************************************
-
-
-if (NOT DEFINED ENV{QT6DIR})
-    message(FATAL_ERROR "QT6DIR needs to be defined and point to the root of your Qt 6 folder (e.g. /Users/MyName/Qt/6.3.1/clang_64).")
-endif()
-
-set(CMAKE_PREFIX_PATH $ENV{QT6DIR} ${CMAKE_PREFIX_PATH})
-find_package(Qt6 COMPONENTS Core Quick Qml QuickControls2 REQUIRED)
-qt_standard_project_setup()
-set(CMAKE_AUTORCC ON)
-message(STATUS "Using Qt ${Qt6_VERSION}")
-
-
-#*****************************************************************************************************************************************************
-# Source files and output
-#*****************************************************************************************************************************************************
-
-
-configure_file(Version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Version.h)
-
-if (NOT TARGET bridgepp)
-add_subdirectory(../bridgepp bridgepp)
-endif()
-
-if (APPLE)
-    set(DOCK_ICON_SRC_FILE DockIcon/DockIcon.mm)
-else()
-    set(DOCK_ICON_SRC_FILE DockIcon/DockIcon.cpp)
-endif()
-
-add_executable(bridge-gui
-    Resources.qrc
-    AppController.cpp AppController.h
-    BridgeMonitor.cpp BridgeMonitor.h
-    EventStreamWorker.cpp EventStreamWorker.h
-    main.cpp
-    Pch.h
-    Version.h
-    QMLBackend.cpp QMLBackend.h
-    UserList.cpp UserList.h
-    ${DOCK_ICON_SRC_FILE} DockIcon/DockIcon.h
-    UserDirectories.h)
-
-target_precompile_headers(bridge-gui PRIVATE Pch.h)
-target_include_directories(bridge-gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(bridge-gui
-    Qt6::Core
-    Qt6::Quick
-    Qt6::Qml
-    Qt6::QuickControls2
-    bridgepp
-    )
-
-if (APPLE)
-target_link_libraries(bridge-gui ${COCOA_LIBRARY})
-endif()
diff --git a/internal/frontend/bridge-gui/AppController.cpp b/internal/frontend/bridge-gui/bridge-gui/AppController.cpp
similarity index 100%
rename from internal/frontend/bridge-gui/AppController.cpp
rename to internal/frontend/bridge-gui/bridge-gui/AppController.cpp
diff --git a/internal/frontend/bridge-gui/AppController.h b/internal/frontend/bridge-gui/bridge-gui/AppController.h
similarity index 100%
rename from internal/frontend/bridge-gui/AppController.h
rename to internal/frontend/bridge-gui/bridge-gui/AppController.h
diff --git a/internal/frontend/bridge-gui/BridgeMonitor.cpp b/internal/frontend/bridge-gui/bridge-gui/BridgeMonitor.cpp
similarity index 100%
rename from internal/frontend/bridge-gui/BridgeMonitor.cpp
rename to internal/frontend/bridge-gui/bridge-gui/BridgeMonitor.cpp
diff --git a/internal/frontend/bridge-gui/BridgeMonitor.h b/internal/frontend/bridge-gui/bridge-gui/BridgeMonitor.h
similarity index 100%
rename from internal/frontend/bridge-gui/BridgeMonitor.h
rename to internal/frontend/bridge-gui/bridge-gui/BridgeMonitor.h
diff --git a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
new file mode 100644
index 00000000..83d86319
--- /dev/null
+++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
@@ -0,0 +1,108 @@
+# Copyright (c) 2022 Proton AG
+#
+# This file is part of Proton Mail Bridge.
+#
+# Proton Mail Bridge is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Proton Mail Bridge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
+
+
+cmake_minimum_required(VERSION 3.22)
+set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../../extern/vcpkg")
+include(../BridgeSetup.cmake)
+
+
+#*****************************************************************************************************************************************************
+# Project
+#*****************************************************************************************************************************************************
+
+
+project(bridge-gui LANGUAGES CXX)
+
+if (NOT DEFINED BRIDGE_APP_VERSION)
+    message(FATAL_ERROR "BRIDGE_APP_VERSION is not defined.")
+else()
+    message(STATUS "Bridge version is ${BRIDGE_APP_VERSION}")
+endif()
+
+configure_file(Version.h.in ${CMAKE_SOURCE_DIR}/Version.h)
+if (APPLE) # On macOS, we have some Objective-C++ code in DockIcon to deal with the dock icon.
+    enable_language(OBJC OBJCXX)
+endif()
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if (APPLE) # We need to link the Cocoa framework for the dock icon.
+    find_library(COCOA_LIBRARY Cocoa REQUIRED)
+endif()
+
+
+#*****************************************************************************************************************************************************
+# Qt
+#*****************************************************************************************************************************************************
+
+
+if (NOT DEFINED ENV{QT6DIR})
+    message(FATAL_ERROR "QT6DIR needs to be defined and point to the root of your Qt 6 folder (e.g. /Users/MyName/Qt/6.3.1/clang_64).")
+endif()
+
+set(CMAKE_PREFIX_PATH $ENV{QT6DIR} ${CMAKE_PREFIX_PATH})
+find_package(Qt6 COMPONENTS Core Quick Qml QuickControls2 REQUIRED)
+qt_standard_project_setup()
+set(CMAKE_AUTORCC ON)
+message(STATUS "Using Qt ${Qt6_VERSION}")
+
+
+#*****************************************************************************************************************************************************
+# Source files and output
+#*****************************************************************************************************************************************************
+
+
+configure_file(Version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Version.h)
+
+if (NOT TARGET bridgepp)
+add_subdirectory(../bridgepp bridgepp)
+endif()
+
+if (APPLE)
+    set(DOCK_ICON_SRC_FILE DockIcon/DockIcon.mm)
+else()
+    set(DOCK_ICON_SRC_FILE DockIcon/DockIcon.cpp)
+endif()
+
+add_executable(bridge-gui
+    Resources.qrc
+    AppController.cpp AppController.h
+    BridgeMonitor.cpp BridgeMonitor.h
+    EventStreamWorker.cpp EventStreamWorker.h
+    main.cpp
+    Pch.h
+    Version.h
+    QMLBackend.cpp QMLBackend.h
+    UserList.cpp UserList.h
+    ${DOCK_ICON_SRC_FILE} DockIcon/DockIcon.h
+    UserDirectories.h)
+
+target_precompile_headers(bridge-gui PRIVATE Pch.h)
+target_include_directories(bridge-gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(bridge-gui
+    Qt6::Core
+    Qt6::Quick
+    Qt6::Qml
+    Qt6::QuickControls2
+    bridgepp
+    )
+
+if (APPLE)
+target_link_libraries(bridge-gui ${COCOA_LIBRARY})
+endif()
diff --git a/internal/frontend/bridge-gui/Config.h.in b/internal/frontend/bridge-gui/bridge-gui/Config.h.in
similarity index 100%
rename from internal/frontend/bridge-gui/Config.h.in
rename to internal/frontend/bridge-gui/bridge-gui/Config.h.in
diff --git a/internal/frontend/bridge-gui/DockIcon/DockIcon.cpp b/internal/frontend/bridge-gui/bridge-gui/DockIcon/DockIcon.cpp
similarity index 100%
rename from internal/frontend/bridge-gui/DockIcon/DockIcon.cpp
rename to internal/frontend/bridge-gui/bridge-gui/DockIcon/DockIcon.cpp
diff --git a/internal/frontend/bridge-gui/DockIcon/DockIcon.h b/internal/frontend/bridge-gui/bridge-gui/DockIcon/DockIcon.h
similarity index 100%
rename from internal/frontend/bridge-gui/DockIcon/DockIcon.h
rename to internal/frontend/bridge-gui/bridge-gui/DockIcon/DockIcon.h
diff --git a/internal/frontend/bridge-gui/DockIcon/DockIcon.mm b/internal/frontend/bridge-gui/bridge-gui/DockIcon/DockIcon.mm
similarity index 100%
rename from internal/frontend/bridge-gui/DockIcon/DockIcon.mm
rename to internal/frontend/bridge-gui/bridge-gui/DockIcon/DockIcon.mm
diff --git a/internal/frontend/bridge-gui/Doxyfile b/internal/frontend/bridge-gui/bridge-gui/Doxyfile
similarity index 100%
rename from internal/frontend/bridge-gui/Doxyfile
rename to internal/frontend/bridge-gui/bridge-gui/Doxyfile
diff --git a/internal/frontend/bridge-gui/EventStreamWorker.cpp b/internal/frontend/bridge-gui/bridge-gui/EventStreamWorker.cpp
similarity index 100%
rename from internal/frontend/bridge-gui/EventStreamWorker.cpp
rename to internal/frontend/bridge-gui/bridge-gui/EventStreamWorker.cpp
diff --git a/internal/frontend/bridge-gui/EventStreamWorker.h b/internal/frontend/bridge-gui/bridge-gui/EventStreamWorker.h
similarity index 100%
rename from internal/frontend/bridge-gui/EventStreamWorker.h
rename to internal/frontend/bridge-gui/bridge-gui/EventStreamWorker.h
diff --git a/internal/frontend/bridge-gui/Pch.h b/internal/frontend/bridge-gui/bridge-gui/Pch.h
similarity index 100%
rename from internal/frontend/bridge-gui/Pch.h
rename to internal/frontend/bridge-gui/bridge-gui/Pch.h
diff --git a/internal/frontend/bridge-gui/QMLBackend.cpp b/internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp
similarity index 100%
rename from internal/frontend/bridge-gui/QMLBackend.cpp
rename to internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp
diff --git a/internal/frontend/bridge-gui/QMLBackend.h b/internal/frontend/bridge-gui/bridge-gui/QMLBackend.h
similarity index 100%
rename from internal/frontend/bridge-gui/QMLBackend.h
rename to internal/frontend/bridge-gui/bridge-gui/QMLBackend.h
diff --git a/internal/frontend/bridge-gui/README.md b/internal/frontend/bridge-gui/bridge-gui/README.md
similarity index 100%
rename from internal/frontend/bridge-gui/README.md
rename to internal/frontend/bridge-gui/bridge-gui/README.md
diff --git a/internal/frontend/bridge-gui/Resources.qrc b/internal/frontend/bridge-gui/bridge-gui/Resources.qrc
similarity index 100%
rename from internal/frontend/bridge-gui/Resources.qrc
rename to internal/frontend/bridge-gui/bridge-gui/Resources.qrc
diff --git a/internal/frontend/bridge-gui/UserDirectories.h b/internal/frontend/bridge-gui/bridge-gui/UserDirectories.h
similarity index 100%
rename from internal/frontend/bridge-gui/UserDirectories.h
rename to internal/frontend/bridge-gui/bridge-gui/UserDirectories.h
diff --git a/internal/frontend/bridge-gui/UserList.cpp b/internal/frontend/bridge-gui/bridge-gui/UserList.cpp
similarity index 100%
rename from internal/frontend/bridge-gui/UserList.cpp
rename to internal/frontend/bridge-gui/bridge-gui/UserList.cpp
diff --git a/internal/frontend/bridge-gui/UserList.h b/internal/frontend/bridge-gui/bridge-gui/UserList.h
similarity index 100%
rename from internal/frontend/bridge-gui/UserList.h
rename to internal/frontend/bridge-gui/bridge-gui/UserList.h
diff --git a/internal/frontend/bridge-gui/bridge-gui/Version.h b/internal/frontend/bridge-gui/bridge-gui/Version.h
new file mode 100644
index 00000000..05db92d9
--- /dev/null
+++ b/internal/frontend/bridge-gui/bridge-gui/Version.h
@@ -0,0 +1,24 @@
+// Copyright (c) 2022 Proton AG
+//
+// This file is part of Proton Mail Bridge.
+//
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Proton Mail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
+
+
+#ifndef BRIDGE_GUI_VERSION_H
+#define BRIDGE_GUI_VERSION_H
+
+#define PROJECT_VER  "2.2.1+git"
+
+#endif // BRIDGE_GUI_VERSION_H
diff --git a/internal/frontend/bridge-gui/Version.h.in b/internal/frontend/bridge-gui/bridge-gui/Version.h.in
similarity index 100%
rename from internal/frontend/bridge-gui/Version.h.in
rename to internal/frontend/bridge-gui/bridge-gui/Version.h.in
diff --git a/internal/frontend/bridge-gui/build.ps1 b/internal/frontend/bridge-gui/bridge-gui/build.ps1
similarity index 95%
rename from internal/frontend/bridge-gui/build.ps1
rename to internal/frontend/bridge-gui/bridge-gui/build.ps1
index ca7214eb..1a8ae94e 100644
--- a/internal/frontend/bridge-gui/build.ps1
+++ b/internal/frontend/bridge-gui/bridge-gui/build.ps1
@@ -23,7 +23,7 @@ $cmakeExe = "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE
 $bridgeVersion = ($env:BRIDGE_APP_VERSION ??= "2.2.1+") # TODO get the version number from a unified location.
 $buildConfig = ($env:BRIDGE_GUI_BUILD_CONFIG ??= "Debug")
 $buildDir=(Join-Path $PSScriptRoot "cmake-build-$buildConfig-visual-studio".ToLower())
-$vcpkgRoot = (Join-Path $PSScriptRoot "../../../extern/vcpkg" -Resolve)
+$vcpkgRoot = (Join-Path $PSScriptRoot "../../../../extern/vcpkg" -Resolve)
 $vcpkgExe = (Join-Path $vcpkgRoot "vcpkg.exe")
 $vcpkgBootstrap = (Join-Path $vcpkgRoot "bootstrap-vcpkg.bat")
 
diff --git a/internal/frontend/bridge-gui/build.sh b/internal/frontend/bridge-gui/bridge-gui/build.sh
similarity index 97%
rename from internal/frontend/bridge-gui/build.sh
rename to internal/frontend/bridge-gui/bridge-gui/build.sh
index f77b91b4..4feb13bc 100755
--- a/internal/frontend/bridge-gui/build.sh
+++ b/internal/frontend/bridge-gui/bridge-gui/build.sh
@@ -20,7 +20,7 @@
 BRIDGE_APP_VERSION=${BRIDGE_APP_VERSION:-2.2.1+git} # TODO get the version number from a unified location.
 BUILD_CONFIG=${BRIDGE_GUI_BUILD_CONFIG:-Debug}
 BUILD_DIR=$(echo "./cmake-build-${BUILD_CONFIG}" | tr '[:upper:]' '[:lower:]')
-VCPKG_ROOT="../../../extern/vcpkg"
+VCPKG_ROOT="../../../../extern/vcpkg"
 VCPKG_EXE="${VCPKG_ROOT}/vcpkg"
 VCPKG_BOOTSTRAP="${VCPKG_ROOT}/bootstrap-vcpkg.sh"
 
@@ -61,4 +61,4 @@ cmake  -DCMAKE_BUILD_TYPE="${BUILD_CONFIG}" -DBRIDGE_APP_VERSION="${BRIDGE_APP_V
 check_exit "CMake failed"
 
 cmake --build "${BUILD_DIR}"
-check_exit "build failed"
\ No newline at end of file
+check_exit "build failed"
diff --git a/internal/frontend/bridge-gui/main.cpp b/internal/frontend/bridge-gui/bridge-gui/main.cpp
similarity index 100%
rename from internal/frontend/bridge-gui/main.cpp
rename to internal/frontend/bridge-gui/bridge-gui/main.cpp
diff --git a/internal/frontend/bridge-gui/qml/AccountDelegate.qml b/internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/AccountDelegate.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml
diff --git a/internal/frontend/bridge-gui/qml/AccountView.qml b/internal/frontend/bridge-gui/bridge-gui/qml/AccountView.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/AccountView.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/AccountView.qml
diff --git a/internal/frontend/bridge-gui/qml/Banner.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Banner.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Banner.qml
diff --git a/internal/frontend/bridge-gui/qml/Bridge.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Bridge.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Bridge.qml
diff --git a/internal/frontend/bridge-gui/qml/BridgeTest/UserControl.qml b/internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/BridgeTest/UserControl.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml
diff --git a/internal/frontend/bridge-gui/qml/BridgeTest/UserList.qml b/internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserList.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/BridgeTest/UserList.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserList.qml
diff --git a/internal/frontend/bridge-gui/qml/BridgeTest/UserModel.qml b/internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserModel.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/BridgeTest/UserModel.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserModel.qml
diff --git a/internal/frontend/bridge-gui/qml/Bridge_test.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Bridge_test.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
diff --git a/internal/frontend/bridge-gui/qml/BugReportView.qml b/internal/frontend/bridge-gui/bridge-gui/qml/BugReportView.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/BugReportView.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/BugReportView.qml
diff --git a/internal/frontend/bridge-gui/qml/Configuration.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Configuration.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Configuration.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Configuration.qml
diff --git a/internal/frontend/bridge-gui/qml/ConfigurationItem.qml b/internal/frontend/bridge-gui/bridge-gui/qml/ConfigurationItem.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/ConfigurationItem.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/ConfigurationItem.qml
diff --git a/internal/frontend/bridge-gui/qml/ContentWrapper.qml b/internal/frontend/bridge-gui/bridge-gui/qml/ContentWrapper.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/ContentWrapper.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/ContentWrapper.qml
diff --git a/internal/frontend/bridge-gui/qml/DebugWrapper.qml b/internal/frontend/bridge-gui/bridge-gui/qml/DebugWrapper.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/DebugWrapper.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/DebugWrapper.qml
diff --git a/internal/frontend/bridge-gui/qml/GeneralSettings.qml b/internal/frontend/bridge-gui/bridge-gui/qml/GeneralSettings.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/GeneralSettings.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/GeneralSettings.qml
diff --git a/internal/frontend/bridge-gui/qml/HelpView.qml b/internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/HelpView.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml
diff --git a/internal/frontend/bridge-gui/qml/KeychainSettings.qml b/internal/frontend/bridge-gui/bridge-gui/qml/KeychainSettings.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/KeychainSettings.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/KeychainSettings.qml
diff --git a/internal/frontend/bridge-gui/qml/LocalCacheSettings.qml b/internal/frontend/bridge-gui/bridge-gui/qml/LocalCacheSettings.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/LocalCacheSettings.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/LocalCacheSettings.qml
diff --git a/internal/frontend/bridge-gui/qml/MainWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/MainWindow.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/MainWindow.qml
diff --git a/internal/frontend/bridge-gui/qml/NotificationDialog.qml b/internal/frontend/bridge-gui/bridge-gui/qml/NotificationDialog.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/NotificationDialog.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/NotificationDialog.qml
diff --git a/internal/frontend/bridge-gui/qml/NotificationPopups.qml b/internal/frontend/bridge-gui/bridge-gui/qml/NotificationPopups.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/NotificationPopups.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/NotificationPopups.qml
diff --git a/internal/frontend/bridge-gui/qml/Notifications/Notification.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Notifications/Notification.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Notifications/Notification.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Notifications/Notification.qml
diff --git a/internal/frontend/bridge-gui/qml/Notifications/NotificationFilter.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Notifications/NotificationFilter.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Notifications/NotificationFilter.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Notifications/NotificationFilter.qml
diff --git a/internal/frontend/bridge-gui/qml/Notifications/Notifications.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Notifications/Notifications.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Notifications/Notifications.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Notifications/Notifications.qml
diff --git a/internal/frontend/bridge-gui/qml/Notifications/qmldir b/internal/frontend/bridge-gui/bridge-gui/qml/Notifications/qmldir
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Notifications/qmldir
rename to internal/frontend/bridge-gui/bridge-gui/qml/Notifications/qmldir
diff --git a/internal/frontend/bridge-gui/qml/PortSettings.qml b/internal/frontend/bridge-gui/bridge-gui/qml/PortSettings.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/PortSettings.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/PortSettings.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Action.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Action.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Action.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Action.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/ApplicationWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/ApplicationWindow.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/ApplicationWindow.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Button.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Button.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Button.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Button.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/CheckBox.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/CheckBox.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/CheckBox.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/CheckBox.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/ColorScheme.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ColorScheme.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/ColorScheme.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/ColorScheme.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/ComboBox.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/ComboBox.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/ComboBox.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/ComboBox.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Dialog.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Dialog.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Dialog.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Label.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Label.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Label.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Label.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Menu.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Menu.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Menu.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Menu.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/MenuItem.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/MenuItem.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/MenuItem.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/MenuItem.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Popup.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Popup.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Popup.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/RadioButton.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/RadioButton.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/RadioButton.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/RadioButton.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Style.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Style.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Switch.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Switch.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Switch.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Switch.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/TextArea.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextArea.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/TextArea.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextArea.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/TextField.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextField.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/TextField.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/TextField.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/Toggle.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Toggle.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/Toggle.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/Toggle.qml
diff --git a/internal/frontend/bridge-gui/qml/Proton/qmldir b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/qmldir
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Proton/qmldir
rename to internal/frontend/bridge-gui/bridge-gui/qml/Proton/qmldir
diff --git a/internal/frontend/bridge-gui/qml/SMTPSettings.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SMTPSettings.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/SMTPSettings.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/SMTPSettings.qml
diff --git a/internal/frontend/bridge-gui/qml/SettingsItem.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SettingsItem.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/SettingsItem.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/SettingsItem.qml
diff --git a/internal/frontend/bridge-gui/qml/SettingsView.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SettingsView.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/SettingsView.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/SettingsView.qml
diff --git a/internal/frontend/bridge-gui/qml/SetupGuide.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupGuide.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/SetupGuide.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/SetupGuide.qml
diff --git a/internal/frontend/bridge-gui/qml/SignIn.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SignIn.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/SignIn.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/SignIn.qml
diff --git a/internal/frontend/bridge-gui/qml/SplashScreen.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SplashScreen.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/SplashScreen.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/SplashScreen.qml
diff --git a/internal/frontend/bridge-gui/qml/Status.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Status.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/Status.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/Status.qml
diff --git a/internal/frontend/bridge-gui/qml/StatusWindow.qml b/internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/StatusWindow.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/StatusWindow.qml
diff --git a/internal/frontend/bridge-gui/qml/WelcomeGuide.qml b/internal/frontend/bridge-gui/bridge-gui/qml/WelcomeGuide.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/WelcomeGuide.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/WelcomeGuide.qml
diff --git a/internal/frontend/bridge-gui/qml/bridgeqml.qmlproject b/internal/frontend/bridge-gui/bridge-gui/qml/bridgeqml.qmlproject
similarity index 100%
rename from internal/frontend/bridge-gui/qml/bridgeqml.qmlproject
rename to internal/frontend/bridge-gui/bridge-gui/qml/bridgeqml.qmlproject
diff --git a/internal/frontend/bridge-gui/qml/icons/Loader_16.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/Loader_16.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/Loader_16.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/Loader_16.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/Loader_48.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/Loader_48.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/Loader_48.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/Loader_48.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-alert.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-alert.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-alert.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-alert.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-apple-mail.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-apple-mail.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-apple-mail.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-apple-mail.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-arrow-left.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-arrow-left.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-arrow-left.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-arrow-left.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-card-identity.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-card-identity.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-card-identity.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-card-identity.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-check.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-check.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-check.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-check.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-chevron-down.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-chevron-down.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-chevron-down.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-chevron-down.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-chevron-up.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-chevron-up.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-chevron-up.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-chevron-up.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-cog-wheel.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-cog-wheel.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-cog-wheel.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-cog-wheel.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-connected.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-connected.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-connected.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-connected.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-copy.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-copy.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-copy.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-copy.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-cross-close.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-cross-close.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-cross-close.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-cross-close.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-drive.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-drive.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-drive.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-drive.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-exclamation-circle-filled.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-exclamation-circle-filled.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-exclamation-circle-filled.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-exclamation-circle-filled.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-external-link.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-external-link.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-external-link.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-external-link.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-eye-slash.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-eye-slash.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-eye-slash.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-eye-slash.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-eye.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-eye.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-eye.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-eye.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-illustrative-view-html-code.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-illustrative-view-html-code.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-illustrative-view-html-code.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-illustrative-view-html-code.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-info-circle-filled.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-info-circle-filled.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-info-circle-filled.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-info-circle-filled.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-info.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-info.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-info.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-info.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-microsoft-outlook.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-microsoft-outlook.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-microsoft-outlook.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-microsoft-outlook.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-mozilla-thunderbird.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-mozilla-thunderbird.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-mozilla-thunderbird.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-mozilla-thunderbird.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-no-connection.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-no-connection.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-no-connection.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-no-connection.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-other-mail-clients.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-other-mail-clients.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-other-mail-clients.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-other-mail-clients.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-plus.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-plus.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-plus.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-plus.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-question-circle.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-question-circle.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-question-circle.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-question-circle.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-success.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-success.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-success.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-success.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-three-dots-vertical.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-three-dots-vertical.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-three-dots-vertical.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-three-dots-vertical.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/ic-trash.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-trash.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/ic-trash.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/ic-trash.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/img-proton-logos.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-proton-logos.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-proton-logos.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-proton-logos.png
diff --git a/internal/frontend/bridge-gui/qml/icons/img-proton-logos.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-proton-logos.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-proton-logos.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-proton-logos.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/img-splash.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-splash.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-splash.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-splash.png
diff --git a/internal/frontend/bridge-gui/qml/icons/img-splash.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-splash.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-splash.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-splash.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/img-welcome-dark.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome-dark.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-welcome-dark.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome-dark.png
diff --git a/internal/frontend/bridge-gui/qml/icons/img-welcome-dark.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome-dark.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-welcome-dark.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome-dark.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/img-welcome.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-welcome.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome.png
diff --git a/internal/frontend/bridge-gui/qml/icons/img-welcome.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/img-welcome.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/img-welcome.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/product_logos.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/product_logos.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/product_logos.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/product_logos.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/product_logos_dark.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/product_logos_dark.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/product_logos_dark.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/product_logos_dark.svg
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-color-error.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-error.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-color-error.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-error.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-color-norm.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-norm.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-color-norm.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-norm.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-color-update.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-update.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-color-update.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-update.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-color-warn.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-warn.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-color-warn.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-color-warn.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-mono-error.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-error.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-mono-error.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-error.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-mono-norm.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-norm.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-mono-norm.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-norm.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-mono-update.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-update.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-mono-update.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-update.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray-mono-warn.png b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-warn.png
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray-mono-warn.png
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray-mono-warn.png
diff --git a/internal/frontend/bridge-gui/qml/icons/systray.svg b/internal/frontend/bridge-gui/bridge-gui/qml/icons/systray.svg
similarity index 100%
rename from internal/frontend/bridge-gui/qml/icons/systray.svg
rename to internal/frontend/bridge-gui/bridge-gui/qml/icons/systray.svg
diff --git a/internal/frontend/bridge-gui/qml/tests/Buttons.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/Buttons.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/Buttons.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/Buttons.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/ButtonsColumn.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/ButtonsColumn.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/ButtonsColumn.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/ButtonsColumn.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/CheckBoxes.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/CheckBoxes.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/CheckBoxes.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/CheckBoxes.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/ComboBoxes.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/ComboBoxes.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/ComboBoxes.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/ComboBoxes.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/RadioButtons.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/RadioButtons.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/RadioButtons.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/RadioButtons.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/Switches.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/Switches.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/Switches.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/Switches.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/Test.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/Test.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/Test.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/Test.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/TestComponents.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/TestComponents.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/TestComponents.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/TestComponents.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/TextAreas.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/TextAreas.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml
diff --git a/internal/frontend/bridge-gui/qml/tests/TextFields.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml
similarity index 100%
rename from internal/frontend/bridge-gui/qml/tests/TextFields.qml
rename to internal/frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml
diff --git a/internal/frontend/bridgepp/CMakeLists.txt b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
similarity index 94%
rename from internal/frontend/bridgepp/CMakeLists.txt
rename to internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
index 292d6c6b..951f0549 100644
--- a/internal/frontend/bridgepp/CMakeLists.txt
+++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
@@ -17,8 +17,8 @@
 
 
 cmake_minimum_required(VERSION 3.22)
-set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../extern/vcpkg")
-include(../bridge_setup.cmake)
+set(VCPKG_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../../extern/vcpkg")
+include(../BridgeSetup.cmake)
 
 
 #****************************************************************************************************************************************************
@@ -61,15 +61,15 @@ message(STATUS "protoc found ${PROTOC_EXE}")
 message(STATUS "grpc_cpp_plugin ${grpc_cpp_plugin}")
 
 find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
-if (GRPC_CPP_PLUGIN STREQUAL GRPC_CPP_PLUGIN-NOTFOUND)
+if (NOT GRPC_CPP_PLUGIN)
     message(FATAL_ERROR "grpc_cpp_plugin exe could not be found. Please add it to your path. it should be located in \${VCPKG_ROOT}/installed/arm64-osx/tools/grpc")
 else ()
     message(STATUS "grpc_cpp_plugin found at ${GRPC_CPP_PLUGIN}")
 endif ()
 
-set(PROTO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../grpc")
+set(PROTO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../grpc")
 set(PROTO_FILE "${PROTO_DIR}/bridge.proto")
-set(GRPC_OUT_DIR "bridgepp/GRPC")
+set(GRPC_OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bridgepp/GRPC")
 set(PROTO_CPP_FILE "${GRPC_OUT_DIR}/bridge.pb.cc")
 set(PROTO_H_FILE "${GRPC_OUT_DIR}/bridge.pb.h")
 set(GRPC_CPP_FILE "${GRPC_OUT_DIR}/bridge.grpc.pb.cc")
diff --git a/internal/frontend/bridgepp/Pch.h b/internal/frontend/bridge-gui/bridgepp/Pch.h
similarity index 100%
rename from internal/frontend/bridgepp/Pch.h
rename to internal/frontend/bridge-gui/bridgepp/Pch.h
diff --git a/internal/frontend/bridgepp/bridgepp/BridgeUtils.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.cpp
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/BridgeUtils.cpp
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.cpp
diff --git a/internal/frontend/bridgepp/bridgepp/BridgeUtils.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/BridgeUtils.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/BridgeUtils.h
diff --git a/internal/frontend/bridgepp/bridgepp/Exception/Exception.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/Exception/Exception.cpp
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/Exception/Exception.cpp
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/Exception/Exception.cpp
diff --git a/internal/frontend/bridgepp/bridgepp/Exception/Exception.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/Exception/Exception.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/Exception/Exception.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/Exception/Exception.h
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/GRPCClient.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCClient.cpp
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/GRPCClient.cpp
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCClient.cpp
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/GRPCClient.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCClient.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/GRPCClient.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCClient.h
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/GRPCUtils.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCUtils.cpp
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/GRPCUtils.cpp
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCUtils.cpp
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/GRPCUtils.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCUtils.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/GRPCUtils.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/GRPCUtils.h
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/bridge.grpc.pb.cc b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.grpc.pb.cc
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/bridge.grpc.pb.cc
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.grpc.pb.cc
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/bridge.grpc.pb.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.grpc.pb.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/bridge.grpc.pb.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.grpc.pb.h
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/bridge.pb.cc b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.cc
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/bridge.pb.cc
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.cc
diff --git a/internal/frontend/bridgepp/bridgepp/GRPC/bridge.pb.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/GRPC/bridge.pb.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/GRPC/bridge.pb.h
diff --git a/internal/frontend/bridgepp/bridgepp/Log/Log.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.cpp
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/Log/Log.cpp
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.cpp
diff --git a/internal/frontend/bridgepp/bridgepp/Log/Log.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/Log/Log.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/Log/Log.h
diff --git a/internal/frontend/bridgepp/bridgepp/User/User.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/User/User.cpp
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp
diff --git a/internal/frontend/bridgepp/bridgepp/User/User.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/User/User.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.h
diff --git a/internal/frontend/bridgepp/bridgepp/Worker/Overseer.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/Worker/Overseer.cpp
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/Worker/Overseer.cpp
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/Worker/Overseer.cpp
diff --git a/internal/frontend/bridgepp/bridgepp/Worker/Overseer.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/Worker/Overseer.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/Worker/Overseer.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/Worker/Overseer.h
diff --git a/internal/frontend/bridgepp/bridgepp/Worker/Worker.h b/internal/frontend/bridge-gui/bridgepp/bridgepp/Worker/Worker.h
similarity index 100%
rename from internal/frontend/bridgepp/bridgepp/Worker/Worker.h
rename to internal/frontend/bridge-gui/bridgepp/bridgepp/Worker/Worker.h